From 59aa0a09bb94497264255faf45a2f81382facf31 Mon Sep 17 00:00:00 2001 From: Michael Panzlaff Date: Wed, 4 Mar 2026 17:12:46 +0100 Subject: [PATCH] cc-metric-collector: update woody --- .../woody-ng/collectors.icx.json | 1 + .../woody-ng/collectors.skl.json | 1 + .../cc-metric-collector/woody-ng/config.json | 16 +-- .../cc-metric-collector/woody-ng/router.json | 102 +++++++++--------- .../cc-metric-collector/woody-ng/sinks.json | 37 +++---- 5 files changed, 82 insertions(+), 75 deletions(-) diff --git a/nhr@fau/cc-metric-collector/woody-ng/collectors.icx.json b/nhr@fau/cc-metric-collector/woody-ng/collectors.icx.json index d49790b..1396b3f 100644 --- a/nhr@fau/cc-metric-collector/woody-ng/collectors.icx.json +++ b/nhr@fau/cc-metric-collector/woody-ng/collectors.icx.json @@ -30,6 +30,7 @@ } }, "nfs4stat" : {}, + "nfsiostat" : {}, "likwid": { "force_overwrite" : true, "invalid_to_zero" : true, diff --git a/nhr@fau/cc-metric-collector/woody-ng/collectors.skl.json b/nhr@fau/cc-metric-collector/woody-ng/collectors.skl.json index ecd51e3..a9f9330 100644 --- a/nhr@fau/cc-metric-collector/woody-ng/collectors.skl.json +++ b/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, diff --git a/nhr@fau/cc-metric-collector/woody-ng/config.json b/nhr@fau/cc-metric-collector/woody-ng/config.json index 308b08f..d66d9f1 100644 --- a/nhr@fau/cc-metric-collector/woody-ng/config.json +++ b/nhr@fau/cc-metric-collector/woody-ng/config.json @@ -1,8 +1,10 @@ { - "sinks": "/etc/cc-metric-collector/sinks.json", - "collectors" : "/etc/cc-metric-collector/collectors.json", - "receivers" : "/etc/cc-metric-collector/receivers.json", - "router" : "/etc/cc-metric-collector/router.json", - "interval": "60s", - "duration": "10s" -} + "sinks-file": "/etc/cc-metric-collector/sinks.json", + "collectors-file" : "/etc/cc-metric-collector/collectors.json", + "receivers-file" : "/etc/cc-metric-collector/receivers.json", + "router-file" : "/etc/cc-metric-collector/router.json", + "main" : { + "interval": "60s", + "duration": "10s" + } +} \ No newline at end of file diff --git a/nhr@fau/cc-metric-collector/woody-ng/router.json b/nhr@fau/cc-metric-collector/woody-ng/router.json index 9b311db..4707be5 100644 --- a/nhr@fau/cc-metric-collector/woody-ng/router.json +++ b/nhr@fau/cc-metric-collector/woody-ng/router.json @@ -1,54 +1,56 @@ { - "add_tags" : [ - { - "key" : "cluster", - "value" : "woodyng", - "if" : "*" - } - ], - "rename_metrics" : { - "load_one" : "cpu_load", - "cpu_load_core" : "cpu_load", - "net_bytes_in_bw" : "net_bytes_in", - "net_bytes_out_bw" : "net_bytes_out", - "net_pkts_in_bw" : "net_pkts_in", - "net_pkts_out_bw" : "net_pkts_out", - "ib_recv_bw" : "ib_recv", - "ib_xmit_bw" : "ib_xmit", - "ib_recv_pkts_bw": "ib_recv_pkts", - "ib_xmit_pkts_bw": "ib_xmit_pkts", - "lustre_read_bytes_diff" : "lustre_read_bytes", - "lustre_read_requests_diff" : "lustre_read_requests", - "lustre_write_bytes_diff" : "lustre_write_bytes", - "lustre_write_requests_diff" : "lustre_write_requests", - "lustre_open_diff" : "lustre_open", - "lustre_close_diff" : "lustre_close", - "lustre_setattr_diff" : "lustre_setattr", - "lustre_getattr_diff" : "lustre_getattr", - "lustre_statfs_diff": "lustre_statfs", - "lustre_inode_permission_diff" : "lustre_inode_permission" + "process_messages":{ + "rename_messages" : { + "load_one" : "cpu_load", + "cpu_load_core" : "cpu_load", + "net_bytes_in_bw" : "net_bytes_in", + "net_bytes_out_bw" : "net_bytes_out", + "net_pkts_in_bw" : "net_pkts_in", + "net_pkts_out_bw" : "net_pkts_out", + "ib_recv_bw" : "ib_recv", + "ib_xmit_bw" : "ib_xmit", + "ib_recv_pkts_bw": "ib_recv_pkts", + "ib_xmit_pkts_bw": "ib_xmit_pkts", + "lustre_read_bytes_diff" : "lustre_read_bytes", + "lustre_read_requests_diff" : "lustre_read_requests", + "lustre_write_bytes_diff" : "lustre_write_bytes", + "lustre_write_requests_diff" : "lustre_write_requests", + "lustre_open_diff" : "lustre_open", + "lustre_close_diff" : "lustre_close", + "lustre_setattr_diff" : "lustre_setattr", + "lustre_getattr_diff" : "lustre_getattr", + "lustre_statfs_diff": "lustre_statfs", + "lustre_inode_permission_diff" : "lustre_inode_permission" + }, + "add_tags_if" : [ + { + "key" : "cluster", + "value" : "woody", + "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, - "change_unit_prefix": { - "mem_used": "G", - "swap_used": "G", - "mem_total": "G", - "swap_total": "G" - }, - "normalize_metrics" : true + "num_cache_intervals" : 0 } diff --git a/nhr@fau/cc-metric-collector/woody-ng/sinks.json b/nhr@fau/cc-metric-collector/woody-ng/sinks.json index 984be7d..700eb0e 100644 --- a/nhr@fau/cc-metric-collector/woody-ng/sinks.json +++ b/nhr@fau/cc-metric-collector/woody-ng/sinks.json @@ -1,20 +1,21 @@ { - "nhrinflux": { - "type": "influxasync", - "host": "monitoring-test.nhr.uni-erlangen.de", - "port": "8086", - "organization": "ClusterCockpit", - "database": "woodyng", - "password": "XZY", - "ssl": true - }, - "woodystore": { - "type": "http", - "url": "http://monitoring.nhr.fau.de:8082/api/write?cluster=woodyng", - "jwt": "XZY", - "meta_as_tags": [ - "unit" - ], - "idle_connection_timeout": "60s" - } + "nhrinflux" : { + "type" : "influxasync", + "host": "monitoring-test.nhr.uni-erlangen.de", + "port": "8086", + "organization" : "ClusterCockpit", + "database" : "woodyng", + "password": "XYZ", + "ssl": true + }, + "woodystore" : { + "type" : "http", + "url" : "http://monitoring.nhr.fau.de:8082/api/write?cluster=woody", + "jwt": "XYZ", + "meta_as_tags" : [ + "unit" + ], + "idle_connection_timeout": "60s", + "precision": "s" + } }