From d9195076b17332420b9131272d66a246409efe50 Mon Sep 17 00:00:00 2001
From: Seth Hall <seth@icir.org>
Date: Fri, 16 Nov 2012 02:37:52 -0500
Subject: [PATCH] Metrics framework checkpoint.

 - New scan.bro merged in and reworked a bit.

 - Updated metrics API.  Now possible to calculate much more.
---
 scripts/base/frameworks/metrics/cluster.bro   | 105 ++--
 scripts/base/frameworks/metrics/main.bro      | 520 +++++++++++-------
 .../base/frameworks/metrics/non-cluster.bro   |  10 +-
 .../protocols/conn/conn-stats-per-host.bro    |  22 +
 scripts/policy/protocols/conn/scan.bro        | 320 +++++++++++
 scripts/policy/protocols/http/detect-sqli.bro |  35 +-
 .../protocols/ssh/detect-bruteforcing.bro     |  15 +-
 scripts/site/local.bro                        |   3 +
 .../manager-1..stdout                         |   1 +
 .../.stdout                                   |  10 +
 .../base/frameworks/metrics/basic-cluster.bro |  40 +-
 .../scripts/base/frameworks/metrics/basic.bro |  14 +-
 .../metrics/cluster-intermediate-update.bro   |  45 +-
 .../base/frameworks/metrics/notice.bro        |  20 -
 .../base/frameworks/metrics/thresholding.bro  |  47 ++
 15 files changed, 851 insertions(+), 356 deletions(-)
 create mode 100644 scripts/policy/protocols/conn/conn-stats-per-host.bro
 create mode 100644 scripts/policy/protocols/conn/scan.bro
 create mode 100644 testing/btest/Baseline/scripts.base.frameworks.metrics.cluster-intermediate-update/manager-1..stdout
 create mode 100644 testing/btest/Baseline/scripts.base.frameworks.metrics.thresholding/.stdout
 delete mode 100644 testing/btest/scripts/base/frameworks/metrics/notice.bro
 create mode 100644 testing/btest/scripts/base/frameworks/metrics/thresholding.bro

diff --git a/scripts/base/frameworks/metrics/cluster.bro b/scripts/base/frameworks/metrics/cluster.bro
index 19f431460f..9650b80554 100644
--- a/scripts/base/frameworks/metrics/cluster.bro
+++ b/scripts/base/frameworks/metrics/cluster.bro
@@ -3,9 +3,6 @@
 ##! and will be depending on if the cluster framework has been enabled.
 ##! The goal of this script is to make metric calculation completely and
 ##! transparently automated when running on a cluster.
-##! 
-##! Events defined here are not exported deliberately because they are meant
-##! to be an internal implementation detail.
 
 @load base/frameworks/cluster
 @load ./main
@@ -24,36 +21,34 @@ export {
 	## since it may opt not to if it requested a global view for the index
 	## recently.
 	const cluster_request_global_view_percent = 0.1 &redef;
-	
-	## Event sent by the manager in a cluster to initiate the 
-	## collection of metrics values for a filter.
+
+	# Event sent by the manager in a cluster to initiate the 
+	# collection of metrics values for a filter.
 	global cluster_filter_request: event(uid: string, id: string, filter_name: string);
 
-	## Event sent by nodes that are collecting metrics after receiving
-	## a request for the metric filter from the manager.
+	# Event sent by nodes that are collecting metrics after receiving
+	# a request for the metric filter from the manager.
 	global cluster_filter_response: event(uid: string, id: string, filter_name: string, data: MetricTable, done: bool);
 
-	## This event is sent by the manager in a cluster to initiate the
-	## collection of a single index value from a filter.  It's typically
-	## used to get intermediate updates before the break interval triggers
-	## to speed detection of a value crossing a threshold.
+	# This event is sent by the manager in a cluster to initiate the
+	# collection of a single index value from a filter.  It's typically
+	# used to get intermediate updates before the break interval triggers
+	# to speed detection of a value crossing a threshold.
 	global cluster_index_request: event(uid: string, id: string, filter_name: string, index: Index);
 
-	## This event is sent by nodes in response to a 
-	## :bro:id:`Metrics::cluster_index_request` event.
-	global cluster_index_response: event(uid: string, id: string, filter_name: string, index: Index, data: DataPoint);
+	# This event is sent by nodes in response to a 
+	# :bro:id:`Metrics::cluster_index_request` event.
+	global cluster_index_response: event(uid: string, id: string, filter_name: string, index: Index, val: ResultVal);
 
-	## This is sent by workers to indicate that they crossed the percent of the 
-	## current threshold by the percentage defined globally in 
-	## :bro:id:`Metrics::cluster_request_global_view_percent`
-	global cluster_index_intermediate_response: event(id: string, filter_name: string, index: Metrics::Index, val: count);
+	# This is sent by workers to indicate that they crossed the percent of the 
+	# current threshold by the percentage defined globally in 
+	# :bro:id:`Metrics::cluster_request_global_view_percent`
+	global cluster_index_intermediate_response: event(id: string, filter_name: string, index: Metrics::Index);
 
-	## This event is scheduled internally on workers to send result chunks.
+	# This event is scheduled internally on workers to send result chunks.
 	global send_data: event(uid: string, id: string, filter_name: string, data: MetricTable);
-	
 }
 
-
 # This is maintained by managers so they can know what data they requested and
 # when they requested it.
 global requested_results: table[string] of time = table() &create_expire=5mins;
@@ -76,7 +71,7 @@ global done_with: table[string] of count &create_expire=5mins &default=0;
 
 # This variable is maintained by managers to track intermediate responses as 
 # they are getting a global view for a certain index.
-global index_requests: table[string, string, string, Index] of DataPoint &create_expire=5mins &default=[];
+global index_requests: table[string, string, string, Index] of ResultVal &create_expire=5mins &default=[];
 
 # This variable is maintained by all hosts for different purposes. Non-managers
 # maintain it to know what indexes they have recently sent as intermediate
