commit f60422271618a4b0d87b7053ee25db61706bc616
author Martin Polreich <polreichmartin@gmail.com> Tue Jul 11 15:05:22 2017 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> Tue Jul 11 15:05:22 2017 +0000
tree 53967b55a13a152f2003233097ed5dd24bf29e8b
parent 74c0edb88a74df2fab0ac11aa525f5cfc74ef6ab
parent a9c561069433b8546122edd866c3876f8eb60728

Merge "Fix bugs with Grafana dashboard"

nginx/files/grafana_dashboards/nginx_prometheus.json

diff --git a/nginx/files/grafana_dashboards/nginx_prometheus.json b/nginx/files/grafana_dashboards/nginx_prometheus.json
index 1c66a53..16b6f82 100644
--- a/nginx/files/grafana_dashboards/nginx_prometheus.json
+++ b/nginx/files/grafana_dashboards/nginx_prometheus.json
@@ -19,8 +19,8 @@
           "colorValue": true,
           "colors": [
             "rgba(245, 54, 54, 0.9)",
-            "rgba(237, 129, 40, 0.89)",
-            "rgba(50, 172, 45, 0.97)"
+            "rgba(40, 237, 55, 0.89)",
+            "rgba(255, 0, 0, 0.97)"
           ],
           "datasource": "prometheus",
           "format": "none",
@@ -214,20 +214,20 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(nginx_connections_accepted{host=~\"$host\"}[1m])",
+              "expr": "irate(nginx_accepts{host=~\"$host\"}[1m])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "accepted",
-              "metric": "nginx_connections_accepted",
+              "metric": "nginx_accepts",
               "refId": "A",
               "step": 2
             },
             {
-              "expr": "irate(nginx_connections_handled{host=~\"$host\"}[1m])",
+              "expr": "irate(nginx_handled{host=~\"$host\"}[1m])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "handled",
-              "metric": "nginx_connections_handled",
+              "metric": "nginx_handled",
               "refId": "B",
               "step": 2
             }
@@ -319,11 +319,11 @@
           },
           "targets": [
             {
-              "expr": "nginx_connections_active{host=~\"$host\"}",
+              "expr": "nginx_active{host=~\"$host\"}",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "{{ host }}",
-              "metric": "nginx_connections_active",
+              "metric": "nginx_active",
               "refId": "A",
               "step": 2
             }
@@ -398,11 +398,11 @@
           },
           "targets": [
             {
-              "expr": "nginx_connections_reading{host=~\"$host\"}",
+              "expr": "nginx_reading{host=~\"$host\"}",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "{{ host }}",
-              "metric": "nginx_connections_reading",
+              "metric": "nginx_reading",
               "refId": "A",
               "step": 2
             }
@@ -477,11 +477,11 @@
           },
           "targets": [
             {
-              "expr": "nginx_connections_writing{host=~\"$host\"}",
+              "expr": "nginx_writing{host=~\"$host\"}",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "{{ host }}",
-              "metric": "nginx_connections_writing",
+              "metric": "nginx_writing",
               "refId": "A",
               "step": 2
             }
@@ -556,11 +556,11 @@
           },
           "targets": [
             {
-              "expr": "nginx_connections_waiting{host=~\"$host\"}",
+              "expr": "nginx_waiting{host=~\"$host\"}",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "{{ host }}",
-              "metric": "nginx_connections_waiting",
+              "metric": "nginx_waiting",
               "refId": "A",
               "step": 2
             }