add a test, fix and smallchange in behaviour to allows us to capture apama-ctrl log lines and to allow for mroe flexibiltiy in userStatusLines

Author: ben-spiller

CHANGELOG.rst

@@ -1,6 +1,6 @@
 3.7.dev
 -------
-- TODO
+- It is not longer required for the prefix in userStatusLines to end with a ":". 
 
 3.6
 ---

README.rst

@@ -78,8 +78,9 @@ To do this create a .json configuration file containing a "userStatusLines" dici
 	{
 		"userStatusLines":{
 		
-		// This is for a typical application-defined status line. Note that any text inside [...] brackets (
-		// typically the monitor instance id) is ignored. 
+		// This is for a typical application-defined status line. Note that any number (or text) inside [...] brackets (
+		// typically the monitor instance id) is ignored. This is matched against the "message" part of the log line, 
+		// which follows the first " - " in the line (except for [apama-ctrl] messages which have an extra <apama-ctrl> prefix)
 		"com.mycompany.MyMonitor [1] MyApplication Status:": {
 			// This prefix is added to the start of each alias to avoid clashes with other status KPIs
 			"keyPrefix":"myApp.",

apamax/log_analyzer.py

@@ -2229,8 +2229,6 @@ def main(self, args):
 						# sanity check it
 						columns = {k or COLUMN_DISPLAY_NAMES[k] for k in COLUMN_DISPLAY_NAMES}
 						for userStatusPrefix, userStatus in v.items():
-							if not userStatusPrefix.endswith(':'): raise UserError('userStatus prefixes should end with a ":"')
-							
 							for k, alias in userStatus['key:alias'].items():
 								alias = userStatus['keyPrefix']+(alias or k)
 								if alias in columns: raise UserError(f"User status line '{userStatusPrefix}' contains display name '{alias}' which is already in use; consider using keyPrefix to ensure this status line doesn't conflict with display names from others")

tests/correctness/Cor_018/Input/analyzer_config.json

@@ -1,5 +1,7 @@
 {"userStatusLines":{
 
+
+
 	"com.mycompany.MyMonitor [1] MyApplication Status:": {
 		"keyPrefix":"myApp.",
 		"key:alias":{
@@ -8,6 +10,20 @@
 			"kpi3":""
 		}},
 
+	// since we munge the message for [apama-ctrl] lines we have a slightly different prefix needed
+	"<apama-ctrl> com.apama.in_c8y.proxy.CepProxyServlet.run - ProxyStatus: addr=192.168.138.64 ": {
+		"keyPrefix":"apama-ctrl.192.168.138.64.",
+		"key:alias":{
+			"started":"",
+			"completed":""
+		}},
+	"<apama-ctrl> com.apama.in_c8y.proxy.CepProxyServlet.run - ProxyStatus: addr=192.168.146.0 ": {
+		"keyPrefix":"apama-ctrl.192.168.146.0.",
+		"key:alias":{
+			"started":"",
+			"completed":""
+		}},
+		
 	"JMS Status:": {
 		"keyPrefix":"jms.",
 		"key:alias":{

tests/correctness/Cor_018/Input/correlator.log

@@ -182,6 +182,9 @@
 2020-06-12 16:06:11.534 INFO  [47556:Status] -       JMSReceiver myConnection-receiver-apama-queue-01: rx=4 rRate=0 rWindow=97 rRedel=0 rMaxDeliverySecs=0.0 msgErrors=1 rDupsDet=1 perSourceDupIds=3 timeExpiryDupIds=0
 2020-06-12 16:06:11.534 INFO  [47556:Status] -       JMSReceiver myConnection-receiver-apama-topic-01: rx=0 rRate=0 rWindow=100 rRedel=0 rMaxDeliverySecs=0.0 msgErrors=0 rDupsDet=0 perSourceDupIds=0 timeExpiryDupIds=0
 2020-06-12 16:06:11.534 INFO  [47556] - Persistence Status: numSnapshots=42 lastSnapshotTime=624772 snapshotWaitTimeEwmaMillis=0.03 commitTimeEwmaMillis=194.34 lastSnapshotRowsChangedEwma=93
+[apama-ctrl]  2020-06-17 20:15:47.342 INFO  [Thread-5] com.apama.in_c8y.proxy.CepProxyServlet.run - ProxyStatus: addr=192.168.146.0 started=5 completed=3
+[apama-ctrl]  2020-06-17 20:15:47.342 INFO  [Thread-5] com.apama.in_c8y.proxy.CepProxyServlet.run - ProxyStatus: addr=192.168.138.64 started=2 completed=2
+[apama-ctrl]  2020-06-17 20:15:47.342 INFO  [Thread-5] com.apama.in_c8y.proxy.CepProxyServlet.run - ProxyStatus: addr=192.168.99.0 started=17 completed=17
 2020-06-12 16:06:11.600 CRIT  [33128] - test.Test [2] Some sample EPL output
 2020-06-12 16:06:12.601 CRIT  [33128] - test.Test [2] Some sample EPL output
 2020-06-12 16:06:13.600 CRIT  [14100] - test.Test [2] Some sample EPL output

tests/correctness/Cor_018/Reference/user_status_final.txt

@@ -1,6 +1,10 @@
 myApp.kpi1=1585
 myApp.kpi2AliasWithUnits=80.2
 myApp.kpi3='abc def'
+apama-ctrl.192.168.138.64.started=2
+apama-ctrl.192.168.138.64.completed=2
+apama-ctrl.192.168.146.0.started=5
+apama-ctrl.192.168.146.0.completed=3
 jms.s=senders=1
 jms.r=receivers=2
 jms.rx /sec=0