Fix a bug in alertmanager 0.9.0. Fix a query in grafana dashboard.

camilb · Sep 29, 2017 · cb968ba · cb968ba
1 parent f413d01
commit cb968ba
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/operator/assets/grafana/kubernetes-cluster-health-dashboard.json b/operator/assets/grafana/kubernetes-cluster-health-dashboard.json
@@ -14,7 +14,7 @@
       "type": "grafana",
       "id": "grafana",
       "name": "Grafana",
-      "version": "4.4.1"
+      "version": "4.5.2"
     },
     {
       "type": "datasource",
@@ -428,7 +428,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "sum(kube_node_status_ready{condition!=\"true\"})",
+              "expr": "sum(kube_node_status_condition{condition!=\"Ready\", status=\"true\"})",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "",
@@ -730,4 +730,4 @@
   "timezone": "",
   "title": "Kubernetes Cluster Health",
   "version": 12
-}
+}
diff --git a/operator/deploy b/operator/deploy
@@ -6,7 +6,7 @@
 GRAFANA_DEFAULT_VERSION=4.5.2
 PROMETHEUS_DEFAULT_VERSION=v2.0.0-beta.5
 PROMETHEUS_OPERATOR_DEFAULT_VERSION=v0.13.0
-ALERT_MANAGER_DEFAULT_VERSION=v0.9.0
+ALERT_MANAGER_DEFAULT_VERSION=v0.9.1
 NODE_EXPORTER_DEFAULT_VERSION=v0.14.0
 KUBE_STATE_METRICS_DEFAULT_VERSION=v1.0.1
 

diff --git a/operator/manifests/grafana/grafana-dashboards.cm.yaml b/operator/manifests/grafana/grafana-dashboards.cm.yaml
@@ -1912,7 +1912,7 @@ data:
           "type": "grafana",
           "id": "grafana",
           "name": "Grafana",
-          "version": "4.4.1"
+          "version": "4.5.2"
         },
         {
           "type": "datasource",
@@ -2326,7 +2326,7 @@ data:
               "tableColumn": "",
               "targets": [
                 {
-                  "expr": "sum(kube_node_status_ready{condition!=\"true\"})",
+                  "expr": "sum(kube_node_status_condition{condition!=\"Ready\", status=\"true\"})",
                   "format": "time_series",
                   "intervalFactor": 2,
                   "legendFormat": "",
@@ -2628,7 +2628,8 @@ data:
       "timezone": "",
       "title": "Kubernetes Cluster Health",
       "version": 12
-    },
+    }
+    ,
       "inputs": [
         {
           "name": "DS_PROMETHEUS",