diff --git a/docker/grafana/dashboards/master-overview.json b/docker/grafana/dashboards/master-overview.json index da391e675..a8987a401 100644 --- a/docker/grafana/dashboards/master-overview.json +++ b/docker/grafana/dashboards/master-overview.json @@ -45,7 +45,7 @@ }, "overrides": [] }, - "gridPos": { "h": 4, "w": 4, "x": 0, "y": 1 }, + "gridPos": { "h": 4, "w": 3, "x": 0, "y": 1 }, "id": 101, "options": { "colorMode": "background", @@ -85,7 +85,7 @@ }, "overrides": [] }, - "gridPos": { "h": 4, "w": 4, "x": 4, "y": 1 }, + "gridPos": { "h": 4, "w": 3, "x": 3, "y": 1 }, "id": 102, "options": { "colorMode": "background", @@ -126,7 +126,7 @@ }, "overrides": [] }, - "gridPos": { "h": 4, "w": 4, "x": 8, "y": 1 }, + "gridPos": { "h": 4, "w": 3, "x": 6, "y": 1 }, "id": 103, "options": { "colorMode": "background", @@ -166,7 +166,7 @@ }, "overrides": [] }, - "gridPos": { "h": 4, "w": 4, "x": 12, "y": 1 }, + "gridPos": { "h": 4, "w": 3, "x": 9, "y": 1 }, "id": 7, "options": { "colorMode": "background", @@ -192,6 +192,86 @@ "title": "Total Users", "type": "stat" }, + { + "datasource": { "type": "prometheus", "uid": "${datasource}" }, + "fieldConfig": { + "defaults": { + "color": { "mode": "thresholds" }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [{ "color": "orange", "value": null }] + }, + "unit": "short" + }, + "overrides": [] + }, + "gridPos": { "h": 4, "w": 3, "x": 12, "y": 1 }, + "id": 106, + "options": { + "colorMode": "background", + "graphMode": "area", + "justifyMode": "center", + "orientation": "auto", + "reduceOptions": { + "calcs": ["lastNotNull"], + "fields": "", + "values": false + }, + "textMode": "value_and_name" + }, + "pluginVersion": "10.0.0", + "targets": [ + { + "datasource": { "type": "prometheus", "uid": "${datasource}" }, + "expr": "sum(http_requests_total)", + "legendFormat": "Total", + "refId": "A" + } + ], + "title": "Total Requests", + "type": "stat" + }, + { + "datasource": { "type": "prometheus", "uid": "${datasource}" }, + "fieldConfig": { + "defaults": { + "color": { "mode": "thresholds" }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [{ "color": "semi-dark-yellow", "value": null }] + }, + "unit": "reqps" + }, + "overrides": [] + }, + "gridPos": { "h": 4, "w": 3, "x": 15, "y": 1 }, + "id": 107, + "options": { + "colorMode": "background", + "graphMode": "area", + "justifyMode": "center", + "orientation": "auto", + "reduceOptions": { + "calcs": ["lastNotNull"], + "fields": "", + "values": false + }, + "textMode": "value_and_name" + }, + "pluginVersion": "10.0.0", + "targets": [ + { + "datasource": { "type": "prometheus", "uid": "${datasource}" }, + "expr": "sum(rate(http_requests_total[5m]))", + "legendFormat": "Req/s", + "refId": "A" + } + ], + "title": "Requests/sec", + "type": "stat" + }, { "datasource": { "type": "prometheus", "uid": "${datasource}" }, "fieldConfig": { @@ -210,7 +290,7 @@ }, "overrides": [] }, - "gridPos": { "h": 4, "w": 4, "x": 16, "y": 1 }, + "gridPos": { "h": 4, "w": 3, "x": 18, "y": 1 }, "id": 104, "options": { "colorMode": "background", @@ -233,7 +313,7 @@ "refId": "A" } ], - "title": "Avg Response Time", + "title": "Avg Response", "type": "stat" }, { @@ -254,7 +334,7 @@ }, "overrides": [] }, - "gridPos": { "h": 4, "w": 4, "x": 20, "y": 1 }, + "gridPos": { "h": 4, "w": 3, "x": 21, "y": 1 }, "id": 9, "options": { "colorMode": "background",