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
}
{
"__inputs": [
{
"name": "DS_LOCALHOST",
"label": "localhost",
"description": "",
"type": "datasource",
"pluginId": "prometheus",
"pluginName": "Prometheus"
}
],
"__requires": [
{
"type": "grafana",
"id": "grafana",
"name": "Grafana",
"version": "6.1.6"
},
{
"type": "panel",
"id": "graph",
"name": "Graph",
"version": ""
},
{
"type": "datasource",
"id": "prometheus",
"name": "Prometheus",
"version": "1.0.0"
}
],
"annotations": {
"list": [
{
......@@ -45,12 +15,14 @@
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"id": null,
"iteration": 1560209742277,
"id": 5,
"iteration": 1558800275735,
"links": [
{
"asDropdown": false,
"icon": "external link",
"tags": [],
"title": "",
"type": "dashboards"
}
],
......@@ -60,11 +32,11 @@
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "${DS_LOCALHOST}",
"fill": 0,
"datasource": "localhost",
"fill": 1,
"gridPos": {
"h": 5,
"w": 8,
"h": 8,
"w": 12,
"x": 0,
"y": 0
},
......@@ -80,185 +52,16 @@
},
"lines": true,
"linewidth": 1,
"links": [],
"nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"expr": "rate(cgroup_cpu_usage{mode=\"user\",service=\"$service.service\"}[5m])",
"format": "time_series",
"intervalFactor": 1,
"legendFormat": "{{host}}/user",
"refId": "A"
},
{
"expr": "rate(group_cpu_usage{mode=\"system\",service=\"$service.service\"}[5m])",
"format": "time_series",
"intervalFactor": 1,
"legendFormat": "{{host}}/sys",
"refId": "B"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "CPU",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "none",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"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": "${DS_LOCALHOST}",
"fill": 1,
"gridPos": {
"h": 5,
"w": 8,
"x": 8,
"y": 0
},
"id": 4,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 1,
"links": [],
"nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
"links": [
{
"expr": "cgroup_memory_usage{service=\"$service.service\"}",
"format": "time_series",
"intervalFactor": 1,
"legendFormat": "{{host}}",
"refId": "A"
"dashUri": "db/service-overview",
"dashboard": "Service overview",
"includeVars": true,
"params": "service",
"title": "Service",
"type": "dashboard"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Memory",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"decimals": null,
"format": "decbytes",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"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": "${DS_LOCALHOST}",
"fill": 1,
"gridPos": {
"h": 5,
"w": 8,
"x": 16,
"y": 0
},
"id": 6,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 1,
"links": [],
"nullPointMode": "null",
"percentage": false,
"pointradius": 5,
......@@ -270,11 +73,11 @@
"steppedLine": false,
"targets": [
{
"expr": "sum(rate(cgroup_blkio_bytes{service=\"$service.service\"}[5m])) by (host,mode)",
"expr": "topk(5, sum(rate(cgroup_cpu_usage{mode=\"user\",host=~\"^$host$\"}[5m])) by (service))",
"format": "time_series",
"interval": "",
"intervalFactor": 1,
"legendFormat": "{{mode}}/{{host}}",
"legendFormat": "{{service}}",
"refId": "A"
}
],
......@@ -282,7 +85,7 @@
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Disk I/O",
"title": "CPU",
"tooltip": {
"shared": true,
"sort": 0,
......@@ -298,7 +101,7 @@
},
"yaxes": [
{
"format": "Bps",
"format": "short",
"label": null,
"logBase": 1,
"max": null,
......@@ -324,15 +127,15 @@
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "${DS_LOCALHOST}",
"datasource": "localhost",
"fill": 1,
"gridPos": {
"h": 5,
"w": 24,
"x": 0,
"y": 5
"h": 8,
"w": 12,
"x": 12,
"y": 0
},
"id": 8,
"id": 4,
"legend": {
"avg": false,
"current": false,
......@@ -350,18 +153,16 @@
"pointradius": 5,
"points": false,
"renderer": "flot",
"repeat": "vhosts",
"repeatDirection": "h",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"expr": "global:nginx_http_requests_total:rate5m{vhost=\"$vhosts\"}",
"expr": "topk(5, sum(cgroup_memory_usage{host=~\"^$host$\"}) by (service))",
"format": "time_series",
"intervalFactor": 1,
"legendFormat": "{{vhost}}",
"legendFormat": "{{service}}",
"refId": "A"
}
],
......@@ -369,7 +170,7 @@
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "HTTP qps",
"title": "Memory",
"tooltip": {
"shared": true,
"sort": 0,
......@@ -407,26 +208,50 @@
}
}
],
"refresh": "5s",
"schemaVersion": 18,
"style": "dark",
"tags": [],
"templating": {
"list": [
{
"allValue": null,
"current": {},
"datasource": "${DS_LOCALHOST}",
"allValue": ".*",
"current": {
"selected": false,
"text": "All",
"value": "$__all"
},
"datasource": "localhost",
"definition": "",
"hide": 0,
"includeAll": false,
"label": "Service",
"includeAll": true,
"label": "Host",
"multi": false,
"name": "service",
"options": [],
"query": "label_values(cgroup_cpu_usage, service)",
"refresh": 1,
"regex": "/(.*)\\.service/",
"name": "host",
"options": [
{
"selected": true,
"text": "All",
"value": "$__all"
},
{
"selected": false,
"text": "host1",
"value": "host1"
},
{
"selected": false,
"text": "host2",
"value": "host2"
},
{
"selected": false,
"text": "host3",
"value": "host3"
}
],
"query": "label_values(up, host)",
"refresh": 0,
"regex": "",
"skipUrlSync": false,
"sort": 1,
"tagValuesQuery": "",
......@@ -434,33 +259,11 @@
"tagsQuery": "",
"type": "query",
"useTags": false
},
{
"allValue": null,
"current": {},