From 34dd0a798a95ef793a1bea33cbeb6e4c19f1b743 Mon Sep 17 00:00:00 2001
From: Lucas Serven <lserven@gmail.com>
Date: Fri, 7 Sep 2018 15:21:16 +0200
Subject: [PATCH] contrib/.../alerts: improve alert messages

---
 jsonnet/kube-prometheus/alerts/alertmanager.libsonnet | 2 +-
 jsonnet/kube-prometheus/alerts/general.libsonnet      | 4 ++--
 jsonnet/kube-prometheus/alerts/node.libsonnet         | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/jsonnet/kube-prometheus/alerts/alertmanager.libsonnet b/jsonnet/kube-prometheus/alerts/alertmanager.libsonnet
index d283cc18..90e3f5c7 100644
--- a/jsonnet/kube-prometheus/alerts/alertmanager.libsonnet
+++ b/jsonnet/kube-prometheus/alerts/alertmanager.libsonnet
@@ -21,7 +21,7 @@
           {
             alert: 'AlertmanagerDownOrMissing',
             annotations: {
-              description: 'An unexpected number of Alertmanagers are scraped or Alertmanagers disappeared from discovery.',
+              description: 'An unexpected number of Alertmanagers were scraped or disappeared from discovery.',
               summary: 'Alertmanager down or missing',
             },
             expr: |||
diff --git a/jsonnet/kube-prometheus/alerts/general.libsonnet b/jsonnet/kube-prometheus/alerts/general.libsonnet
index 6f3e4534..ecdd9a21 100644
--- a/jsonnet/kube-prometheus/alerts/general.libsonnet
+++ b/jsonnet/kube-prometheus/alerts/general.libsonnet
@@ -7,7 +7,7 @@
           {
             alert: 'TargetDown',
             annotations: {
-              description: '{{ $value }}% of {{ $labels.job }} targets are down.',
+              description: '{{ $value }}% of the {{ $labels.job }} targets are down.',
               summary: 'Targets are down',
             },
             expr: '100 * (count(up == 0) BY (job) / count(up) BY (job)) > 10',
@@ -19,7 +19,7 @@
           {
             alert: 'DeadMansSwitch',
             annotations: {
-              description: 'This is a DeadMansSwitch meant to ensure that the entire Alerting pipeline is functional.',
+              description: 'This is a DeadMansSwitch meant to ensure that the entire alerting pipeline is functional.',
               summary: 'Alerting DeadMansSwitch',
             },
             expr: 'vector(1)',
diff --git a/jsonnet/kube-prometheus/alerts/node.libsonnet b/jsonnet/kube-prometheus/alerts/node.libsonnet
index 27039f4e..37fff428 100644
--- a/jsonnet/kube-prometheus/alerts/node.libsonnet
+++ b/jsonnet/kube-prometheus/alerts/node.libsonnet
@@ -7,7 +7,7 @@
           {
             alert: 'NodeDiskRunningFull',
             annotations: {
-              message: 'Device {{ $labels.device }} of node-exporter {{ $labels.namespace }}/{{ $labels.pod }} is running full within the next 24 hours.',
+              message: 'Device {{ $labels.device }} of node-exporter {{ $labels.namespace }}/{{ $labels.pod }} will be full within the next 24 hours.',
             },
             expr: |||
               (node:node_filesystem_usage: > 0.85) and (predict_linear(node:node_filesystem_avail:[6h], 3600 * 24) < 0)
@@ -20,7 +20,7 @@
           {
             alert: 'NodeDiskRunningFull',
             annotations: {
-              message: 'Device {{ $labels.device }} of node-exporter {{ $labels.namespace }}/{{ $labels.pod }} is running full within the next 2 hours.',
+              message: 'Device {{ $labels.device }} of node-exporter {{ $labels.namespace }}/{{ $labels.pod }} will be full within the next 2 hours.',
             },
             expr: |||
               (node:node_filesystem_usage: > 0.85) and (predict_linear(node:node_filesystem_avail:[30m], 3600 * 2) < 0)
-- 
GitLab