From 323b4dfc7dc7175d676f6b7640bed199041d3bb2 Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Mon, 3 Aug 2020 17:06:16 +0300 Subject: [PATCH] Change ceph_pg_* to sum(ceph_pg_*) because they are per-pool --- ceph-cluster.json | 157 ++++++++++++++++++---------------------------- 1 file changed, 62 insertions(+), 95 deletions(-) diff --git a/ceph-cluster.json b/ceph-cluster.json index 3ddf8b5..90c0c47 100644 --- a/ceph-cluster.json +++ b/ceph-cluster.json @@ -1,40 +1,4 @@ { - "__inputs": [ - { - "name": "DS_PROMETHEUS", - "label": "prometheus", - "description": "", - "type": "datasource", - "pluginId": "prometheus", - "pluginName": "Prometheus" - } - ], - "__requires": [ - { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "5.3.0" - }, - { - "type": "panel", - "id": "graph", - "name": "Graph", - "version": "5.0.0" - }, - { - "type": "datasource", - "id": "prometheus", - "name": "Prometheus", - "version": "5.0.0" - }, - { - "type": "panel", - "id": "singlestat", - "name": "Singlestat", - "version": "5.0.0" - } - ], "annotations": { "list": [ { @@ -52,8 +16,8 @@ "editable": true, "gnetId": 2842, "graphTooltip": 0, - "id": null, - "iteration": 1545162803069, + "id": 2, + "iteration": 1596463360527, "links": [], "panels": [ { @@ -79,7 +43,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(245, 54, 54, 0.9)" ], - "datasource": "${DS_PROMETHEUS}", + "datasource": "prometheus", "editable": true, "error": false, "format": "none", @@ -179,7 +143,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)" ], - "datasource": "${DS_PROMETHEUS}", + "datasource": "prometheus", "editable": true, "error": false, "format": "none", @@ -265,7 +229,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)" ], - "datasource": "${DS_PROMETHEUS}", + "datasource": "prometheus", "editable": true, "error": false, "format": "none", @@ -351,7 +315,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(245, 54, 54, 0.9)" ], - "datasource": "${DS_PROMETHEUS}", + "datasource": "prometheus", "editable": true, "error": false, "format": "bytes", @@ -437,7 +401,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(245, 54, 54, 0.9)" ], - "datasource": "${DS_PROMETHEUS}", + "datasource": "prometheus", "editable": true, "error": false, "format": "bytes", @@ -523,7 +487,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(245, 54, 54, 0.9)" ], - "datasource": "${DS_PROMETHEUS}", + "datasource": "prometheus", "editable": true, "error": false, "format": "percent", @@ -623,7 +587,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)" ], - "datasource": "${DS_PROMETHEUS}", + "datasource": "prometheus", "editable": true, "error": false, "format": "none", @@ -708,7 +672,7 @@ "rgba(237, 40, 40, 0.89)", "rgba(245, 54, 54, 0.9)" ], - "datasource": "${DS_PROMETHEUS}", + "datasource": "prometheus", "editable": true, "error": false, "format": "none", @@ -793,7 +757,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)" ], - "datasource": "${DS_PROMETHEUS}", + "datasource": "prometheus", "editable": true, "error": false, "format": "none", @@ -878,7 +842,7 @@ "rgba(237, 40, 40, 0.89)", "rgba(245, 54, 54, 0.9)" ], - "datasource": "${DS_PROMETHEUS}", + "datasource": "prometheus", "editable": true, "error": false, "format": "none", @@ -963,7 +927,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(245, 54, 54, 0.9)" ], - "datasource": "${DS_PROMETHEUS}", + "datasource": "prometheus", "editable": true, "error": false, "format": "none", @@ -1048,7 +1012,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(245, 54, 54, 0.9)" ], - "datasource": "${DS_PROMETHEUS}", + "datasource": "prometheus", "editable": true, "error": false, "format": "ms", @@ -1133,7 +1097,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(245, 54, 54, 0.9)" ], - "datasource": "${DS_PROMETHEUS}", + "datasource": "prometheus", "editable": true, "error": false, "format": "ms", @@ -1218,7 +1182,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(245, 54, 54, 0.9)" ], - "datasource": "${DS_PROMETHEUS}", + "datasource": "prometheus", "editable": true, "error": false, "format": "s", @@ -1322,7 +1286,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_PROMETHEUS}", + "datasource": "prometheus", "editable": true, "error": false, "fill": 4, @@ -1447,7 +1411,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_PROMETHEUS}", + "datasource": "prometheus", "decimals": 0, "editable": true, "error": false, @@ -1558,7 +1522,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_PROMETHEUS}", + "datasource": "prometheus", "editable": true, "error": false, "fill": 1, @@ -1681,7 +1645,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_PROMETHEUS}", + "datasource": "prometheus", "decimals": null, "fill": 1, "gridPos": { @@ -1790,7 +1754,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_PROMETHEUS}", + "datasource": "prometheus", "decimals": null, "fill": 1, "gridPos": { @@ -1895,7 +1859,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_PROMETHEUS}", + "datasource": "prometheus", "editable": true, "error": false, "fill": 1, @@ -1992,7 +1956,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_PROMETHEUS}", + "datasource": "prometheus", "editable": true, "error": false, "fill": 1, @@ -2113,7 +2077,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_PROMETHEUS}", + "datasource": "prometheus", "editable": true, "error": false, "fill": 1, @@ -2155,7 +2119,7 @@ "steppedLine": false, "targets": [ { - "expr": "ceph_pg_active{job=\"$job\"}", + "expr": "sum(ceph_pg_active{job=\"$job\"})", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -2163,7 +2127,7 @@ "refId": "M" }, { - "expr": "ceph_pg_clean{job=\"$job\"}", + "expr": "sum(ceph_pg_clean{job=\"$job\"})", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -2171,7 +2135,7 @@ "refId": "U" }, { - "expr": "ceph_pg_peering{job=\"$job\"}", + "expr": "sum(ceph_pg_peering{job=\"$job\"})", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -2179,7 +2143,7 @@ "refId": "I" }, { - "expr": "ceph_pg_degraded{job=\"$job\"}", + "expr": "sum(ceph_pg_degraded{job=\"$job\"})", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -2188,7 +2152,7 @@ "step": 300 }, { - "expr": "ceph_pg_stale{job=\"$job\"}", + "expr": "sum(ceph_pg_stale{job=\"$job\"})", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -2197,7 +2161,7 @@ "step": 300 }, { - "expr": "ceph_unclean_pgs{job=\"$job\"}", + "expr": "sum(ceph_unclean_pgs{job=\"$job\"})", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -2206,7 +2170,7 @@ "step": 300 }, { - "expr": "ceph_pg_undersized{job=\"$job\"}", + "expr": "sum(ceph_pg_undersized{job=\"$job\"})", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -2215,7 +2179,7 @@ "step": 300 }, { - "expr": "ceph_pg_incomplete{job=\"$job\"}", + "expr": "sum(ceph_pg_incomplete{job=\"$job\"})", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -2223,7 +2187,7 @@ "refId": "G" }, { - "expr": "ceph_pg_forced_backfill{job=\"$job\"}", + "expr": "sum(ceph_pg_forced_backfill{job=\"$job\"})", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -2231,7 +2195,7 @@ "refId": "H" }, { - "expr": "ceph_pg_inconsistent{job=\"$job\"}", + "expr": "sum(ceph_pg_inconsistent{job=\"$job\"})", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -2239,7 +2203,7 @@ "refId": "F" }, { - "expr": "ceph_pg_forced_recovery{job=\"$job\"}", + "expr": "sum(ceph_pg_forced_recovery{job=\"$job\"})", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -2247,7 +2211,7 @@ "refId": "J" }, { - "expr": "ceph_pg_creating{job=\"$job\"}", + "expr": "sum(ceph_pg_creating{job=\"$job\"})", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -2255,7 +2219,7 @@ "refId": "K" }, { - "expr": "ceph_pg_wait_backfill{job=\"$job\"}", + "expr": "sum(ceph_pg_wait_backfill{job=\"$job\"})", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -2263,7 +2227,7 @@ "refId": "L" }, { - "expr": "ceph_pg_deep{job=\"$job\"}", + "expr": "sum(ceph_pg_deep{job=\"$job\"})", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -2271,7 +2235,7 @@ "refId": "N" }, { - "expr": "ceph_pg_scrubbing{job=\"$job\"}", + "expr": "sum(ceph_pg_scrubbing{job=\"$job\"})", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -2279,7 +2243,7 @@ "refId": "O" }, { - "expr": "ceph_pg_recovering{job=\"$job\"}", + "expr": "sum(ceph_pg_recovering{job=\"$job\"})", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -2287,7 +2251,7 @@ "refId": "P" }, { - "expr": "ceph_pg_repair{job=\"$job\"}", + "expr": "sum(ceph_pg_repair{job=\"$job\"})", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -2295,7 +2259,7 @@ "refId": "Q" }, { - "expr": "ceph_pg_down{job=\"$job\"}", + "expr": "sum(ceph_pg_down{job=\"$job\"})", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -2303,7 +2267,7 @@ "refId": "R" }, { - "expr": "ceph_pg_peered{job=\"$job\"}", + "expr": "sum(ceph_pg_peered{job=\"$job\"})", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -2311,7 +2275,7 @@ "refId": "S" }, { - "expr": "ceph_pg_backfill{job=\"$job\"}", + "expr": "sum(ceph_pg_backfill{job=\"$job\"})", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -2319,7 +2283,7 @@ "refId": "T" }, { - "expr": "ceph_pg_remapped{job=\"$job\"}", + "expr": "sum(ceph_pg_remapped{job=\"$job\"})", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -2327,7 +2291,7 @@ "refId": "V" }, { - "expr": "ceph_pg_backfill_toofull{job=\"$job\"}", + "expr": "sum(ceph_pg_backfill_toofull{job=\"$job\"})", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -2381,7 +2345,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_PROMETHEUS}", + "datasource": "prometheus", "editable": true, "error": false, "fill": 1, @@ -2423,7 +2387,7 @@ "steppedLine": false, "targets": [ { - "expr": "ceph_pg_degraded{job=\"$job\"}", + "expr": "sum(ceph_pg_degraded{job=\"$job\"})", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -2432,7 +2396,7 @@ "step": 300 }, { - "expr": "ceph_pg_stale{job=\"$job\"}", + "expr": "sum(ceph_pg_stale{job=\"$job\"})", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -2441,7 +2405,7 @@ "step": 300 }, { - "expr": "ceph_pg_undersized{job=\"$job\"}", + "expr": "sum(ceph_pg_undersized{job=\"$job\"})", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -2496,7 +2460,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_PROMETHEUS}", + "datasource": "prometheus", "editable": true, "error": false, "fill": 1, @@ -2600,7 +2564,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_PROMETHEUS}", + "datasource": "prometheus", "decimals": 2, "editable": true, "error": false, @@ -2696,7 +2660,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_PROMETHEUS}", + "datasource": "prometheus", "decimals": 2, "editable": true, "error": false, @@ -2788,7 +2752,7 @@ } } ], - "refresh": "30s", + "refresh": false, "schemaVersion": 16, "style": "dark", "tags": [ @@ -2890,8 +2854,11 @@ }, { "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", + "current": { + "text": "ceph-prod", + "value": "ceph-prod" + }, + "datasource": "prometheus", "hide": 0, "includeAll": false, "label": "Cluster", @@ -2902,7 +2869,7 @@ "refresh": 1, "regex": "", "skipUrlSync": false, - "sort": 0, + "sort": 2, "tagValuesQuery": "", "tags": [], "tagsQuery": "", @@ -2943,5 +2910,5 @@ "timezone": "browser", "title": "Ceph - Cluster", "uid": "vwcB0Bzmk", - "version": 16 -} \ No newline at end of file + "version": 19 +}