From bac644f7b5c86dc56246be5771cde8b18089aa6b Mon Sep 17 00:00:00 2001
From: Mateusz Matuszkowiak <mateusz.matuszkowiak@gmail.com>
Date: Mon, 8 Oct 2018 12:32:26 +0200
Subject: [PATCH] Fixed some expr when count in use

Change-Id: Ibd097f0b7b60ffd71f862d8125105d4b965a2831
Closes-Bug: PROD-23762
---
 .../kubernetes/kubernetes_cluster_prometheus.json      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/grafana/files/dashboards/kubernetes/kubernetes_cluster_prometheus.json b/grafana/files/dashboards/kubernetes/kubernetes_cluster_prometheus.json
index e31f327..ed12e6a 100644
--- a/grafana/files/dashboards/kubernetes/kubernetes_cluster_prometheus.json
+++ b/grafana/files/dashboards/kubernetes/kubernetes_cluster_prometheus.json
@@ -98,7 +98,7 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "100*count(procstat_running{environment=\"$environment\", process_name=~\"hyperkube-controller-manager\"})/count(procstat_running{environment=\"$environment\", process_name=~\"hyperkube-controller-manager\"} == 1)",
+          "expr": "100*count(procstat_running{environment=\"$environment\", process_name=~\"hyperkube-controller-manager\"} == 1)/count(procstat_running{environment=\"$environment\", process_name=~\"hyperkube-controller-manager\"})",
           "format": "time_series",
           "intervalFactor": 2,
           "metric": "elasticsearch_cluster_health_status",
@@ -372,7 +372,7 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "100*count(procstat_running{environment=\"$environment\", process_name=~\"hyperkube-apiserver\"})/count(procstat_running{environment=\"$environment\", process_name=~\"hyperkube-apiserver\"} == 1)",
+          "expr": "100*count(procstat_running{environment=\"$environment\", process_name=~\"hyperkube-apiserver\"} == 1)/count(procstat_running{environment=\"$environment\", process_name=~\"hyperkube-apiserver\"})",
           "format": "time_series",
           "intervalFactor": 2,
           "metric": "elasticsearch_cluster_health_status",
@@ -474,7 +474,7 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "100*count(procstat_running{environment=\"$environment\", process_name=~\"hyperkube-scheduler\"})/count(procstat_running{environment=\"$environment\", process_name=~\"hyperkube-scheduler\"} == 1)",
+          "expr": "100*count(procstat_running{environment=\"$environment\", process_name=~\"hyperkube-scheduler\"} == 1)/count(procstat_running{environment=\"$environment\", process_name=~\"hyperkube-scheduler\"})",
           "format": "time_series",
           "intervalFactor": 2,
           "metric": "elasticsearch_cluster_health_status",
@@ -576,7 +576,7 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "100*count(procstat_running{environment=\"$environment\", process_name=~\"hyperkube-proxy\"})/count(procstat_running{environment=\"$environment\", process_name=~\"hyperkube-proxy\"} == 1)",
+          "expr": "100*count(procstat_running{environment=\"$environment\", process_name=~\"hyperkube-proxy\"} == 1)/count(procstat_running{environment=\"$environment\", process_name=~\"hyperkube-proxy\"})",
           "format": "time_series",
           "intervalFactor": 2,
           "metric": "elasticsearch_cluster_health_status",
@@ -678,7 +678,7 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "100*count(procstat_running{environment=\"$environment\", process_name=~\"hyperkube-kubelet\"})/count(procstat_running{environment=\"$environment\", process_name=~\"hyperkube-kubelet\"} == 1)",
+          "expr": "100*count(procstat_running{environment=\"$environment\", process_name=~\"hyperkube-kubelet\"} == 1)/count(procstat_running{environment=\"$environment\", process_name=~\"hyperkube-kubelet\"})",
           "format": "time_series",
           "intervalFactor": 2,
           "metric": "elasticsearch_cluster_health_status",