Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-08 09:38:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Cluster support for the metrics framework returns and all tests work again.

Browse source
This commit is contained in:
Seth Hall 2012-03-28 14:00:59 -04:00
parent 6600e62ea3
commit 47f58e6340
10 changed files with 76 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

26
scripts/base/frameworks/metrics/main.bro
View file

@ -192,6 +192,32 @@ function index2str(index: Index): string
return fmt("metric_index(%s)", out);
}
function merge_data_points(dp1: DataPoint, dp2: DataPoint): DataPoint
{
local result: DataPoint;
if ( dp1?$num || dp2?$num )
{
result$num = 0;
if ( dp1?$num )
result$num += dp1$num;
if ( dp2?$num )
result$num += dp2$num;
}
if ( dp1?$unique_vals || dp2?$unique_vals )
{
result$unique_vals = set();
if ( dp1?$unique_vals )
for ( val1 in dp1$unique_vals )
add result$unique_vals[val1];
if ( dp2?$unique_vals )
for ( val2 in dp2$unique_vals )
add result$unique_vals[val2];
}
return result;
}
function write_log(ts: time, filter: Filter, data: MetricTable)
{
for ( index in data )