Merge pull request #2888 from vasrem/fix_grafana_datasource

Fix grafana datasources
kubernetes · Aug 4, 2018 · c475f9d · c475f9d
2 parents 7b67794 + c3d9aa8
commit c475f9d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/deploy/grafana/dashboards/README.md b/deploy/grafana/dashboards/README.md
@@ -12,4 +12,8 @@ This folder contains a dashboard that you can import:
   - Network IO pressure, memory and CPU use
   - Ingress P50, P95 and P99 percentile response times with IN/OUT throughput
   - SSL certificate expiry 
-  - Annotational overlays to show when config reloads happened
+  - Annotational overlays to show when config reloads happened
+
+## Requirements
+
+  - **Grafana v5.2.0** (or newer)
diff --git a/deploy/grafana/dashboards/nginx.yaml b/deploy/grafana/dashboards/nginx.yaml
@@ -41,7 +41,7 @@
         "type": "dashboard"
       },
       {
-        "datasource": "Prometheus",
+        "datasource": "prometheus",
         "enable": true,
         "expr": "sum(changes(nginx_ingress_controller_config_last_reload_successful_timestamp_seconds{instance!=\"unknown\",controller_class=~\"$controller_class\",namespace=~\"$namespace\"}[30s])) by (controller_class)",
         "hide": false,
@@ -72,7 +72,7 @@
         "rgba(237, 129, 40, 0.89)",
         "rgba(50, 172, 45, 0.97)"
       ],
-      "datasource": null,
+      "datasource": "prometheus",
       "format": "ops",
       "gauge": {
         "maxValue": 100,
@@ -154,7 +154,7 @@
         "rgba(237, 129, 40, 0.89)",
         "rgba(50, 172, 45, 0.97)"
       ],
-      "datasource": null,
+      "datasource": "prometheus",
       "format": "none",
       "gauge": {
         "maxValue": 100,
@@ -237,7 +237,7 @@
         "rgba(237, 129, 40, 0.89)",
         "rgba(50, 172, 45, 0.97)"
       ],
-      "datasource": null,
+      "datasource": "prometheus",
       "format": "percentunit",
       "gauge": {
         "maxValue": 100,
@@ -319,7 +319,7 @@
         "rgba(237, 129, 40, 0.89)",
         "rgba(50, 172, 45, 0.97)"
       ],
-      "datasource": null,
+      "datasource": "prometheus",
       "decimals": 0,
       "format": "none",
       "gauge": {
@@ -403,7 +403,7 @@
         "rgba(237, 129, 40, 0.89)",
         "rgba(50, 172, 45, 0.97)"
       ],
-      "datasource": null,
+      "datasource": "prometheus",
       "decimals": 0,
       "format": "none",
       "gauge": {
@@ -483,7 +483,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": null,
+      "datasource": "prometheus",
       "decimals": 2,
       "editable": true,
       "error": false,
@@ -599,7 +599,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": null,
+      "datasource": "prometheus",
       "decimals": 2,
       "editable": false,
       "error": false,
@@ -701,7 +701,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": null,
+      "datasource": "prometheus",
       "decimals": 3,
       "editable": false,
       "error": false,
@@ -804,7 +804,7 @@
     },
     {
       "columns": [],
-      "datasource": null,
+      "datasource": "prometheus",
       "fontSize": "100%",
       "gridPos": {
         "h": 8,
@@ -1029,7 +1029,7 @@
           "value": "current"
         }
       ],
-      "datasource": null,
+      "datasource": "prometheus",
       "fontSize": "100%",
       "gridPos": {
         "h": 8,
@@ -1117,7 +1117,7 @@
           "text": "All",
           "value": "$__all"
         },
-        "datasource": "Prometheus",
+        "datasource": "prometheus",
         "hide": 0,
         "includeAll": true,
         "label": "Namespace",
@@ -1140,7 +1140,7 @@
           "text": "All",
           "value": "$__all"
         },
-        "datasource": "Prometheus",
+        "datasource": "prometheus",
         "hide": 0,
         "includeAll": true,
         "label": "Controller Class",
@@ -1163,7 +1163,7 @@
           "text": "All",
           "value": "$__all"
         },
-        "datasource": "Prometheus",
+        "datasource": "prometheus",
         "hide": 0,
         "includeAll": true,
         "label": "Controller",