cc-metric-collector: update woody

nhr@fau/cc-metric-collector/woody-ng/collectors.icx.json

@@ -30,6 +30,7 @@
     }
   },
   "nfs4stat" : {},
+  "nfsiostat" : {},
   "likwid": {
     "force_overwrite" : true,
     "invalid_to_zero" : true,

nhr@fau/cc-metric-collector/woody-ng/collectors.skl.json

@@ -18,6 +18,7 @@
   },
   "tempstat" : {},
   "nfs4stat" : {},
+  "nfsiostat" : {},
   "likwid": {
     "force_overwrite" : true,
     "invalid_to_zero" : true,

nhr@fau/cc-metric-collector/woody-ng/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/woody-ng/router.json

@@ -1,12 +1,6 @@
 {
-    "add_tags" : [
+    "process_messages":{
-        {
+        "rename_messages" : {
-            "key" : "cluster",
-            "value" : "woodyng",
-            "if" : "*"
-        }
-    ],
-    "rename_metrics" : {
             "load_one" : "cpu_load",
             "cpu_load_core" : "cpu_load",
             "net_bytes_in_bw" : "net_bytes_in",
@@ -28,7 +22,14 @@
             "lustre_statfs_diff": "lustre_statfs",
             "lustre_inode_permission_diff" : "lustre_inode_permission"
         },
-    "drop_metrics" : [
+        "add_tags_if" : [
+            {
+                "key" : "cluster",
+                "value" : "woody",
+                "if" : "true"
+            }
+        ],
+        "drop_messages" : [
             "net_bytes_in",
             "net_bytes_out",
             "ib_recv",
@@ -42,13 +43,14 @@
             "lustre_write_bytes",
             "lustre_write_requests"
         ],
-    "interval_timestamp" : true,
-    "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" : true,
+    "num_cache_intervals" : 0
 }

nhr@fau/cc-metric-collector/woody-ng/sinks.json

@@ -1,20 +1,21 @@
 {
-    "nhrinflux": {
+  "nhrinflux" : {
-        "type": "influxasync",
+    "type" : "influxasync",
     "host": "monitoring-test.nhr.uni-erlangen.de",
     "port": "8086",
-        "organization": "ClusterCockpit",
+    "organization" : "ClusterCockpit",
-        "database": "woodyng",
+    "database" : "woodyng",
-        "password": "XZY",
+    "password": "XYZ",
     "ssl": true
   },
-    "woodystore": {
+  "woodystore" : {
-        "type": "http",
+    "type" : "http",
-        "url": "http://monitoring.nhr.fau.de:8082/api/write?cluster=woodyng",
+    "url" : "http://monitoring.nhr.fau.de:8082/api/write?cluster=woody",
-        "jwt": "XZY",
+    "jwt": "XYZ",
-        "meta_as_tags": [
+    "meta_as_tags" : [
       "unit"
     ],
-        "idle_connection_timeout": "60s"
+    "idle_connection_timeout": "60s",
+    "precision": "s"
   }
 }