diff --git a/ceph-cluster.json b/ceph-cluster.json index 82253c5..241597a 100644 --- a/ceph-cluster.json +++ b/ceph-cluster.json @@ -1,4 +1,40 @@ { + "__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": [ { @@ -16,8 +52,8 @@ "editable": true, "gnetId": 2842, "graphTooltip": 0, - "id": 2, - "iteration": 1596463360527, + "id": null, + "iteration": 1598134395352, "links": [], "panels": [ { @@ -43,7 +79,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(245, 54, 54, 0.9)" ], - "datasource": "prometheus", + "datasource": "${DS_PROMETHEUS}", "editable": true, "error": false, "format": "none", @@ -143,7 +179,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)" ], - "datasource": "prometheus", + "datasource": "${DS_PROMETHEUS}", "editable": true, "error": false, "format": "none", @@ -229,7 +265,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)" ], - "datasource": "prometheus", + "datasource": "${DS_PROMETHEUS}", "editable": true, "error": false, "format": "none", @@ -315,7 +351,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(245, 54, 54, 0.9)" ], - "datasource": "prometheus", + "datasource": "${DS_PROMETHEUS}", "editable": true, "error": false, "format": "bytes", @@ -401,7 +437,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(245, 54, 54, 0.9)" ], - "datasource": "prometheus", + "datasource": "${DS_PROMETHEUS}", "editable": true, "error": false, "format": "bytes", @@ -487,7 +523,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(245, 54, 54, 0.9)" ], - "datasource": "prometheus", + "datasource": "${DS_PROMETHEUS}", "editable": true, "error": false, "format": "percent", @@ -587,7 +623,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)" ], - "datasource": "prometheus", + "datasource": "${DS_PROMETHEUS}", "editable": true, "error": false, "format": "none", @@ -672,7 +708,7 @@ "rgba(237, 40, 40, 0.89)", "rgba(245, 54, 54, 0.9)" ], - "datasource": "prometheus", + "datasource": "${DS_PROMETHEUS}", "editable": true, "error": false, "format": "none", @@ -757,7 +793,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)" ], - "datasource": "prometheus", + "datasource": "${DS_PROMETHEUS}", "editable": true, "error": false, "format": "none", @@ -842,7 +878,7 @@ "rgba(237, 40, 40, 0.89)", "rgba(245, 54, 54, 0.9)" ], - "datasource": "prometheus", + "datasource": "${DS_PROMETHEUS}", "editable": true, "error": false, "format": "none", @@ -927,7 +963,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(245, 54, 54, 0.9)" ], - "datasource": "prometheus", + "datasource": "${DS_PROMETHEUS}", "editable": true, "error": false, "format": "none", @@ -1012,7 +1048,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(245, 54, 54, 0.9)" ], - "datasource": "prometheus", + "datasource": "${DS_PROMETHEUS}", "editable": true, "error": false, "format": "ms", @@ -1097,7 +1133,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(245, 54, 54, 0.9)" ], - "datasource": "prometheus", + "datasource": "${DS_PROMETHEUS}", "editable": true, "error": false, "format": "ms", @@ -1182,7 +1218,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(245, 54, 54, 0.9)" ], - "datasource": "prometheus", + "datasource": "${DS_PROMETHEUS}", "editable": true, "error": false, "format": "s", @@ -1286,7 +1322,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "prometheus", + "datasource": "${DS_PROMETHEUS}", "editable": true, "error": false, "fill": 4, @@ -1411,7 +1447,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "prometheus", + "datasource": "${DS_PROMETHEUS}", "decimals": 0, "editable": true, "error": false, @@ -1522,7 +1558,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "prometheus", + "datasource": "${DS_PROMETHEUS}", "editable": true, "error": false, "fill": 1, @@ -1645,7 +1681,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "prometheus", + "datasource": "${DS_PROMETHEUS}", "decimals": null, "fill": 1, "gridPos": { @@ -1754,7 +1790,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "prometheus", + "datasource": "${DS_PROMETHEUS}", "decimals": null, "fill": 1, "gridPos": { @@ -1859,7 +1895,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "prometheus", + "datasource": "${DS_PROMETHEUS}", "editable": true, "error": false, "fill": 1, @@ -1956,7 +1992,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "prometheus", + "datasource": "${DS_PROMETHEUS}", "editable": true, "error": false, "fill": 1, @@ -2077,7 +2113,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "prometheus", + "datasource": "${DS_PROMETHEUS}", "editable": true, "error": false, "fill": 1, @@ -2345,7 +2381,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "prometheus", + "datasource": "${DS_PROMETHEUS}", "editable": true, "error": false, "fill": 1, @@ -2460,7 +2496,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "prometheus", + "datasource": "${DS_PROMETHEUS}", "editable": true, "error": false, "fill": 1, @@ -2564,7 +2600,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "prometheus", + "datasource": "${DS_PROMETHEUS}", "decimals": 2, "editable": true, "error": false, @@ -2660,7 +2696,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "prometheus", + "datasource": "${DS_PROMETHEUS}", "decimals": 2, "editable": true, "error": false, @@ -2854,11 +2890,8 @@ }, { "allValue": null, - "current": { - "text": "ceph-prod", - "value": "ceph-prod" - }, - "datasource": "prometheus", + "current": {}, + "datasource": "${DS_PROMETHEUS}", "hide": 0, "includeAll": false, "label": "Cluster", @@ -2910,5 +2943,5 @@ "timezone": "browser", "title": "Ceph - Cluster", "uid": "vwcB0Bzmk", - "version": 19 -} + "version": 22 +} \ No newline at end of file diff --git a/ceph-pool.json b/ceph-pool.json index 991fbdc..cbb0ad6 100644 --- a/ceph-pool.json +++ b/ceph-pool.json @@ -53,7 +53,7 @@ "gnetId": 5342, "graphTooltip": 0, "id": null, - "iteration": 1545146665183, + "iteration": 1598784302961, "links": [], "panels": [ { @@ -81,7 +81,7 @@ "fill": 4, "grid": {}, "gridPos": { - "h": 7, + "h": 6, "w": 20, "x": 0, "y": 1 @@ -111,15 +111,12 @@ "renderer": "flot", "seriesOverrides": [ { - "alias": "/^Total.*$/", - "fill": 0, - "linewidth": 4, - "stack": false + "alias": "/^Avail.*$/", + "color": "#9ac48a" }, { - "alias": "/^Raw.*$/", - "color": "#BF1B00", - "fill": 0, + "alias": "/^Used.*$/", + "color": "#f2c96d", "linewidth": 4 } ], @@ -128,43 +125,23 @@ "steppedLine": false, "targets": [ { - "expr": "ceph_pool_max_avail{job=\"$job\",pool_id=\"$pool\"}", + "expr": "ceph_pool_stored{job=\"$job\"} * on(pool_id) group_left(job,name) ceph_pool_metadata{job=\"$job\",name=\"$pool\"}", "format": "time_series", "interval": "$interval", "intervalFactor": 1, - "legendFormat": "Avilable - {{ pool }}", - "metric": "ceph_pool_available_bytes", - "refId": "A", - "step": 60 - }, - { - "expr": "ceph_pool_bytes_used{job=\"$job\",pool_id=\"$pool\"}", - "format": "time_series", - "interval": "$interval", - "intervalFactor": 1, - "legendFormat": "Used - {{ pool }}", + "legendFormat": "Used - {{name}}", "metric": "ceph_pool", "refId": "B", "step": 60 }, { - "expr": "ceph_pool_bytes_used{job=\"$job\",pool_id=\"$pool\"} + ceph_pool_max_avail{job=\"$job\",pool_id=\"$pool\"}", + "expr": "ceph_pool_max_avail{job=\"$job\"} * on(pool_id) group_left(job,name) ceph_pool_metadata{job=\"$job\",name=\"$pool\"}", "format": "time_series", "interval": "$interval", "intervalFactor": 1, - "legendFormat": "Total - {{ pool }}", - "metric": "ceph_pool", - "refId": "C", - "step": 60 - }, - { - "expr": "ceph_pool_raw_bytes_used{job=\"$job\",pool_id=\"$pool\"}", - "format": "time_series", - "interval": "$interval", - "intervalFactor": 1, - "legendFormat": "Raw - {{ pool }}", - "metric": "ceph_pool", - "refId": "D", + "legendFormat": "Available - {{name}}", + "metric": "ceph_pool_available_bytes", + "refId": "A", "step": 60 } ], @@ -231,7 +208,7 @@ "thresholdMarkers": true }, "gridPos": { - "h": 7, + "h": 6, "w": 4, "x": 20, "y": 1 @@ -274,7 +251,7 @@ "tableColumn": "", "targets": [ { - "expr": "ceph_pool_bytes_used{job=\"$job\",pool_id=\"$pool\"} / (ceph_pool_bytes_used{job=\"$job\",pool_id=\"$pool\"} + ceph_pool_max_avail{job=\"$job\",pool_id=\"$pool\"})", + "expr": "ceph_pool_stored{job=\"$job\"} / (ceph_pool_stored{job=\"$job\"} + ceph_pool_max_avail{job=\"$job\"}) * on(pool_id) group_left(job,name) ceph_pool_metadata{job=\"$job\",name=\"$pool\"}", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -301,7 +278,7 @@ "h": 1, "w": 24, "x": 0, - "y": 8 + "y": 7 }, "id": 12, "panels": [], @@ -322,7 +299,7 @@ "h": 7, "w": 12, "x": 0, - "y": 9 + "y": 8 }, "height": "", "id": 7, @@ -350,7 +327,7 @@ "steppedLine": false, "targets": [ { - "expr": "ceph_pool_objects{job=\"$job\",pool_id=\"$pool\"}", + "expr": "ceph_pool_objects{job=\"$job\"} * on(pool_id) group_left(job,name) ceph_pool_metadata{job=\"$job\",name=\"$pool\"}", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -359,7 +336,7 @@ "step": 60 }, { - "expr": "ceph_pool_dirty{job=\"$job\",pool_id=\"$pool\"}", + "expr": "ceph_pool_dirty{job=\"$job\"} * on(pool_id) group_left(job,name) ceph_pool_metadata{job=\"$job\",name=\"$pool\"}", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -368,7 +345,7 @@ "step": 60 }, { - "expr": "ceph_pool_quota_objects{job=\"$job\",pool_id=\"$pool\"}", + "expr": "ceph_pool_quota_objects{job=\"$job\"} * on(pool_id) group_left(job,name) ceph_pool_metadata{job=\"$job\",name=\"$pool\"}", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -432,7 +409,7 @@ "h": 7, "w": 12, "x": 12, - "y": 9 + "y": 8 }, "id": 4, "interval": "$interval", @@ -457,25 +434,25 @@ "renderer": "flot", "seriesOverrides": [], "spaceLength": 10, - "stack": true, + "stack": false, "steppedLine": false, "targets": [ { - "expr": "irate(ceph_pool_rd{job=\"$job\",pool_id=\"$pool\"}[1m])", + "expr": "irate(ceph_pool_rd{job=\"$job\"}[1m]) * on(pool_id) group_left(job,name) ceph_pool_metadata{job=\"$job\",name=\"$pool\"}", "format": "time_series", "instant": false, "interval": "$interval", "intervalFactor": 1, - "legendFormat": "Read - {{ pool }}", + "legendFormat": "Read - {{name}}", "refId": "B", "step": 60 }, { - "expr": "irate(ceph_pool_wr{job=\"$job\",pool_id=\"$pool\"}[1m])", + "expr": "irate(ceph_pool_wr{job=\"$job\"}[1m]) * on(pool_id) group_left(job,name) ceph_pool_metadata{job=\"$job\",name=\"$pool\"}", "format": "time_series", "interval": "$interval", "intervalFactor": 1, - "legendFormat": "Write - {{ pool }}", + "legendFormat": "Write - {{name}}", "refId": "A", "step": 60 } @@ -536,7 +513,7 @@ "h": 7, "w": 24, "x": 0, - "y": 16 + "y": 15 }, "id": 5, "interval": "$interval", @@ -561,24 +538,24 @@ "renderer": "flot", "seriesOverrides": [], "spaceLength": 10, - "stack": true, + "stack": false, "steppedLine": false, "targets": [ { - "expr": "irate(ceph_pool_rd_bytes{job=\"$job\",pool_id=\"$pool\"}[1m])", + "expr": "irate(ceph_pool_rd_bytes{job=\"$job\"}[1m]) * on(pool_id) group_left(job,name) ceph_pool_metadata{job=\"$job\",name=\"$pool\"}", "format": "time_series", "interval": "$interval", "intervalFactor": 1, - "legendFormat": "Read Bytes - {{ pool }}", + "legendFormat": "Read Bytes - {{name}}", "refId": "A", "step": 60 }, { - "expr": "irate(ceph_pool_wr_bytes{job=\"$job\",pool_id=\"$pool\"}[1m])", + "expr": "irate(ceph_pool_wr_bytes{job=\"$job\"}[1m]) * on(pool_id) group_left(job,name) ceph_pool_metadata{job=\"$job\",name=\"$pool\"}", "format": "time_series", "interval": "$interval", "intervalFactor": 1, - "legendFormat": "Written Bytes - {{ pool }}", + "legendFormat": "Written Bytes - {{name}}", "refId": "B", "step": 60 } @@ -751,7 +728,7 @@ "multi": false, "name": "pool", "options": [], - "query": "label_values(ceph_pool_metadata{job=\"$job\"}, pool_id)", + "query": "label_values(ceph_pool_metadata{job=\"$job\"}, name)", "refresh": 1, "regex": "", "skipUrlSync": false, @@ -796,5 +773,5 @@ "timezone": "browser", "title": "Ceph - Pools", "uid": "-gtf0Bzik", - "version": 2 + "version": 3 } \ No newline at end of file diff --git a/ceph-pool.png b/ceph-pool.png index e7ab2e8..8d989ca 100644 Binary files a/ceph-pool.png and b/ceph-pool.png differ