cc-metric-collector: update fritz

nhr@fau/cc-metric-collector/fritz/config.json

@@ -1,8 +1,10 @@
 {
-  "sinks": "/etc/cc-metric-collector/sinks.json",
+  "sinks-file": "/etc/cc-metric-collector/sinks.json",
-  "collectors" : "/etc/cc-metric-collector/collectors.json",
+  "collectors-file" : "/etc/cc-metric-collector/collectors.json",
-  "receivers" : "/etc/cc-metric-collector/receivers.json",
+  "receivers-file" : "/etc/cc-metric-collector/receivers.json",
-  "router" : "/etc/cc-metric-collector/router.json",
+  "router-file" : "/etc/cc-metric-collector/router.json",
+  "main" : {
     "interval": "60s",
     "duration": "10s"
   }
+}

nhr@fau/cc-metric-collector/fritz/router.json

@@ -1,12 +1,6 @@
 {
-    "add_tags" : [
+    "process_messages": {
-        {
+        "rename_messages" : {
-            "key" : "cluster",
-            "value" : "fritz",
-            "if" : "*"
-        }
-    ],
-    "rename_metrics" : {
             "load_one" : "cpu_load",
             "net_bytes_in_bw" : "net_bytes_in",
             "net_bytes_out_bw" : "net_bytes_out",
@@ -27,7 +21,14 @@
             "lustre_statfs_diff": "lustre_statfs",
             "lustre_inode_permission_diff" : "lustre_inode_permission"
         },
-    "drop_metrics" : [
+        "add_tags_if" : [
+            {
+                "key" : "cluster",
+                "value" : "fritz",
+                "if" : "true"
+            }
+        ],
+        "drop_messages" : [
             "net_bytes_in",
             "net_bytes_out",
             "ib_recv",
@@ -41,13 +42,14 @@
             "lustre_write_bytes",
             "lustre_write_requests"
         ],
-    "interval_timestamp" : false,
-    "num_cache_intervals" : 0,
         "change_unit_prefix": {
-        "mem_used": "G",
+            "name == 'mem_used'": "G",
-        "swap_used": "G",
+            "name == 'swap_used'": "G",
-        "mem_total": "G",
+            "name == 'mem_total'": "G",
-        "swap_total": "G"
+            "name == 'swap_total'": "G"
         },
         "normalize_metrics" : true
+    },
+    "interval_timestamp" : false,
+    "num_cache_intervals" : 0
 }

nhr@fau/cc-metric-collector/fritz/sinks.json

@@ -1,10 +1,4 @@
 {
-    "fritzganglia": {
-        "type": "libganglia",
-        "gmond_config": "/etc/ganglia/gmond.conf",
-        "libganglia_path": "libganglia.so.0",
-        "add_ganglia_group": true
-    },
   "nhrinflux" : {
     "type" : "influxasync",
     "host": "monitoring-test.nhr.uni-erlangen.de",
@@ -27,6 +21,7 @@
     "idle_connection_timeout": "60s",
     "flush_delay" : "2s",
     "max_retries" : 1,
-        "timeout": "10s"
+    "timeout" : "10s",
+    "precision": "s"
   }
 }

nhr@fau/cc-metric-collector/fritz/sinks_debug.json

@@ -1,33 +0,0 @@
-{
-    "fritzganglia": {
-        "type": "libganglia",
-        "gmond_config": "/etc/ganglia/gmond.conf",
-        "libganglia_path": "libganglia.so.0",
-        "add_ganglia_group": true
-    },
-    "nhrinflux": {
-        "type": "influxasync",
-        "host": "monitoring-test.nhr.uni-erlangen.de",
-        "port": "8086",
-        "organization": "ClusterCockpit",
-        "database": "fritz_neu",
-        "password": "XZY",
-        "ssl": true,
-        "meta_as_tags": [
-            "unit"
-        ]
-    },
-    "fritzstore": {
-        "type": "http",
-        "url": "http://monitoring.nhr.fau.de:8082/api/write?cluster=fritz",
-        "jwt": "XZY",
-        "meta_as_tags": [
-            "unit"
-        ],
-        "idle_connection_timeout": "60s"
-    },
-    "debugstdout": {
-        "type": "stdout",
-        "output_file": "/tmp/debug.log"
-    }
-}