From 580c9ea400e278cbfa7be4f88ad6ba6b5351bc1d Mon Sep 17 00:00:00 2001 From: Simon Volpert Date: Thu, 26 Mar 2020 13:52:37 +0000 Subject: [PATCH] target label hotfix --- dashboards/node.json | 84 ++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/dashboards/node.json b/dashboards/node.json index 504bf99..c668098 100644 --- a/dashboards/node.json +++ b/dashboards/node.json @@ -120,7 +120,7 @@ "tableColumn": "", "targets": [ { - "expr": "count(node_cpu_seconds_total{service_id=\"node-exporter-$node\", mode=\"system\"}) or count(node_cpu{service_id=\"node-exporter-$node\", mode=\"system\"})", + "expr": "count(node_cpu_seconds_total{service_id=\"$node\", mode=\"system\"}) or count(node_cpu{service_id=\"$node\", mode=\"system\"})", "instant": true, "interval": "", "intervalFactor": 2, @@ -204,7 +204,7 @@ "steppedLine": false, "targets": [ { - "expr": "sum(irate(node_cpu_seconds_total{mode=\"system\",service_id='node-exporter-$node'}[5m])) or sum(irate(node_cpu{mode=\"system\",service_id='node-exporter-$node'}[5m]))", + "expr": "sum(irate(node_cpu_seconds_total{mode=\"system\",service_id='$node'}[5m])) or sum(irate(node_cpu{mode=\"system\",service_id='$node'}[5m]))", "interval": "", "intervalFactor": 2, "legendFormat": "system", @@ -214,7 +214,7 @@ "target": "" }, { - "expr": "sum(irate(node_cpu_seconds_total{mode=\"user\",service_id='node-exporter-$node'}[5m])) or sum(irate(node_cpu{mode=\"user\",service_id='node-exporter-$node'}[5m]))", + "expr": "sum(irate(node_cpu_seconds_total{mode=\"user\",service_id='$node'}[5m])) or sum(irate(node_cpu{mode=\"user\",service_id='$node'}[5m]))", "interval": "", "intervalFactor": 2, "legendFormat": "user", @@ -222,7 +222,7 @@ "step": 1200 }, { - "expr": "sum(irate(node_cpu_seconds_total{mode=\"nice\",service_id='node-exporter-$node'}[5m])) or sum(irate(node_cpu{mode=\"nice\",service_id='node-exporter-$node'}[5m]))", + "expr": "sum(irate(node_cpu_seconds_total{mode=\"nice\",service_id='$node'}[5m])) or sum(irate(node_cpu{mode=\"nice\",service_id='$node'}[5m]))", "interval": "", "intervalFactor": 2, "legendFormat": "nice", @@ -230,7 +230,7 @@ "step": 1200 }, { - "expr": "sum(irate(node_cpu_seconds_total{mode=\"iowait\",service_id='node-exporter-$node'}[5m])) or sum(irate(node_cpu{mode=\"iowait\",service_id='node-exporter-$node'}[5m]))", + "expr": "sum(irate(node_cpu_seconds_total{mode=\"iowait\",service_id='$node'}[5m])) or sum(irate(node_cpu{mode=\"iowait\",service_id='$node'}[5m]))", "interval": "", "intervalFactor": 2, "legendFormat": "iowait", @@ -238,14 +238,14 @@ "step": 1200 }, { - "expr": "sum(irate(node_cpu_seconds_total{mode=\"steal\",service_id='node-exporter-$node'}[5m])) or sum(irate(node_cpu{mode=\"steal\",service_id='node-exporter-$node'}[5m]))", + "expr": "sum(irate(node_cpu_seconds_total{mode=\"steal\",service_id='$node'}[5m])) or sum(irate(node_cpu{mode=\"steal\",service_id='$node'}[5m]))", "intervalFactor": 2, "legendFormat": "steal", "refId": "H", "step": 1200 }, { - "expr": "sum(irate(node_cpu_seconds_total{mode=\"idle\",service_id='node-exporter-$node'}[5m])) or sum(irate(node_cpu{mode=\"idle\",service_id='node-exporter-$node'}[5m]))", + "expr": "sum(irate(node_cpu_seconds_total{mode=\"idle\",service_id='$node'}[5m])) or sum(irate(node_cpu{mode=\"idle\",service_id='$node'}[5m]))", "interval": "", "intervalFactor": 2, "legendFormat": "idle", @@ -253,7 +253,7 @@ "step": 1200 }, { - "expr": "sum(irate(node_cpu_seconds_total{mode=\"irq\",service_id='node-exporter-$node'}[5m])) or sum(irate(node_cpu{mode=\"irq\",service_id='node-exporter-$node'}[5m]))", + "expr": "sum(irate(node_cpu_seconds_total{mode=\"irq\",service_id='$node'}[5m])) or sum(irate(node_cpu{mode=\"irq\",service_id='$node'}[5m]))", "interval": "", "intervalFactor": 2, "legendFormat": "irq", @@ -261,7 +261,7 @@ "step": 1200 }, { - "expr": "sum(irate(node_cpu_seconds_total{mode=\"softirq\",service_id='node-exporter-$node'}[5m])) or sum(irate(node_cpu{mode=\"softirq\",service_id='node-exporter-$node'}[5m]))", + "expr": "sum(irate(node_cpu_seconds_total{mode=\"softirq\",service_id='$node'}[5m])) or sum(irate(node_cpu{mode=\"softirq\",service_id='$node'}[5m]))", "interval": "", "intervalFactor": 2, "legendFormat": "softirq", @@ -269,7 +269,7 @@ "step": 1200 }, { - "expr": "sum(irate(node_cpu_seconds_total{mode=\"guest\",service_id='node-exporter-$node'}[5m])) or sum(irate(node_cpu{mode=\"guest\",service_id='node-exporter-$node'}[5m]))", + "expr": "sum(irate(node_cpu_seconds_total{mode=\"guest\",service_id='$node'}[5m])) or sum(irate(node_cpu{mode=\"guest\",service_id='$node'}[5m]))", "interval": "", "intervalFactor": 2, "legendFormat": "guest", @@ -398,7 +398,7 @@ "steppedLine": false, "targets": [ { - "expr": "( node_memory_MemTotal_bytes{service_id='node-exporter-$node'} - node_memory_MemFree_bytes{service_id='node-exporter-$node'} - node_memory_Buffers_bytes{service_id='node-exporter-$node'} - node_memory_Cached_bytes{service_id='node-exporter-$node'} - node_memory_SwapCached_bytes{service_id='node-exporter-$node'} - node_memory_Slab_bytes{service_id='node-exporter-$node'} - node_memory_PageTables_bytes{service_id='node-exporter-$node'} - node_memory_VmallocUsed_bytes{service_id='node-exporter-$node'} ) or ( node_memory_MemTotal{service_id='node-exporter-$node'} - node_memory_MemFree{service_id='node-exporter-$node'} - node_memory_Buffers{service_id='node-exporter-$node'} - node_memory_Cached{service_id='node-exporter-$node'} - node_memory_SwapCached{service_id='node-exporter-$node'} - node_memory_Slab{service_id='node-exporter-$node'} - node_memory_PageTables{service_id='node-exporter-$node'} - node_memory_VmallocUsed{service_id='node-exporter-$node'} )", + "expr": "( node_memory_MemTotal_bytes{service_id='$node'} - node_memory_MemFree_bytes{service_id='$node'} - node_memory_Buffers_bytes{service_id='$node'} - node_memory_Cached_bytes{service_id='$node'} - node_memory_SwapCached_bytes{service_id='$node'} - node_memory_Slab_bytes{service_id='$node'} - node_memory_PageTables_bytes{service_id='$node'} - node_memory_VmallocUsed_bytes{service_id='$node'} ) or ( node_memory_MemTotal{service_id='$node'} - node_memory_MemFree{service_id='$node'} - node_memory_Buffers{service_id='$node'} - node_memory_Cached{service_id='$node'} - node_memory_SwapCached{service_id='$node'} - node_memory_Slab{service_id='$node'} - node_memory_PageTables{service_id='$node'} - node_memory_VmallocUsed{service_id='$node'} )", "interval": "", "intervalFactor": 2, "legendFormat": "Apps", @@ -408,7 +408,7 @@ "target": "" }, { - "expr": "node_memory_Buffers_bytes{service_id='node-exporter-$node'} or node_memory_Buffers{service_id='node-exporter-$node'}", + "expr": "node_memory_Buffers_bytes{service_id='$node'} or node_memory_Buffers{service_id='$node'}", "interval": "", "intervalFactor": 2, "legendFormat": "Buffers", @@ -416,7 +416,7 @@ "step": 1200 }, { - "expr": "node_memory_Cached_bytes{service_id='node-exporter-$node'} or node_memory_Cached{service_id='node-exporter-$node'}", + "expr": "node_memory_Cached_bytes{service_id='$node'} or node_memory_Cached{service_id='$node'}", "interval": "", "intervalFactor": 2, "legendFormat": "Cached", @@ -424,7 +424,7 @@ "step": 1200 }, { - "expr": "node_memory_MemFree_bytes{service_id='node-exporter-$node'} or node_memory_MemFree{service_id='node-exporter-$node'}", + "expr": "node_memory_MemFree_bytes{service_id='$node'} or node_memory_MemFree{service_id='$node'}", "hide": false, "interval": "", "intervalFactor": 2, @@ -433,7 +433,7 @@ "step": 1200 }, { - "expr": "node_memory_Slab_bytes{service_id='node-exporter-$node'} or node_memory_Slab{service_id='node-exporter-$node'}", + "expr": "node_memory_Slab_bytes{service_id='$node'} or node_memory_Slab{service_id='$node'}", "interval": "", "intervalFactor": 2, "legendFormat": "Slab", @@ -441,7 +441,7 @@ "step": 1200 }, { - "expr": "node_memory_SwapCached_bytes{service_id='node-exporter-$node'} or node_memory_SwapCached{service_id='node-exporter-$node'}", + "expr": "node_memory_SwapCached_bytes{service_id='$node'} or node_memory_SwapCached{service_id='$node'}", "interval": "", "intervalFactor": 2, "legendFormat": "SwapCached", @@ -449,7 +449,7 @@ "step": 1200 }, { - "expr": "node_memory_PageTables_bytes{service_id='node-exporter-$node'} or node_memory_PageTables{service_id='node-exporter-$node'}", + "expr": "node_memory_PageTables_bytes{service_id='$node'} or node_memory_PageTables{service_id='$node'}", "interval": "", "intervalFactor": 2, "legendFormat": "PageTables", @@ -457,7 +457,7 @@ "step": 1200 }, { - "expr": "node_memory_VmallocUsed_bytes{service_id='node-exporter-$node'} or node_memory_VmallocUsed{service_id='node-exporter-$node'}", + "expr": "node_memory_VmallocUsed_bytes{service_id='$node'} or node_memory_VmallocUsed{service_id='$node'}", "interval": "", "intervalFactor": 2, "legendFormat": "VmallocUsed", @@ -466,7 +466,7 @@ "step": 1200 }, { - "expr": "(node_memory_SwapTotal_bytes{service_id='node-exporter-$node'} - node_memory_SwapFree{service_id='node-exporter-$node'}) or (node_memory_SwapTotal{service_id='node-exporter-$node'} - node_memory_SwapFree{service_id='node-exporter-$node'})", + "expr": "(node_memory_SwapTotal_bytes{service_id='$node'} - node_memory_SwapFree{service_id='$node'}) or (node_memory_SwapTotal{service_id='$node'} - node_memory_SwapFree{service_id='$node'})", "interval": "", "intervalFactor": 2, "legendFormat": "Swap", @@ -475,7 +475,7 @@ "step": 1200 }, { - "expr": "node_memory_Committed_AS_bytes{service_id='node-exporter-$node'} or node_memory_Committed_AS{service_id='node-exporter-$node'}", + "expr": "node_memory_Committed_AS_bytes{service_id='$node'} or node_memory_Committed_AS{service_id='$node'}", "interval": "", "intervalFactor": 2, "legendFormat": "Committed", @@ -484,7 +484,7 @@ "step": 1200 }, { - "expr": "node_memory_Mapped_bytes{service_id='node-exporter-$node'} or node_memory_Mapped{service_id='node-exporter-$node'}", + "expr": "node_memory_Mapped_bytes{service_id='$node'} or node_memory_Mapped{service_id='$node'}", "interval": "", "intervalFactor": 2, "legendFormat": "Mapped", @@ -492,7 +492,7 @@ "step": 1200 }, { - "expr": "node_memory_Active_bytes{service_id='node-exporter-$node'} or node_memory_Active{service_id='node-exporter-$node'}", + "expr": "node_memory_Active_bytes{service_id='$node'} or node_memory_Active{service_id='$node'}", "interval": "", "intervalFactor": 2, "legendFormat": "Active", @@ -501,7 +501,7 @@ "step": 1200 }, { - "expr": "node_memory_Inactive_bytes{service_id='node-exporter-$node'} or node_memory_Inactive{service_id='node-exporter-$node'}", + "expr": "node_memory_Inactive_bytes{service_id='$node'} or node_memory_Inactive{service_id='$node'}", "interval": "", "intervalFactor": 2, "legendFormat": "Inactive", @@ -608,7 +608,7 @@ "steppedLine": false, "targets": [ { - "expr": "node_load1{service_id=\"node-exporter-$node\"}", + "expr": "node_load1{service_id=\"$node\"}", "format": "time_series", "interval": "", "intervalFactor": 2, @@ -716,7 +716,7 @@ "steppedLine": false, "targets": [ { - "expr": "100.0 - 100 * (node_filesystem_avail_bytes{service_id='node-exporter-$node',device !~'tmpfs',device!~'by-uuid'} / node_filesystem_size_bytes{service_id='node-exporter-$node',device !~'tmpfs',device!~'by-uuid'}) or 100.0 - 100 * (node_filesystem_avail{service_id='node-exporter-$node',device !~'tmpfs',device!~'by-uuid'} / node_filesystem_size{service_id='node-exporter-$node',device !~'tmpfs',device!~'by-uuid'})", + "expr": "100.0 - 100 * (node_filesystem_avail_bytes{service_id='$node',device !~'tmpfs',device!~'by-uuid'} / node_filesystem_size_bytes{service_id='$node',device !~'tmpfs',device!~'by-uuid'}) or 100.0 - 100 * (node_filesystem_avail{service_id='$node',device !~'tmpfs',device!~'by-uuid'} / node_filesystem_size{service_id='$node',device !~'tmpfs',device!~'by-uuid'})", "interval": "", "intervalFactor": 2, "legendFormat": "{{mountpoint}}", @@ -827,7 +827,7 @@ "steppedLine": false, "targets": [ { - "expr": "irate(node_disk_io_time_seconds_total{service_id=\"node-exporter-$node\"}[5m])*100 or irate(node_disk_io_time_ms{service_id=\"node-exporter-$node\"}[5m])/10", + "expr": "irate(node_disk_io_time_seconds_total{service_id=\"$node\"}[5m])*100 or irate(node_disk_io_time_ms{service_id=\"$node\"}[5m])/10", "format": "time_series", "interval": "", "intervalFactor": 2, @@ -945,7 +945,7 @@ "steppedLine": false, "targets": [ { - "expr": "irate(node_disk_reads_completed_total{service_id='node-exporter-$node'}[5m]) or irate(node_disk_reads_completed{service_id='node-exporter-$node'}[5m])", + "expr": "irate(node_disk_reads_completed_total{service_id='$node'}[5m]) or irate(node_disk_reads_completed{service_id='$node'}[5m])", "format": "time_series", "interval": "", "intervalFactor": 4, @@ -956,7 +956,7 @@ "target": "" }, { - "expr": "irate(node_disk_writes_completed_total{service_id='node-exporter-$node'}[5m]) or irate(node_disk_writes_completed{service_id='node-exporter-$node'}[5m])", + "expr": "irate(node_disk_writes_completed_total{service_id='$node'}[5m]) or irate(node_disk_writes_completed{service_id='$node'}[5m])", "format": "time_series", "intervalFactor": 2, "legendFormat": "{{device}}_write", @@ -1074,7 +1074,7 @@ "steppedLine": false, "targets": [ { - "expr": "irate(node_disk_read_bytes_total{service_id='node-exporter-$node'}[5m]) or irate(node_disk_sectors_read{service_id='node-exporter-$node'}[5m]) * 512", + "expr": "irate(node_disk_read_bytes_total{service_id='$node'}[5m]) or irate(node_disk_sectors_read{service_id='$node'}[5m]) * 512", "format": "time_series", "interval": "", "intervalFactor": 4, @@ -1083,7 +1083,7 @@ "step": 2400 }, { - "expr": "irate(node_disk_written_bytes_total{service_id='node-exporter-$node'}[5m]) or irate(node_disk_sectors_written{service_id='node-exporter-$node'}[5m]) * 512", + "expr": "irate(node_disk_written_bytes_total{service_id='$node'}[5m]) or irate(node_disk_sectors_written{service_id='$node'}[5m]) * 512", "format": "time_series", "interval": "", "intervalFactor": 4, @@ -1191,7 +1191,7 @@ "steppedLine": false, "targets": [ { - "expr": "node_disk_io_now{service_id=\"node-exporter-$node\"}", + "expr": "node_disk_io_now{service_id=\"$node\"}", "format": "time_series", "interval": "", "intervalFactor": 1, @@ -1293,7 +1293,7 @@ "steppedLine": false, "targets": [ { - "expr": "irate(node_context_switches_total{service_id=\"node-exporter-$node\"}[5m]) or irate(node_context_switches{service_id=\"node-exporter-$node\"}[5m])", + "expr": "irate(node_context_switches_total{service_id=\"$node\"}[5m]) or irate(node_context_switches{service_id=\"$node\"}[5m])", "interval": "", "intervalFactor": 2, "legendFormat": "context switches", @@ -1399,7 +1399,7 @@ "steppedLine": false, "targets": [ { - "expr": "irate(node_network_receive_bytes_total{service_id='node-exporter-$node'}[5m])*8 or irate(node_network_receive_bytes{service_id='node-exporter-$node'}[5m])*8", + "expr": "irate(node_network_receive_bytes_total{service_id='$node'}[5m])*8 or irate(node_network_receive_bytes{service_id='$node'}[5m])*8", "interval": "", "intervalFactor": 2, "legendFormat": "{{device}}_in", @@ -1409,7 +1409,7 @@ "target": "" }, { - "expr": "irate(node_network_transmit_bytes_total{service_id='node-exporter-$node'}[5m])*8 or irate(node_network_transmit_bytes{service_id='node-exporter-$node'}[5m])*8", + "expr": "irate(node_network_transmit_bytes_total{service_id='$node'}[5m])*8 or irate(node_network_transmit_bytes{service_id='$node'}[5m])*8", "interval": "", "intervalFactor": 2, "legendFormat": "{{device}}_out", @@ -1509,7 +1509,7 @@ "steppedLine": false, "targets": [ { - "expr": "node_netstat_Tcp_CurrEstab{service_id='node-exporter-$node'}", + "expr": "node_netstat_Tcp_CurrEstab{service_id='$node'}", "intervalFactor": 2, "legendFormat": "established", "refId": "A", @@ -1617,7 +1617,7 @@ "steppedLine": false, "targets": [ { - "expr": "irate(node_netstat_Udp_InDatagrams{service_id=\"node-exporter-$node\"}[5m])", + "expr": "irate(node_netstat_Udp_InDatagrams{service_id=\"$node\"}[5m])", "intervalFactor": 2, "legendFormat": "Udp_InDatagrams", "refId": "A", @@ -1625,14 +1625,14 @@ "target": "" }, { - "expr": "irate(node_netstat_Udp_InErrors{service_id=\"node-exporter-$node\"}[5m])", + "expr": "irate(node_netstat_Udp_InErrors{service_id=\"$node\"}[5m])", "intervalFactor": 2, "legendFormat": "Udp_InErrors", "refId": "B", "step": 1200 }, { - "expr": "irate(node_netstat_Udp_OutDatagrams{service_id=\"node-exporter-$node\"}[5m])", + "expr": "irate(node_netstat_Udp_OutDatagrams{service_id=\"$node\"}[5m])", "interval": "", "intervalFactor": 2, "legendFormat": "Udp_OutDatagrams", @@ -1640,7 +1640,7 @@ "step": 1200 }, { - "expr": "irate(node_netstat_Udp_NoPorts{service_id=\"node-exporter-$node\"}[5m])", + "expr": "irate(node_netstat_Udp_NoPorts{service_id=\"$node\"}[5m])", "intervalFactor": 2, "legendFormat": "Udp_NoPorts", "refId": "D", @@ -1738,7 +1738,7 @@ "steppedLine": false, "targets": [ { - "expr": "node_nf_conntrack_entries_limit{service_id=\"node-exporter-$node\"} - node_nf_conntrack_entries{service_id=\"node-exporter-$node\"}", + "expr": "node_nf_conntrack_entries_limit{service_id=\"$node\"} - node_nf_conntrack_entries{service_id=\"$node\"}", "intervalFactor": 2, "legendFormat": "free", "refId": "A", @@ -1812,7 +1812,7 @@ "options": [], "query": "label_values(node_exporter_build_info, service_id)", "refresh": 1, - "regex": "/node-exporter-(.*)/", + "regex": "/(.*)/", "skipUrlSync": false, "sort": 1, "tagValuesQuery": "", @@ -1860,4 +1860,4 @@ "list": [] }, "version": 1 -} \ No newline at end of file +} -- GitLab