From d1a47be025af96a9457d72be602dc5d0f1f3e4be Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Tue, 28 Nov 2023 16:54:37 +0000 Subject: [PATCH] Fix OSD summary pie chart --- .../grafana/dashboards/ceph/ceph_osds.json | 381 ++++++++++++------ ...xes-osd-size-summary-9924ef4aac61d2b6.yaml | 4 + 2 files changed, 256 insertions(+), 129 deletions(-) create mode 100644 etc/kayobe/kolla/config/grafana/dashboards/ceph/releasenotes/notes/fixes-osd-size-summary-9924ef4aac61d2b6.yaml diff --git a/etc/kayobe/kolla/config/grafana/dashboards/ceph/ceph_osds.json b/etc/kayobe/kolla/config/grafana/dashboards/ceph/ceph_osds.json index 6c6f525a7..826701984 100644 --- a/etc/kayobe/kolla/config/grafana/dashboards/ceph/ceph_osds.json +++ b/etc/kayobe/kolla/config/grafana/dashboards/ceph/ceph_osds.json @@ -1,10 +1,47 @@ {% raw %} { + "__inputs": [], + "__elements": {}, + "__requires": [ + { + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "10.1.4" + }, + { + "type": "panel", + "id": "graph", + "name": "Graph (old)", + "version": "" + }, + { + "type": "panel", + "id": "piechart", + "name": "Pie chart", + "version": "" + }, + { + "type": "datasource", + "id": "prometheus", + "name": "Prometheus", + "version": "1.0.0" + }, + { + "type": "panel", + "id": "table-old", + "name": "Table (old)", + "version": "" + } + ], "annotations": { "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": { + "type": "datasource", + "uid": "grafana" + }, "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -14,11 +51,11 @@ ] }, "editable": true, - "gnetId": null, + "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 191, - "iteration": 1616693984817, + "id": null, "links": [], + "liveNow": false, "panels": [ { "aliasColors": { @@ -27,7 +64,15 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$datasource", + "datasource": { + "uid": "$datasource" + }, + "fieldConfig": { + "defaults": { + "links": [] + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -52,9 +97,10 @@ "links": [], "nullPointMode": "null", "options": { - "dataLinks": [] + "alertThreshold": true }, "percentage": false, + "pluginVersion": "10.1.4", "pointradius": 5, "points": false, "renderer": "flot", @@ -64,6 +110,9 @@ "steppedLine": false, "targets": [ { + "datasource": { + "uid": "$datasource" + }, "expr": "avg (irate(ceph_osd_op_r_latency_sum[5m]) / on (ceph_daemon) irate(ceph_osd_op_r_latency_count[5m]) * 1000)", "format": "time_series", "intervalFactor": 1, @@ -71,6 +120,9 @@ "refId": "A" }, { + "datasource": { + "uid": "$datasource" + }, "expr": "max (irate(ceph_osd_op_r_latency_sum[5m]) / on (ceph_daemon) irate(ceph_osd_op_r_latency_count[5m]) * 1000)", "format": "time_series", "intervalFactor": 1, @@ -78,6 +130,9 @@ "refId": "B" }, { + "datasource": { + "uid": "$datasource" + }, "expr": "quantile(0.95,\n (irate(ceph_osd_op_r_latency_sum[5m]) / on (ceph_daemon) irate(ceph_osd_op_r_latency_count[5m]) * 1000)\n)", "format": "time_series", "intervalFactor": 1, @@ -86,9 +141,7 @@ } ], "thresholds": [], - "timeFrom": null, "timeRegions": [], - "timeShift": null, "title": "OSD Read Latencies", "tooltip": { "shared": true, @@ -97,38 +150,32 @@ }, "type": "graph", "xaxis": { - "buckets": null, "mode": "time", - "name": null, "show": true, "values": [] }, "yaxes": [ { "format": "ms", - "label": null, "logBase": 1, - "max": null, "min": "0", "show": true }, { "format": "short", - "label": null, "logBase": 1, - "max": null, - "min": null, "show": false } ], "yaxis": { - "align": false, - "alignLevel": null + "align": false } }, { "columns": [], - "datasource": "$datasource", + "datasource": { + "uid": "$datasource" + }, "description": "This table shows the osd's that are delivering the 10 highest read latencies within the cluster", "fontSize": "100%", "gridPos": { @@ -139,19 +186,15 @@ }, "id": 15, "links": [], - "options": {}, - "pageSize": null, "scroll": true, "showHeader": true, "sort": { - "col": null, "desc": false }, "styles": [ { "alias": "OSD ID", "align": "auto", - "colorMode": null, "colors": [ "rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", @@ -167,7 +210,6 @@ { "alias": "Latency (ms)", "align": "auto", - "colorMode": null, "colors": [ "rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", @@ -183,7 +225,6 @@ { "alias": "", "align": "auto", - "colorMode": null, "colors": [ "rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", @@ -199,6 +240,9 @@ ], "targets": [ { + "datasource": { + "uid": "$datasource" + }, "expr": "topk(10,\n (sort(\n (irate(ceph_osd_op_r_latency_sum[5m]) / on (ceph_daemon) irate(ceph_osd_op_r_latency_count[5m]) * 1000)\n ))\n)\n\n", "format": "table", "instant": true, @@ -209,7 +253,7 @@ ], "title": "Highest READ Latencies", "transform": "table", - "type": "table" + "type": "table-old" }, { "aliasColors": { @@ -218,7 +262,15 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$datasource", + "datasource": { + "uid": "$datasource" + }, + "fieldConfig": { + "defaults": { + "links": [] + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -243,9 +295,10 @@ "links": [], "nullPointMode": "null", "options": { - "dataLinks": [] + "alertThreshold": true }, "percentage": false, + "pluginVersion": "10.1.4", "pointradius": 5, "points": false, "renderer": "flot", @@ -255,6 +308,9 @@ "steppedLine": false, "targets": [ { + "datasource": { + "uid": "$datasource" + }, "expr": "avg (rate(ceph_osd_op_w_latency_sum[10m]) / on (ceph_daemon) rate(ceph_osd_op_w_latency_count[10m]) * 1000)", "format": "time_series", "intervalFactor": 1, @@ -262,6 +318,9 @@ "refId": "A" }, { + "datasource": { + "uid": "$datasource" + }, "expr": "max (irate(ceph_osd_op_w_latency_sum[5m]) / on (ceph_daemon) irate(ceph_osd_op_w_latency_count[5m]) * 1000)", "format": "time_series", "hide": false, @@ -270,6 +329,9 @@ "refId": "B" }, { + "datasource": { + "uid": "$datasource" + }, "expr": "quantile(0.95,\n (irate(ceph_osd_op_w_latency_sum[5m]) / on (ceph_daemon) irate(ceph_osd_op_w_latency_count[5m]) * 1000)\n)", "format": "time_series", "hide": false, @@ -279,9 +341,7 @@ } ], "thresholds": [], - "timeFrom": null, "timeRegions": [], - "timeShift": null, "title": "OSD Write Latencies", "tooltip": { "shared": true, @@ -290,38 +350,32 @@ }, "type": "graph", "xaxis": { - "buckets": null, "mode": "time", - "name": null, "show": true, "values": [] }, "yaxes": [ { "format": "ms", - "label": null, "logBase": 1, - "max": null, "min": "0", "show": true }, { "format": "short", - "label": null, "logBase": 1, - "max": null, - "min": null, "show": false } ], "yaxis": { - "align": false, - "alignLevel": null + "align": false } }, { "columns": [], - "datasource": "$datasource", + "datasource": { + "uid": "$datasource" + }, "description": "This table shows the osd's that are delivering the 10 highest write latencies within the cluster", "fontSize": "100%", "gridPos": { @@ -332,19 +386,15 @@ }, "id": 16, "links": [], - "options": {}, - "pageSize": null, "scroll": true, "showHeader": true, "sort": { - "col": null, "desc": false }, "styles": [ { "alias": "OSD ID", "align": "auto", - "colorMode": null, "colors": [ "rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", @@ -360,7 +410,6 @@ { "alias": "Latency (ms)", "align": "auto", - "colorMode": null, "colors": [ "rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", @@ -376,7 +425,6 @@ { "alias": "", "align": "auto", - "colorMode": null, "colors": [ "rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", @@ -392,6 +440,9 @@ ], "targets": [ { + "datasource": { + "uid": "$datasource" + }, "expr": "topk(10,\n (sort(\n (irate(ceph_osd_op_w_latency_sum[5m]) / on (ceph_daemon) irate(ceph_osd_op_w_latency_count[5m]) * 1000)\n ))\n)\n\n", "format": "table", "instant": true, @@ -402,12 +453,13 @@ ], "title": "Highest WRITE Latencies", "transform": "table", - "type": "table" + "type": "table-old" }, { - "cacheTimeout": null, "columns": [], - "datasource": "$datasource", + "datasource": { + "uid": "$datasource" + }, "fontSize": "100%", "gridPos": { "h": 8, @@ -417,8 +469,6 @@ }, "id": 2, "links": [], - "options": {}, - "pageSize": null, "pluginVersion": "6.6.1", "showHeader": true, "sort": { @@ -436,7 +486,6 @@ { "alias": "", "align": "right", - "colorMode": null, "colors": [ "rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", @@ -451,6 +500,9 @@ ], "targets": [ { + "datasource": { + "uid": "$datasource" + }, "expr": "count by (device_class) (ceph_osd_metadata)", "format": "table", "instant": true, @@ -459,16 +511,15 @@ "refId": "A" } ], - "timeFrom": null, - "timeShift": null, "title": "OSD Types Summary", "transform": "table", - "type": "table" + "type": "table-old" }, { - "cacheTimeout": null, "columns": [], - "datasource": "$datasource", + "datasource": { + "uid": "$datasource" + }, "fontSize": "100%", "gridPos": { "h": 8, @@ -479,8 +530,6 @@ "hideTimeOverride": true, "id": 4, "links": [], - "options": {}, - "pageSize": null, "showHeader": true, "sort": { "col": 0, @@ -497,7 +546,6 @@ { "alias": "", "align": "right", - "colorMode": null, "colors": [ "rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", @@ -512,6 +560,9 @@ ], "targets": [ { + "datasource": { + "uid": "$datasource" + }, "expr": "count(ceph_bluefs_wal_total_bytes)", "format": "time_series", "instant": true, @@ -521,6 +572,9 @@ "step": 240 }, { + "datasource": { + "uid": "$datasource" + }, "expr": "count(ceph_osd_metadata) - count(ceph_bluefs_wal_total_bytes)", "format": "time_series", "instant": true, @@ -530,6 +584,9 @@ "step": 240 }, { + "datasource": { + "uid": "$datasource" + }, "expr": "absent(ceph_bluefs_wal_total_bytes)*count(ceph_osd_metadata)", "format": "time_series", "instant": true, @@ -539,18 +596,36 @@ "step": 240 } ], - "timeFrom": null, - "timeShift": null, "title": "OSD Objectstore Types", "transform": "timeseries_to_columns", - "type": "table" + "type": "table-old" }, { - "cacheTimeout": null, - "columns": [], - "datasource": "$datasource", + "datasource": { + "type": "prometheus", + "uid": "$datasource" + }, "description": "The pie chart shows the various OSD sizes used within the cluster", - "fontSize": "100%", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + } + }, + "decimals": 2, + "displayName": "", + "mappings": [], + "noValue": "0", + "unit": "short" + }, + "overrides": [] + }, "gridPos": { "h": 8, "w": 4, @@ -560,39 +635,35 @@ "hideTimeOverride": true, "id": 8, "links": [], - "options": {}, - "pageSize": null, - "showHeader": true, - "sort": { - "col": 0, - "desc": true - }, - "styles": [ - { - "alias": "Time", - "align": "auto", - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "pattern": "Time", - "type": "date" + "options": { + "displayLabels": [ + "name" + ], + "legend": { + "displayMode": "list", + "placement": "bottom", + "showLegend": true }, - { - "alias": "", - "align": "right", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" + "pieType": "pie", + "reduceOptions": { + "calcs": [ + "lastNotNull" ], - "decimals": 2, - "pattern": "/.*/", - "thresholds": [], - "type": "number", - "unit": "short" + "fields": "", + "values": true + }, + "tooltip": { + "mode": "multi", + "sort": "none" } - ], + }, + "pluginVersion": "10.1.4", "targets": [ { + "datasource": { + "uid": "$datasource" + }, + "editorMode": "code", "expr": "count(ceph_osd_stat_bytes < 1099511627776)", "format": "time_series", "instant": true, @@ -602,6 +673,10 @@ "step": 2 }, { + "datasource": { + "uid": "$datasource" + }, + "editorMode": "code", "expr": "count(ceph_osd_stat_bytes >= 1099511627776 < 2199023255552)", "format": "time_series", "instant": true, @@ -611,6 +686,10 @@ "step": 2 }, { + "datasource": { + "uid": "$datasource" + }, + "editorMode": "code", "expr": "count(ceph_osd_stat_bytes >= 2199023255552 < 3298534883328)", "format": "time_series", "instant": true, @@ -620,6 +699,10 @@ "step": 2 }, { + "datasource": { + "uid": "$datasource" + }, + "editorMode": "code", "expr": "count(ceph_osd_stat_bytes >= 3298534883328 < 4398046511104)", "format": "time_series", "instant": true, @@ -629,6 +712,10 @@ "step": 2 }, { + "datasource": { + "uid": "$datasource" + }, + "editorMode": "code", "expr": "count(ceph_osd_stat_bytes >= 4398046511104 < 6597069766656)", "format": "time_series", "instant": true, @@ -638,7 +725,11 @@ "step": 2 }, { - "expr": "count(ceph_osd_stat_bytes >= 6597069766656 < 8796093022208)", + "datasource": { + "uid": "$datasource" + }, + "editorMode": "code", + "expr": "count(ceph_osd_stat_bytes >= 6597069766656 < 8796093022208) ", "format": "time_series", "instant": true, "intervalFactor": 2, @@ -647,6 +738,10 @@ "step": 2 }, { + "datasource": { + "uid": "$datasource" + }, + "editorMode": "code", "expr": "count(ceph_osd_stat_bytes >= 8796093022208 < 10995116277760)", "format": "time_series", "instant": true, @@ -656,6 +751,10 @@ "step": 2 }, { + "datasource": { + "uid": "$datasource" + }, + "editorMode": "code", "expr": "count(ceph_osd_stat_bytes >= 10995116277760 < 13194139533312)", "format": "time_series", "instant": true, @@ -665,6 +764,10 @@ "step": 2 }, { + "datasource": { + "uid": "$datasource" + }, + "editorMode": "code", "expr": "count(ceph_osd_stat_bytes >= 13194139533312)", "format": "time_series", "instant": true, @@ -674,19 +777,25 @@ "step": 2 } ], - "timeFrom": null, - "timeShift": null, "title": "OSD Size Summary", - "transform": "timeseries_to_columns", - "type": "table" + "transformations": [], + "type": "piechart" }, { "aliasColors": {}, "bars": true, "dashLength": 10, "dashes": false, - "datasource": "$datasource", + "datasource": { + "uid": "$datasource" + }, "description": "Each bar indicates the number of OSD's that have a PG count in a specific range as shown on the x axis.", + "fieldConfig": { + "defaults": { + "links": [] + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -715,9 +824,10 @@ "links": [], "nullPointMode": "null", "options": { - "dataLinks": [] + "alertThreshold": true }, "percentage": false, + "pluginVersion": "10.1.4", "pointradius": 5, "points": false, "renderer": "flot", @@ -727,6 +837,9 @@ "steppedLine": false, "targets": [ { + "datasource": { + "uid": "$datasource" + }, "expr": "ceph_osd_numpg\n", "format": "time_series", "instant": true, @@ -736,9 +849,7 @@ } ], "thresholds": [], - "timeFrom": null, "timeRegions": [], - "timeShift": null, "title": "Distribution of PGs per OSD", "tooltip": { "shared": false, @@ -749,7 +860,6 @@ "xaxis": { "buckets": 20, "mode": "histogram", - "name": null, "show": true, "values": [ "total" @@ -761,27 +871,25 @@ "format": "short", "label": "# of OSDs", "logBase": 1, - "max": null, "min": "0", "show": true }, { "format": "short", - "label": null, "logBase": 1, - "max": null, - "min": null, "show": false } ], "yaxis": { - "align": false, - "alignLevel": null + "align": false } }, { "collapsed": false, - "datasource": null, + "datasource": { + "type": "datasource", + "uid": "grafana" + }, "gridPos": { "h": 1, "w": 24, @@ -790,6 +898,15 @@ }, "id": 20, "panels": [], + "targets": [ + { + "datasource": { + "type": "datasource", + "uid": "grafana" + }, + "refId": "A" + } + ], "title": "R/W Profile", "type": "row" }, @@ -798,8 +915,16 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$datasource", + "datasource": { + "uid": "$datasource" + }, "description": "Show the read/write workload profile overtime", + "fieldConfig": { + "defaults": { + "links": [] + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -824,9 +949,10 @@ "links": [], "nullPointMode": "null", "options": { - "dataLinks": [] + "alertThreshold": true }, "percentage": false, + "pluginVersion": "10.1.4", "pointradius": 5, "points": false, "renderer": "flot", @@ -836,6 +962,9 @@ "steppedLine": false, "targets": [ { + "datasource": { + "uid": "$datasource" + }, "expr": "round(sum(irate(ceph_pool_rd[5m])))", "format": "time_series", "intervalFactor": 1, @@ -843,6 +972,9 @@ "refId": "A" }, { + "datasource": { + "uid": "$datasource" + }, "expr": "round(sum(irate(ceph_pool_wr[5m])))", "format": "time_series", "intervalFactor": 1, @@ -851,9 +983,7 @@ } ], "thresholds": [], - "timeFrom": null, "timeRegions": [], - "timeShift": null, "title": "Read/Write Profile", "tooltip": { "shared": true, @@ -862,46 +992,38 @@ }, "type": "graph", "xaxis": { - "buckets": null, "mode": "time", - "name": null, "show": true, "values": [] }, "yaxes": [ { "format": "short", - "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 + "align": false } } ], - "refresh": false, - "schemaVersion": 22, + "refresh": "", + "schemaVersion": 38, "style": "dark", "tags": [], "templating": { "list": [ { "current": { + "selected": false, "text": "Prometheus", - "value": "Prometheus" + "value": "PBFA97CFB590B2093" }, "hide": 0, "includeAll": false, @@ -949,6 +1071,7 @@ "timezone": "", "title": "Ceph OSD Overview", "uid": "lo02I1Aiz", - "version": 9 + "version": 1, + "weekStart": "" } {% endraw %} diff --git a/etc/kayobe/kolla/config/grafana/dashboards/ceph/releasenotes/notes/fixes-osd-size-summary-9924ef4aac61d2b6.yaml b/etc/kayobe/kolla/config/grafana/dashboards/ceph/releasenotes/notes/fixes-osd-size-summary-9924ef4aac61d2b6.yaml new file mode 100644 index 000000000..d2c9fd1d3 --- /dev/null +++ b/etc/kayobe/kolla/config/grafana/dashboards/ceph/releasenotes/notes/fixes-osd-size-summary-9924ef4aac61d2b6.yaml @@ -0,0 +1,4 @@ +--- +fixes: + - | + Fix an issue with the OSD summary pie chart not showing any data.