@@ -95,23 +90,20 @@ redef Cluster::worker2manager_events += /Metrics::cluster_(filter_response|index
 @if ( Cluster::local_node_type() != Cluster::MANAGER )
 # This is done on all non-manager node types in the event that a metric is 
 # being collected somewhere other than a worker.
-function data_added(filter: Filter, index: Index, val: count)
+function data_added(filter: Filter, index: Index, val: ResultVal)
 	{
 	# If an intermediate update for this value was sent recently, don't send
 	# it again.
 	if ( [filter$id, filter$name, index] in recent_global_view_indexes )
 		return;
-		
+
 	# If val is 5 and global view % is 0.1 (10%), pct_val will be 50.  If that
 	# crosses the full threshold then it's a candidate to send as an 
 	# intermediate update.
-	local pct_val = double_to_count(val / cluster_request_global_view_percent);
-	
-	if ( check_threshold(filter, index, pct_val) ) 
+	if ( check_thresholds(filter, index, val, cluster_request_global_view_percent) )
 		{
 		# kick off intermediate update
-		event Metrics::cluster_index_intermediate_response(filter$id, filter$name, index, val);
-		
+		event Metrics::cluster_index_intermediate_response(filter$id, filter$name, index);
 		++recent_global_view_indexes[filter$id, filter$name, index];
 		}
 	}
@@ -137,9 +129,6 @@ event Metrics::send_data(uid: string, id: string, filter_name: string, data: Met
 	# If data is empty, this metric is done.
 	if ( |data| == 0 )
 		done = T;
-
-	#print "Here is local_data";
-	#print local_data;
 	
 	event Metrics::cluster_filter_response(uid, id, filter_name, local_data, done);
 	if ( ! done )
@@ -148,7 +137,7 @@ event Metrics::send_data(uid: string, id: string, filter_name: string, data: Met
 
 event Metrics::cluster_filter_request(uid: string, id: string, filter_name: string)
 	{
-	#print fmt("WORKER %s: received the cluster_filter_request event.", Cluster::node);
+	#print fmt("WORKER %s: received the cluster_filter_request event for %s.", Cluster::node, id);
 	
 	# Initiate sending all of the data for the requested filter.
 	event Metrics::send_data(uid, id, filter_name, store[id, filter_name]);
@@ -160,12 +149,12 @@ event Metrics::cluster_filter_request(uid: string, id: string, filter_name: stri
 	
 event Metrics::cluster_index_request(uid: string, id: string, filter_name: string, index: Index)
 	{
-	local data: DataPoint;
-	if ( index in store[id, filter_name] )
-		data = store[id, filter_name][index];
-	
-	# fmt("WORKER %s: received the cluster_index_request event for %s=%d.", Cluster::node, index2str(index), val);
-	event Metrics::cluster_index_response(uid, id, filter_name, index, data);
+	if ( [id, filter_name] in store && index in store[id, filter_name] )
+		{
+		local data = store[id, filter_name][index];
+		#print fmt("WORKER %s: received the cluster_index_request event for %s=%s.", Cluster::node, index2str(index), data);
+		event Metrics::cluster_index_response(uid, id, filter_name, index, data);
+		}
 	}
 
 @endif
@@ -177,7 +166,6 @@ event Metrics::cluster_index_request(uid: string, id: string, filter_name: strin
 event Metrics::log_it(filter: Filter)
 	{
 	#print fmt("%.6f MANAGER: breaking %s filter for %s metric", network_time(), filter$name, filter$id);
-	
 	local uid = unique_id("");
 	
 	# Set some tracking variables.
@@ -187,39 +175,44 @@ event Metrics::log_it(filter: Filter)
 	# Request data from peers.
 	event Metrics::cluster_filter_request(uid, filter$id, filter$name);
 	# Schedule the log_it event for the next break period.
-	schedule filter$break_interval { Metrics::log_it(filter) };
+	schedule filter$every { Metrics::log_it(filter) };
 	}
 
 # This is unlikely to be called often, but it's here in case there are metrics
 # being collected by managers.
-function data_added(filter: Filter, index: Index, val: count)
+function data_added(filter: Filter, index: Index, val: ResultVal)
 	{
-	if ( check_threshold(filter, index, val) )
-		threshold_crossed_alert( filter, index, val );
-		#do_notice(filter, index, val);
+	if ( check_thresholds(filter, index, val, 1.0) )
+		threshold_crossed(filter, index, val);
 	}
 	
-event Metrics::cluster_index_response(uid: string, id: string, filter_name: string, index: Index, data: DataPoint)
+event Metrics::cluster_index_response(uid: string, id: string, filter_name: string, index: Index, val: ResultVal)
 	{
-	#print fmt("%0.6f MANAGER: receiving index data from %s", network_time(), get_event_peer()$descr);
+	#print fmt("%0.6f MANAGER: receiving index data from %s - %s=%s", network_time(), get_event_peer()$descr, index2str(index), val);
 	
-	index_requests[uid, id, filter_name, index] = merge_data_points(index_requests[uid, id, filter_name, index], data);
+	local merged_val = merge_result_vals(index_requests[uid, id, filter_name, index], val);
+	index_requests[uid, id, filter_name, index] = merged_val;
 	local ir = index_requests[uid, id, filter_name, index];
 	
+	# Mark that this worker is done.
 	++done_with[uid];
+
+	#print ir;
+	#print fmt("worker_count:%d :: done_with:%d", Cluster::worker_count, done_with[uid]);
+
 	if ( Cluster::worker_count == done_with[uid] )
 		{
-		local size = ir?$num ? ir$num : |ir$unique_vals|;
-		if ( check_threshold(filter_store[id, filter_name], index, size) )
-			threshold_crossed_alert( filter_store[id, filter_name], index, size );
-			#do_notice(filter_store[id, filter_name], index, size);
+		if ( check_thresholds(filter_store[id, filter_name], index, ir, 1.0) )
+			{
+			threshold_crossed(filter_store[id, filter_name], index, ir);
+			}
 		delete done_with[uid];
 		delete index_requests[uid, id, filter_name, index];
 		}
 	}
 
 # Managers handle intermediate updates here.
-event Metrics::cluster_index_intermediate_response(id: string, filter_name: string, index: Index, val: count)
+event Metrics::cluster_index_intermediate_response(id: string, filter_name: string, index: Index)
 	{
 	#print fmt("MANAGER: receiving intermediate index data from %s", get_event_peer()$descr);
 	#print fmt("MANAGER: requesting index data for %s", index2str(index));
@@ -237,12 +230,12 @@ event Metrics::cluster_filter_response(uid: string, id: string, filter_name: str
 	for ( index in data )
 		{
 		if ( index in local_data )
-			local_data[index] = merge_data_points(local_data[index], data[index]);
+			local_data[index] = merge_result_vals(local_data[index], data[index]);
 		else
 			local_data[index] = data[index];
 		}
 	
-		# Mark another worker as being "done" for this uid.
+	# Mark another worker as being "done" for this uid.
 	if ( done )
 		++done_with[uid];
 	
diff --git a/scripts/base/frameworks/metrics/main.bro b/scripts/base/frameworks/metrics/main.bro
index 174b30a09a..8e40e76e02 100644
--- a/scripts/base/frameworks/metrics/main.bro
+++ b/scripts/base/frameworks/metrics/main.bro
@@ -1,7 +1,5 @@
 ##! The metrics framework provides a way to count and measure data.  
 
-@load base/frameworks/notice
-
 module Metrics;
 
 export {
@@ -11,15 +9,21 @@ export {
 	## The default interval used for "breaking" metrics and writing the 
 	## current value to the logging stream.
 	const default_break_interval = 15mins &redef;
-
-	## The default number of metric items which trigger 
-	## filter$custom_check_threshold 
-	const default_trigger_custom_check_threshold = 10 &redef;
 	
 	## This is the interval for how often threshold based notices will happen 
 	## after they have already fired.
 	const threshold_series_restart_interval = 1hr &redef;
 	
+	type Calculation: enum {
+		SUM,
+		MIN,
+		MAX,
+		VARIANCE,
+		STD_DEV,
+		AVG,
+		UNIQUE,
+	};
+
 	## Represents a thing which is having metrics collected for it.  An instance
 	## of this record type and an id together represent a single measurement.
 	type Index: record {
@@ -40,12 +44,47 @@ export {
 		network:      subnet &optional;
 	} &log;
 	
-	## Represents data being added for a single metric data point.  Used internally.
+	## Represents data being added for a single metric data point.
 	type DataPoint: record {
-		num:        count       &optional;
-		unique_vals: set[string] &optional;
+		num:       count       &optional;
+		dbl:       double      &optional;
+		str:       string      &optional;
 	};
-	
+
+	## Value supplied when a metric is finished.  It contains all
+	## of the measurements collected for the metric.
+	type ResultVal: record {
+		## The number of measurements received.
+		num:     count        &log &default=0;
+
+		## For numeric data, this tracks the sum of all values.
+		sum:     double       &log &optional;
+
+		## For numeric data, this tracks the minimum value given.
+		min:     double       &log &optional;
+
+		## For numeric data, this tracks the maximum value given.
+		max:     double       &log &optional;
+
+		## For numeric data, this calculates the average of all values.
+		avg:     double       &log &optional;
+
+		## For numeric data, this calculates the variance.
+		variance: double      &log &optional;
+
+		## For numeric data, this calculates the standard deviation.
+		std_dev:  double      &log &optional;
+
+		## If cardinality is being tracked, the number of unique
+		## items is tracked here.
+		unique: count         &log &optional;
+
+		## A sample of something being measured.  This is helpful in 
+		## some cases for collecting information to do further detection
+		## or better logging for forensic purposes.
+		sample: set[DataPoint]   &optional;
+	};
+
 	## The record type that is used for logging metrics.
 	type Info: record {
 		## Timestamp at which the metric was "broken".
@@ -57,67 +96,58 @@ export {
 		## the data so this is necessary to understand the value.
 		filter_name:  string   &log;
 		## What measurement the metric represents.
-		metric_id:    string   &log;
+		metric:       string   &log;
 		## What the metric value applies to.
 		index:        Index    &log;
 		## The simple numeric value of the metric.
-		value:        count    &log;
+		result:        ResultVal    &log;
 	};
 	
-    # TODO: configure a metrics filter logging stream to log the current
-	#       metrics configuration in case someone is looking through
-	#       old logs and the configuration has changed since then.
-	
 	## Filters define how the data from a metric is aggregated and handled.  
-	## Filters can be used to set how often the measurements are cut or "broken"
+	## Filters can be used to set how often the measurements are cut 
 	## and logged or how the data within them is aggregated.  It's also 
-	## possible to disable logging and use filters for thresholding.
+	## possible to disable logging and use filters solely for thresholding.
 	type Filter: record {
 		## The name for this filter so that multiple filters can be
 		## applied to a single metrics to get a different view of the same
 		## metric data being collected (different aggregation, break, etc).
-		name:              string                  &default="default";
-		## The :bro:type:`Metrics::ID` that this filter applies to.
-		id:                string                  &optional;
+		name:              string                   &default="default";
+		## The metric that this filter applies to.
+		id:                string                   &optional;
+		## The measurements to perform on the data.
+		measure:           set[Calculation]         &optional;
 		## A predicate so that you can decide per index if you would like
 		## to accept the data being inserted.
-		pred:              function(index: Index, str: string): bool &optional;
-		## A function to normalize the index.  This can be used to normalize
-		## any field in the index and is likely most useful to normalize
-		## the $str field.
-		normalize_func:    function(index: Index): Index &optional;
-		## Global mask by which you'd like to aggregate traffic.
-		aggregation_mask:  count                   &optional;
-		## This is essentially a mapping table between addresses and subnets.
-		aggregation_table: table[subnet] of subnet &optional;
+		pred:              function(index: Metrics::Index, data: DataPoint): bool &optional;
+		## A function to normalize the index.  This can be used to aggregate or
+		## normalize the entire index.
+		normalize_func:    function(index: Metrics::Index): Index &optional;
+		## Global mask by to aggregate traffic measuring an attribute of hosts.
+		## This is a special case of the normalize_func.
+		aggregation_mask:  count                    &optional;
 		## The interval at which this filter should be "broken" and written
 		## to the logging stream.  The counters are also reset to zero at 
 		## this time so any threshold based detection needs to be set to a 
 		## number that should be expected to happen within this period.
-		break_interval:    interval                &default=default_break_interval;
+		every:             interval                 &default=default_break_interval;
 		## This determines if the result of this filter is sent to the metrics
 		## logging stream.  One use for the logging framework is as an internal
 		## thresholding and statistics gathering utility that is meant to
 		## never log but rather to generate notices and derive data.
-		log:               bool                    &default=T;
-		## A straight threshold for generating a notice.
-		default_threshold:  count                   &optional;
+		log:               bool                     &default=T;
+		## A direct threshold for calling the $threshold_crossed function when 
+		## the SUM is greater than or equal to this value.
+		threshold:         count                    &optional;
+		## A series of thresholds for calling the $threshold_crossed function.
+		threshold_series:  vector of count          &optional;
 		## A predicate so that you can decide when to flexibly declare when 
-		## a threshold crossed, and do extra stuff
-		custom_check_threshold:     function(index: Index, default_thresh: count, 
-						     val: count ): bool &optional;
-		## Even if custom_check_threshold has been defined, we don't want 
-		## to call it every time because of function call overhead.
-		## Metrics::Filter$trigger_custom_check_threshold describes how often
-		## custom_check_threshold will be called
-		## e.g. call custom_check_threshold for every 10 items seen by the metrics fw
-		trigger_custom_check_threshold: count   &default=default_trigger_custom_check_threshold;
-		## A predicate that is called whenever a threshold is crossed
-		## ToDo: Also have a parameter here that is a sample of the
-		## observed trackable items 
-		threshold_crossed:     function(index: Index, val: count );
-		## A series of thresholds at which to generate notices.
-		threshold_series: vector of count         &optional;
+		## a threshold crossed, and do extra work.
+		threshold_func:    function(index: Metrics::Index, val: Metrics::ResultVal): bool &optional;
+		## A function callback that is called when a threshold is crossed.
+		threshold_crossed: function(index: Metrics::Index, val: Metrics::ResultVal) &optional;
+		## A number of sample DataPoints to collect for the threshold 
+		## crossing callback.
+		samples:           count                    &optional;
 	};
 	
 	## Function to associate a metric filter with a metric ID.
@@ -125,70 +155,72 @@ export {
 	## id: The metric ID that the filter should be associated with.
 	##
 	## filter: The record representing the filter configuration.
-	global add_filter: function(id: string, filter: Filter);
+	global add_filter: function(id: string, filter: Metrics::Filter);
 	
-	## Add data into a :bro:type:`Metrics::ID`.  This should be called when
+	## Add data into a metric.  This should be called when
 	## a script has measured some point value and is ready to increment the
 	## counters.
 	##
-	## id: The metric ID that the data represents.
+	## id: The metric identifier that the data represents.
 	##
 	## index: The metric index that the value is to be added to.
 	##
 	## increment: How much to increment the counter by.
-	global add_data: function(id: string, index: Index, increment: count);
-
-	# This function does the following:
-	# If index (src,) doesn't exist, it creates an entry for this index. It
-	# adds data (c$id$orig_h) to a set associated with this index. If the number
-	# of unique data values for an index exceeds threshold, a notice is generated.
-	# So the threshold applies to the number of unique data values associated with
-	# an index.
-	
-	global add_unique: function(id: string, index: Index, data: string);
+	global add_data: function(id: string, index: Metrics::Index, data: Metrics::DataPoint);
 	
 	## Helper function to represent a :bro:type:`Metrics::Index` value as 
-	## a simple string
+	## a simple string.
 	## 
 	## index: The metric index that is to be converted into a string.
 	##
 	## Returns: A string reprentation of the metric index.
-	global index2str: function(index: Index): string;
-	
-	## Event that is used to "finish" metrics and adapt the metrics
-	## framework for clustered or non-clustered usage.
-	##
-	## ..note: This is primarily intended for internal use.
-	global log_it: event(filter: Filter);
-	
+	global index2str: function(index: Metrics::Index): string;
+		
 	## Event to access metrics records as they are passed to the logging framework.
-	global log_metrics: event(rec: Info);
+	global log_metrics: event(rec: Metrics::Info);
 	
-	## Type to store a table of metrics values.  Interal use only!
-	type MetricTable: table[Index] of DataPoint;
 }
 
-redef record Notice::Info += {
-	metric_index: Index &log &optional;
+redef record ResultVal += {
+	# Internal use only.  Used for incrementally calculating variance.
+	prev_avg:      double      &optional;
+
+	# Internal use only.  For calculating variance.
+	var_s:         double      &optional;
+
+	# Internal use only.  This is not meant to be publically available 
+	# because we don't want to trust that we can inspect the values 
+	# since we will like move to a probalistic data structure in the future.
+	# TODO: in the future this will optionally be a hyperloglog structure
+	unique_vals:  set[DataPoint] &optional;
 };
 
+# Type to store a table of metrics values.
+type MetricTable: table[Index] of ResultVal;
+
+# Store the filters indexed on the metric identifier.
 global metric_filters: table[string] of vector of Filter = table();
+
+# Store the filters indexed on the metric identifier and filter name.
 global filter_store: table[string, string] of Filter = table();
 
-# This is indexed by metric ID and stream filter name.
+# This is indexed by metric id and filter name.
 global store: table[string, string] of MetricTable = table() &default=table();
 
-# This function checks if a threshold has been crossed and generates a 
-# notice if it has.  It is also used as a method to implement 
-# mid-break-interval threshold crossing detection for cluster deployments.
-global check_threshold: function(filter: Filter, index: Index, val: count): bool;
-# This is hook for watching thresholds being crossed.  It is called whenever
-# index values are updated and the new val is given as the `val` argument.
-global data_added: function(filter: Filter, index: Index, val: count);
-
 # This stores the current threshold index for filters using $threshold_series.
 global threshold_series_index: table[string, string, Index] of count = {} &create_expire=threshold_series_restart_interval &default=0;
 
+# This is hook for watching thresholds being crossed.  It is called whenever
+# index values are updated and the new val is given as the `val` argument.
+# It's only prototyped here because cluster and non-cluster has separate 
+# implementations.
+global data_added: function(filter: Filter, index: Index, val: ResultVal);
+
+## Event that is used to "finish" metrics and adapt the metrics
+## framework for clustered or non-clustered usage.
+global log_it: event(filter: Metrics::Filter);
+
+
 event bro_init() &priority=5
 	{
 	Log::create_stream(Metrics::LOG, [$columns=Info, $ev=log_metrics]);
@@ -206,29 +238,91 @@ function index2str(index: Index): string
 	return fmt("metric_index(%s)", out);
 	}
 	
-function merge_data_points(dp1: DataPoint, dp2: DataPoint): DataPoint
+function do_calculated_fields(val: ResultVal)
 	{
-	local result: DataPoint;
-	if ( dp1?$num || dp2?$num )
+	if ( val?$unique_vals )
+		val$unique = |val$unique_vals|;
+	if ( val?$var_s )
+		val$variance = (val$num > 1) ? val$var_s/val$num : 0.0;
+	if ( val?$variance )
+		val$std_dev = sqrt(val$variance);
+	}
+
+function merge_result_vals(rv1: ResultVal, rv2: ResultVal): ResultVal
+	{
+	local result: ResultVal;
+	
+	# Merge $num
+	result$num = rv1$num + rv2$num;
+
+	# Merge $sum
+	if ( rv1?$sum || rv2?$sum )
 		{
-		result$num = 0;
-		if ( dp1?$num )
-			result$num += dp1$num;
-		if ( dp2?$num )
-			result$num += dp2$num;
+		result$sum = 0;
+		if ( rv1?$sum )
+			result$sum += rv1$sum;
+		if ( rv2?$sum )
+			result$sum += rv2$sum;
 		}
-		
-	if ( dp1?$unique_vals || dp2?$unique_vals )
+	
+	# Merge $max
+	if ( rv1?$max && rv2?$max )
+		result$max = (rv1$max > rv2$max) ? rv1$max : rv2$max;
+	else if ( rv1?$max )
+		result$max = rv1$max;
+	else if ( rv2?$max )
+		result$max = rv2$max;
+
+	# Merge $min
+	if ( rv1?$min && rv2?$min )
+		result$min = (rv1$min < rv2$min) ? rv1$min : rv2$min;
+	else if ( rv1?$min )
+		result$min = rv1$min;
+	else if ( rv2?$min )
+		result$min = rv2$min;
+
+	# Merge $avg
+	if ( rv1?$avg && rv2?$avg )
+		result$avg = ((rv1$avg*rv1$num) + (rv2$avg*rv2$num))/(rv1$num+rv2$num);
+	else if ( rv1?$avg )
+		result$avg = rv1$avg;
+	else if ( rv2?$avg )
+		result$avg = rv2$avg;
+
+	# Merge $prev_avg
+	if ( rv1?$prev_avg && rv2?$prev_avg )
+		result$prev_avg = ((rv1$prev_avg*rv1$num) + (rv2$prev_avg*rv2$num))/(rv1$num+rv2$num);
+	else if ( rv1?$prev_avg )
+		result$prev_avg = rv1$prev_avg;
+	else if ( rv2?$prev_avg )
+		result$prev_avg = rv2$prev_avg;
+
+	# Merge $var_s
+	if ( rv1?$var_s && rv2?$var_s )
+		{
+		local rv1_avg_sq = (rv1$avg - result$avg);
+		rv1_avg_sq = rv1_avg_sq*rv1_avg_sq;
+		local rv2_avg_sq = (rv2$avg - result$avg);
+		rv2_avg_sq = rv2_avg_sq*rv2_avg_sq;
+		result$var_s = rv1$num*(rv1$var_s/rv1$num + rv1_avg_sq) + rv2$num*(rv2$var_s/rv2$num + rv2_avg_sq);
+		}
+	else if ( rv1?$var_s )
+		result$var_s = rv1$var_s;
+	else if ( rv2?$var_s )
+		result$var_s = rv2$var_s;
+
+	if ( rv1?$unique_vals || rv2?$unique_vals )
 		{
 		result$unique_vals = set();
-		if ( dp1?$unique_vals )
-			for ( val1 in dp1$unique_vals )
+		if ( rv1?$unique_vals )
+			for ( val1 in rv1$unique_vals )
 				add result$unique_vals[val1];
-		if ( dp2?$unique_vals )
-			for ( val2 in dp2$unique_vals )
+		if ( rv2?$unique_vals )
+			for ( val2 in rv2$unique_vals )
 				add result$unique_vals[val2];
-			}
-			
+		}
+	
+	do_calculated_fields(result);
 	return result;
 	}
 	
@@ -236,24 +330,18 @@ function write_log(ts: time, filter: Filter, data: MetricTable)
 	{
 	for ( index in data )
 		{
-		local val = 0;
-		if ( data[index]?$unique_vals )
-			val = |data[index]$unique_vals|;
-		else
-			val = data[index]$num;
 		local m: Info = [$ts=ts,
-		                 $ts_delta=filter$break_interval,
-		                 $metric_id=filter$id,
+		                 $ts_delta=filter$every,
+		                 $metric=filter$id,
 		                 $filter_name=filter$name,
 		                 $index=index,
-		                 $value=val];
+		                 $result=data[index]];
 		
 		if ( filter$log )
 			Log::write(Metrics::LOG, m);
 		}
 	}
 
-
 function reset(filter: Filter)
 	{
 	store[filter$id, filter$name] = table();
@@ -261,45 +349,16 @@ function reset(filter: Filter)
 
 function add_filter(id: string, filter: Filter)
 	{
-	if ( filter?$aggregation_table && filter?$aggregation_mask )
+	if ( filter?$normalize_func && filter?$aggregation_mask )
 		{
-		print "INVALID Metric filter: Defined $aggregation_table and $aggregation_mask.";
+		Reporter::warning(fmt("invalid Metric filter (%s): Defined $normalize_func and $aggregation_mask.", filter$name));
 		return;
 		}
 	if ( [id, filter$name] in store )
 		{
-		print fmt("INVALID Metric filter: Filter with name \"%s\" already exists.", filter$name);
+		Reporter::warning(fmt("invalid Metric filter (%s): Filter with same name already exists.", filter$name));
 		return;
 		}
-	if ( !filter?$threshold_series &&  !filter?$default_threshold )
-		{
-		print "INVALID Metric filter: Must define one of $default_threshold and $threshold_series";
-		return;
-		}
-	if ( filter?$threshold_series &&  filter?$custom_check_threshold )
-		{
-		print "INVALID Metric filter: Cannot define $custom_check_threshold with $threshold_series";
-		return;
-		}
-	if ( filter?$threshold_series &&  filter?$default_threshold )
-		{
-		print "INVALID Metric filter: Cannot define both $default_threshold and $threshold_series";
-		return;
-		}
-	if ( filter?$custom_check_threshold &&  !filter?$default_threshold )
-		{
-		print "INVALID Metric filter: Must define $default_threshold with $custom_check_threshold";
-		return;
-		}
-	if ( !filter?$trigger_custom_check_threshold &&  filter?$custom_check_threshold )
-		{
-		print "INVALID Metric filter: You defined $trigger_custom_check_threshold but $custom_check_threshold is missing";
-		return;
-		}
-	if ( !filter?$trigger_custom_check_threshold &&  filter?$custom_check_threshold )
-		{
-		print "WARNING Metric filter: You did not define $trigger_custom_check_threshold (default will be used)";
-		}
 	
 	if ( ! filter?$id )
 		filter$id = id;
@@ -311,10 +370,10 @@ function add_filter(id: string, filter: Filter)
 	filter_store[id, filter$name] = filter;
 	store[id, filter$name] = table();
 	
-	schedule filter$break_interval { Metrics::log_it(filter) };
+	schedule filter$every { Metrics::log_it(filter) };
 	}
 
-function add_it(id: string, index: Index, integer_value: bool, num: count, str: string)
+function add_data(id: string, index: Index, data: DataPoint)
 	{
 	if ( id !in metric_filters )
 		return;
@@ -328,103 +387,140 @@ function add_it(id: string, index: Index, integer_value: bool, num: count, str:
 		
 		# If this filter has a predicate, run the predicate and skip this
 		# index if the predicate return false.
-		if ( filter?$pred && ! filter$pred(index,str) )
+		if ( filter?$pred && ! filter$pred(index, data) )
 			next;
 		
-		if ( index?$host )
+		if ( filter?$normalize_func )
+			index = filter$normalize_func(copy(index));
+
+		if ( index?$host && filter?$aggregation_mask )
 			{
-			if ( filter?$normalize_func )
-				{
-				index = filter$normalize_func(copy(index));
-				}
-			
-			if ( filter?$aggregation_mask )
-				{
-				index$network = mask_addr(index$host, filter$aggregation_mask);
-				delete index$host;
-				}
-			else if ( filter?$aggregation_table )
-				{
-				# Don't add the data if the aggregation table doesn't include 
-				# the given host address.
-				if ( index$host !in filter$aggregation_table )
-					return;
-				index$network = filter$aggregation_table[index$host];
-				delete index$host;
-				}
+			index$network = mask_addr(index$host, filter$aggregation_mask);
+			delete index$host;
 			}
 		
 		local metric_tbl = store[id, filter$name];
-		if ( integer_value )
+		if ( index !in metric_tbl )
+			metric_tbl[index] = [];
+
+		local result = metric_tbl[index];
+
+		# If a string was given, fall back to 1.0 as the value.
+		local val = 1.0;
+		if ( data?$num || data?$dbl )
+			val = data?$dbl ? data$dbl : data$num;
+
+		++result$num;
+
+		if ( SUM in filter$measure )
 			{
-			if ( index !in metric_tbl )
-				metric_tbl[index] = [$num=0];
-			metric_tbl[index]$num += num;
-			data_added(filter, index, metric_tbl[index]$num);
+			if ( ! result?$sum ) result$sum = 0;
+			result$sum += val;
 			}
-		else
+
+		if ( MIN in filter$measure )
 			{
-			if ( index !in metric_tbl )
+			if ( ! result?$min ) 
+				result$min = val;
+			else if (val < result$min) 
+				result$min = val;
+			}
+
+		if ( MAX in filter$measure )
+			{
+			if ( ! result?$max ) 
+				result$max = val;
+			else if (val > result$max) 
+				result$max = val;
+			}
+	
+		if ( AVG in filter$measure || VARIANCE in filter$measure )
+			{
+			if ( ! result?$avg ) 
 				{
-				local empty_ss: set[string] = set();
-				metric_tbl[index] = [$unique_vals=empty_ss];
+				result$avg = val;
+				result$prev_avg = val;
+				}
+			else
+				{
+				result$prev_avg = result$avg;
+				result$avg += (val - result$avg) / result$num;
 				}
-			add metric_tbl[index]$unique_vals[str];
-			#print metric_tbl[index]$unique_vals;
-			#print "-------------------------------------";
-			data_added(filter, index, |metric_tbl[index]$unique_vals|);
 			}
+
+		if ( VARIANCE in filter$measure )
+			{
+			if ( ! result?$var_s ) result$var_s = 0.0;
+			result$var_s += (val - result$prev_avg)*(val - result$avg);
+			}
+
+		if ( STD_DEV in filter$measure )
+			{
+			#if ( result?$variance )
+			#	result$std_dev = sqrt(result$variance);
+			}
+
+		if ( UNIQUE in filter$measure )
+			{
+			if ( ! result?$unique_vals ) result$unique_vals=set();
+			add result$unique_vals[data];
+			}
+
+		do_calculated_fields(result);
+		data_added(filter, index, result);
 		}
 	}
 
-function add_data(id: string, index: Index, increment: count)
+# This function checks if a threshold has been crossed and generates a 
+# notice if it has.  It is also used as a method to implement 
+# mid-break-interval threshold crossing detection for cluster deployments.
+function check_thresholds(filter: Filter, index: Index, val: ResultVal, modify_pct: double): bool
 	{
-	add_it(id, index, T, increment, "");
-	}
-	
-function add_unique(id: string, index: Index, data: string)
-	{
-	add_it(id, index, F, 0, data);
-	}
-	
-function check_threshold(filter: Filter, index: Index, val: count): bool
-	{
-	local def_thresh = 0;
+	local watch = 0.0;
+	if ( val?$unique )
+		watch = val$unique;
+	else if ( val?$sum )
+		watch = val$sum;
 
-	if ( filter?$default_threshold )
-		def_thresh = filter$default_threshold;
- 
-	if ( filter?$custom_check_threshold && ( val%filter$trigger_custom_check_threshold == 0 ) )
-		return filter$custom_check_threshold( index, def_thresh, val );
+	if ( modify_pct < 1.0 && modify_pct > 0.0 )
+		watch = watch/modify_pct;
 
-	# No custom check threshold defined
-	else if ( !filter?$custom_check_threshold )
+	if ( filter?$threshold && watch >= filter$threshold )
 		{
-		if ( filter?$default_threshold )
-			{
-			if ( val > def_thresh)
-				return T;
-			}
-
-		else if ( filter?$threshold_series )
-			{
-			if ( |filter$threshold_series| >= threshold_series_index[filter$id, filter$name, index] &&
-			     val >= filter$threshold_series[threshold_series_index[filter$id, filter$name, index]] )
-				return T;
-			}
+		# A default threshold was given and the value crossed it.
+		return T;
 		}
+
+	if ( filter?$threshold_series &&
+	     |filter$threshold_series| >= threshold_series_index[filter$id, filter$name, index] &&
+	     watch >= filter$threshold_series[threshold_series_index[filter$id, filter$name, index]] )
+		{
+		# A threshold series was given and the value crossed the next 
+		# value in the series.
+		return T;
+		}
+
+	if ( filter?$threshold_func &&
+	     filter$threshold_func(index, val) )
+		{
+		# The threshold function indicated it was crossed.
+		return T;
+		}
+
 	return F;
 	}
 		
-function threshold_crossed_alert(filter: Filter, index: Index, val: count)
+function threshold_crossed(filter: Filter, index: Index, val: ResultVal)
 	{
 	if ( filter?$threshold_crossed )
-		filter$threshold_crossed( index, val );
+		filter$threshold_crossed(index, val);
 
 	# If I don't reset here, the value just keeps
-	# retriggering once the threshold has been exceeded
+	# retriggering once the threshold has been exceeded.
 	if ( !filter?$threshold_series )
+		{
 		reset(filter);
+		}
 	else
 		{
 		# This just needs set to some value so that it doesn't refire the 
diff --git a/scripts/base/frameworks/metrics/non-cluster.bro b/scripts/base/frameworks/metrics/non-cluster.bro
index ccd0414b2b..a94370d776 100644
--- a/scripts/base/frameworks/metrics/non-cluster.bro
+++ b/scripts/base/frameworks/metrics/non-cluster.bro
@@ -6,16 +6,16 @@ event Metrics::log_it(filter: Filter)
 	{
 	local id = filter$id;
 	local name = filter$name;
-	
+
 	write_log(network_time(), filter, store[id, name]);
 	reset(filter);
 	
-	schedule filter$break_interval { Metrics::log_it(filter) };
+	schedule filter$every { Metrics::log_it(filter) };
 	}
 	
 	
-function data_added(filter: Filter, index: Index, val: count)
+function data_added(filter: Filter, index: Index, val: ResultVal)
 	{
-	if ( check_threshold(filter, index, val) )
-		threshold_crossed_alert( filter, index, val );
+	if ( check_thresholds(filter, index, val, 1.0) )
+		threshold_crossed(filter, index, val);
 	}
diff --git a/scripts/policy/protocols/conn/conn-stats-per-host.bro b/scripts/policy/protocols/conn/conn-stats-per-host.bro
new file mode 100644
index 0000000000..9e532b8590
--- /dev/null
+++ b/scripts/policy/protocols/conn/conn-stats-per-host.bro
@@ -0,0 +1,22 @@
+
+event bro_init() &priority=5
+	{
+	Metrics::add_filter("conn.orig.data", 
+	                    [$every=5mins,
+	                     $measure=set(Metrics::VARIANCE, Metrics::AVG, Metrics::MAX, Metrics::MIN, Metrics::STD_DEV)]);
+	Metrics::add_filter("conn.resp.data", 
+	                    [$every=5mins,
+	                     $measure=set(Metrics::VARIANCE, Metrics::AVG, Metrics::MAX, Metrics::MIN, Metrics::STD_DEV)]);
+	}
+
+
+event connection_state_remove(c: connection)
+	{
+	if ( ! (c$conn$conn_state == "SF" && c$conn$proto == tcp) )
+		return;
+
+	if ( Site::is_local_addr(c$id$orig_h) )
+		Metrics::add_data("conn.orig.data", [$host=c$id$orig_h], [$num=c$orig$size]);
+	if ( Site::is_local_addr(c$id$resp_h) )
+		Metrics::add_data("conn.resp.data", [$host=c$id$resp_h], [$num=c$resp$size]);
+	}
\ No newline at end of file
diff --git a/scripts/policy/protocols/conn/scan.bro b/scripts/policy/protocols/conn/scan.bro
new file mode 100644
index 0000000000..4df2697092
--- /dev/null
+++ b/scripts/policy/protocols/conn/scan.bro
@@ -0,0 +1,320 @@
+##! Scan detection
+##!
+##! ..Authors: Sheharbano Kattack
+##!            Seth Hall
+##!            All the authors of the old scan.bro
+
+module Scan;
+
+export {
+
+	redef enum Notice::Type += {
+		AddressScan,
+		PortScan,
+		};
+
+	const analyze_addr_scan = T &redef;
+	const analyze_port_scan = T &redef;
+
+	## Interval at which to watch for the
+	## :bro:id:`Scan::conn_failed_(port|addr)_threshold` variable to be crossed.
+	## At the end of each interval the counter is reset.
+	const conn_failed_addr_interval = 5min &redef;
+	const conn_failed_port_interval = 5min &redef;
+
+	const default_addr_scan_threshold = 25 &redef;
+	const default_port_scan_threshold = 15 &redef;
+
+	# For address scan
+	const suppress_UDP_scan_checks  = T &redef;
+	const suppress_TCP_scan_checks  = F &redef;
+	const suppress_ICMP_scan_checks = T &redef;
+	
+	global addr_scan_thresh_series: vector of count = vector(100, 200, 300);
+	global port_scan_thresh_series: vector of count = vector(10, 20, 30);
+
+	# Custom threholds based on service for address scan
+	const addr_scan_custom_thresholds: table[port] of count &redef;
+}
+
+function is_failed_conn(c: connection): bool
+	{
+	# Sr || ( (hR || ShR) && (data not sent in any direction) ) 
+	if ( (c$orig$state == TCP_SYN_SENT && c$resp$state == TCP_RESET) ||
+	     (
+	      ((c$orig$state == TCP_RESET && c$resp$state == TCP_SYN_ACK_SENT) ||
+	       (c$orig$state == TCP_RESET && c$resp$state == TCP_ESTABLISHED && "S" in c$history )
+	      ) &&
+	      !("D" in c$history || "d" in c$history)
+	     ) )
+		return T;
+	return F;
+	}
+
+function is_reverse_failed_conn(c: connection): bool
+	{
+	# reverse scan i.e. conn dest is the scanner
+	# sR || ( (Hr || sHr) && (data not sent in any direction) ) 
+	if ( (c$resp$state == TCP_SYN_SENT && c$orig$state == TCP_RESET) ||
+	     (
+	      ((c$resp$state == TCP_RESET && c$orig$state == TCP_SYN_ACK_SENT) ||
+	       (c$resp$state == TCP_RESET && c$orig$state == TCP_ESTABLISHED && "s" in c$history )
+	      ) &&
+	      !("D" in c$history || "d" in c$history)
+	     ) )
+		return T;
+	return F;
+	}
+
+function addr_scan_predicate(index: Metrics::Index, data: Metrics::DataPoint): bool
+	{
+	local service = to_port(index$str);
+	local host = index$host;
+
+	local transport_layer_proto = get_port_transport_proto(service);
+	if ( suppress_UDP_scan_checks && (transport_layer_proto == udp) )
+		return F;
+	else if ( suppress_TCP_scan_checks && (transport_layer_proto == tcp) )
+		return F;
+	else if ( suppress_ICMP_scan_checks && (transport_layer_proto == icmp) )
+		return F;
+
+	# TODO: all of this whitelist/blacklist will be done 
+	#       through the upcoming hook mechanism
+	# Blacklisting/whitelisting services
+	#if ( |analyze_services| > 0 )
+	#	{
+	#	if ( service !in analyze_services )
+	#		return F;
+	#	}
+	#else if ( service in skip_services )
+	#	return F;
+	#
+	## Blacklisting/whitelisting subnets
+	#if ( |analyze_subnets| > 0 && host !in analyze_subnets )
+	#	return F;
+
+	return T;
+	}
+
+function port_scan_predicate(index: Metrics::Index, data: Metrics::DataPoint): bool
+	{
+	local service = to_port(data$str);
+	local host = index$host;
+
+	local transport_layer_proto = get_port_transport_proto(service);
+	if ( suppress_UDP_scan_checks && (transport_layer_proto == udp) )
+		return F;
+	else if ( suppress_TCP_scan_checks && (transport_layer_proto == tcp) )
+		return F;
+	else if ( suppress_ICMP_scan_checks && (transport_layer_proto == icmp) )
+		return F;
+
+	# TODO: all of this whitelist/blacklist will be done 
+	#       through the upcoming hook mechanism
+	# Blacklisting/whitelisting services
+	#if ( |analyze_services| > 0 )
+	#	{
+	#	if ( service !in analyze_services )
+	#		return F;
+	#	}
+	#else if ( service in skip_services )
+	#	return F;
+	#
+	## Blacklisting/whitelisting subnets
+	#if ( |analyze_subnets| > 0 && host !in analyze_subnets )
+	#	return F;
+
+	return T;
+	}
+
+function check_addr_scan_threshold(index: Metrics::Index, val: Metrics::ResultVal): bool
+	{
+	local service = to_port(index$str);
+
+	return ( service in addr_scan_custom_thresholds &&
+	         val$sum > addr_scan_custom_thresholds[service] );
+	}
+
+function addr_scan_threshold_crossed(index: Metrics::Index, val: Metrics::ResultVal)
+	{
+	local direction = Site::is_local_addr(index$host) ? "OutboundScan" : "InboundScan";
+	local message=fmt("%s scanned %d unique hosts on port %s", index$host, val$unique, index$str);
+
+	NOTICE([$note=AddressScan,
+	        $src=index$host,
+	        $p=to_port(index$str),
+	        $sub=direction,
+	        $msg=message,
+	        $identifier=message]);
+	}
+
+function port_scan_threshold_crossed(index: Metrics::Index, val: Metrics::ResultVal)
+	{
+	local direction = Site::is_local_addr(index$host) ? "OutboundScan" : "InboundScan";
+	local message = fmt("%s scanned %d unique ports of host %s", index$host, val$unique, index$str);
+
+	NOTICE([$note=PortScan, 
+	        $src=index$host,
+	        $dst=to_addr(index$str),
+	        $sub=direction,
+	        $msg=message,
+	        $identifier=message]);
+	}
+
+event bro_init() &priority=5
+	{
+	# Add local networks here to determine scan direction
+	# i.e. inbound scan / outbound scan
+	#add Site::local_nets[0.0.0.0/16];
+
+	if ( analyze_addr_scan )
+		{
+		# note=> Addr scan: table [src_ip, port] of set(dst);	
+		# Add filters to the metrics so that the metrics framework knows how to
+		# determine when it looks like an actual attack and how to respond when
+		# thresholds are crossed.
+		Metrics::add_filter("scan.addr.fail", [$log=F,
+		                                       $every=conn_failed_addr_interval,
+		                                       $measure=set(Metrics::UNIQUE),
+		                                       $pred=addr_scan_predicate,
+		                                       $threshold_func=check_addr_scan_threshold,
+		                                       $threshold=default_addr_scan_threshold,
+		                                       $threshold_crossed=addr_scan_threshold_crossed]); 
+		}
+
+	if ( analyze_port_scan )
+		{
+		# note=> Port Sweep: table[src_ip, dst_ip] of set(port);
+		# Add filters to the metrics so that the metrics framework knows how to
+		# determine when it looks like an actual attack and how to respond when
+		# thresholds are crossed.
+		Metrics::add_filter("scan.port.fail", [$log=F,
+		                                       $every=conn_failed_port_interval,
+		                                       $measure=set(Metrics::UNIQUE),
+		                                       $pred=port_scan_predicate,
+		                                       $threshold=default_port_scan_threshold,
+		                                       $threshold_crossed=port_scan_threshold_crossed]); 
+		}
+	}
+
+## Generated when a SYN-ACK packet is seen in response to a SYN 
+## packet during a TCP handshake. The final ACK of the handshake 
+## in response to SYN-ACK may or may not occur later, one way to 
+## tell is to check the history field of connection to see if the 
+## originator sent an ACK, indicated by ‘A’ in the history string.
+#event connection_established(c: connection)
+#	{
+	# Not useful for scan (too early)
+#	}
+
+## Generated when one endpoint of a TCP connection attempted 
+## to gracefully close the connection, but the other endpoint 
+## is in the TCP_INACTIVE state. This can happen due to split 
+## routing, in which Bro only sees one side of a connection.
+#event connection_half_finished(c: connection)
+#	{
+	# Half connections never were "established", so do scan-checking here.
+	# I am not taking *f cases of c$history into account. Ask Seth if I should
+#	}
+
+function add_metrics(id: conn_id, reverse: bool)
+	{
+	local scanner:      addr;
+	local victim:       string;
+	local scanned_port: string;
+
+	if ( reverse )
+		{
+		scanner      = id$resp_h;
+		victim       = cat(id$orig_h);
+		scanned_port = fmt("%s", id$orig_p);
+		}
+	else
+		{
+		scanner      = id$orig_h;
+		victim       = cat(id$resp_h);
+		scanned_port = fmt("%s", id$resp_p);
+		}
+
+	if ( analyze_addr_scan )
+		Metrics::add_data("scan.addr.fail", [$host=scanner, $str=scanned_port], [$str=victim]);
+	if ( analyze_port_scan )
+		Metrics::add_data("scan.port.fail", [$host=scanner, $str=victim],       [$str=scanned_port]);
+	}
+
+## Generated for an unsuccessful connection attempt. This 
+## event is raised when an originator unsuccessfully attempted 
+## to establish a connection. “Unsuccessful” is defined as at least 
+## tcp_attempt_delay seconds having elapsed since the originator 
+## first sent a connection establishment packet to the destination 
+## without seeing a reply.
+event connection_attempt(c: connection)
+	{
+	local is_reverse_scan = F;
+	if ( "H" in c$history )
+		is_reverse_scan = T;
+	
+	add_metrics(c$id, is_reverse_scan);
+	}
+
+## Generated for a rejected TCP connection. This event 
+## is raised when an originator attempted to setup a TCP 
+## connection but the responder replied with a RST packet 
+## denying it.
+event connection_rejected(c: connection)
+	{
+	local is_reverse_scan = F;
+	if ( "s" in c$history )
+		is_reverse_scan = T;
+	
+	add_metrics(c$id, is_reverse_scan);
+	}
+
+## Generated when an endpoint aborted a TCP connection. 
+## The event is raised when one endpoint of an *established* 
+## TCP connection aborted by sending a RST packet.
+event connection_reset(c: connection)
+	{
+	local is_reverse_scan = F;
+	local is_scan = F;
+
+	if ( is_failed_conn(c) )
+		{
+		is_scan = T;
+		is_reverse_scan = F;
+		}
+	else if ( is_reverse_failed_conn(c) )
+		{
+		is_scan = T;
+		is_reverse_scan = T;
+		}
+
+	if ( is_scan )
+		{
+		add_metrics(c$id, is_reverse_scan);
+		}
+	}
+
+## Generated for each still-open connection when Bro terminates.
+event connection_pending(c: connection)
+	{
+	local is_reverse_scan = F;
+	local is_scan = F;
+
+	if ( is_failed_conn(c) )
+		{
+		is_scan = T;
+		is_reverse_scan = F;
+		}
+	else if ( is_reverse_failed_conn(c) )
+		{
+		is_scan = T;
+		is_reverse_scan = T;
+		}
+
+	if ( is_scan )
+		{
+		add_metrics(c$id, is_reverse_scan);
+		}
+	}
\ No newline at end of file
diff --git a/scripts/policy/protocols/http/detect-sqli.bro b/scripts/policy/protocols/http/detect-sqli.bro
index 193a4b9614..9dab73c43e 100644
--- a/scripts/policy/protocols/http/detect-sqli.bro
+++ b/scripts/policy/protocols/http/detect-sqli.bro
@@ -51,14 +51,29 @@ event bro_init() &priority=3
 	# determine when it looks like an actual attack and how to respond when
 	# thresholds are crossed.
 	
-	Metrics::add_filter("http.sqli.attacker", [$log=F,
-	                                           $notice_threshold=sqli_requests_threshold,
-	                                           $break_interval=sqli_requests_interval,
-	                                           $note=SQL_Injection_Attacker]);
-	Metrics::add_filter("http.sqli.victim", [$log=F,
-	                                         $notice_threshold=sqli_requests_threshold,
-	                                         $break_interval=sqli_requests_interval,
-	                                         $note=SQL_Injection_Victim]);
+	Metrics::add_filter("http.sqli.attacker", 
+	                    [$every=sqli_requests_interval,
+	                     $measure=set(Metrics::SUM),
+	                     $threshold=sqli_requests_threshold,
+	                     $samples=10,
+	                     $threshold_crossed(index: Metrics::Index, val: Metrics::ResultVal) = {
+	                     	NOTICE([$note=SQL_Injection_Attacker, 
+	                     	        $msg="An SQL injection attacker was discovered!",
+	                     	        $src=index$host,
+	                     	        $identifier=cat(index$host)]);
+	                     }, $log=F]);
+
+	Metrics::add_filter("http.sqli.victim",
+	                    [$every=sqli_requests_interval,
+	                     $measure=set(Metrics::SUM),
+	                     $threshold=sqli_requests_threshold,
+	                     $samples=10,
+	                     $threshold_crossed(index: Metrics::Index, val: Metrics::ResultVal) = {
+	                     	NOTICE([$note=SQL_Injection_Victim, 
+	                     	        $msg="An SQL injection victim was discovered!",
+	                     	        $src=index$host,
+	                     	        $identifier=cat(index$host)]);
+	                     }, $log=F]);
 	}
 
 event http_request(c: connection, method: string, original_URI: string,
@@ -68,7 +83,7 @@ event http_request(c: connection, method: string, original_URI: string,
 		{
 		add c$http$tags[URI_SQLI];
 		
-		Metrics::add_data("http.sqli.attacker", [$host=c$id$orig_h], 1);
-		Metrics::add_data("http.sqli.victim", [$host=c$id$resp_h], 1);
+		Metrics::add_data("http.sqli.attacker", [$host=c$id$orig_h], [$str=original_URI]);
+		Metrics::add_data("http.sqli.victim",   [$host=c$id$resp_h], [$str=original_URI]);
 		}
 	}
diff --git a/scripts/policy/protocols/ssh/detect-bruteforcing.bro b/scripts/policy/protocols/ssh/detect-bruteforcing.bro
index 7939f00c72..d0f1b63d70 100644
--- a/scripts/policy/protocols/ssh/detect-bruteforcing.bro
+++ b/scripts/policy/protocols/ssh/detect-bruteforcing.bro
@@ -42,10 +42,15 @@ export {
 event bro_init()
 	{
 	Metrics::add_filter("ssh.login.failure", [$name="detect-bruteforcing", $log=F,
-	                                          $note=Password_Guessing,
-	                                          $notice_threshold=password_guesses_limit,
-	                                          $notice_freq=1hr,
-	                                          $break_interval=guessing_timeout]);
+	                                          $every=guessing_timeout,
+	                                          $measure=set(Metrics::SUM),
+	                                          $threshold=password_guesses_limit,
+	                                          $threshold_crossed(index: Metrics::Index, val: Metrics::ResultVal) = {
+	                                          	NOTICE([$note=Password_Guessing, 
+	                                          	        $msg=fmt("%s appears to be guessing SSH passwords (seen in %.0f connections).", index$host, val$sum),
+	                                          	        $src=index$host,
+	                                          	        $identifier=cat(index$host)]);
+	                                          }]);
 	}
 
 event SSH::heuristic_successful_login(c: connection)
@@ -70,5 +75,5 @@ event SSH::heuristic_failed_login(c: connection)
 	# be ignored.
 	if ( ! (id$orig_h in ignore_guessers &&
 	        id$resp_h in ignore_guessers[id$orig_h]) )
-		Metrics::add_data("ssh.login.failure", [$host=id$orig_h], 1);
+		Metrics::add_data("ssh.login.failure", [$host=id$orig_h], [$num=1]);
 	}
diff --git a/scripts/site/local.bro b/scripts/site/local.bro
index db1a786839..acbef96721 100644
--- a/scripts/site/local.bro
+++ b/scripts/site/local.bro
@@ -8,6 +8,9 @@
 # Apply the default tuning scripts for common tuning settings.
 @load tuning/defaults
 
+# Load the scan detection script.
+@load protocols/conn/scan
+
 # Generate notices when vulnerable versions of software are discovered.
 # The default is to only monitor software found in the address space defined
 # as "local".  Refer to the software framework's documentation for more 
diff --git a/testing/btest/Baseline/scripts.base.frameworks.metrics.cluster-intermediate-update/manager-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.metrics.cluster-intermediate-update/manager-1..stdout
new file mode 100644
index 0000000000..2d0750ca18
--- /dev/null
+++ b/testing/btest/Baseline/scripts.base.frameworks.metrics.cluster-intermediate-update/manager-1..stdout
@@ -0,0 +1 @@
+A test metric threshold was crossed!
diff --git a/testing/btest/Baseline/scripts.base.frameworks.metrics.thresholding/.stdout b/testing/btest/Baseline/scripts.base.frameworks.metrics.thresholding/.stdout
new file mode 100644
index 0000000000..fc881ba68e
--- /dev/null
+++ b/testing/btest/Baseline/scripts.base.frameworks.metrics.thresholding/.stdout
@@ -0,0 +1,10 @@
+THRESHOLD_SERIES: hit a threshold series value at 3 for metric_index(host=1.2.3.4)
+THRESHOLD_FUNC: hit a threshold function value at 3 for metric_index(host=1.2.3.4)
+THRESHOLD_FUNC: hit a threshold function value at 2 for metric_index(host=6.5.4.3)
+THRESHOLD_FUNC: hit a threshold function value at 1 for metric_index(host=7.2.1.5)
+THRESHOLD: hit a threshold value at 6 for metric_index(host=1.2.3.4)
+THRESHOLD_SERIES: hit a threshold series value at 6 for metric_index(host=1.2.3.4)
+THRESHOLD_FUNC: hit a threshold function value at 3 for metric_index(host=1.2.3.4)
+THRESHOLD: hit a threshold value at 1000 for metric_index(host=7.2.1.5)
+THRESHOLD_SERIES: hit a threshold series value at 1001 for metric_index(host=7.2.1.5)
+THRESHOLD_FUNC: hit a threshold function value at 1000 for metric_index(host=7.2.1.5)
diff --git a/testing/btest/scripts/base/frameworks/metrics/basic-cluster.bro b/testing/btest/scripts/base/frameworks/metrics/basic-cluster.bro
index acd57f037e..41ef9b57dc 100644
--- a/testing/btest/scripts/base/frameworks/metrics/basic-cluster.bro
+++ b/testing/btest/scripts/base/frameworks/metrics/basic-cluster.bro
@@ -5,15 +5,15 @@
 # @TEST-EXEC: sleep 1
 # @TEST-EXEC: btest-bg-run worker-1  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-1 bro %INPUT
 # @TEST-EXEC: btest-bg-run worker-2  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-2 bro %INPUT
-# @TEST-EXEC: btest-bg-wait 30
+# @TEST-EXEC: btest-bg-wait 15
 # @TEST-EXEC: btest-diff manager-1/metrics.log
 
 @TEST-START-FILE cluster-layout.bro
 redef Cluster::nodes = {
 	["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=37757/tcp, $workers=set("worker-1", "worker-2")],
-	["proxy-1"] = [$node_type=Cluster::PROXY,     $ip=127.0.0.1, $p=37758/tcp, $manager="manager-1", $workers=set("worker-1", "worker-2")],
-	["worker-1"] = [$node_type=Cluster::WORKER,   $ip=127.0.0.1, $p=37760/tcp, $manager="manager-1", $proxy="proxy-1", $interface="eth0"],
-	["worker-2"] = [$node_type=Cluster::WORKER,   $ip=127.0.0.1, $p=37761/tcp, $manager="manager-1", $proxy="proxy-1", $interface="eth1"],
+	["proxy-1"]   = [$node_type=Cluster::PROXY,   $ip=127.0.0.1, $p=37758/tcp, $manager="manager-1", $workers=set("worker-1", "worker-2")],
+	["worker-1"]  = [$node_type=Cluster::WORKER,  $ip=127.0.0.1, $p=37760/tcp, $manager="manager-1", $proxy="proxy-1", $interface="eth0"],
+	["worker-2"]  = [$node_type=Cluster::WORKER,  $ip=127.0.0.1, $p=37761/tcp, $manager="manager-1", $proxy="proxy-1", $interface="eth1"],
 };
 @TEST-END-FILE
 
@@ -22,8 +22,8 @@ redef Log::default_rotation_interval = 0secs;
 event bro_init() &priority=5
 	{
 	Metrics::add_filter("test.metric", 
-		[$name="foo-bar",
-		 $break_interval=3secs]);
+	                    [$every=3secs,
+	                     $measure=set(Metrics::SUM, Metrics::MIN, Metrics::MAX, Metrics::AVG, Metrics::STD_DEV, Metrics::VARIANCE)]);
 	}
 
 event remote_connection_closed(p: event_peer)
@@ -39,9 +39,25 @@ redef Cluster::manager2worker_events += /ready_for_data/;
 
 event ready_for_data()
 	{
-	Metrics::add_data(TEST_METRIC, [$host=1.2.3.4], 3);
-	Metrics::add_data(TEST_METRIC, [$host=6.5.4.3], 2);
-	Metrics::add_data(TEST_METRIC, [$host=7.2.1.5], 1);
+	if ( Cluster::node == "worker-1" )
+		{
+		Metrics::add_data("test.metric", [$host=1.2.3.4], [$num=34]);
+		Metrics::add_data("test.metric", [$host=1.2.3.4], [$num=30]);
+		Metrics::add_data("test.metric", [$host=6.5.4.3], [$num=1]);
+		Metrics::add_data("test.metric", [$host=7.2.1.5], [$num=54]);
+		}
+	if ( Cluster::node == "worker-2" )
+		{
+		Metrics::add_data("test.metric", [$host=1.2.3.4], [$num=75]);
+		Metrics::add_data("test.metric", [$host=1.2.3.4], [$num=30]);
+		Metrics::add_data("test.metric", [$host=1.2.3.4], [$num=3]);
+		Metrics::add_data("test.metric", [$host=1.2.3.4], [$num=57]);
+		Metrics::add_data("test.metric", [$host=1.2.3.4], [$num=52]);
+		Metrics::add_data("test.metric", [$host=1.2.3.4], [$num=61]);
+		Metrics::add_data("test.metric", [$host=1.2.3.4], [$num=95]);
+		Metrics::add_data("test.metric", [$host=6.5.4.3], [$num=5]);
+		Metrics::add_data("test.metric", [$host=7.2.1.5], [$num=91]);
+		}
 	}
 
 @endif
@@ -53,7 +69,7 @@ global peer_count = 0;
 
 event Metrics::log_metrics(rec: Metrics::Info)
 	{
-	n = n + 1;
+	++n;
 	if ( n == 3 )
 		{
 		terminate_communication();
@@ -64,11 +80,9 @@ event Metrics::log_metrics(rec: Metrics::Info)
 event remote_connection_handshake_done(p: event_peer)
 	{
 	print p;
-	peer_count = peer_count + 1;
+	++peer_count;
 	if ( peer_count == 3 )
-		{
 		event ready_for_data();
-		}
 	}
 
 @endif
diff --git a/testing/btest/scripts/base/frameworks/metrics/basic.bro b/testing/btest/scripts/base/frameworks/metrics/basic.bro
index 23a79d2bd3..12163ed689 100644
--- a/testing/btest/scripts/base/frameworks/metrics/basic.bro
+++ b/testing/btest/scripts/base/frameworks/metrics/basic.bro
@@ -5,8 +5,14 @@ event bro_init() &priority=5
 	{
 	Metrics::add_filter("test.metric", 
 		[$name="foo-bar",
-		 $break_interval=3secs]);
-	Metrics::add_data("test.metric", [$host=1.2.3.4], 3);
-	Metrics::add_data("test.metric", [$host=6.5.4.3], 2);
-	Metrics::add_data("test.metric", [$host=7.2.1.5], 1);
+		 $every=3secs,
+		 $measure=set(Metrics::SUM, Metrics::VARIANCE, Metrics::AVG, Metrics::MAX, Metrics::MIN, Metrics::STD_DEV)]);
+	Metrics::add_data("test.metric", [$host=1.2.3.4], [$num=5]);
+	Metrics::add_data("test.metric", [$host=1.2.3.4], [$num=22]);
+	Metrics::add_data("test.metric", [$host=1.2.3.4], [$num=94]);
+	Metrics::add_data("test.metric", [$host=1.2.3.4], [$num=50]);
+	Metrics::add_data("test.metric", [$host=1.2.3.4], [$num=50]);
+
+	Metrics::add_data("test.metric", [$host=6.5.4.3], [$num=2]);
+	Metrics::add_data("test.metric", [$host=7.2.1.5], [$num=1]);
 	}
diff --git a/testing/btest/scripts/base/frameworks/metrics/cluster-intermediate-update.bro b/testing/btest/scripts/base/frameworks/metrics/cluster-intermediate-update.bro
index eacebaa50e..3341fa1887 100644
--- a/testing/btest/scripts/base/frameworks/metrics/cluster-intermediate-update.bro
+++ b/testing/btest/scripts/base/frameworks/metrics/cluster-intermediate-update.bro
@@ -1,36 +1,33 @@
 # @TEST-SERIALIZE: comm
 #
 # @TEST-EXEC: btest-bg-run manager-1 BROPATH=$BROPATH:.. CLUSTER_NODE=manager-1 bro %INPUT
-# @TEST-EXEC: btest-bg-run proxy-1   BROPATH=$BROPATH:.. CLUSTER_NODE=proxy-1 bro %INPUT
-# @TEST-EXEC: sleep 1
+# @TEST-EXEC: sleep 3
 # @TEST-EXEC: btest-bg-run worker-1  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-1 bro %INPUT 
 # @TEST-EXEC: btest-bg-run worker-2  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-2 bro %INPUT
-# @TEST-EXEC: btest-bg-wait 20
-# @TEST-EXEC: btest-diff manager-1/notice.log
+# @TEST-EXEC: btest-bg-wait 10
+# @TEST-EXEC: btest-diff manager-1/.stdout
 
 @TEST-START-FILE cluster-layout.bro
 redef Cluster::nodes = {
 	["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=37757/tcp, $workers=set("worker-1", "worker-2")],
-	["proxy-1"] = [$node_type=Cluster::PROXY,     $ip=127.0.0.1, $p=37758/tcp, $manager="manager-1", $workers=set("worker-1", "worker-2")],
-	["worker-1"] = [$node_type=Cluster::WORKER,   $ip=127.0.0.1, $p=37760/tcp, $manager="manager-1", $proxy="proxy-1", $interface="eth0"],
-	["worker-2"] = [$node_type=Cluster::WORKER,   $ip=127.0.0.1, $p=37761/tcp, $manager="manager-1", $proxy="proxy-1", $interface="eth1"],
+	["worker-1"]  = [$node_type=Cluster::WORKER,  $ip=127.0.0.1, $p=37760/tcp, $manager="manager-1", $interface="eth0"],
+	["worker-2"]  = [$node_type=Cluster::WORKER,  $ip=127.0.0.1, $p=37761/tcp, $manager="manager-1", $interface="eth1"],
 };
 @TEST-END-FILE
 
 redef Log::default_rotation_interval = 0secs;
 
-redef enum Notice::Type += {
-	Test_Notice,
-};
-
 event bro_init() &priority=5
 	{
 	Metrics::add_filter("test.metric",
-		[$name="foo-bar",
-		 $break_interval=1hr,
-		 $note=Test_Notice,
-		 $notice_threshold=100,
-		 $log=T]);
+	                    [$every=1hr,
+	                     $measure=set(Metrics::SUM),
+	                     $threshold=100,
+	                     $threshold_crossed(index: Metrics::Index, val: Metrics::ResultVal) = {
+	                     	print "A test metric threshold was crossed!";
+	                     	terminate();
+	                     }
+	                     ]);
 	}
 
 event remote_connection_closed(p: event_peer)
@@ -38,24 +35,12 @@ event remote_connection_closed(p: event_peer)
 	terminate();
 	}
 
-@if ( Cluster::local_node_type() == Cluster::MANAGER )
-
-event Notice::log_notice(rec: Notice::Info)
-	{
-	terminate_communication();
-	terminate();
-	}
-
-@endif
-
-@if ( Cluster::local_node_type() == Cluster::WORKER )
-
 event do_metrics(i: count)
 	{
 	# Worker-1 will trigger an intermediate update and then if everything
 	# works correctly, the data from worker-2 will hit the threshold and
 	# should trigger the notice.
-	Metrics::add_data("test.metric", [$host=1.2.3.4], i);
+	Metrics::add_data("test.metric", [$host=1.2.3.4], [$num=i]);
 	}
 
 event bro_init()
@@ -65,5 +50,3 @@ event bro_init()
 	if ( Cluster::node == "worker-2" )
 		event do_metrics(1);
 	}
-
-@endif
diff --git a/testing/btest/scripts/base/frameworks/metrics/notice.bro b/testing/btest/scripts/base/frameworks/metrics/notice.bro
deleted file mode 100644
index 1ed11a968c..0000000000
--- a/testing/btest/scripts/base/frameworks/metrics/notice.bro
+++ /dev/null
@@ -1,20 +0,0 @@
-# @TEST-EXEC: bro %INPUT
-# @TEST-EXEC: btest-diff notice.log
-
-
-redef enum Notice::Type += {
-	Test_Notice,
-};
-
-event bro_init() &priority=5
-	{
-	Metrics::add_filter("test.metric", 
-		[$name="foo-bar",
-		 $break_interval=3secs,
-		 $note=Test_Notice,
-		 $notice_threshold=2,
-		 $log=F]);
-	Metrics::add_data("test.metric", [$host=1.2.3.4], 3);
-	Metrics::add_data("test.metric", [$host=6.5.4.3], 2);
-	Metrics::add_data("test.metric", [$host=7.2.1.5], 1);
-	}
diff --git a/testing/btest/scripts/base/frameworks/metrics/thresholding.bro b/testing/btest/scripts/base/frameworks/metrics/thresholding.bro
new file mode 100644
index 0000000000..bd0cd6faae
--- /dev/null
+++ b/testing/btest/scripts/base/frameworks/metrics/thresholding.bro
@@ -0,0 +1,47 @@
+# @TEST-EXEC: bro %INPUT
+# @TEST-EXEC: btest-diff .stdout
+
+
+redef enum Notice::Type += {
+	Test_Notice,
+};
+
+event bro_init() &priority=5
+	{
+	Metrics::add_filter("test.metric", 
+	                    [$name="foobar",
+	                     $every=3secs,
+	                     $measure=set(Metrics::SUM),
+	                     $threshold=5,
+	                     $threshold_crossed(index: Metrics::Index, val: Metrics::ResultVal) = {
+	                     	print fmt("THRESHOLD: hit a threshold value at %.0f for %s", val$sum, Metrics::index2str(index));
+	                     },
+	                     $log=F]);
+
+	Metrics::add_filter("test.metric", 
+	                    [$name="foobar2",
+	                     $every=3secs,
+	                     $measure=set(Metrics::SUM),
+	                     $threshold_series=vector(3,6,800),
+	                     $threshold_crossed(index: Metrics::Index, val: Metrics::ResultVal) = {
+	                     	print fmt("THRESHOLD_SERIES: hit a threshold series value at %.0f for %s", val$sum, Metrics::index2str(index));
+		                 },
+	                     $log=F]);
+	Metrics::add_filter("test.metric", 
+	                    [$every=3secs,
+	                     $measure=set(Metrics::SUM),
+	                     $threshold_func(index: Metrics::Index, val: Metrics::ResultVal) = {
+	                     	# This causes any data added to be cross the threshold.
+	                     	return T;
+	                     },
+	                     $threshold_crossed(index: Metrics::Index, val: Metrics::ResultVal) = {
+	                     	print fmt("THRESHOLD_FUNC: hit a threshold function value at %.0f for %s", val$sum, Metrics::index2str(index));
+	                     },
+	                     $log=F]);
+
+	Metrics::add_data("test.metric", [$host=1.2.3.4], [$num=3]);
+	Metrics::add_data("test.metric", [$host=6.5.4.3], [$num=2]);
+	Metrics::add_data("test.metric", [$host=7.2.1.5], [$num=1]);
+	Metrics::add_data("test.metric", [$host=1.2.3.4], [$num=3]);
+	Metrics::add_data("test.metric", [$host=7.2.1.5], [$num=1000]);
+	}