From a2d273b11a651cf99fb97993e0b11be9404002c9 Mon Sep 17 00:00:00 2001
From: Arslanbekov Denis <Arslanbekov@gmail.com>
Date: Tue, 10 Apr 2018 18:18:24 +0300
Subject: [PATCH] In description is displayed correctly namespace (#1190)

* in description is displayed correctly namespace

* Bump kube state version

* Update Chart.yaml
---
 assets/prometheus/rules/kube-state-metrics.rules.yaml | 8 ++++----
 manifests/prometheus/prometheus-k8s-rules.yaml        | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/assets/prometheus/rules/kube-state-metrics.rules.yaml b/assets/prometheus/rules/kube-state-metrics.rules.yaml
index 2a5b9527..4c7041fe 100644
--- a/assets/prometheus/rules/kube-state-metrics.rules.yaml
+++ b/assets/prometheus/rules/kube-state-metrics.rules.yaml
@@ -8,7 +8,7 @@ groups:
       severity: warning
     annotations:
       description: Observed deployment generation does not match expected one for
-        deployment {{$labels.namespaces}}/{{$labels.deployment}}
+        deployment {{$labels.namespace}}/{{$labels.deployment}}
       summary: Deployment is outdated
   - alert: DeploymentReplicasNotUpdated
     expr: ((kube_deployment_status_replicas_updated != kube_deployment_spec_replicas)
@@ -18,7 +18,7 @@ groups:
     labels:
       severity: warning
     annotations:
-      description: Replicas are not updated and available for deployment {{$labels.namespaces}}/{{$labels.deployment}}
+      description: Replicas are not updated and available for deployment {{$labels.namespace}}/{{$labels.deployment}}
       summary: Deployment replicas are outdated
   - alert: DaemonSetRolloutStuck
     expr: kube_daemonset_status_number_ready / kube_daemonset_status_desired_number_scheduled
@@ -28,7 +28,7 @@ groups:
       severity: warning
     annotations:
       description: Only {{$value}}% of desired pods scheduled and ready for daemon
-        set {{$labels.namespaces}}/{{$labels.daemonset}}
+        set {{$labels.namespace}}/{{$labels.daemonset}}
       summary: DaemonSet is missing pods
   - alert: K8SDaemonSetsNotScheduled
     expr: kube_daemonset_status_desired_number_scheduled - kube_daemonset_status_current_number_scheduled
@@ -54,6 +54,6 @@ groups:
     labels:
       severity: warning
     annotations:
-      description: Pod {{$labels.namespaces}}/{{$labels.pod}} was restarted {{$value}}
+      description: Pod {{$labels.namespace}}/{{$labels.pod}} was restarted {{$value}}
         times within the last hour
       summary: Pod is restarting frequently
diff --git a/manifests/prometheus/prometheus-k8s-rules.yaml b/manifests/prometheus/prometheus-k8s-rules.yaml
index 7a8911d3..caea8d08 100644
--- a/manifests/prometheus/prometheus-k8s-rules.yaml
+++ b/manifests/prometheus/prometheus-k8s-rules.yaml
@@ -288,7 +288,7 @@ data:
           severity: warning
         annotations:
           description: Observed deployment generation does not match expected one for
-            deployment {{$labels.namespaces}}/{{$labels.deployment}}
+            deployment {{$labels.namespace}}/{{$labels.deployment}}
           summary: Deployment is outdated
       - alert: DeploymentReplicasNotUpdated
         expr: ((kube_deployment_status_replicas_updated != kube_deployment_spec_replicas)
@@ -298,7 +298,7 @@ data:
         labels:
           severity: warning
         annotations:
-          description: Replicas are not updated and available for deployment {{$labels.namespaces}}/{{$labels.deployment}}
+          description: Replicas are not updated and available for deployment {{$labels.namespace}}/{{$labels.deployment}}
           summary: Deployment replicas are outdated
       - alert: DaemonSetRolloutStuck
         expr: kube_daemonset_status_number_ready / kube_daemonset_status_desired_number_scheduled
@@ -308,7 +308,7 @@ data:
           severity: warning
         annotations:
           description: Only {{$value}}% of desired pods scheduled and ready for daemon
-            set {{$labels.namespaces}}/{{$labels.daemonset}}
+            set {{$labels.namespace}}/{{$labels.daemonset}}
           summary: DaemonSet is missing pods
       - alert: K8SDaemonSetsNotScheduled
         expr: kube_daemonset_status_desired_number_scheduled - kube_daemonset_status_current_number_scheduled
@@ -334,7 +334,7 @@ data:
         labels:
           severity: warning
         annotations:
-          description: Pod {{$labels.namespaces}}/{{$labels.pod}} was restarted {{$value}}
+          description: Pod {{$labels.namespace}}/{{$labels.pod}} was restarted {{$value}}
             times within the last hour
           summary: Pod is restarting frequently
   kubelet.rules.yaml: |+
-- 
GitLab