Updated Nginx dashboard to align with recent rules
Change-Id: Ieab2aeb2b867feb436d28e077dcb32039b953f80
Related-Bug: PROD-20879
diff --git a/nginx/files/grafana_dashboards/nginx_prometheus.json b/nginx/files/grafana_dashboards/nginx_prometheus.json
index db7e6b9..ce5a261 100644
--- a/nginx/files/grafana_dashboards/nginx_prometheus.json
+++ b/nginx/files/grafana_dashboards/nginx_prometheus.json
@@ -3,8 +3,9 @@
"annotations": {
"list": [
{
+ "$$hashKey": "object:12123",
"builtIn": 1,
- "datasource": "default",
+ "datasource": "prometheus",
"enable": true,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
@@ -19,11 +20,11 @@
"gnetId": null,
"graphTooltip": 0,
"id": null,
- "iteration": 1528293496635,
+ "iteration": 1529576141459,
"links": [],
"panels": [
{
- "collapsed": true,
+ "collapsed": false,
"gridPos": {
"h": 1,
"w": 24,
@@ -55,7 +56,7 @@
},
"gridPos": {
"h": 3,
- "w": 24,
+ "w": 12,
"x": 0,
"y": 1
},
@@ -65,10 +66,12 @@
"mappingType": 1,
"mappingTypes": [
{
+ "$$hashKey": "object:16734",
"name": "value to text",
"value": 1
},
{
+ "$$hashKey": "object:16735",
"name": "range to text",
"value": 2
}
@@ -90,6 +93,14 @@
],
"repeat": "host",
"repeatDirection": "h",
+ "scopedVars": {
+ "host": {
+ "$$hashKey": "object:12486",
+ "selected": false,
+ "text": "prx01",
+ "value": "prx01"
+ }
+ },
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
"full": false,
@@ -99,6 +110,7 @@
"tableColumn": "",
"targets": [
{
+ "$$hashKey": "object:16641",
"expr": "nginx_up{host=~\"$host\"}",
"format": "time_series",
"intervalFactor": 1,
@@ -111,16 +123,128 @@
"valueFontSize": "80%",
"valueMaps": [
{
+ "$$hashKey": "object:16737",
"op": "=",
"text": "N/A",
"value": "null"
},
{
+ "$$hashKey": "object:16738",
"op": "=",
- "text": "Fail",
+ "text": "FAIL",
"value": "0"
},
{
+ "$$hashKey": "object:16739",
+ "op": "=",
+ "text": "OK",
+ "value": "1"
+ }
+ ],
+ "valueName": "current"
+ },
+ {
+ "cacheTimeout": null,
+ "colorBackground": true,
+ "colorValue": false,
+ "colors": [
+ "#d44a3a",
+ "rgba(237, 129, 40, 0.89)",
+ "#299c46"
+ ],
+ "datasource": null,
+ "format": "none",
+ "gauge": {
+ "maxValue": 100,
+ "minValue": 0,
+ "show": false,
+ "thresholdLabels": false,
+ "thresholdMarkers": true
+ },
+ "gridPos": {
+ "h": 3,
+ "w": 12,
+ "x": 12,
+ "y": 1
+ },
+ "id": 30,
+ "interval": null,
+ "links": [],
+ "mappingType": 1,
+ "mappingTypes": [
+ {
+ "$$hashKey": "object:16734",
+ "name": "value to text",
+ "value": 1
+ },
+ {
+ "$$hashKey": "object:16735",
+ "name": "range to text",
+ "value": 2
+ }
+ ],
+ "maxDataPoints": 100,
+ "minSpan": 2,
+ "nullPointMode": "connected",
+ "nullText": null,
+ "postfix": "",
+ "postfixFontSize": "50%",
+ "prefix": "",
+ "prefixFontSize": "50%",
+ "rangeMaps": [
+ {
+ "from": "null",
+ "text": "N/A",
+ "to": "null"
+ }
+ ],
+ "repeat": null,
+ "repeatDirection": "h",
+ "repeatIteration": 1529576141459,
+ "repeatPanelId": 18,
+ "scopedVars": {
+ "host": {
+ "$$hashKey": "object:12487",
+ "selected": false,
+ "text": "prx02",
+ "value": "prx02"
+ }
+ },
+ "sparkline": {
+ "fillColor": "rgba(31, 118, 189, 0.18)",
+ "full": false,
+ "lineColor": "rgb(31, 120, 193)",
+ "show": false
+ },
+ "tableColumn": "",
+ "targets": [
+ {
+ "$$hashKey": "object:16641",
+ "expr": "nginx_up{host=~\"$host\"}",
+ "format": "time_series",
+ "intervalFactor": 1,
+ "refId": "A"
+ }
+ ],
+ "thresholds": "0.5,1",
+ "title": "Nginx@${host}",
+ "type": "singlestat",
+ "valueFontSize": "80%",
+ "valueMaps": [
+ {
+ "$$hashKey": "object:16737",
+ "op": "=",
+ "text": "N/A",
+ "value": "null"
+ },
+ {
+ "$$hashKey": "object:16738",
+ "op": "=",
+ "text": "FAIL",
+ "value": "0"
+ },
+ {
+ "$$hashKey": "object:16739",
"op": "=",
"text": "OK",
"value": "1"
@@ -156,13 +280,15 @@
},
"id": 4,
"legend": {
- "avg": false,
+ "alignAsTable": true,
+ "avg": true,
"current": false,
"max": false,
"min": false,
+ "rightSide": true,
"show": true,
"total": false,
- "values": false
+ "values": true
},
"lines": true,
"linewidth": 1,
@@ -178,7 +304,8 @@
"steppedLine": false,
"targets": [
{
- "expr": "irate(nginx_requests{host=~\"$host\"}[1m])",
+ "$$hashKey": "object:12216",
+ "expr": "rate(nginx_requests{host=~\"$host\"}[$rate_interval])",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{ host }}",
@@ -204,6 +331,8 @@
},
"yaxes": [
{
+ "$$hashKey": "object:12244",
+ "decimals": 0,
"format": "ops",
"label": null,
"logBase": 1,
@@ -212,6 +341,7 @@
"show": true
},
{
+ "$$hashKey": "object:12245",
"format": "short",
"label": null,
"logBase": 1,
@@ -254,15 +384,15 @@
},
"id": 6,
"legend": {
- "alignAsTable": false,
- "avg": false,
+ "alignAsTable": true,
+ "avg": true,
"current": false,
"max": false,
"min": false,
- "rightSide": false,
+ "rightSide": true,
"show": true,
"total": false,
- "values": false
+ "values": true
},
"lines": true,
"linewidth": 1,
@@ -273,7 +403,7 @@
"pointradius": 5,
"points": false,
"renderer": "flot",
- "repeat": "host",
+ "repeat": null,
"repeatDirection": "h",
"seriesOverrides": [],
"spaceLength": 10,
@@ -281,24 +411,26 @@
"steppedLine": false,
"targets": [
{
- "expr": "irate(nginx_accepts{host=~\"$host\"}[1m])",
+ "$$hashKey": "object:12438",
+ "expr": "rate(nginx_accepts{host=~\"$host\"}[$rate_interval])",
"format": "time_series",
"intervalFactor": 2,
- "legendFormat": "accepted",
+ "legendFormat": "accepted @{{ host }}",
"refId": "A"
},
{
- "expr": "irate(nginx_handled{host=~\"$host\"}[1m])",
+ "$$hashKey": "object:12439",
+ "expr": "rate(nginx_handled{host=~\"$host\"}[$rate_interval])",
"format": "time_series",
"intervalFactor": 2,
- "legendFormat": "handled",
+ "legendFormat": "handled @{{ host }}",
"refId": "B"
}
],
"thresholds": [],
"timeFrom": null,
"timeShift": null,
- "title": "Connections for Nginx@${host}",
+ "title": "Connection status",
"tooltip": {
"shared": true,
"sort": 0,
@@ -314,6 +446,8 @@
},
"yaxes": [
{
+ "$$hashKey": "object:12408",
+ "decimals": 0,
"format": "ops",
"label": null,
"logBase": 1,
@@ -322,6 +456,7 @@
"show": true
},
{
+ "$$hashKey": "object:12409",
"format": "short",
"label": null,
"logBase": 1,
@@ -336,69 +471,45 @@
}
},
{
- "cacheTimeout": null,
- "colorBackground": false,
- "colorValue": false,
- "colors": [
- "#d44a3a",
- "rgba(237, 129, 40, 0.89)",
- "#299c46"
- ],
+ "aliasColors": {},
+ "bars": false,
+ "dashLength": 10,
+ "dashes": false,
"datasource": null,
- "format": "none",
- "gauge": {
- "maxValue": 100,
- "minValue": 0,
- "show": false,
- "thresholdLabels": false,
- "thresholdMarkers": true
- },
+ "fill": 1,
"gridPos": {
- "h": 3,
- "w": 24,
+ "h": 6,
+ "w": 12,
"x": 0,
"y": 18
},
- "id": 8,
- "interval": null,
- "links": [],
- "mappingType": 1,
- "mappingTypes": [
- {
- "name": "value to text",
- "value": 1
- },
- {
- "name": "range to text",
- "value": 2
- }
- ],
- "maxDataPoints": 100,
- "minSpan": 2,
- "nullPointMode": "connected",
- "nullText": null,
- "postfix": "",
- "postfixFontSize": "50%",
- "prefix": "",
- "prefixFontSize": "50%",
- "rangeMaps": [
- {
- "from": "null",
- "text": "N/A",
- "to": "null"
- }
- ],
- "repeat": "host",
- "repeatDirection": "h",
- "sparkline": {
- "fillColor": "rgba(31, 118, 189, 0.18)",
- "full": false,
- "lineColor": "rgb(31, 120, 193)",
- "show": true
+ "id": 23,
+ "legend": {
+ "alignAsTable": true,
+ "avg": true,
+ "current": false,
+ "max": false,
+ "min": false,
+ "rightSide": true,
+ "show": true,
+ "total": false,
+ "values": true
},
- "tableColumn": "",
+ "lines": true,
+ "linewidth": 1,
+ "links": [],
+ "nullPointMode": "null",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "seriesOverrides": [],
+ "spaceLength": 10,
+ "stack": false,
+ "steppedLine": false,
"targets": [
{
+ "$$hashKey": "object:13079",
"expr": "nginx_active{host=~\"$host\"}",
"format": "time_series",
"intervalFactor": 2,
@@ -406,251 +517,89 @@
"refId": "A"
}
],
- "thresholds": "",
- "title": "Active connections for Nginx@${host}",
- "type": "singlestat",
- "valueFontSize": "80%",
- "valueMaps": [
- {
- "op": "=",
- "text": "N/A",
- "value": "null"
- }
- ],
- "valueName": "current"
- },
- {
- "cacheTimeout": null,
- "colorBackground": false,
- "colorValue": false,
- "colors": [
- "#d44a3a",
- "rgba(237, 129, 40, 0.89)",
- "#299c46"
- ],
- "datasource": null,
- "format": "none",
- "gauge": {
- "maxValue": 100,
- "minValue": 0,
- "show": false,
- "thresholdLabels": false,
- "thresholdMarkers": true
+ "thresholds": [],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Active connections",
+ "tooltip": {
+ "shared": true,
+ "sort": 0,
+ "value_type": "individual"
},
- "gridPos": {
- "h": 3,
- "w": 24,
- "x": 0,
- "y": 21
+ "type": "graph",
+ "xaxis": {
+ "buckets": null,
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
},
- "id": 11,
- "interval": null,
- "links": [],
- "mappingType": 1,
- "mappingTypes": [
+ "yaxes": [
{
- "name": "value to text",
- "value": 1
+ "$$hashKey": "object:13148",
+ "decimals": 0,
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": "0",
+ "show": true
},
{
- "name": "range to text",
- "value": 2
+ "$$hashKey": "object:13149",
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
}
],
- "maxDataPoints": 100,
- "minSpan": 2,
- "nullPointMode": "connected",
- "nullText": null,
- "postfix": "",
- "postfixFontSize": "50%",
- "prefix": "",
- "prefixFontSize": "50%",
- "rangeMaps": [
- {
- "from": "null",
- "text": "N/A",
- "to": "null"
- }
- ],
- "repeat": "host",
- "repeatDirection": "h",
- "sparkline": {
- "fillColor": "rgba(31, 118, 189, 0.18)",
- "full": false,
- "lineColor": "rgb(31, 120, 193)",
- "show": true
- },
- "tableColumn": "",
- "targets": [
- {
- "expr": "nginx_writing{host=~\"$host\"}",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": "{{ host }}",
- "refId": "A"
- }
- ],
- "thresholds": "",
- "title": "Writing connections for Nginx@${host}",
- "type": "singlestat",
- "valueFontSize": "80%",
- "valueMaps": [
- {
- "op": "=",
- "text": "N/A",
- "value": "null"
- }
- ],
- "valueName": "current"
+ "yaxis": {
+ "align": false,
+ "alignLevel": null
+ }
},
{
- "cacheTimeout": null,
- "colorBackground": false,
- "colorValue": false,
- "colors": [
- "#d44a3a",
- "rgba(237, 129, 40, 0.89)",
- "#299c46"
- ],
+ "aliasColors": {},
+ "bars": false,
+ "dashLength": 10,
+ "dashes": false,
"datasource": null,
- "format": "none",
- "gauge": {
- "maxValue": 100,
- "minValue": 0,
- "show": false,
- "thresholdLabels": false,
- "thresholdMarkers": true
- },
+ "fill": 1,
"gridPos": {
- "h": 3,
- "w": 24,
- "x": 0,
- "y": 24
+ "h": 6,
+ "w": 12,
+ "x": 12,
+ "y": 18
},
- "id": 10,
- "interval": null,
+ "id": 29,
+ "legend": {
+ "alignAsTable": true,
+ "avg": true,
+ "current": false,
+ "max": false,
+ "min": false,
+ "rightSide": true,
+ "show": true,
+ "total": false,
+ "values": true
+ },
+ "lines": true,
+ "linewidth": 1,
"links": [],
- "mappingType": 1,
- "mappingTypes": [
- {
- "name": "value to text",
- "value": 1
- },
- {
- "name": "range to text",
- "value": 2
- }
- ],
- "maxDataPoints": 100,
- "minSpan": 2,
- "nullPointMode": "connected",
- "nullText": null,
- "postfix": "",
- "postfixFontSize": "50%",
- "prefix": "",
- "prefixFontSize": "50%",
- "rangeMaps": [
- {
- "from": "null",
- "text": "N/A",
- "to": "null"
- }
- ],
- "repeat": "host",
- "repeatDirection": "h",
- "sparkline": {
- "fillColor": "rgba(31, 118, 189, 0.18)",
- "full": false,
- "lineColor": "rgb(31, 120, 193)",
- "show": true
- },
- "tableColumn": "",
+ "nullPointMode": "null",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "seriesOverrides": [],
+ "spaceLength": 10,
+ "stack": false,
+ "steppedLine": false,
"targets": [
{
- "expr": "nginx_reading{host=~\"$host\"}",
- "format": "time_series",
- "intervalFactor": 1,
- "legendFormat": "{{ host }}",
- "refId": "A"
- }
- ],
- "thresholds": "",
- "title": "Reading connections for Nginx@${host}",
- "type": "singlestat",
- "valueFontSize": "80%",
- "valueMaps": [
- {
- "op": "=",
- "text": "N/A",
- "value": "null"
- }
- ],
- "valueName": "current"
- },
- {
- "cacheTimeout": null,
- "colorBackground": false,
- "colorValue": false,
- "colors": [
- "#d44a3a",
- "rgba(237, 129, 40, 0.89)",
- "#299c46"
- ],
- "datasource": null,
- "format": "none",
- "gauge": {
- "maxValue": 100,
- "minValue": 0,
- "show": false,
- "thresholdLabels": false,
- "thresholdMarkers": true
- },
- "gridPos": {
- "h": 3,
- "w": 24,
- "x": 0,
- "y": 27
- },
- "id": 12,
- "interval": null,
- "links": [],
- "mappingType": 1,
- "mappingTypes": [
- {
- "name": "value to text",
- "value": 1
- },
- {
- "name": "range to text",
- "value": 2
- }
- ],
- "maxDataPoints": 100,
- "minSpan": 2,
- "nullPointMode": "connected",
- "nullText": null,
- "postfix": "",
- "postfixFontSize": "50%",
- "prefix": "",
- "prefixFontSize": "50%",
- "rangeMaps": [
- {
- "from": "null",
- "text": "N/A",
- "to": "null"
- }
- ],
- "repeat": "host",
- "repeatDirection": "h",
- "sparkline": {
- "fillColor": "rgba(31, 118, 189, 0.18)",
- "full": false,
- "lineColor": "rgb(31, 120, 193)",
- "show": true
- },
- "tableColumn": "",
- "targets": [
- {
+ "$$hashKey": "object:13804",
"expr": "nginx_waiting{host=~\"$host\"}",
"format": "time_series",
"intervalFactor": 2,
@@ -658,20 +607,232 @@
"refId": "A"
}
],
- "thresholds": "",
- "title": "Waiting connections for Nginx@${host}",
- "type": "singlestat",
- "valueFontSize": "80%",
- "valueMaps": [
+ "thresholds": [],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Waiting connections",
+ "tooltip": {
+ "shared": true,
+ "sort": 0,
+ "value_type": "individual"
+ },
+ "type": "graph",
+ "xaxis": {
+ "buckets": null,
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
+ },
+ "yaxes": [
{
- "op": "=",
- "text": "N/A",
- "value": "null"
+ "$$hashKey": "object:13873",
+ "decimals": 0,
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": "0",
+ "show": true
+ },
+ {
+ "$$hashKey": "object:13874",
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
}
],
- "valueName": "current"
+ "yaxis": {
+ "align": false,
+ "alignLevel": null
+ }
+ },
+ {
+ "aliasColors": {},
+ "bars": false,
+ "dashLength": 10,
+ "dashes": false,
+ "datasource": null,
+ "fill": 1,
+ "gridPos": {
+ "h": 6,
+ "w": 12,
+ "x": 0,
+ "y": 24
+ },
+ "id": 25,
+ "legend": {
+ "alignAsTable": true,
+ "avg": true,
+ "current": false,
+ "max": false,
+ "min": false,
+ "rightSide": true,
+ "show": true,
+ "total": false,
+ "values": true
+ },
+ "lines": true,
+ "linewidth": 1,
+ "links": [],
+ "nullPointMode": "null",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "seriesOverrides": [],
+ "spaceLength": 10,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "$$hashKey": "object:13332",
+ "expr": "nginx_writing{host=~\"$host\"}",
+ "format": "time_series",
+ "intervalFactor": 2,
+ "legendFormat": "{{ host }}",
+ "refId": "A"
+ }
+ ],
+ "thresholds": [],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Writing connections",
+ "tooltip": {
+ "shared": true,
+ "sort": 0,
+ "value_type": "individual"
+ },
+ "type": "graph",
+ "xaxis": {
+ "buckets": null,
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
+ },
+ "yaxes": [
+ {
+ "$$hashKey": "object:13401",
+ "decimals": 0,
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": "0",
+ "show": true
+ },
+ {
+ "$$hashKey": "object:13402",
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ }
+ ],
+ "yaxis": {
+ "align": false,
+ "alignLevel": null
+ }
+ },
+ {
+ "aliasColors": {},
+ "bars": false,
+ "dashLength": 10,
+ "dashes": false,
+ "datasource": null,
+ "fill": 1,
+ "gridPos": {
+ "h": 6,
+ "w": 12,
+ "x": 12,
+ "y": 24
+ },
+ "id": 27,
+ "legend": {
+ "alignAsTable": true,
+ "avg": true,
+ "current": false,
+ "max": false,
+ "min": false,
+ "rightSide": true,
+ "show": true,
+ "total": false,
+ "values": true
+ },
+ "lines": true,
+ "linewidth": 1,
+ "links": [],
+ "nullPointMode": "null",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "seriesOverrides": [],
+ "spaceLength": 10,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "$$hashKey": "object:13538",
+ "expr": "nginx_reading{host=~\"$host\"}",
+ "format": "time_series",
+ "intervalFactor": 2,
+ "legendFormat": "{{ host }}",
+ "refId": "A"
+ }
+ ],
+ "thresholds": [],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Reading connections",
+ "tooltip": {
+ "shared": true,
+ "sort": 0,
+ "value_type": "individual"
+ },
+ "type": "graph",
+ "xaxis": {
+ "buckets": null,
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
+ },
+ "yaxes": [
+ {
+ "$$hashKey": "object:13648",
+ "decimals": 0,
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": "0",
+ "show": true
+ },
+ {
+ "$$hashKey": "object:13649",
+ "decimals": null,
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ }
+ ],
+ "yaxis": {
+ "align": false,
+ "alignLevel": null
+ }
}
],
+ "refresh": "1m",
"schemaVersion": 16,
"style": "dark",
"tags": [],
@@ -679,7 +840,13 @@
"list": [
{
"allValue": null,
- "current": {},
+ "current": {
+ "tags": [],
+ "text": "All",
+ "value": [
+ "$__all"
+ ]
+ },
"datasource": "default",
"hide": 0,
"includeAll": true,
@@ -696,11 +863,53 @@
"tagsQuery": "",
"type": "query",
"useTags": false
+ },
+ {
+ "auto": false,
+ "auto_count": 30,
+ "auto_min": "10s",
+ "current": {
+ "text": "3m",
+ "value": "3m"
+ },
+ "hide": 0,
+ "label": null,
+ "name": "rate_interval",
+ "options": [
+ {
+ "selected": false,
+ "text": "1m",
+ "value": "1m"
+ },
+ {
+ "selected": false,
+ "text": "2m",
+ "value": "2m"
+ },
+ {
+ "selected": true,
+ "text": "3m",
+ "value": "3m"
+ },
+ {
+ "selected": false,
+ "text": "10m",
+ "value": "10m"
+ },
+ {
+ "selected": false,
+ "text": "15m",
+ "value": "15m"
+ }
+ ],
+ "query": "1m,2m,3m,10m,15m",
+ "refresh": 2,
+ "type": "interval"
}
]
},
"time": {
- "from": "now-6h",
+ "from": "now-1h",
"to": "now"
},
"timepicker": {