diff --git a/contrib/kube-prometheus/jsonnet/kube-prometheus/alerts/node.libsonnet b/contrib/kube-prometheus/jsonnet/kube-prometheus/alerts/node.libsonnet index 46a5e36dd..5c24f09f3 100644 --- a/contrib/kube-prometheus/jsonnet/kube-prometheus/alerts/node.libsonnet +++ b/contrib/kube-prometheus/jsonnet/kube-prometheus/alerts/node.libsonnet @@ -11,7 +11,7 @@ summary: 'Node disk is running full within 24 hours', }, expr: ||| - predict_linear(node_filesystem_free{%(nodeExporterSelector)s,mountpoint!~"^/etc/(?:resolv.conf|hosts|hostname)$"}[6h], 3600 * 24) < 0 + predict_linear(node_filesystem_free{%(nodeExporterSelector)s,mountpoint!~"^/etc/(?:resolv.conf|hosts|hostname)$"}[6h], 3600 * 24) < 0 and on(instance) up{%(nodeExporterSelector)s} ||| % $._config, 'for': '30m', labels: { @@ -25,7 +25,7 @@ summary: 'Node disk is running full within 2 hours', }, expr: ||| - predict_linear(node_filesystem_free{%(nodeExporterSelector)s,mountpoint!~"^/etc/(?:resolv.conf|hosts|hostname)$"}[30m], 3600 * 2) < 0 + predict_linear(node_filesystem_free{%(nodeExporterSelector)s,mountpoint!~"^/etc/(?:resolv.conf|hosts|hostname)$"}[30m], 3600 * 2) < 0 and on(instance) up{%(nodeExporterSelector)s} ||| % $._config, 'for': '10m', labels: { diff --git a/contrib/kube-prometheus/manifests/prometheus-rules.yaml b/contrib/kube-prometheus/manifests/prometheus-rules.yaml index 49c4a9954..5af7d2fa9 100644 --- a/contrib/kube-prometheus/manifests/prometheus-rules.yaml +++ b/contrib/kube-prometheus/manifests/prometheus-rules.yaml @@ -744,7 +744,7 @@ spec: full within the next 24 hours (mounted at {{$labels.mountpoint}}) summary: Node disk is running full within 24 hours expr: | - predict_linear(node_filesystem_free{job="node-exporter",mountpoint!~"^/etc/(?:resolv.conf|hosts|hostname)$"}[6h], 3600 * 24) < 0 + predict_linear(node_filesystem_free{job="node-exporter",mountpoint!~"^/etc/(?:resolv.conf|hosts|hostname)$"}[6h], 3600 * 24) < 0 and on(instance) up{job="node-exporter"} for: 30m labels: severity: warning @@ -754,7 +754,7 @@ spec: full within the next 2 hours (mounted at {{$labels.mountpoint}}) summary: Node disk is running full within 2 hours expr: | - predict_linear(node_filesystem_free{job="node-exporter",mountpoint!~"^/etc/(?:resolv.conf|hosts|hostname)$"}[30m], 3600 * 2) < 0 + predict_linear(node_filesystem_free{job="node-exporter",mountpoint!~"^/etc/(?:resolv.conf|hosts|hostname)$"}[30m], 3600 * 2) < 0 and on(instance) up{job="node-exporter"} for: 10m labels: severity: critical diff --git a/helm/exporter-node/Chart.yaml b/helm/exporter-node/Chart.yaml index 1b3fe90a7..e64847866 100755 --- a/helm/exporter-node/Chart.yaml +++ b/helm/exporter-node/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: A Helm chart for Kubernetes node exporter name: exporter-node -version: 0.4.3 +version: 0.4.4 maintainers: - name: Giancarlo Rubio email: gianrubio@gmail.com diff --git a/helm/exporter-node/templates/node.rules.yaml b/helm/exporter-node/templates/node.rules.yaml index 21f2d40cf..fc54f03f9 100644 --- a/helm/exporter-node/templates/node.rules.yaml +++ b/helm/exporter-node/templates/node.rules.yaml @@ -29,7 +29,7 @@ groups: or node-exporters have disappeared from discovery summary: Prometheus could not scrape a node-exporter - alert: NodeDiskRunningFull - expr: predict_linear(node_filesystem_free{job="node-exporter",mountpoint!~"^/etc/(?:resolv.conf|hosts|hostname)$"}[6h], 3600 * 24) + expr: predict_linear(node_filesystem_free{job="node-exporter",mountpoint!~"^/etc/(?:resolv.conf|hosts|hostname)$"}[6h], 3600 * 24) and on(instance) up{job="node-exporter"} for: 30m labels: severity: warning @@ -38,7 +38,7 @@ groups: full within the next 24 hours (mounted at {{`{{$labels.mountpoint}}`}}) summary: Node disk is running full within 24 hours - alert: NodeDiskRunningFull - expr: predict_linear(node_filesystem_free{job="node-exporter",mountpoint!~"^/etc/(?:resolv.conf|hosts|hostname)$"}[30m], 3600 * 2) < 0 + expr: predict_linear(node_filesystem_free{job="node-exporter",mountpoint!~"^/etc/(?:resolv.conf|hosts|hostname)$"}[30m], 3600 * 2) < 0 and on(instance) up{job="node-exporter"} for: 10m labels: severity: critical diff --git a/helm/kube-prometheus/Chart.yaml b/helm/kube-prometheus/Chart.yaml index 892ae9d0b..bb2f13885 100644 --- a/helm/kube-prometheus/Chart.yaml +++ b/helm/kube-prometheus/Chart.yaml @@ -7,4 +7,4 @@ maintainers: name: kube-prometheus sources: - https://github.com/coreos/prometheus-operator -version: 0.0.100 \ No newline at end of file +version: 0.0.101 diff --git a/helm/kube-prometheus/requirements.yaml b/helm/kube-prometheus/requirements.yaml index e7328cd2d..1ee1c7bbd 100644 --- a/helm/kube-prometheus/requirements.yaml +++ b/helm/kube-prometheus/requirements.yaml @@ -58,7 +58,7 @@ dependencies: repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/ - name: exporter-node - version: 0.4.3 + version: 0.4.4 #e2e-repository: file://../exporter-node repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/ condition: deployExporterNode