From: Paul Cuzner Date: Thu, 27 Sep 2018 23:44:22 +0000 (+1200) Subject: Refresh of the dashboards X-Git-Tag: v14.1.0~1150^2~10 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b84f0ce45f7b6be613ffda62af003a3c98e0fcf3;p=ceph.git Refresh of the dashboards Fixes some minor anomalies and tested against node_exporter 0.15 and 0.16 Signed-off-by: Paul Cuzner --- diff --git a/monitoring/grafana/dashboards/cephfs-overview.json b/monitoring/grafana/dashboards/cephfs-overview.json index 42fa86a7f287..9c71d3822be5 100644 --- a/monitoring/grafana/dashboards/cephfs-overview.json +++ b/monitoring/grafana/dashboards/cephfs-overview.json @@ -1,14 +1,4 @@ { - "__inputs": [ - { - "name": "DS_LOCAL", - "label": "Local", - "description": "", - "type": "datasource", - "pluginId": "prometheus", - "pluginName": "Prometheus" - } - ], "__requires": [ { "type": "grafana", @@ -21,12 +11,6 @@ "id": "graph", "name": "Graph", "version": "5.0.0" - }, - { - "type": "datasource", - "id": "prometheus", - "name": "Prometheus", - "version": "5.0.0" } ], "annotations": { @@ -42,7 +26,7 @@ } ] }, - "editable": true, + "editable": false, "gnetId": null, "graphTooltip": 0, "id": null, @@ -67,7 +51,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_LOCAL}", + "datasource": null, "fill": 1, "gridPos": { "h": 9, @@ -154,7 +138,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_LOCAL}", + "datasource": null, "fill": 1, "gridPos": { "h": 9, @@ -239,7 +223,7 @@ { "allValue": null, "current": {}, - "datasource": "${DS_LOCAL}", + "datasource": null, "hide": 0, "includeAll": true, "label": "MDS Server", @@ -292,4 +276,4 @@ "title": "MDS Performance", "uid": "rRfFzWtik", "version": 2 -} \ No newline at end of file +} diff --git a/monitoring/grafana/dashboards/host-details.json b/monitoring/grafana/dashboards/host-details.json index edb32b0931ee..7ac1bdc1a88b 100644 --- a/monitoring/grafana/dashboards/host-details.json +++ b/monitoring/grafana/dashboards/host-details.json @@ -1,14 +1,4 @@ { - "__inputs": [ - { - "name": "DS_LOCAL", - "label": "Local", - "description": "", - "type": "datasource", - "pluginId": "prometheus", - "pluginName": "Prometheus" - } - ], "__requires": [ { "type": "grafana", @@ -22,12 +12,6 @@ "name": "Graph", "version": "5.0.0" }, - { - "type": "datasource", - "id": "prometheus", - "name": "Prometheus", - "version": "5.0.0" - }, { "type": "panel", "id": "singlestat", @@ -52,7 +36,7 @@ "gnetId": null, "graphTooltip": 0, "id": null, - "iteration": 1534803407384, + "iteration": 1538021829737, "links": [ { "asDropdown": true, @@ -85,7 +69,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)" ], - "datasource": "${DS_LOCAL}", + "datasource": null, "format": "none", "gauge": { "maxValue": 100, @@ -171,7 +155,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_LOCAL}", + "datasource": null, "description": "Shows the CPU breakdown. When multiple servers are selected, only the first host's cpu data is shown", "fill": 3, "gridPos": { @@ -195,7 +179,7 @@ "linewidth": 1, "links": [], "minSpan": 12, - "nullPointMode": "connected", + "nullPointMode": "null", "percentage": false, "pointradius": 5, "points": false, @@ -207,7 +191,7 @@ "steppedLine": false, "targets": [ { - "expr": "sum by (mode) (\n irate(node_cpu{instance=~\"($ceph_hosts).*\", mode=~\"(irq|nice|softirq|steal|system|user|iowait)\"}[5m])\n) / scalar(\n sum(irate(node_cpu{instance=~\"($ceph_hosts).*\"}[5m]))\n) * 100", + "expr": "sum by (mode) (\n irate(node_cpu{instance=~\"($ceph_hosts).*\", mode=~\"(irq|nice|softirq|steal|system|user|iowait)\"}[1m]) or\n irate(node_cpu_seconds_total{instance=~\"($ceph_hosts).*\", mode=~\"(irq|nice|softirq|steal|system|user|iowait)\"}[1m])\n) / scalar(\n sum(irate(node_cpu{instance=~\"($ceph_hosts).*\"}[1m]) or\n irate(node_cpu_seconds_total{instance=~\"($ceph_hosts).*\"}[1m]))\n) * 100", "format": "time_series", "intervalFactor": 2, "legendFormat": "{{mode}}", @@ -264,7 +248,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_LOCAL}", + "datasource": null, "fill": 1, "gridPos": { "h": 10, @@ -304,28 +288,30 @@ "steppedLine": false, "targets": [ { - "expr": "node_memory_MemTotal{instance=~\"[[ceph_hosts]].*\"} - (\n node_memory_MemFree{instance=~\"[[ceph_hosts]].*\"} + \n node_memory_Cached{instance=~\"[[ceph_hosts]].*\"} + \n node_memory_Buffers{instance=~\"[[ceph_hosts]].*\"} +\n node_memory_Slab{instance=~\"[[ceph_hosts]].*\"}\n )\n \n", + "expr": "(node_memory_MemTotal{instance=~\"[[ceph_hosts]].*\"} or node_memory_MemTotal_bytes{instance=~\"[[ceph_hosts]].*\"})- (\n (node_memory_MemFree{instance=~\"[[ceph_hosts]].*\"} or node_memory_MemFree_bytes{instance=~\"[[ceph_hosts]].*\"}) + \n (node_memory_Cached{instance=~\"[[ceph_hosts]].*\"} or node_memory_Cached_bytes{instance=~\"[[ceph_hosts]].*\"}) + \n (node_memory_Buffers{instance=~\"[[ceph_hosts]].*\"} or node_memory_Buffers_bytes{instance=~\"[[ceph_hosts]].*\"}) +\n (node_memory_Slab{instance=~\"[[ceph_hosts]].*\"} or node_memory_Slab_bytes{instance=~\"[[ceph_hosts]].*\"})\n )\n \n", "format": "time_series", "intervalFactor": 1, "legendFormat": "used", "refId": "D" }, { - "expr": "node_memory_MemFree{instance=~\"[[ceph_hosts]].*\"} ", + "expr": "node_memory_MemFree{instance=~\"[[ceph_hosts]].*\"} or node_memory_MemFree_bytes{instance=~\"[[ceph_hosts]].*\"} ", "format": "time_series", + "hide": false, "intervalFactor": 1, "legendFormat": "Free", "refId": "A" }, { - "expr": "node_memory_Cached{instance=~\"[[ceph_hosts]].*\"} + \nnode_memory_Buffers{instance=~\"[[ceph_hosts]].*\"} +\nnode_memory_Slab{instance=~\"[[ceph_hosts]].*\"} \n", + "expr": "(node_memory_Cached{instance=~\"[[ceph_hosts]].*\"} or node_memory_Cached_bytes{instance=~\"[[ceph_hosts]].*\"}) + \n(node_memory_Buffers{instance=~\"[[ceph_hosts]].*\"} or node_memory_Buffers_bytes{instance=~\"[[ceph_hosts]].*\"}) +\n(node_memory_Slab{instance=~\"[[ceph_hosts]].*\"} or node_memory_Slab_bytes{instance=~\"[[ceph_hosts]].*\"}) \n", "format": "time_series", + "hide": false, "intervalFactor": 1, "legendFormat": "buffers/cache", "refId": "C" }, { - "expr": "node_memory_MemTotal{instance=~\"[[ceph_hosts]].*\"}", + "expr": "node_memory_MemTotal{instance=~\"[[ceph_hosts]].*\"} or node_memory_MemTotal_bytes{instance=~\"[[ceph_hosts]].*\"} ", "format": "time_series", "hide": false, "intervalFactor": 1, @@ -374,7 +360,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_LOCAL}", + "datasource": null, "description": "Show the network load (rx,tx) across all interfaces (excluding loopback 'lo')", "fill": 1, "gridPos": { @@ -400,7 +386,7 @@ "linewidth": 1, "links": [], "minSpan": 12, - "nullPointMode": "connected", + "nullPointMode": "null", "percentage": false, "pointradius": 5, "points": false, @@ -411,18 +397,18 @@ "steppedLine": false, "targets": [ { - "expr": "sum by (device) (irate(node_network_receive_bytes{instance=~\"($ceph_hosts).*\",device!=\"lo\"}[5m]))", + "expr": "sum by (device) (\n irate(node_network_receive_bytes{instance=~\"($ceph_hosts).*\",device!=\"lo\"}[1m]) or \n irate(node_network_receive_bytes_total{instance=~\"($ceph_hosts).*\",device!=\"lo\"}[1m])\n)", "format": "time_series", - "intervalFactor": 2, + "intervalFactor": 1, "legendFormat": "{{device}}.rx", "refId": "A", "step": 10, "textEditor": true }, { - "expr": "sum by (device) (irate(node_network_transmit_bytes{instance=~\"($ceph_hosts).*\",device!=\"lo\"}[5m]))", + "expr": "sum by (device) (\n irate(node_network_transmit_bytes{instance=~\"($ceph_hosts).*\",device!=\"lo\"}[1m]) or\n irate(node_network_transmit_bytes_total{instance=~\"($ceph_hosts).*\",device!=\"lo\"}[1m])\n)", "format": "time_series", - "intervalFactor": 2, + "intervalFactor": 1, "legendFormat": "{{device}}.tx", "refId": "B", "step": 10 @@ -469,7 +455,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_LOCAL}", + "datasource": null, "fill": 1, "gridPos": { "h": 5, @@ -502,7 +488,7 @@ "steppedLine": false, "targets": [ { - "expr": "irate(node_network_transmit_drop{instance=~\"[[ceph_hosts]].*\"}[1m]) + \nirate(node_network_receive_drop{instance=~\"[[ceph_hosts]].*\"}[1m])", + "expr": "irate(node_network_transmit_drop{instance=~\"[[ceph_hosts]].*\"}[1m]) or irate(node_network_transmit_drop_total{instance=~\"[[ceph_hosts]].*\"}[1m]) + \nirate(node_network_receive_drop{instance=~\"[[ceph_hosts]].*\"}[1m]) or irate(node_network_receive_drop_total{instance=~\"[[ceph_hosts]].*\"}[1m])", "format": "time_series", "instant": false, "intervalFactor": 1, @@ -555,7 +541,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)" ], - "datasource": "${DS_LOCAL}", + "datasource": null, "decimals": 0, "description": "Each OSD consists of a Journal/WAL partition and a data partition. The RAW Capacity shown is the sum of the data partitions across all OSDs on the selected OSD hosts.", "format": "bytes", @@ -637,7 +623,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_LOCAL}", + "datasource": null, "fill": 1, "gridPos": { "h": 5, @@ -670,7 +656,7 @@ "steppedLine": false, "targets": [ { - "expr": "irate(node_network_transmit_errs{instance=~\"[[ceph_hosts]].*\"}[1m]) + \nirate(node_network_receive_errs{instance=~\"[[ceph_hosts]].*\"}[1m])", + "expr": "irate(node_network_transmit_errs{instance=~\"[[ceph_hosts]].*\"}[1m]) or irate(node_network_transmit_errs_total{instance=~\"[[ceph_hosts]].*\"}[1m])+ \nirate(node_network_receive_errs{instance=~\"[[ceph_hosts]].*\"}[1m]) or irate(node_network_receive_errs_total{instance=~\"[[ceph_hosts]].*\"}[1m])", "format": "time_series", "instant": false, "intervalFactor": 1, @@ -763,7 +749,7 @@ "steppedLine": false, "targets": [ { - "expr": "(\n ((irate(node_disk_reads_completed{instance=~\"($ceph_hosts).*\"}[5m]) + (irate(node_disk_writes_completed{instance=~\"($ceph_hosts).*\"}[5m])))\n * on(instance, device) group_left(osd_id) label_replace(ceph_disk_occupation, \"osd_id\",\"$1\",\"ceph_daemon\",\"osd.(.*)\")) \n)", + "expr": "((irate(node_disk_reads_completed{instance=~\"($ceph_hosts).*\"}[5m]) or irate(node_disk_reads_completed_total{instance=~\"($ceph_hosts).*\"}[5m]) ) + \n(irate(node_disk_writes_completed{instance=~\"($ceph_hosts).*\"}[5m]) or irate(node_disk_writes_completed_total{instance=~\"($ceph_hosts).*\"}[5m]))) *\non(instance, device) group_left(osd_id) label_replace(ceph_disk_occupation, \"osd_id\",\"$1\",\"ceph_daemon\",\"osd.(.*)\") ", "format": "time_series", "intervalFactor": 1, "legendFormat": "{{device}}({{osd_id}})", @@ -847,12 +833,12 @@ "steppedLine": false, "targets": [ { - "expr": "(\n irate(node_disk_io_time_ms[5m]) * on(instance, device) group_left(osd_id) label_replace(ceph_disk_occupation{instance=~\"($ceph_hosts).*\"}, \"osd_id\",\"$1\",\"ceph_daemon\",\"osd.(.*)\")\n) / 10", + "expr": "(\n (irate(node_disk_io_time_ms[5m]) / 10 ) or\n irate(node_disk_io_time_seconds_total[5m]) * 100)\n* on(instance, device) group_left(osd_id) label_replace(ceph_disk_occupation{instance=~\"($ceph_hosts).*\"}, \"osd_id\",\"$1\",\"ceph_daemon\",\"osd.(.*)\")\n", "format": "time_series", "hide": false, "intervalFactor": 1, "legendFormat": "{{device}}({{osd_id}})", - "refId": "B", + "refId": "C", "step": 10, "textEditor": true } @@ -932,14 +918,12 @@ "steppedLine": false, "targets": [ { - "expr": "max by(instance,device) (\n (irate(node_disk_write_time_ms{ instance=~\"($ceph_hosts).*\"}[5m]) )\n /\n clamp_min(irate(node_disk_writes_completed{ instance=~\"($ceph_hosts).*\"}[5m]), 0.001) or \n (irate(node_disk_read_time_ms{ instance=~\"($ceph_hosts).*\"}[5m]) )\n /\n clamp_min(irate(node_disk_reads_completed{ instance=~\"($ceph_hosts).*\"}[5m]), 0.001)\n ) * on(instance,device) group_left(osd_id) label_replace(ceph_disk_occupation,\"osd_id\",\"$1\",\"ceph_daemon\",\"osd.(.*)\")", + "expr": "max by(instance,device) (((\n (irate(node_disk_write_time_ms{ instance=~\"($ceph_hosts).*\"}[5m]) )\n / clamp_min(irate(node_disk_writes_completed{ instance=~\"($ceph_hosts).*\"}[5m]), 0.001) or \n (irate(node_disk_read_time_ms{ instance=~\"($ceph_hosts).*\"}[5m]) )\n / clamp_min(irate(node_disk_reads_completed{ instance=~\"($ceph_hosts).*\"}[5m]), 0.001)\n ) / 1000) or\n (irate(node_disk_write_time_seconds_total{ instance=~\"($ceph_hosts).*\"}[5m]) )\n / clamp_min(irate(node_disk_writes_completed_total{ instance=~\"($ceph_hosts).*\"}[5m]), 0.001) or \n (irate(node_disk_read_time_seconds_total{ instance=~\"($ceph_hosts).*\"}[5m]) )\n / clamp_min(irate(node_disk_reads_completed_total{ instance=~\"($ceph_hosts).*\"}[5m]), 0.001)\n ) *\n on(instance,device) group_left(osd_id) label_replace(ceph_disk_occupation,\"osd_id\",\"$1\",\"ceph_daemon\",\"osd.(.*)\")", "format": "time_series", "hide": false, "intervalFactor": 1, "legendFormat": "{{device}}({{osd_id}})", - "refId": "A", - "step": 10, - "textEditor": true + "refId": "D" } ], "thresholds": [], @@ -961,7 +945,7 @@ }, "yaxes": [ { - "format": "ms", + "format": "s", "label": "", "logBase": 1, "max": null, @@ -1017,7 +1001,7 @@ "steppedLine": false, "targets": [ { - "expr": " (irate(node_disk_bytes_read{instance=~\"($ceph_hosts).*\"}[5m]) + \n irate(node_disk_bytes_written{instance=~\"($ceph_hosts).*\"}[5m])) * on(instance,device) group_left(osd_id) label_replace(ceph_disk_occupation,\"osd_id\",\"$1\",\"ceph_daemon\",\"osd.(.*)\")", + "expr": " ((irate(node_disk_bytes_read{instance=~\"($ceph_hosts).*\"}[5m]) or irate(node_disk_read_bytes_total{instance=~\"($ceph_hosts).*\"}[5m])) + \n (irate(node_disk_bytes_written{instance=~\"($ceph_hosts).*\"}[5m]) or irate(node_disk_written_bytes_total{instance=~\"($ceph_hosts).*\"}[5m]))\n ) * \n on(instance,device) group_left(osd_id) label_replace(ceph_disk_occupation,\"osd_id\",\"$1\",\"ceph_daemon\",\"osd.(.*)\")", "format": "time_series", "interval": "", "intervalFactor": 1, @@ -1080,14 +1064,14 @@ { "allValue": null, "current": {}, - "datasource": "${DS_LOCAL}", + "datasource": null, "hide": 0, "includeAll": false, "label": "Hostname", "multi": false, "name": "ceph_hosts", "options": [], - "query": "label_values(node_cpu, instance) ", + "query": "label_values(node_scrape_collector_success, instance) ", "refresh": 1, "regex": "([^.]*).*", "sort": 3, @@ -1131,5 +1115,5 @@ "timezone": "browser", "title": "Host Details", "uid": "7IGu2Ttmz", - "version": 9 -} \ No newline at end of file + "version": 11 +} diff --git a/monitoring/grafana/dashboards/osd-device-details.json b/monitoring/grafana/dashboards/osd-device-details.json index f288883214e0..a02d9c4a4080 100644 --- a/monitoring/grafana/dashboards/osd-device-details.json +++ b/monitoring/grafana/dashboards/osd-device-details.json @@ -1,14 +1,4 @@ { - "__inputs": [ - { - "name": "DS_LOCAL", - "label": "Local", - "description": "", - "type": "datasource", - "pluginId": "prometheus", - "pluginName": "Prometheus" - } - ], "__requires": [ { "type": "grafana", @@ -21,12 +11,6 @@ "id": "graph", "name": "Graph", "version": "5.0.0" - }, - { - "type": "datasource", - "id": "prometheus", - "name": "Prometheus", - "version": "5.0.0" } ], "annotations": { @@ -42,7 +26,7 @@ } ] }, - "editable": true, + "editable": false, "gnetId": null, "graphTooltip": 0, "id": null, @@ -67,7 +51,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_LOCAL}", + "datasource": null, "fill": 1, "gridPos": { "h": 9, @@ -154,7 +138,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_LOCAL}", + "datasource": null, "fill": 1, "gridPos": { "h": 9, @@ -241,7 +225,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_LOCAL}", + "datasource": null, "fill": 1, "gridPos": { "h": 9, @@ -341,7 +325,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_LOCAL}", + "datasource": null, "fill": 1, "gridPos": { "h": 9, @@ -428,7 +412,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_LOCAL}", + "datasource": null, "fill": 1, "gridPos": { "h": 9, @@ -515,7 +499,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_LOCAL}", + "datasource": null, "fill": 1, "gridPos": { "h": 9, @@ -602,7 +586,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_LOCAL}", + "datasource": null, "fill": 1, "gridPos": { "h": 9, @@ -686,7 +670,7 @@ { "allValue": null, "current": {}, - "datasource": "${DS_LOCAL}", + "datasource": null, "hide": 0, "includeAll": false, "label": "OSD Id", @@ -738,4 +722,4 @@ "title": "OSD device details", "uid": "MKj_9ipiz", "version": 3 -} \ No newline at end of file +} diff --git a/monitoring/grafana/dashboards/pool-detail.json b/monitoring/grafana/dashboards/pool-detail.json index 968926532598..2fd34169a532 100644 --- a/monitoring/grafana/dashboards/pool-detail.json +++ b/monitoring/grafana/dashboards/pool-detail.json @@ -1,14 +1,4 @@ { - "__inputs": [ - { - "name": "DS_LOCAL", - "label": "Local", - "description": "", - "type": "datasource", - "pluginId": "prometheus", - "pluginName": "Prometheus" - } - ], "__requires": [ { "type": "grafana", @@ -22,12 +12,6 @@ "name": "Graph", "version": "5.0.0" }, - { - "type": "datasource", - "id": "prometheus", - "name": "Prometheus", - "version": "5.0.0" - }, { "type": "panel", "id": "text", @@ -48,7 +32,7 @@ } ] }, - "editable": true, + "editable": false, "gnetId": null, "graphTooltip": 0, "id": null, @@ -77,7 +61,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_LOCAL}", + "datasource": null, "fill": 1, "gridPos": { "h": 7, @@ -168,7 +152,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_LOCAL}", + "datasource": null, "fill": 1, "gridPos": { "h": 7, @@ -250,21 +234,6 @@ "show": false } ] - }, - { - "content": "\n", - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 8 - }, - "id": 18, - "links": [], - "mode": "html", - "title": "", - "transparent": true, - "type": "text" } ], "refresh": "15s", @@ -276,7 +245,7 @@ { "allValue": null, "current": {}, - "datasource": "${DS_LOCAL}", + "datasource": null, "hide": 2, "includeAll": true, "label": null, @@ -296,7 +265,7 @@ { "allValue": null, "current": {}, - "datasource": "${DS_LOCAL}", + "datasource": null, "hide": 0, "includeAll": false, "label": "Pool Name", @@ -349,4 +318,4 @@ "title": "Ceph Pool Detail", "uid": "8ypfkWpik", "version": 11 -} \ No newline at end of file +} diff --git a/monitoring/grafana/dashboards/pool-overview.json b/monitoring/grafana/dashboards/pool-overview.json index 1484e9d047b0..099bb731b870 100644 --- a/monitoring/grafana/dashboards/pool-overview.json +++ b/monitoring/grafana/dashboards/pool-overview.json @@ -1,14 +1,4 @@ { - "__inputs": [ - { - "name": "DS_LOCAL", - "label": "Local", - "description": "", - "type": "datasource", - "pluginId": "prometheus", - "pluginName": "Prometheus" - } - ], "__requires": [ { "type": "grafana", @@ -22,12 +12,6 @@ "name": "Graph", "version": "5.0.0" }, - { - "type": "datasource", - "id": "prometheus", - "name": "Prometheus", - "version": "5.0.0" - }, { "type": "panel", "id": "table", @@ -48,7 +32,7 @@ } ] }, - "editable": true, + "editable": false, "gnetId": null, "graphTooltip": 0, "id": null, @@ -74,7 +58,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_LOCAL}", + "datasource": null, "fill": 5, "gridPos": { "h": 7, @@ -156,7 +140,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_LOCAL}", + "datasource": null, "fill": 5, "gridPos": { "h": 7, @@ -254,7 +238,7 @@ "value": "current" } ], - "datasource": "${DS_LOCAL}", + "datasource": null, "fontSize": "100%", "gridPos": { "h": 7, @@ -400,7 +384,7 @@ "value": "current" } ], - "datasource": "${DS_LOCAL}", + "datasource": null, "fontSize": "100%", "gridPos": { "h": 7, @@ -532,7 +516,7 @@ }, { "columns": [], - "datasource": "${DS_LOCAL}", + "datasource": null, "fontSize": "100%", "gridPos": { "h": 7, @@ -670,7 +654,7 @@ { "allValue": null, "current": {}, - "datasource": "${DS_LOCAL}", + "datasource": null, "hide": 2, "includeAll": true, "label": null, @@ -690,7 +674,7 @@ { "allValue": null, "current": {}, - "datasource": "${DS_LOCAL}", + "datasource": null, "hide": 2, "includeAll": true, "label": "Pool Name", @@ -743,4 +727,4 @@ "title": "Ceph Pools Overview", "uid": "z99hzWtmk", "version": 3 -} \ No newline at end of file +} diff --git a/monitoring/grafana/dashboards/radosgw-detail.json b/monitoring/grafana/dashboards/radosgw-detail.json index 59d9ee2d7308..b3dbd8a2706c 100644 --- a/monitoring/grafana/dashboards/radosgw-detail.json +++ b/monitoring/grafana/dashboards/radosgw-detail.json @@ -1,14 +1,4 @@ { - "__inputs": [ - { - "name": "DS_LOCAL", - "label": "Local", - "description": "", - "type": "datasource", - "pluginId": "prometheus", - "pluginName": "Prometheus" - } - ], "__requires": [ { "type": "grafana", @@ -27,12 +17,6 @@ "id": "graph", "name": "Graph", "version": "5.0.0" - }, - { - "type": "datasource", - "id": "prometheus", - "name": "Prometheus", - "version": "5.0.0" } ], "annotations": { @@ -48,7 +32,7 @@ } ] }, - "editable": true, + "editable": false, "gnetId": null, "graphTooltip": 0, "id": null, @@ -74,7 +58,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_LOCAL}", + "datasource": null, "fill": 1, "gridPos": { "h": 8, @@ -161,7 +145,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_LOCAL}", + "datasource": null, "fill": 1, "gridPos": { "h": 8, @@ -255,7 +239,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_LOCAL}", + "datasource": null, "fill": 1, "gridPos": { "h": 8, @@ -364,7 +348,7 @@ "label": "Others", "threshold": 0 }, - "datasource": "${DS_LOCAL}", + "datasource": null, "fontSize": "80%", "format": "none", "gridPos": { @@ -431,7 +415,7 @@ { "allValue": null, "current": {}, - "datasource": "${DS_LOCAL}", + "datasource": null, "hide": 0, "includeAll": true, "label": null, @@ -484,4 +468,4 @@ "title": "RGW Instance Detail", "uid": "x5ARzZtmk", "version": 2 -} \ No newline at end of file +} diff --git a/monitoring/grafana/dashboards/radosgw-overview.json b/monitoring/grafana/dashboards/radosgw-overview.json index 3213d7197ed0..64f3e13c8fa3 100644 --- a/monitoring/grafana/dashboards/radosgw-overview.json +++ b/monitoring/grafana/dashboards/radosgw-overview.json @@ -1,14 +1,4 @@ { - "__inputs": [ - { - "name": "DS_LOCAL", - "label": "Local", - "description": "", - "type": "datasource", - "pluginId": "prometheus", - "pluginName": "Prometheus" - } - ], "__requires": [ { "type": "grafana", @@ -21,12 +11,6 @@ "id": "graph", "name": "Graph", "version": "5.0.0" - }, - { - "type": "datasource", - "id": "prometheus", - "name": "Prometheus", - "version": "5.0.0" } ], "annotations": { @@ -42,7 +26,7 @@ } ] }, - "editable": true, + "editable": false, "gnetId": null, "graphTooltip": 0, "id": null, @@ -67,7 +51,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_LOCAL}", + "datasource": null, "fill": 1, "gridPos": { "h": 7, @@ -154,7 +138,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_LOCAL}", + "datasource": null, "fill": 1, "gridPos": { "h": 7, @@ -235,7 +219,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_LOCAL}", + "datasource": null, "description": "Latencies are shown stacked, without a yaxis to provide a visual indication of GET latency imbalance across RGW hosts", "fill": 1, "gridPos": { @@ -317,7 +301,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_LOCAL}", + "datasource": null, "description": "Total bytes transferred in/out of all radosgw instances within the cluster", "fill": 1, "gridPos": { @@ -405,7 +389,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_LOCAL}", + "datasource": null, "description": "Total bytes transferred in/out through get/put operations, by radosgw instance", "fill": 1, "gridPos": { @@ -486,7 +470,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_LOCAL}", + "datasource": null, "description": "Latencies are shown stacked, without a yaxis to provide a visual indication of PUT latency imbalance across RGW hosts", "fill": 1, "gridPos": { @@ -575,7 +559,7 @@ { "allValue": null, "current": {}, - "datasource": "${DS_LOCAL}", + "datasource": null, "hide": 2, "includeAll": true, "label": null, @@ -628,4 +612,4 @@ "title": "RGW Overview", "uid": "WAkugZpiz", "version": 2 -} \ No newline at end of file +}