Merge pull request #1483 from s-urbaniak/fix-selectors

node-mixin: fix configuration for unset fsSelector/diskDeviceSelector and dashboard query
pull/1485/head
Björn Rabenstein 5 years ago committed by GitHub
commit e7c2dbed4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -9,13 +9,13 @@
// empty, all filesystems are selected. If you have unusual // empty, all filesystems are selected. If you have unusual
// filesystem you don't want to include in dashboards and // filesystem you don't want to include in dashboards and
// alerting, you can exclude them here, e.g. 'fstype!="tmpfs"'. // alerting, you can exclude them here, e.g. 'fstype!="tmpfs"'.
fsSelector: '', fsSelector: 'fstype!=""',
// Select the device for disk-related queries. If left empty, all // Select the device for disk-related queries. If left empty, all
// devices are selected. If you have unusual devices you don't // devices are selected. If you have unusual devices you don't
// want to include in dashboards and alerting, you can exclude // want to include in dashboards and alerting, you can exclude
// them here, e.g. 'device!="tmpfs"'. // them here, e.g. 'device!="tmpfs"'.
diskDeviceSelector: '', diskDeviceSelector: 'device!=""',
// Some of the alerts are meant to fire if a critical failure of a // Some of the alerts are meant to fire if a critical failure of a
// node is imminent (e.g. the disk is about to run full). In a // node is imminent (e.g. the disk is about to run full). In a

@ -280,9 +280,9 @@ local g = import 'grafana-builder/grafana.libsonnet';
g.queryPanel(||| g.queryPanel(|||
1 - 1 -
( (
max without (mountpoint, fstype) (node_filesystem_avail_bytes{%(nodeExporterSelector)s, %(fsSelector)s, instance="$instance"}}) max without (mountpoint, fstype) (node_filesystem_avail_bytes{%(nodeExporterSelector)s, %(fsSelector)s, instance="$instance"})
/ /
max without (mountpoint, fstype) (node_filesystem_size_bytes{%(nodeExporterSelector)s, %(fsSelector)s, instance="$instance"}}) max without (mountpoint, fstype) (node_filesystem_size_bytes{%(nodeExporterSelector)s, %(fsSelector)s, instance="$instance"})
) )
||| % $._config, '{{device}}') + ||| % $._config, '{{device}}') +
{ {

Loading…
Cancel
Save