From 54d243cd98968977f9f66a94791a4969febda4d9 Mon Sep 17 00:00:00 2001 From: Nitish Tiwari Date: Wed, 9 Dec 2020 13:56:42 +0530 Subject: [PATCH] fix: grafana dashboard calculating online nodes (#11041) Also use a generic name instead of diff names per revision --- docs/metrics/prometheus/grafana/README.md | 2 +- ...overview_rev1.json => minio-overview.json} | 140 ++++-------------- 2 files changed, 31 insertions(+), 111 deletions(-) rename docs/metrics/prometheus/grafana/{minio-overview_rev1.json => minio-overview.json} (95%) diff --git a/docs/metrics/prometheus/grafana/README.md b/docs/metrics/prometheus/grafana/README.md index dc0374e7e..a07abd6f9 100644 --- a/docs/metrics/prometheus/grafana/README.md +++ b/docs/metrics/prometheus/grafana/README.md @@ -11,6 +11,6 @@ Visualize MinIO metrics with our official Grafana dashboard available on the [Grafana dashboard portal](https://grafana.com/grafana/dashboards/13502). -Refer to the dashboard [json file here](https://raw.githubusercontent.com/minio/minio/master/docs/metrics/prometheus/grafana/minio-overview_rev1.json). +Refer to the dashboard [json file here](https://raw.githubusercontent.com/minio/minio/master/docs/metrics/prometheus/grafana/minio-overview.json). ![Grafana](https://raw.githubusercontent.com/minio/minio/master/docs/metrics/prometheus/grafana/grafana-minio.png) diff --git a/docs/metrics/prometheus/grafana/minio-overview_rev1.json b/docs/metrics/prometheus/grafana/minio-overview.json similarity index 95% rename from docs/metrics/prometheus/grafana/minio-overview_rev1.json rename to docs/metrics/prometheus/grafana/minio-overview.json index 8b28e5672..52d37baa7 100644 --- a/docs/metrics/prometheus/grafana/minio-overview_rev1.json +++ b/docs/metrics/prometheus/grafana/minio-overview.json @@ -3,7 +3,7 @@ { "name": "DS_PROMETHEUS", "label": "Prometheus", - "description": "Scrape data from MinIO Prometheus Endpoint", + "description": "", "type": "datasource", "pluginId": "prometheus", "pluginName": "Prometheus" @@ -71,7 +71,7 @@ "gnetId": 13502, "graphTooltip": 0, "id": null, - "iteration": 1606971558062, + "iteration": 1607258286192, "links": [ { "icon": "external link", @@ -613,7 +613,7 @@ "overrides": [] }, "gridPos": { - "h": 3, + "h": 6, "w": 3, "x": 0, "y": 7 @@ -639,7 +639,7 @@ "pluginVersion": "7.2.0", "targets": [ { - "expr": "count(count by (instances) (minio_version_info))", + "expr": "count by (instances) (minio_version_info)", "format": "table", "hide": false, "instant": true, @@ -996,86 +996,6 @@ "title": "Total Open FDs", "type": "stat" }, - { - "cacheTimeout": null, - "datasource": "${DS_PROMETHEUS}", - "description": "", - "fieldConfig": { - "defaults": { - "custom": { - "align": null - }, - "mappings": [ - { - "id": 0, - "op": "=", - "text": "N/A", - "type": 1, - "value": "null" - } - ], - "nullValueMode": "connected", - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - }, - "unit": "short" - }, - "overrides": [] - }, - "gridPos": { - "h": 3, - "w": 3, - "x": 0, - "y": 10 - }, - "id": 57, - "interval": null, - "links": [], - "maxDataPoints": 100, - "options": { - "colorMode": "value", - "graphMode": "none", - "justifyMode": "auto", - "orientation": "auto", - "reduceOptions": { - "calcs": [ - "last" - ], - "fields": "", - "values": false - }, - "textMode": "auto" - }, - "pluginVersion": "7.2.0", - "targets": [ - { - "expr": "", - "format": "table", - "hide": false, - "instant": false, - "interval": "", - "intervalFactor": 1, - "legendFormat": "", - "metric": "process_start_time_seconds", - "refId": "A", - "step": 60 - } - ], - "timeFrom": null, - "timeShift": null, - "title": "Total Offline Servers", - "type": "stat" - }, { "cacheTimeout": null, "datasource": "${DS_PROMETHEUS}", @@ -1671,20 +1591,6 @@ "alignLevel": null } }, - { - "collapsed": false, - "datasource": "${DS_PROMETHEUS}", - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 28 - }, - "id": 36, - "panels": [], - "title": "Disks", - "type": "row" - }, { "aliasColors": { "10.13.1.25:9000 DELETE": "red", @@ -1707,9 +1613,9 @@ "fillGradient": 0, "gridPos": { "h": 8, - "w": 12, + "w": 24, "x": 0, - "y": 29 + "y": 28 }, "hiddenSeries": false, "id": 17, @@ -1800,6 +1706,20 @@ "alignLevel": null } }, + { + "collapsed": false, + "datasource": "${DS_PROMETHEUS}", + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 36 + }, + "id": 36, + "panels": [], + "title": "Disks", + "type": "row" + }, { "aliasColors": { "Offline 10.13.1.25:9000": "dark-red", @@ -1821,10 +1741,10 @@ "fill": 1, "fillGradient": 0, "gridPos": { - "h": 8, + "h": 9, "w": 12, - "x": 12, - "y": 29 + "x": 0, + "y": 37 }, "hiddenSeries": false, "id": 11, @@ -1931,9 +1851,9 @@ "fill": 1, "fillGradient": 0, "gridPos": { - "h": 8, - "w": 24, - "x": 0, + "h": 9, + "w": 12, + "x": 12, "y": 37 }, "hiddenSeries": false, @@ -2055,7 +1975,7 @@ "hide": 0, "includeAll": true, "label": "Drive", - "multi": false, + "multi": true, "name": "disk", "options": [], "query": "label_values(disk_storage_total,disk)", @@ -2072,7 +1992,7 @@ ] }, "time": { - "from": "now-1h", + "from": "now-15m", "to": "now" }, "timepicker": { @@ -2100,7 +2020,7 @@ ] }, "timezone": "", - "title": "MinIO Dashboard", + "title": "MinIO Overview", "uid": "pJnnS4hZz", - "version": 176 + "version": 190 } \ No newline at end of file