Commit ebcffd28 authored by ale's avatar ale

Update the correct dashboards

Partial rollback of ae50318d where we mistakenly overwrote the wrong
dashboard.
parent 21d367a0
......@@ -2,7 +2,6 @@
"annotations": {
"list": [
{
"$$hashKey": "object:84",
"builtIn": 1,
"datasource": "-- Grafana --",
"enable": true,
......@@ -16,7 +15,8 @@
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"iteration": 1526148484623,
"id": null,
"iteration": 1560209742277,
"links": [
{
"icon": "external link",
......@@ -69,7 +69,7 @@
"refId": "A"
},
{
"expr": "rate(group_cpu_usage{mode=\"system\",service=\"$service.service\"}[5m])\n",
"expr": "rate(group_cpu_usage{mode=\"system\",service=\"$service.service\"}[5m])",
"format": "time_series",
"intervalFactor": 1,
"legendFormat": "{{host}}/sys",
......@@ -78,6 +78,7 @@
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "CPU",
"tooltip": {
......@@ -95,7 +96,7 @@
},
"yaxes": [
{
"format": "short",
"format": "none",
"label": null,
"logBase": 1,
"max": null,
......@@ -162,6 +163,7 @@
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Memory",
"tooltip": {
......@@ -179,7 +181,8 @@
},
"yaxes": [
{
"format": "short",
"decimals": null,
"format": "decbytes",
"label": null,
"logBase": 1,
"max": null,
......@@ -247,6 +250,7 @@
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Disk I/O",
"tooltip": {
......@@ -264,7 +268,7 @@
},
"yaxes": [
{
"format": "short",
"format": "Bps",
"label": null,
"logBase": 1,
"max": null,
......@@ -294,7 +298,7 @@
"fill": 1,
"gridPos": {
"h": 5,
"w": 8,
"w": 24,
"x": 0,
"y": 5
},
......@@ -324,7 +328,6 @@
"steppedLine": false,
"targets": [
{
"$$hashKey": "object:1290",
"expr": "global:nginx_http_requests_total:rate5m{vhost=\"$vhosts\"}",
"format": "time_series",
"intervalFactor": 1,
......@@ -334,6 +337,7 @@
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "HTTP qps",
"tooltip": {
......@@ -351,7 +355,6 @@
},
"yaxes": [
{
"$$hashKey": "object:1350",
"format": "short",
"label": null,
"logBase": 1,
......@@ -360,7 +363,6 @@
"show": true
},
{
"$$hashKey": "object:1351",
"format": "short",
"label": null,
"logBase": 1,
......@@ -376,19 +378,16 @@
}
],
"refresh": "5s",
"schemaVersion": 16,
"schemaVersion": 18,
"style": "dark",
"tags": [],
"templating": {
"list": [
{
"allValue": null,
"current": {
"tags": [],
"text": "docker-ok-http",
"value": "docker-ok-http"
},
"current": {},
"datasource": "localhost",
"definition": "",
"hide": 0,
"includeAll": false,
"label": "Service",
......@@ -398,6 +397,7 @@
"query": "label_values(cgroup_cpu_usage, service)",
"refresh": 1,
"regex": "/(.*)\\.service/",
"skipUrlSync": false,
"sort": 1,
"tagValuesQuery": "",
"tags": [],
......@@ -407,26 +407,19 @@
},
{
"allValue": null,
"current": {
"text": "ok.example.com:443",
"value": "ok.example.com:443"
},
"current": {},
"datasource": "localhost",
"definition": "",
"hide": 2,
"includeAll": false,
"label": null,
"multi": false,
"name": "vhosts",
"options": [
{
"selected": true,
"text": "ok.example.com:443",
"value": "ok.example.com:443"
}
],
"options": [],
"query": "query_result(sum (vhostmap{service=\"$service.service\"}) by (vhost))",
"refresh": 0,
"refresh": 1,
"regex": "/^.*vhost=\"([^\"]*)\".*$/",
"skipUrlSync": false,
"sort": 0,
"tagValuesQuery": "",
"tags": [],
......@@ -437,7 +430,7 @@
]
},
"time": {
"from": "now-1h",
"from": "now-3h",
"to": "now"
},
"timepicker": {
......@@ -468,5 +461,5 @@
"timezone": "",
"title": "Service overview",
"uid": "xfV2rd7ik",
"version": 2
"version": 3
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment