From 3a5b762cef5578a58077e2db691d219c56d6fa5a Mon Sep 17 00:00:00 2001 From: Mike Bryant <m@ocado.com> Date: Thu, 9 Mar 2017 21:25:27 +0000 Subject: [PATCH] Update generated files --- manifests/grafana/grafana-dashboards.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/manifests/grafana/grafana-dashboards.yaml b/manifests/grafana/grafana-dashboards.yaml index f9757dc1..b9cfac08 100644 --- a/manifests/grafana/grafana-dashboards.yaml +++ b/manifests/grafana/grafana-dashboards.yaml @@ -1166,7 +1166,7 @@ data: "targets": [ { "refId": "A", - "expr": "kube_deployment_spec_replicas{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}", + "expr": "max(kube_deployment_spec_replicas{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}) without (instance)", "intervalFactor": 2, "step": 600, "metric": "kube_deployment_spec_replicas" @@ -1245,7 +1245,7 @@ data: "targets": [ { "refId": "A", - "expr": "kube_deployment_status_replicas_available{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}", + "expr": "min(kube_deployment_status_replicas_available{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}) without (instance)", "intervalFactor": 2, "step": 600 } @@ -1369,7 +1369,7 @@ data: }, "targets": [ { - "expr": "kube_deployment_status_observed_generation{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}", + "expr": "max(kube_deployment_status_observed_generation{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}) without (instance)", "intervalFactor": 2, "legendFormat": "", "refId": "A", @@ -1447,7 +1447,7 @@ data: }, "targets": [ { - "expr": "kube_deployment_metadata_generation{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}", + "expr": "max(kube_deployment_metadata_generation{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}) without (instance)", "intervalFactor": 2, "legendFormat": "", "refId": "A", @@ -1513,35 +1513,35 @@ data: "steppedLine": false, "targets": [ { - "expr": "kube_deployment_status_replicas{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}", + "expr": "max(kube_deployment_status_replicas{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}) without (instance)", "intervalFactor": 2, "legendFormat": "current replicas", "refId": "A", "step": 30 }, { - "expr": "kube_deployment_status_replicas_available{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}", + "expr": "min(kube_deployment_status_replicas_available{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}) without (instance)", "intervalFactor": 2, "legendFormat": "available", "refId": "B", "step": 30 }, { - "expr": "kube_deployment_status_replicas_unavailable{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}", + "expr": "max(kube_deployment_status_replicas_unavailable{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}) without (instance)", "intervalFactor": 2, "legendFormat": "unavailable", "refId": "C", "step": 30 }, { - "expr": "kube_deployment_status_replicas_updated{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}", + "expr": "min(kube_deployment_status_replicas_updated{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}) without (instance)", "intervalFactor": 2, "legendFormat": "updated", "refId": "D", "step": 30 }, { - "expr": "kube_deployment_spec_replicas{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}", + "expr": "max(kube_deployment_spec_replicas{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}) without (instance)", "intervalFactor": 2, "legendFormat": "desired", "refId": "E", -- GitLab