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",
-  "interval": "60s",
+  "main" : {
-  "duration": "10s"
+    "interval": "60s",
-}
+    "duration": "10s"
+  }
+}

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

@@ -1,54 +1,56 @@
 {
-    "add_tags" : [
+    "process_messages":{
-        {
+        "rename_messages" : {
-            "key" : "cluster",
+            "load_one" : "cpu_load",
-            "value" : "woodyng",
+            "cpu_load_core" : "cpu_load",
-            "if" : "*"
+            "net_bytes_in_bw" : "net_bytes_in",
-        }
+            "net_bytes_out_bw" : "net_bytes_out",
-    ],
+            "net_pkts_in_bw" : "net_pkts_in",
-    "rename_metrics" : {
+            "net_pkts_out_bw" : "net_pkts_out",
-        "load_one" : "cpu_load",
+            "ib_recv_bw" : "ib_recv",
-        "cpu_load_core" : "cpu_load",
+            "ib_xmit_bw" : "ib_xmit",
-        "net_bytes_in_bw" : "net_bytes_in",
+            "ib_recv_pkts_bw": "ib_recv_pkts",
-        "net_bytes_out_bw" : "net_bytes_out",
+            "ib_xmit_pkts_bw": "ib_xmit_pkts",
-        "net_pkts_in_bw" : "net_pkts_in",
+            "lustre_read_bytes_diff" : "lustre_read_bytes",
-        "net_pkts_out_bw" : "net_pkts_out",
+            "lustre_read_requests_diff" : "lustre_read_requests",
-        "ib_recv_bw" : "ib_recv",
+            "lustre_write_bytes_diff" : "lustre_write_bytes",
-        "ib_xmit_bw" : "ib_xmit",
+            "lustre_write_requests_diff" : "lustre_write_requests",
-        "ib_recv_pkts_bw": "ib_recv_pkts",
+            "lustre_open_diff" : "lustre_open",
-        "ib_xmit_pkts_bw": "ib_xmit_pkts",
+            "lustre_close_diff" : "lustre_close",
-        "lustre_read_bytes_diff" : "lustre_read_bytes",
+            "lustre_setattr_diff" : "lustre_setattr",
-        "lustre_read_requests_diff" : "lustre_read_requests",
+            "lustre_getattr_diff" : "lustre_getattr",
-        "lustre_write_bytes_diff" : "lustre_write_bytes",
+            "lustre_statfs_diff": "lustre_statfs",
-        "lustre_write_requests_diff" : "lustre_write_requests",
+            "lustre_inode_permission_diff" : "lustre_inode_permission"
-        "lustre_open_diff" : "lustre_open",
+        },
-        "lustre_close_diff" : "lustre_close",
+        "add_tags_if" : [
-        "lustre_setattr_diff" : "lustre_setattr",
+            {
-        "lustre_getattr_diff" : "lustre_getattr",
+                "key" : "cluster",
-        "lustre_statfs_diff": "lustre_statfs",
+                "value" : "woody",
-        "lustre_inode_permission_diff" : "lustre_inode_permission"
+                "if" : "true"
+            }
+        ],
+        "drop_messages" : [
+            "net_bytes_in",
+            "net_bytes_out",
+            "ib_recv",
+            "ib_xmit",
+            "ib_recv_pkts",
+            "ib_xmit_pkts",
+            "net_pkts_in",
+            "net_pkts_out",
+            "lustre_read_bytes",
+            "lustre_read_requests",
+            "lustre_write_bytes",
+            "lustre_write_requests"
+        ],
+        "change_unit_prefix": {
+            "name == 'mem_used'": "G",
+            "name == 'swap_used'": "G",
+            "name == 'mem_total'": "G",
+            "name == 'swap_total'": "G"
+        },
+        "normalize_metrics" : true
     },
-    "drop_metrics" : [
-        "net_bytes_in",
-        "net_bytes_out",
-        "ib_recv",
-        "ib_xmit",
-        "ib_recv_pkts",
-        "ib_xmit_pkts",
-        "net_pkts_in",
-        "net_pkts_out",
-        "lustre_read_bytes",
-        "lustre_read_requests",
-        "lustre_write_bytes",
-        "lustre_write_requests"
-    ],
     "interval_timestamp" : true,
-    "num_cache_intervals" : 0,
+    "num_cache_intervals" : 0
-    "change_unit_prefix": {
-        "mem_used": "G",
-        "swap_used": "G",
-        "mem_total": "G",
-        "swap_total": "G"
-    },
-    "normalize_metrics" : true
 }

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",
+    "host": "monitoring-test.nhr.uni-erlangen.de",
-        "port": "8086",
+    "port": "8086",
-        "organization": "ClusterCockpit",
+    "organization" : "ClusterCockpit",
-        "database": "woodyng",
+    "database" : "woodyng",
-        "password": "XZY",
+    "password": "XYZ",
-        "ssl": true
+    "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"
+      "unit"
-        ],
+    ],
-        "idle_connection_timeout": "60s"
+    "idle_connection_timeout": "60s",
-    }
+    "precision": "s"
+  }
 }