cc-metric-collector: update alex

nhr@fau/cc-metric-collector/alex/collectors.json

@@ -27,15 +27,11 @@
     "send_derived_values": true
   },
   "diskstat" : {},
-  "iostat" : {},
+  "nfsiostat" : {},
   "ibstat" : {
     "send_abs_values": true,
     "send_derived_values": true
   },
-  "ipmistat" : {
-    "send_abs_values": true,
-    "send_derived_values": true
-  },
   "tempstat" : {
     "tag_override" : {
       "hwmon0" : {

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

@@ -1,12 +1,6 @@
 {
-    "add_tags" : [
+    "process_messages" : {
-        {
+        "rename_messages" : {
-            "key" : "cluster",
-            "value" : "alex",
-            "if" : "*"
-        }
-    ],
-    "rename_metrics" : {
             "load_one" : "cpu_load",
             "cpu_load_core" : "cpu_load",
             "net_bytes_in_bw" : "net_bytes_in",
@@ -31,7 +25,14 @@
             "nv_fb_mem_used" : "acc_mem_used",
             "nv_power_usage" : "acc_power"
         },
-    "drop_metrics" : [
+        "add_tags_if" : [
+            {
+                "key" : "cluster",
+                "value" : "alex",
+                "if" : "true"
+            }
+        ],
+        "drop_messages" : [
             "net_bytes_in",
             "net_bytes_out",
             "ib_recv",
@@ -45,14 +46,15 @@
             "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",
-        "cpufreq": "M"
+            "name == 'cpufreq'": "M"
         },
         "normalize_metrics" : true
+    },
+    "interval_timestamp" : false,
+    "num_cache_intervals" : 0
 }

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

@@ -1,26 +1,27 @@
 {
-    "nhrinflux": {
+  "nhrinflux" : {
-        "type": "influxasync",
+    "type" : "influxasync",
     "host": "monitoring-test.nhr.uni-erlangen.de",
     "port": "8086",
-        "organization": "ClusterCockpit",
+    "organization" : "ClusterCockpit",
-        "database": "alex",
+    "database" : "alex",
-        "password": "XYZ",
+    "password": "XYX",
     "ssl": true,
-        "meta_as_tags": [
+    "meta_as_tags" : [
       "unit"
     ]
   },
-    "alexstore": {
+  "alexstore" : {
-        "type": "http",
+    "type" : "http",
-        "url": "http://monitoring.nhr.fau.de:8082/api/write?cluster=alex",
+    "url" : "http://monitoring.nhr.fau.de:8082/api/write?cluster=alex",
     "jwt": "XYZ",
-        "meta_as_tags": [
+    "meta_as_tags" : [
       "unit"
     ],
-        "idle_connection_timeout": "60s",
+    "idle_connection_timeout" : "60s",
-        "flush_delay": "2s",
+    "flush_delay" : "2s",
-        "max_retries": 1,
+    "max_retries" : 1,
-        "timeout": "10s"
+    "timeout" : "10s",
+    "precision": "s"
   }
 }

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

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