github
/
node_exporter
mirror of https://github.com/prometheus/node_exporter
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removed unneeded `sum_` and `avg_` from rule names 

Signed-off-by: beorn7 <beorn@grafana.com>
pull/1429/head
beorn7 2019-07-18 14:14:02 +02:00
parent 706511a495
commit b8c4b0cb29
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
docs/node-mixin/dashboards/use.libsonnet
View File

@ -12,7 +12,7 @@ local g = import 'grafana-builder/grafana.libsonnet';
g.panel('CPU Utilisation') + g.panel('CPU Utilisation') +
g.queryPanel(||| g.queryPanel(|||
( (
instance:node_cpu_utilisation:avg_rate1m{%(nodeExporterSelector)s} instance:node_cpu_utilisation:rate1m{%(nodeExporterSelector)s}
* *
instance:node_num_cpu:sum{%(nodeExporterSelector)s} instance:node_num_cpu:sum{%(nodeExporterSelector)s}
/ ignoring (instance) group_left / ignoring (instance) group_left
@ -46,10 +46,10 @@ local g = import 'grafana-builder/grafana.libsonnet';
{ yaxes: g.yaxes({ format: 'percentunit', max: 1 }) }, { yaxes: g.yaxes({ format: 'percentunit', max: 1 }) },
) )
.addPanel( .addPanel(
g.panel('Memory Saturation (Swap I/O)') + g.panel('Memory Saturation (Swapped Pages)') +
g.queryPanel('instance:node_memory_swap_io_bytes:sum_rate{%(nodeExporterSelector)s}' % $._config, '{{instance}}', legendLink) + g.queryPanel('instance:node_memory_swap_io_pages:rate{%(nodeExporterSelector)s}' % $._config, '{{instance}}', legendLink) +
g.stack + g.stack +
{ yaxes: g.yaxes('Bps') }, { yaxes: g.yaxes('rps') },
) )
) )
.addRow( .addRow(
@ -60,9 +60,9 @@ local g = import 'grafana-builder/grafana.libsonnet';
// 1 second per second doing I/O, normalize by metric cardinality for stacked charts. // 1 second per second doing I/O, normalize by metric cardinality for stacked charts.
g.queryPanel(||| g.queryPanel(|||
( (
instance:node_disk_io_time_seconds:sum_rate1m{%(nodeExporterSelector)s} instance:node_disk_io_time_seconds:rate1m{%(nodeExporterSelector)s}
/ ignoring (instance) group_left / ignoring (instance) group_left
count without (instance) (instance:node_disk_io_time_seconds:sum_rate1m{%(nodeExporterSelector)s}) count without (instance) (instance:node_disk_io_time_seconds:rate1m{%(nodeExporterSelector)s})
) )
||| % $._config, '{{instance}}', legendLink) + ||| % $._config, '{{instance}}', legendLink) +
g.stack + g.stack +
@ -72,9 +72,9 @@ local g = import 'grafana-builder/grafana.libsonnet';
g.panel('Disk IO Saturation') + g.panel('Disk IO Saturation') +
g.queryPanel(||| g.queryPanel(|||
( (
instance:node_disk_io_time_weighted_seconds:sum_rate1m{%(nodeExporterSelector)s} instance:node_disk_io_time_weighted_seconds:rate1m{%(nodeExporterSelector)s}
/ ignoring (instance) group_left / ignoring (instance) group_left
count without (instance) (instance:node_disk_io_time_weighted_seconds:sum_rate1m{%(nodeExporterSelector)s}) count without (instance) (instance:node_disk_io_time_weighted_seconds:rate1m{%(nodeExporterSelector)s})
) )
||| % $._config, '{{instance}}', legendLink) + ||| % $._config, '{{instance}}', legendLink) +
g.stack + g.stack +
@ -87,8 +87,8 @@ local g = import 'grafana-builder/grafana.libsonnet';
g.panel('Net Utilisation (Bytes Receive/Transmit)') + g.panel('Net Utilisation (Bytes Receive/Transmit)') +
g.queryPanel( g.queryPanel(
[ [
'instance:node_network_receive_bytes:sum_rate1m{%(nodeExporterSelector)s}' % $._config, 'instance:node_network_receive_bytes:rate1m{%(nodeExporterSelector)s}' % $._config,
'-instance:node_network_transmit_bytes:sum_rate1m{%(nodeExporterSelector)s}' % $._config, '-instance:node_network_transmit_bytes:rate1m{%(nodeExporterSelector)s}' % $._config,
], ],
['{{instance}} Receive', '{{instance}} Transmit'], ['{{instance}} Receive', '{{instance}} Transmit'],
legendLink, legendLink,
@ -100,8 +100,8 @@ local g = import 'grafana-builder/grafana.libsonnet';
g.panel('Net Saturation (Drops Receive/Transmit)') + g.panel('Net Saturation (Drops Receive/Transmit)') +
g.queryPanel( g.queryPanel(
[ [
'instance:node_network_receive_drop:sum_rate1m{%(nodeExporterSelector)s}' % $._config, 'instance:node_network_receive_drop:rate1m{%(nodeExporterSelector)s}' % $._config,
'-instance:node_network_transmit_drop:sum_rate1m{%(nodeExporterSelector)s}' % $._config, '-instance:node_network_transmit_drop:rate1m{%(nodeExporterSelector)s}' % $._config,
], ],
['{{instance}} Receive', '{{instance}} Transmit'], ['{{instance}} Receive', '{{instance}} Transmit'],
legendLink, legendLink,
@ -141,7 +141,7 @@ local g = import 'grafana-builder/grafana.libsonnet';
g.row('CPU') g.row('CPU')
.addPanel( .addPanel(
g.panel('CPU Utilisation') + g.panel('CPU Utilisation') +
g.queryPanel('instance:node_cpu_utilisation:avg_rate1m{%(nodeExporterSelector)s, instance="$instance"}' % $._config, 'Utilisation') + g.queryPanel('instance:node_cpu_utilisation:rate1m{%(nodeExporterSelector)s, instance="$instance"}' % $._config, 'Utilisation') +
{ yaxes: g.yaxes('percentunit') }, { yaxes: g.yaxes('percentunit') },
) )
.addPanel( .addPanel(
@ -167,12 +167,12 @@ local g = import 'grafana-builder/grafana.libsonnet';
g.row('Disk') g.row('Disk')
.addPanel( .addPanel(
g.panel('Disk IO Utilisation') + g.panel('Disk IO Utilisation') +
g.queryPanel('instance:node_disk_io_time_seconds:sum_rate1m{%(nodeExporterSelector)s, instance="$instance"}' % $._config, 'Utilisation') + g.queryPanel('instance:node_disk_io_time_seconds:rate1m{%(nodeExporterSelector)s, instance="$instance"}' % $._config, 'Utilisation') +
{ yaxes: g.yaxes('percentunit') }, { yaxes: g.yaxes('percentunit') },
) )
.addPanel( .addPanel(
g.panel('Disk IO Saturation') + g.panel('Disk IO Saturation') +
g.queryPanel('instance:node_disk_io_time_weighted_seconds:sum_rate1m{%(nodeExporterSelector)s, instance="$instance"}' % $._config, 'Saturation') + g.queryPanel('instance:node_disk_io_time_weighted_seconds:rate1m{%(nodeExporterSelector)s, instance="$instance"}' % $._config, 'Saturation') +
{ yaxes: g.yaxes('percentunit') }, { yaxes: g.yaxes('percentunit') },
) )
) )
@ -182,8 +182,8 @@ local g = import 'grafana-builder/grafana.libsonnet';
g.panel('Net Utilisation (Bytes Receive/Transmit)') + g.panel('Net Utilisation (Bytes Receive/Transmit)') +
g.queryPanel( g.queryPanel(
[ [
'instance:node_network_receive_bytes:sum_rate1m{%(nodeExporterSelector)s, instance="$instance"}' % $._config, 'instance:node_network_receive_bytes:rate1m{%(nodeExporterSelector)s, instance="$instance"}' % $._config,
'-instance:node_network_transmit_bytes:sum_rate1m{%(nodeExporterSelector)s, instance="$instance"}' % $._config, '-instance:node_network_transmit_bytes:rate1m{%(nodeExporterSelector)s, instance="$instance"}' % $._config,
], ],
['Receive', 'Transmit'], ['Receive', 'Transmit'],
) + ) +
@ -193,8 +193,8 @@ local g = import 'grafana-builder/grafana.libsonnet';
g.panel('Net Saturation (Drops Receive/Transmit)') + g.panel('Net Saturation (Drops Receive/Transmit)') +
g.queryPanel( g.queryPanel(
[ [
'instance:node_network_receive_drop:sum_rate1m{%(nodeExporterSelector)s, instance="$instance"}' % $._config, 'instance:node_network_receive_drop:rate1m{%(nodeExporterSelector)s, instance="$instance"}' % $._config,
'-instance:node_network_transmit_drop:sum_rate1m{%(nodeExporterSelector)s, instance="$instance"}' % $._config, '-instance:node_network_transmit_drop:rate1m{%(nodeExporterSelector)s, instance="$instance"}' % $._config,
], ],
['Receive drops', 'Transmit drops'], ['Receive drops', 'Transmit drops'],
) + ) +

14
docs/node-mixin/rules/rules.libsonnet
View File

@ -17,7 +17,7 @@
}, },
{ {
// CPU utilisation is % CPU is not idle. // CPU utilisation is % CPU is not idle.
record: 'instance:node_cpu_utilisation:avg_rate1m', record: 'instance:node_cpu_utilisation:rate1m',
expr: ||| expr: |||
1 - avg without (cpu, mode) ( 1 - avg without (cpu, mode) (
rate(node_cpu_seconds_total{%(nodeExporterSelector)s, mode="idle"}[1m]) rate(node_cpu_seconds_total{%(nodeExporterSelector)s, mode="idle"}[1m])
@ -63,7 +63,7 @@
// Disk utilisation (seconds spent, 1 second rate) // Disk utilisation (seconds spent, 1 second rate)
// TODO: This should probably not aggregate over all devices but // TODO: This should probably not aggregate over all devices but
// keep them separate. // keep them separate.
record: 'instance:node_disk_io_time_seconds:sum_rate1m', record: 'instance:node_disk_io_time_seconds:rate1m',
expr: ||| expr: |||
sum without (device) ( sum without (device) (
rate(node_disk_io_time_seconds_total{%(nodeExporterSelector)s, %(diskDeviceSelector)s}[1m]) rate(node_disk_io_time_seconds_total{%(nodeExporterSelector)s, %(diskDeviceSelector)s}[1m])
@ -74,7 +74,7 @@
// Disk saturation (weighted seconds spent, 1 second rate) // Disk saturation (weighted seconds spent, 1 second rate)
// TODO: This should probably not aggregate over all devices but // TODO: This should probably not aggregate over all devices but
// keep them separate. // keep them separate.
record: 'instance:node_disk_io_time_weighted_seconds:sum_rate1m', record: 'instance:node_disk_io_time_weighted_seconds:rate1m',
expr: ||| expr: |||
sum without (device) ( sum without (device) (
rate(node_disk_io_time_weighted_seconds_total{%(nodeExporterSelector)s, %(diskDeviceSelector)s}[1m]) rate(node_disk_io_time_weighted_seconds_total{%(nodeExporterSelector)s, %(diskDeviceSelector)s}[1m])
@ -84,7 +84,7 @@
// TODO: For the following rules, consider configurable filtering to exclude more network // TODO: For the following rules, consider configurable filtering to exclude more network
// device names than just "lo". // device names than just "lo".
{ {
record: 'instance:node_network_receive_bytes:sum_rate1m', record: 'instance:node_network_receive_bytes:rate1m',
expr: ||| expr: |||
sum without (device) ( sum without (device) (
rate(node_network_receive_bytes_total{%(nodeExporterSelector)s, device!="lo"}[1m]) rate(node_network_receive_bytes_total{%(nodeExporterSelector)s, device!="lo"}[1m])
@ -92,7 +92,7 @@
||| % $._config, ||| % $._config,
}, },
{ {
record: 'instance:node_network_transmit_bytes:sum_rate1m', record: 'instance:node_network_transmit_bytes:rate1m',
expr: ||| expr: |||
sum without (device) ( sum without (device) (
rate(node_network_transmit_bytes_total{%(nodeExporterSelector)s, device!="lo"}[1m]) rate(node_network_transmit_bytes_total{%(nodeExporterSelector)s, device!="lo"}[1m])
@ -101,7 +101,7 @@
}, },
// TODO: Find out if those drops ever happen on modern switched networks. // TODO: Find out if those drops ever happen on modern switched networks.
{ {
record: 'instance:node_network_receive_drop:sum_rate1m', record: 'instance:node_network_receive_drop:rate1m',
expr: ||| expr: |||
sum without (device) ( sum without (device) (
rate(node_network_receive_drop_total{%(nodeExporterSelector)s, device!="lo"}[1m]) rate(node_network_receive_drop_total{%(nodeExporterSelector)s, device!="lo"}[1m])
@ -109,7 +109,7 @@
||| % $._config, ||| % $._config,
}, },
{ {
record: 'instance:node_network_transmit_drop:sum_rate1m', record: 'instance:node_network_transmit_drop:rate1m',
expr: ||| expr: |||
sum without (device) ( sum without (device) (
rate(node_network_transmit_drop_total{%(nodeExporterSelector)s, device!="lo"}[1m]) rate(node_network_transmit_drop_total{%(nodeExporterSelector)s, device!="lo"}[1m])