Fixes to the configuration example

analytics/config/smucngperf.conf

@@ -2,38 +2,36 @@ global {
 mqttPrefix    /test
 }
 
-template_smucperf def1 {
-interval    1000
+template_supermucngperf def1 {
+interval    10000
 minValues   3
 duplicate 	false
 streaming	true
 }
 
-smucperf cpi {
+supermucngperf cpi {
 default     def1
 	input {
-		sensor "<bottomup 1> clocks"{
-             position  0
-        }
-        sensor "<bottomup 1> ref_clocks"{
-             position  1
-        }
-        sensor "<bottomup 1> instructions" {
-             position  2
-        }
+        	sensor "<bottomup>clocks"{
+             	     position  0
+       		}
+	        sensor "<bottomup>ref_clocks"{
+        	     position  1
+        	}
+        	sensor "<bottomup>instructions" {
+             	     position  2
+        	}
 	}
 
 	output {
-	
-		sensor "<bottomup 1> cpi" {
-    		mqttsuffix  /cpi
-    		scaling_factor	100
-    	}
-    	
-    	sensor "<bottomup 1> frequency" {
-    		mqttsuffix  /cpi
-    		scaling_factor	1
-    	}
+		sensor "<bottomup, filter /login08/cpu>cpi" {
+    			mqttsuffix  /cpi
+	    		scaling_factor	100
+    		}
     	
+	    	sensor "<bottomup, filter /login08/cpu>frequency" {
+    			mqttsuffix  /frequency
+    			scaling_factor	1
+    		}
 	}
-}
\ No newline at end of file
+}

collectagent/config/collectagent.conf

 global {
-	mqttListenAddress    127.0.0.1:1883
-	cleaningInterval	 86400
-	mqttprefix 			 /test
-	threads				 24
-	messageThreads       128
-	messageSlots         16
-	cacheInterval        120
-	daemonize            false
-	statistics           true
-	verbosity 			 3
-	tempDir				 .
+        mqttListenAddress    127.0.0.1:1883
+        cleaningInterval         86400
+        mqttprefix                       /test
+        threads                          24
+        messageThreads       128
+        messageSlots         16
+        cacheInterval        120
+        daemonize            false
+        statistics           true
+        verbosity                        3
+        tempDir                          .
 }
 
 restAPI {
-	address	127.0.0.1:8080
+        address 127.0.0.1:8080
     certificate ../../deps/openssl-1.1.1c/test/certs/ca-cert.pem
     privateKey  ../../deps/openssl-1.1.1c/test/certs/ca-key.pem
     dhFile      ../../deps/openssl-1.1.1c/crypto/dh/dh2048.pem
@@ -31,11 +31,11 @@ restAPI {
 }
 
 cassandra {
-	address	127.0.0.1:9042
-	username
-	password
-	ttl 0
-	numThreadsIo 1
+        address 127.0.0.1:9042
+        username
+        password
+        ttl 0
+        numThreadsIo 1
     queueSizeIo 4096
     coreConnPerHost 1
     debugLog false