From 9dc4e1c87638671bf720f42d785658bc03f6eff8 Mon Sep 17 00:00:00 2001 From: Arslanbekov Denis 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 ++++---- helm/exporter-kube-state/Chart.yaml | 2 +- .../templates/kube-state-metrics.rules.yaml | 8 ++++---- helm/kube-prometheus/Chart.yaml | 2 +- helm/kube-prometheus/requirements.yaml | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/contrib/kube-prometheus/assets/prometheus/rules/kube-state-metrics.rules.yaml b/contrib/kube-prometheus/assets/prometheus/rules/kube-state-metrics.rules.yaml index 2a5b95277..4c7041fea 100644 --- a/contrib/kube-prometheus/assets/prometheus/rules/kube-state-metrics.rules.yaml +++ b/contrib/kube-prometheus/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/contrib/kube-prometheus/manifests/prometheus/prometheus-k8s-rules.yaml b/contrib/kube-prometheus/manifests/prometheus/prometheus-k8s-rules.yaml index 7a8911d39..caea8d08f 100644 --- a/contrib/kube-prometheus/manifests/prometheus/prometheus-k8s-rules.yaml +++ b/contrib/kube-prometheus/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: |+ diff --git a/helm/exporter-kube-state/Chart.yaml b/helm/exporter-kube-state/Chart.yaml index 8b1f4d575..2babbfc9e 100644 --- a/helm/exporter-kube-state/Chart.yaml +++ b/helm/exporter-kube-state/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: A Helm chart singleton for kube-state-metrics name: exporter-kube-state -version: 0.1.15 +version: 0.1.16 maintainers: - name: Michael Goodness email: mgoodness@gmail.com diff --git a/helm/exporter-kube-state/templates/kube-state-metrics.rules.yaml b/helm/exporter-kube-state/templates/kube-state-metrics.rules.yaml index 1feb2ffbe..477c5ffea 100644 --- a/helm/exporter-kube-state/templates/kube-state-metrics.rules.yaml +++ b/helm/exporter-kube-state/templates/kube-state-metrics.rules.yaml @@ -9,7 +9,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) @@ -19,7 +19,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 @@ -29,7 +29,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 @@ -55,7 +55,7 @@ groups: labels: severity: warning annotations: - description: Pod {{`{{$labels.namespaces}}`}}/{{`{{$labels.pod}}`}} is was restarted {{`{{$value}}`}} + description: Pod {{`{{$labels.namespace}}`}}/{{`{{$labels.pod}}`}} is was restarted {{`{{$value}}`}} times within the last hour summary: Pod is restarting frequently {{ end }} \ No newline at end of file diff --git a/helm/kube-prometheus/Chart.yaml b/helm/kube-prometheus/Chart.yaml index 897d60faf..058ce66be 100644 --- a/helm/kube-prometheus/Chart.yaml +++ b/helm/kube-prometheus/Chart.yaml @@ -9,4 +9,4 @@ maintainers: name: kube-prometheus sources: - https://github.com/coreos/prometheus-operator -version: 0.0.44 +version: 0.0.45 diff --git a/helm/kube-prometheus/requirements.yaml b/helm/kube-prometheus/requirements.yaml index 22deb3fb6..f0cf325a9 100644 --- a/helm/kube-prometheus/requirements.yaml +++ b/helm/kube-prometheus/requirements.yaml @@ -38,7 +38,7 @@ dependencies: repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/ - name: exporter-kube-state - version: 0.1.15 + version: 0.1.16 #e2e-repository: file://../exporter-kube-state repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/