diff options
author | beorn7 <beorn@grafana.com> | 2019-07-18 14:14:02 +0200 |
---|---|---|
committer | beorn7 <beorn@grafana.com> | 2019-07-18 14:14:02 +0200 |
commit | b8c4b0cb298bf63ca701073e921c65e5fc99a0d7 (patch) | |
tree | a668aa97e020600c88dd73aa52afec7f5391246a /docs | |
parent | 706511a49598db1c256a85b2b7dec4e6d754cabd (diff) | |
download | prometheus_node_collector-b8c4b0cb298bf63ca701073e921c65e5fc99a0d7.tar.bz2 prometheus_node_collector-b8c4b0cb298bf63ca701073e921c65e5fc99a0d7.tar.xz prometheus_node_collector-b8c4b0cb298bf63ca701073e921c65e5fc99a0d7.zip |
Removed unneeded `sum_` and `avg_` from rule names
Signed-off-by: beorn7 <beorn@grafana.com>
Diffstat (limited to 'docs')
-rw-r--r-- | docs/node-mixin/dashboards/use.libsonnet | 38 | ||||
-rw-r--r-- | docs/node-mixin/rules/rules.libsonnet | 14 |
2 files changed, 26 insertions, 26 deletions
diff --git a/docs/node-mixin/dashboards/use.libsonnet b/docs/node-mixin/dashboards/use.libsonnet index e3739ac..23cd2ea 100644 --- a/docs/node-mixin/dashboards/use.libsonnet +++ b/docs/node-mixin/dashboards/use.libsonnet | |||
@@ -12,7 +12,7 @@ local g = import 'grafana-builder/grafana.libsonnet'; | |||
12 | g.panel('CPU Utilisation') + | 12 | g.panel('CPU Utilisation') + |
13 | g.queryPanel(||| | 13 | g.queryPanel(||| |
14 | ( | 14 | ( |
15 | instance:node_cpu_utilisation:avg_rate1m{%(nodeExporterSelector)s} | 15 | instance:node_cpu_utilisation:rate1m{%(nodeExporterSelector)s} |
16 | * | 16 | * |
17 | instance:node_num_cpu:sum{%(nodeExporterSelector)s} | 17 | instance:node_num_cpu:sum{%(nodeExporterSelector)s} |
18 | / ignoring (instance) group_left | 18 | / ignoring (instance) group_left |
@@ -46,10 +46,10 @@ local g = import 'grafana-builder/grafana.libsonnet'; | |||
46 | { yaxes: g.yaxes({ format: 'percentunit', max: 1 }) }, | 46 | { yaxes: g.yaxes({ format: 'percentunit', max: 1 }) }, |
47 | ) | 47 | ) |
48 | .addPanel( | 48 | .addPanel( |
49 | g.panel('Memory Saturation (Swap I/O)') + | 49 | g.panel('Memory Saturation (Swapped Pages)') + |
50 | g.queryPanel('instance:node_memory_swap_io_bytes:sum_rate{%(nodeExporterSelector)s}' % $._config, '{{instance}}', legendLink) + | 50 | g.queryPanel('instance:node_memory_swap_io_pages:rate{%(nodeExporterSelector)s}' % $._config, '{{instance}}', legendLink) + |
51 | g.stack + | 51 | g.stack + |
52 | { yaxes: g.yaxes('Bps') }, | 52 | { yaxes: g.yaxes('rps') }, |
53 | ) | 53 | ) |
54 | ) | 54 | ) |
55 | .addRow( | 55 | .addRow( |
@@ -60,9 +60,9 @@ local g = import 'grafana-builder/grafana.libsonnet'; | |||
60 | // 1 second per second doing I/O, normalize by metric cardinality for stacked charts. | 60 | // 1 second per second doing I/O, normalize by metric cardinality for stacked charts. |
61 | g.queryPanel(||| | 61 | g.queryPanel(||| |
62 | ( | 62 | ( |
63 | instance:node_disk_io_time_seconds:sum_rate1m{%(nodeExporterSelector)s} | 63 | instance:node_disk_io_time_seconds:rate1m{%(nodeExporterSelector)s} |
64 | / ignoring (instance) group_left | 64 | / ignoring (instance) group_left |
65 | count without (instance) (instance:node_disk_io_time_seconds:sum_rate1m{%(nodeExporterSelector)s}) | 65 | count without (instance) (instance:node_disk_io_time_seconds:rate1m{%(nodeExporterSelector)s}) |
66 | ) | 66 | ) |
67 | ||| % $._config, '{{instance}}', legendLink) + | 67 | ||| % $._config, '{{instance}}', legendLink) + |
68 | g.stack + | 68 | g.stack + |
@@ -72,9 +72,9 @@ local g = import 'grafana-builder/grafana.libsonnet'; | |||
72 | g.panel('Disk IO Saturation') + | 72 | g.panel('Disk IO Saturation') + |
73 | g.queryPanel(||| | 73 | g.queryPanel(||| |
74 | ( | 74 | ( |
75 | instance:node_disk_io_time_weighted_seconds:sum_rate1m{%(nodeExporterSelector)s} | 75 | instance:node_disk_io_time_weighted_seconds:rate1m{%(nodeExporterSelector)s} |
76 | / ignoring (instance) group_left | 76 | / ignoring (instance) group_left |
77 | count without (instance) (instance:node_disk_io_time_weighted_seconds:sum_rate1m{%(nodeExporterSelector)s}) | 77 | count without (instance) (instance:node_disk_io_time_weighted_seconds:rate1m{%(nodeExporterSelector)s}) |
78 | ) | 78 | ) |
79 | ||| % $._config, '{{instance}}', legendLink) + | 79 | ||| % $._config, '{{instance}}', legendLink) + |
80 | g.stack + | 80 | g.stack + |
@@ -87,8 +87,8 @@ local g = import 'grafana-builder/grafana.libsonnet'; | |||
87 | g.panel('Net Utilisation (Bytes Receive/Transmit)') + | 87 | g.panel('Net Utilisation (Bytes Receive/Transmit)') + |
88 | g.queryPanel( | 88 | g.queryPanel( |
89 | [ | 89 | [ |
90 | 'instance:node_network_receive_bytes:sum_rate1m{%(nodeExporterSelector)s}' % $._config, | 90 | 'instance:node_network_receive_bytes:rate1m{%(nodeExporterSelector)s}' % $._config, |
91 | '-instance:node_network_transmit_bytes:sum_rate1m{%(nodeExporterSelector)s}' % $._config, | 91 | '-instance:node_network_transmit_bytes:rate1m{%(nodeExporterSelector)s}' % $._config, |
92 | ], | 92 | ], |
93 | ['{{instance}} Receive', '{{instance}} Transmit'], | 93 | ['{{instance}} Receive', '{{instance}} Transmit'], |
94 | legendLink, | 94 | legendLink, |
@@ -100,8 +100,8 @@ local g = import 'grafana-builder/grafana.libsonnet'; | |||
100 | g.panel('Net Saturation (Drops Receive/Transmit)') + | 100 | g.panel('Net Saturation (Drops Receive/Transmit)') + |
101 | g.queryPanel( | 101 | g.queryPanel( |
102 | [ | 102 | [ |
103 | 'instance:node_network_receive_drop:sum_rate1m{%(nodeExporterSelector)s}' % $._config, | 103 | 'instance:node_network_receive_drop:rate1m{%(nodeExporterSelector)s}' % $._config, |
104 | '-instance:node_network_transmit_drop:sum_rate1m{%(nodeExporterSelector)s}' % $._config, | 104 | '-instance:node_network_transmit_drop:rate1m{%(nodeExporterSelector)s}' % $._config, |
105 | ], | 105 | ], |
106 | ['{{instance}} Receive', '{{instance}} Transmit'], | 106 | ['{{instance}} Receive', '{{instance}} Transmit'], |
107 | legendLink, | 107 | legendLink, |
@@ -141,7 +141,7 @@ local g = import 'grafana-builder/grafana.libsonnet'; | |||
141 | g.row('CPU') | 141 | g.row('CPU') |
142 | .addPanel( | 142 | .addPanel( |
143 | g.panel('CPU Utilisation') + | 143 | g.panel('CPU Utilisation') + |
144 | g.queryPanel('instance:node_cpu_utilisation:avg_rate1m{%(nodeExporterSelector)s, instance="$instance"}' % $._config, 'Utilisation') + | 144 | g.queryPanel('instance:node_cpu_utilisation:rate1m{%(nodeExporterSelector)s, instance="$instance"}' % $._config, 'Utilisation') + |
145 | { yaxes: g.yaxes('percentunit') }, | 145 | { yaxes: g.yaxes('percentunit') }, |
146 | ) | 146 | ) |
147 | .addPanel( | 147 | .addPanel( |
@@ -167,12 +167,12 @@ local g = import 'grafana-builder/grafana.libsonnet'; | |||
167 | g.row('Disk') | 167 | g.row('Disk') |
168 | .addPanel( | 168 | .addPanel( |
169 | g.panel('Disk IO Utilisation') + | 169 | g.panel('Disk IO Utilisation') + |
170 | g.queryPanel('instance:node_disk_io_time_seconds:sum_rate1m{%(nodeExporterSelector)s, instance="$instance"}' % $._config, 'Utilisation') + | 170 | g.queryPanel('instance:node_disk_io_time_seconds:rate1m{%(nodeExporterSelector)s, instance="$instance"}' % $._config, 'Utilisation') + |
171 | { yaxes: g.yaxes('percentunit') }, | 171 | { yaxes: g.yaxes('percentunit') }, |
172 | ) | 172 | ) |
173 | .addPanel( | 173 | .addPanel( |
174 | g.panel('Disk IO Saturation') + | 174 | g.panel('Disk IO Saturation') + |
175 | g.queryPanel('instance:node_disk_io_time_weighted_seconds:sum_rate1m{%(nodeExporterSelector)s, instance="$instance"}' % $._config, 'Saturation') + | 175 | g.queryPanel('instance:node_disk_io_time_weighted_seconds:rate1m{%(nodeExporterSelector)s, instance="$instance"}' % $._config, 'Saturation') + |
176 | { yaxes: g.yaxes('percentunit') }, | 176 | { yaxes: g.yaxes('percentunit') }, |
177 | ) | 177 | ) |
178 | ) | 178 | ) |
@@ -182,8 +182,8 @@ local g = import 'grafana-builder/grafana.libsonnet'; | |||
182 | g.panel('Net Utilisation (Bytes Receive/Transmit)') + | 182 | g.panel('Net Utilisation (Bytes Receive/Transmit)') + |
183 | g.queryPanel( | 183 | g.queryPanel( |
184 | [ | 184 | [ |
185 | 'instance:node_network_receive_bytes:sum_rate1m{%(nodeExporterSelector)s, instance="$instance"}' % $._config, | 185 | 'instance:node_network_receive_bytes:rate1m{%(nodeExporterSelector)s, instance="$instance"}' % $._config, |
186 | '-instance:node_network_transmit_bytes:sum_rate1m{%(nodeExporterSelector)s, instance="$instance"}' % $._config, | 186 | '-instance:node_network_transmit_bytes:rate1m{%(nodeExporterSelector)s, instance="$instance"}' % $._config, |
187 | ], | 187 | ], |
188 | ['Receive', 'Transmit'], | 188 | ['Receive', 'Transmit'], |
189 | ) + | 189 | ) + |
@@ -193,8 +193,8 @@ local g = import 'grafana-builder/grafana.libsonnet'; | |||
193 | g.panel('Net Saturation (Drops Receive/Transmit)') + | 193 | g.panel('Net Saturation (Drops Receive/Transmit)') + |
194 | g.queryPanel( | 194 | g.queryPanel( |
195 | [ | 195 | [ |
196 | 'instance:node_network_receive_drop:sum_rate1m{%(nodeExporterSelector)s, instance="$instance"}' % $._config, | 196 | 'instance:node_network_receive_drop:rate1m{%(nodeExporterSelector)s, instance="$instance"}' % $._config, |
197 | '-instance:node_network_transmit_drop:sum_rate1m{%(nodeExporterSelector)s, instance="$instance"}' % $._config, | 197 | '-instance:node_network_transmit_drop:rate1m{%(nodeExporterSelector)s, instance="$instance"}' % $._config, |
198 | ], | 198 | ], |
199 | ['Receive drops', 'Transmit drops'], | 199 | ['Receive drops', 'Transmit drops'], |
200 | ) + | 200 | ) + |
diff --git a/docs/node-mixin/rules/rules.libsonnet b/docs/node-mixin/rules/rules.libsonnet index d8c0fae..ad1b717 100644 --- a/docs/node-mixin/rules/rules.libsonnet +++ b/docs/node-mixin/rules/rules.libsonnet | |||
@@ -17,7 +17,7 @@ | |||
17 | }, | 17 | }, |
18 | { | 18 | { |
19 | // CPU utilisation is % CPU is not idle. | 19 | // CPU utilisation is % CPU is not idle. |
20 | record: 'instance:node_cpu_utilisation:avg_rate1m', | 20 | record: 'instance:node_cpu_utilisation:rate1m', |
21 | expr: ||| | 21 | expr: ||| |
22 | 1 - avg without (cpu, mode) ( | 22 | 1 - avg without (cpu, mode) ( |
23 | rate(node_cpu_seconds_total{%(nodeExporterSelector)s, mode="idle"}[1m]) | 23 | rate(node_cpu_seconds_total{%(nodeExporterSelector)s, mode="idle"}[1m]) |
@@ -63,7 +63,7 @@ | |||
63 | // Disk utilisation (seconds spent, 1 second rate) | 63 | // Disk utilisation (seconds spent, 1 second rate) |
64 | // TODO: This should probably not aggregate over all devices but | 64 | // TODO: This should probably not aggregate over all devices but |
65 | // keep them separate. | 65 | // keep them separate. |
66 | record: 'instance:node_disk_io_time_seconds:sum_rate1m', | 66 | record: 'instance:node_disk_io_time_seconds:rate1m', |
67 | expr: ||| | 67 | expr: ||| |
68 | sum without (device) ( | 68 | sum without (device) ( |
69 | rate(node_disk_io_time_seconds_total{%(nodeExporterSelector)s, %(diskDeviceSelector)s}[1m]) | 69 | rate(node_disk_io_time_seconds_total{%(nodeExporterSelector)s, %(diskDeviceSelector)s}[1m]) |
@@ -74,7 +74,7 @@ | |||
74 | // Disk saturation (weighted seconds spent, 1 second rate) | 74 | // Disk saturation (weighted seconds spent, 1 second rate) |
75 | // TODO: This should probably not aggregate over all devices but | 75 | // TODO: This should probably not aggregate over all devices but |
76 | // keep them separate. | 76 | // keep them separate. |
77 | record: 'instance:node_disk_io_time_weighted_seconds:sum_rate1m', | 77 | record: 'instance:node_disk_io_time_weighted_seconds:rate1m', |
78 | expr: ||| | 78 | expr: ||| |
79 | sum without (device) ( | 79 | sum without (device) ( |
80 | rate(node_disk_io_time_weighted_seconds_total{%(nodeExporterSelector)s, %(diskDeviceSelector)s}[1m]) | 80 | rate(node_disk_io_time_weighted_seconds_total{%(nodeExporterSelector)s, %(diskDeviceSelector)s}[1m]) |
@@ -84,7 +84,7 @@ | |||
84 | // TODO: For the following rules, consider configurable filtering to exclude more network | 84 | // TODO: For the following rules, consider configurable filtering to exclude more network |
85 | // device names than just "lo". | 85 | // device names than just "lo". |
86 | { | 86 | { |
87 | record: 'instance:node_network_receive_bytes:sum_rate1m', | 87 | record: 'instance:node_network_receive_bytes:rate1m', |
88 | expr: ||| | 88 | expr: ||| |
89 | sum without (device) ( | 89 | sum without (device) ( |
90 | rate(node_network_receive_bytes_total{%(nodeExporterSelector)s, device!="lo"}[1m]) | 90 | rate(node_network_receive_bytes_total{%(nodeExporterSelector)s, device!="lo"}[1m]) |
@@ -92,7 +92,7 @@ | |||
92 | ||| % $._config, | 92 | ||| % $._config, |
93 | }, | 93 | }, |
94 | { | 94 | { |
95 | record: 'instance:node_network_transmit_bytes:sum_rate1m', | 95 | record: 'instance:node_network_transmit_bytes:rate1m', |
96 | expr: ||| | 96 | expr: ||| |
97 | sum without (device) ( | 97 | sum without (device) ( |
98 | rate(node_network_transmit_bytes_total{%(nodeExporterSelector)s, device!="lo"}[1m]) | 98 | rate(node_network_transmit_bytes_total{%(nodeExporterSelector)s, device!="lo"}[1m]) |
@@ -101,7 +101,7 @@ | |||
101 | }, | 101 | }, |
102 | // TODO: Find out if those drops ever happen on modern switched networks. | 102 | // TODO: Find out if those drops ever happen on modern switched networks. |
103 | { | 103 | { |
104 | record: 'instance:node_network_receive_drop:sum_rate1m', | 104 | record: 'instance:node_network_receive_drop:rate1m', |
105 | expr: ||| | 105 | expr: ||| |
106 | sum without (device) ( | 106 | sum without (device) ( |
107 | rate(node_network_receive_drop_total{%(nodeExporterSelector)s, device!="lo"}[1m]) | 107 | rate(node_network_receive_drop_total{%(nodeExporterSelector)s, device!="lo"}[1m]) |
@@ -109,7 +109,7 @@ | |||
109 | ||| % $._config, | 109 | ||| % $._config, |
110 | }, | 110 | }, |
111 | { | 111 | { |
112 | record: 'instance:node_network_transmit_drop:sum_rate1m', | 112 | record: 'instance:node_network_transmit_drop:rate1m', |
113 | expr: ||| | 113 | expr: ||| |
114 | sum without (device) ( | 114 | sum without (device) ( |
115 | rate(node_network_transmit_drop_total{%(nodeExporterSelector)s, device!="lo"}[1m]) | 115 | rate(node_network_transmit_drop_total{%(nodeExporterSelector)s, device!="lo"}[1m]) |