Merge pull request #464 from cbowman0/issue461

Support stop in aggregate section without send to.

ChangeLog.md

@@ -4,6 +4,8 @@
 
 * [PR #463](https://github.com/grobian/carbon-c-relay/pull/463)
   support rewrite form \g{n} to allow for integers to follow expansion
+* [PR #464](https://github.com/grobian/carbon-c-relay/pull/464)
+  support stop in aggregate section without send to
 
 ### Bugfixes
 

Makefile.am

@@ -126,6 +126,7 @@ CRTESTS = \
 	issue357 \
 	issue369 \
 	issue448 \
+	issue461 \
 	issue462 \
 	server-type \
 	basic \

conffile.l

@@ -125,7 +125,7 @@ match				{
 						return crTO;
 					}
 <idcl>blackhole			return crBLACKHOLE;
-<ma,idcl>stop			return crSTOP;
+<ma,idcl,ag>stop		return crSTOP;
 
 rewrite				{
 						identstate = re;

issues/issue461.conf

@@ -0,0 +1,24 @@
+cluster default
+    fnv1a_ch replication 1
+        127.0.0.1:2103 proto tcp
+    ;
+
+# metric name reported by collectd: collectd.$hostname.cpu.$core-id.percent.$type
+# aggregate target metric name:     collectd.$hostname.aggregated.cpu.total_cores
+aggregate
+        ^collectd\.(.+)\.cpu\.([0-9]+)\.percent\.idle
+                ^collectd\.(ABC-.+)\.cpu\.([0-9]+)\.percent\.idle
+                ^collectd\.ABC-(.+)\.cpu\.([0-9]+)\.percent\.idle
+                ^collectd\.([^.]+)\.cpu\.([0-9]+)\.percent\.idle
+        every 10 seconds
+        expire after 15 seconds
+        compute count write to
+                collectd.\1.aggregated.cpu.total_cores
+        stop
+        ;
+
+match *
+    send to
+        default
+    stop
+    ;

test/issue461.out

@@ -0,0 +1,42 @@
+listen
+    type linemode
+        2003 proto tcp
+        2003 proto udp
+        /tmp/.s.carbon-c-relay.2003 proto unix
+    ;
+
+statistics
+    submit every 60 seconds
+    prefix with carbon.relays.test_hostname
+    ;
+
+cluster default
+    fnv1a_ch replication 1
+        127.0.0.1:2103
+    ;
+
+aggregate
+        ^collectd\.(.+)\.cpu\.([0-9]+)\.percent\.idle
+        ^collectd\.(ABC-.+)\.cpu\.([0-9]+)\.percent\.idle
+        ^collectd\.ABC-(.+)\.cpu\.([0-9]+)\.percent\.idle
+        ^collectd\.([^.]+)\.cpu\.([0-9]+)\.percent\.idle
+    every 10 seconds
+    expire after 15 seconds
+    timestamp at end of bucket
+    compute count write to
+        collectd.\1.aggregated.cpu.total_cores
+    stop
+    ;
+match *
+    send to default
+    stop
+    ;
+
+aggregation
+    ^collectd\.(.+)\.cpu\.([0-9]+)\.percent\.idle (regex) -> collectd.test_host.cpu.42.percent.idle
+    count(collectd.\1.aggregated.cpu.total_cores) -> collectd.test_host.aggregated.cpu.total_cores 
+    stop
+aggregation
+    ^collectd\.(.+)\.cpu\.([0-9]+)\.percent\.idle (regex) -> collectd.test_host2.cpu.42.percent.idle
+    count(collectd.\1.aggregated.cpu.total_cores) -> collectd.test_host2.aggregated.cpu.total_cores 
+    stop

test/issue461.tst

@@ -0,0 +1,2 @@
+collectd.test_host.cpu.42.percent.idle
+collectd.test_host2.cpu.42.percent.idle