diff --git a/ansible/install/roles/grafana-dashboards/files/cloud_ceph_monitoring.json b/ansible/install/roles/grafana-dashboards/files/cloud_ceph_monitoring.json index 788bd5528..0446928d1 100644 --- a/ansible/install/roles/grafana-dashboards/files/cloud_ceph_monitoring.json +++ b/ansible/install/roles/grafana-dashboards/files/cloud_ceph_monitoring.json @@ -385,19 +385,19 @@ "targets": [ { "refId": "A", - "target": "alias($Cloud.$Node.processes-ceph-mon.ps_disk_ops.read, 'Ceph Mon Read')" + "target": "alias($Cloud.$Node.processes-ceph-mon.io_ops.read, 'Ceph Mon Read')" }, { "refId": "B", - "target": "alias($Cloud.$Node.processes-ceph-mon.ps_disk_ops.write, 'Ceph Mon Write')" + "target": "alias($Cloud.$Node.processes-ceph-mon.io_ops.write, 'Ceph Mon Write')" }, { "refId": "C", - "target": "alias($Cloud.$Node.processes-ceph-osd.ps_disk_ops.read, 'Ceph OSD Read')" + "target": "alias($Cloud.$Node.processes-ceph-osd.io_ops.read, 'Ceph OSD Read')" }, { "refId": "D", - "target": "alias($Cloud.$Node.processes-ceph-osd.ps_disk_ops.write, 'Ceph OSD Write')" + "target": "alias($Cloud.$Node.processes-ceph-osd.io_ops.write, 'Ceph OSD Write')" } ], "thresholds": [], @@ -469,19 +469,19 @@ "targets": [ { "refId": "A", - "target": "alias($Cloud.$Node.processes-ceph-mon.ps_disk_octets.read, 'Ceph Mon Read')" + "target": "alias($Cloud.$Node.processes-ceph-mon.io_octets.rx, 'Ceph Mon Rx')" }, { "refId": "B", - "target": "alias($Cloud.$Node.processes-ceph-mon.ps_disk_octets.write, 'Ceph Mon Write')" + "target": "alias($Cloud.$Node.processes-ceph-mon.io_octets.tx, 'Ceph Mon Tx')" }, { "refId": "C", - "target": "alias($Cloud.$Node.processes-ceph-osd.ps_disk_octets.read, 'Ceph OSD Read')" + "target": "alias($Cloud.$Node.processes-ceph-osd.io_octets.rx, 'Ceph OSD Rx')" }, { "refId": "D", - "target": "alias($Cloud.$Node.processes-ceph-osd.ps_disk_octets.write, 'Ceph OSD Write')" + "target": "alias($Cloud.$Node.processes-ceph-osd.io_octets.tx, 'Ceph OSD Tx')" } ], "thresholds": [], @@ -516,6 +516,90 @@ "show": true } ] + }, + { + "aliasColors": {}, + "bars": false, + "datasource": null, + "decimals": 0, + "editable": true, + "error": false, + "fill": 0, + "grid": {}, + "id": 7, + "legend": { + "alignAsTable": true, + "avg": false, + "current": true, + "max": true, + "min": true, + "rightSide": true, + "show": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "null", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "span": 12, + "stack": false, + "steppedLine": false, + "targets": [ + { + "refId": "A", + "target": "alias($Cloud.$Node.processes-ceph-mon.disk_octets.read, 'Ceph Mon Disk Read')" + }, + { + "refId": "B", + "target": "alias($Cloud.$Node.processes-ceph-mon.disk_octets.write, 'Ceph Mon Disk Write')" + }, + { + "refId": "C", + "target": "alias($Cloud.$Node.processes-ceph-osd.disk_octets.read, 'Ceph OSD Disk Read')" + }, + { + "refId": "D", + "target": "alias($Cloud.$Node.processes-ceph-osd.disk_octets.write, 'Ceph OSD Disk Write')" + } + ], + "thresholds": [], + "timeFrom": null, + "timeShift": null, + "title": "Disk IO Throughput(Estimated via SYSCALLS)", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "cumulative" + }, + "type": "graph", + "xaxis": { + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "bytes", + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ] } ], "repeat": null, @@ -534,7 +618,7 @@ "bars": false, "datasource": null, "fill": 0, - "id": 7, + "id": 8, "legend": { "alignAsTable": true, "avg": false, @@ -608,7 +692,7 @@ "bars": false, "datasource": null, "fill": 0, - "id": 8, + "id": 9, "legend": { "alignAsTable": true, "avg": false, @@ -678,7 +762,7 @@ "bars": false, "datasource": null, "fill": 0, - "id": 9, + "id": 10, "legend": { "alignAsTable": true, "avg": false, @@ -748,7 +832,7 @@ "bars": false, "datasource": null, "fill": 0, - "id": 10, + "id": 11, "legend": { "alignAsTable": true, "avg": false, @@ -818,7 +902,7 @@ "bars": false, "datasource": null, "fill": 0, - "id": 11, + "id": 12, "legend": { "alignAsTable": true, "avg": false, @@ -900,7 +984,7 @@ "bars": false, "datasource": null, "fill": 0, - "id": 12, + "id": 13, "legend": { "alignAsTable": true, "avg": false, @@ -970,7 +1054,7 @@ "bars": false, "datasource": null, "fill": 0, - "id": 13, + "id": 14, "legend": { "alignAsTable": true, "avg": false, @@ -1044,7 +1128,7 @@ "bars": false, "datasource": null, "fill": 0, - "id": 14, + "id": 15, "legend": { "alignAsTable": true, "avg": false, @@ -1118,7 +1202,7 @@ "bars": false, "datasource": null, "fill": 0, - "id": 15, + "id": 16, "legend": { "alignAsTable": true, "avg": false, @@ -1192,7 +1276,7 @@ "bars": false, "datasource": null, "fill": 0, - "id": 16, + "id": 17, "legend": { "alignAsTable": true, "avg": false, @@ -1262,7 +1346,7 @@ "bars": false, "datasource": null, "fill": 0, - "id": 17, + "id": 18, "legend": { "alignAsTable": true, "avg": false, @@ -1336,7 +1420,7 @@ "bars": false, "datasource": null, "fill": 0, - "id": 18, + "id": 19, "legend": { "alignAsTable": true, "avg": false, @@ -1410,7 +1494,7 @@ "bars": false, "datasource": null, "fill": 0, - "id": 19, + "id": 20, "legend": { "alignAsTable": true, "avg": false, @@ -1484,7 +1568,7 @@ "bars": false, "datasource": null, "fill": 0, - "id": 20, + "id": 21, "legend": { "alignAsTable": true, "avg": false, @@ -1567,7 +1651,7 @@ "bars": false, "datasource": null, "fill": 0, - "id": 21, + "id": 22, "legend": { "alignAsTable": true, "avg": false, @@ -1657,7 +1741,7 @@ "bars": false, "datasource": null, "fill": 0, - "id": 22, + "id": 23, "legend": { "alignAsTable": true, "avg": false, @@ -1739,7 +1823,7 @@ "bars": false, "datasource": null, "fill": 0, - "id": 23, + "id": 24, "legend": { "alignAsTable": true, "avg": false, @@ -1821,7 +1905,7 @@ "bars": false, "datasource": null, "fill": 0, - "id": 24, + "id": 25, "legend": { "alignAsTable": true, "avg": false, @@ -1903,7 +1987,7 @@ "bars": false, "datasource": null, "fill": 0, - "id": 25, + "id": 26, "legend": { "alignAsTable": true, "avg": false, @@ -1985,7 +2069,7 @@ "bars": false, "datasource": null, "fill": 0, - "id": 26, + "id": 27, "legend": { "alignAsTable": true, "avg": false, @@ -2067,7 +2151,7 @@ "bars": false, "datasource": null, "fill": 0, - "id": 27, + "id": 28, "legend": { "alignAsTable": true, "avg": false, @@ -2137,7 +2221,7 @@ "bars": false, "datasource": null, "fill": 1, - "id": 28, + "id": 29, "legend": { "alignAsTable": true, "avg": false, @@ -2224,7 +2308,7 @@ "bars": false, "datasource": null, "fill": 1, - "id": 29, + "id": 30, "legend": { "alignAsTable": true, "avg": false, @@ -2294,7 +2378,7 @@ "bars": false, "datasource": null, "fill": 0, - "id": 30, + "id": 31, "legend": { "alignAsTable": true, "avg": false, @@ -2374,7 +2458,7 @@ "bars": false, "datasource": null, "fill": 0, - "id": 31, + "id": 32, "legend": { "alignAsTable": true, "avg": false, @@ -2444,7 +2528,7 @@ "bars": false, "datasource": null, "fill": 0, - "id": 32, + "id": 33, "legend": { "alignAsTable": true, "avg": false, @@ -2529,7 +2613,7 @@ "bars": false, "datasource": null, "fill": 0, - "id": 33, + "id": 34, "legend": { "alignAsTable": true, "avg": false, @@ -2599,7 +2683,7 @@ "bars": false, "datasource": null, "fill": 0, - "id": 34, + "id": 35, "legend": { "alignAsTable": true, "avg": false, @@ -2669,7 +2753,7 @@ "bars": false, "datasource": null, "fill": 0, - "id": 35, + "id": 36, "legend": { "alignAsTable": true, "avg": false, @@ -2756,7 +2840,7 @@ "bars": false, "datasource": null, "fill": 0, - "id": 36, + "id": 37, "legend": { "alignAsTable": true, "avg": false, @@ -2843,7 +2927,7 @@ "bars": false, "datasource": null, "fill": 0, - "id": 37, + "id": 38, "legend": { "alignAsTable": true, "avg": false, diff --git a/ansible/install/roles/grafana-dashboards/files/cloud_rabbitmq_monitoring.json b/ansible/install/roles/grafana-dashboards/files/cloud_rabbitmq_monitoring.json index 5036137c9..bec6a2ffa 100644 --- a/ansible/install/roles/grafana-dashboards/files/cloud_rabbitmq_monitoring.json +++ b/ansible/install/roles/grafana-dashboards/files/cloud_rabbitmq_monitoring.json @@ -354,11 +354,11 @@ "targets": [ { "refId": "A", - "target": "alias($Cloud.$Node.processes-rabbitmq.ps_disk_ops.read, 'rabbitmq Read')" + "target": "alias($Cloud.$Node.processes-rabbitmq.io_ops.read, 'rabbitmq Read')" }, { "refId": "B", - "target": "alias($Cloud.$Node.processes-rabbitmq.ps_disk_ops.write, 'rabbitmq Write')" + "target": "alias($Cloud.$Node.processes-rabbitmq.io_ops.write, 'rabbitmq Write')" } ], "thresholds": [], @@ -430,11 +430,11 @@ "targets": [ { "refId": "A", - "target": "alias($Cloud.$Node.processes-rabbitmq.ps_disk_octets.read, 'rabbitmq Read')" + "target": "alias($Cloud.$Node.processes-rabbitmq.io_octets.rx, 'rabbitmq Rx')" }, { "refId": "B", - "target": "alias($Cloud.$Node.processes-rabbitmq.ps_disk_octets.write, 'rabbitmq Write')" + "target": "alias($Cloud.$Node.processes-rabbitmq.io_octets.tx, 'rabbitmq Tx')" } ], "thresholds": [], @@ -469,6 +469,82 @@ "show": true } ] + }, + { + "aliasColors": {}, + "bars": false, + "datasource": null, + "decimals": 0, + "editable": true, + "error": false, + "fill": 0, + "grid": {}, + "id": 7, + "legend": { + "alignAsTable": true, + "avg": false, + "current": true, + "max": true, + "min": true, + "rightSide": true, + "show": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "null", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "span": 12, + "stack": false, + "steppedLine": false, + "targets": [ + { + "refId": "A", + "target": "alias($Cloud.$Node.processes-rabbitmq.disk_octets.read, 'rabbitmq Disk Read')" + }, + { + "refId": "B", + "target": "alias($Cloud.$Node.processes-rabbitmq.disk_octets.write, 'rabbitmq Disk Write')" + } + ], + "thresholds": [], + "timeFrom": null, + "timeShift": null, + "title": "Disk IO Throughput(Estimated via SYSCALLS)", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "cumulative" + }, + "type": "graph", + "xaxis": { + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "bytes", + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ] } ], "repeat": null, @@ -487,7 +563,7 @@ "bars": false, "datasource": null, "fill": 0, - "id": 7, + "id": 8, "legend": { "alignAsTable": true, "avg": false, @@ -573,7 +649,7 @@ "bars": false, "datasource": null, "fill": 0, - "id": 8, + "id": 9, "legend": { "alignAsTable": true, "avg": false, @@ -644,7 +720,7 @@ "bars": false, "datasource": null, "fill": 1, - "id": 9, + "id": 10, "legend": { "alignAsTable": true, "avg": false, @@ -715,7 +791,7 @@ "bars": false, "datasource": null, "fill": 0, - "id": 10, + "id": 11, "legend": { "alignAsTable": true, "avg": false, @@ -786,7 +862,7 @@ "bars": false, "datasource": null, "fill": 0, - "id": 11, + "id": 12, "legend": { "alignAsTable": true, "avg": false, @@ -857,7 +933,7 @@ "bars": false, "datasource": null, "fill": 0, - "id": 12, + "id": 13, "legend": { "alignAsTable": true, "avg": false, @@ -943,7 +1019,7 @@ "error": false, "fill": 1, "grid": {}, - "id": 13, + "id": 14, "legend": { "alignAsTable": true, "avg": true, @@ -1116,4 +1192,4 @@ "title": "Cloud Rabbitmq Monitoring", "version": 2 } -} +} \ No newline at end of file diff --git a/ansible/install/roles/grafana-dashboards/files/cloud_system_performance_comparsion.json b/ansible/install/roles/grafana-dashboards/files/cloud_system_performance_comparsion.json index bc9ce3ccb..ba4673b5f 100644 --- a/ansible/install/roles/grafana-dashboards/files/cloud_system_performance_comparsion.json +++ b/ansible/install/roles/grafana-dashboards/files/cloud_system_performance_comparsion.json @@ -1519,19 +1519,19 @@ "targets": [ { "refId": "A", - "target": "alias(timeShift($Cloud1.$Node1.$Node1_Process.ps_disk_ops.read, '$Node1_Timeshift'), 'Node1 - $Node1_Process - Read')" + "target": "alias(timeShift($Cloud1.$Node1.$Node1_Process.io_ops.read, '$Node1_Timeshift'), 'Node1 - $Node1_Process - Read')" }, { "refId": "B", - "target": "alias(timeShift($Cloud1.$Node1.$Node1_Process.ps_disk_ops.write, '$Node1_Timeshift'), 'Node1 - $Node1_Process - Write')" + "target": "alias(timeShift($Cloud1.$Node1.$Node1_Process.io_ops.write, '$Node1_Timeshift'), 'Node1 - $Node1_Process - Write')" }, { "refId": "C", - "target": "alias(timeShift($Cloud2.$Node2.$Node2_Process.ps_disk_ops.read, '$Node2_Timeshift'), 'Node2 - $Node2_Process - Read')" + "target": "alias(timeShift($Cloud2.$Node2.$Node2_Process.io_ops.read, '$Node2_Timeshift'), 'Node2 - $Node2_Process - Read')" }, { "refId": "D", - "target": "alias(timeShift($Cloud2.$Node2.$Node2_Process.ps_disk_ops.write, '$Node2_Timeshift'), 'Node2 - $Node2_Process - Write')" + "target": "alias(timeShift($Cloud2.$Node2.$Node2_Process.io_ops.write, '$Node2_Timeshift'), 'Node2 - $Node2_Process - Write')" } ], "timeFrom": null, @@ -1596,19 +1596,19 @@ "targets": [ { "refId": "A", - "target": "alias(timeShift($Cloud1.$Node1.$Node1_Process.ps_disk_octets.read, '$Node1_Timeshift'), 'Node1 - $Node1_Process - Read')" + "target": "alias(timeShift($Cloud1.$Node1.$Node1_Process.io_octets.rx, '$Node1_Timeshift'), 'Node1 - $Node1_Process - Rx')" }, { "refId": "B", - "target": "alias(timeShift($Cloud1.$Node1.$Node1_Process.ps_disk_octets.write, '$Node1_Timeshift'), 'Node1 - $Node1_Process - Write')" + "target": "alias(timeShift($Cloud1.$Node1.$Node1_Process.io_octets.tx, '$Node1_Timeshift'), 'Node1 - $Node1_Process - Tx')" }, { "refId": "C", - "target": "alias(timeShift($Cloud2.$Node2.$Node2_Process.ps_disk_octets.read, '$Node2_Timeshift'), 'Node2 - $Node2_Process - Read')" + "target": "alias(timeShift($Cloud2.$Node2.$Node2_Process.io_octets.rx, '$Node2_Timeshift'), 'Node2 - $Node2_Process - Rx')" }, { "refId": "D", - "target": "alias(timeShift($Cloud2.$Node2.$Node2_Process.ps_disk_octets.write, '$Node2_Timeshift'), 'Node2 - $Node2_Process - Write')" + "target": "alias(timeShift($Cloud2.$Node2.$Node2_Process.io_octets.tx, '$Node2_Timeshift'), 'Node2 - $Node2_Process - Tx')" } ], "timeFrom": null, @@ -1625,6 +1625,83 @@ "bytes", "short" ] + }, + { + "aliasColors": {}, + "bars": false, + "datasource": null, + "editable": true, + "error": false, + "fill": 1, + "grid": { + "leftLogBase": 1, + "leftMax": null, + "leftMin": null, + "rightLogBase": 1, + "rightMax": null, + "rightMin": null, + "threshold1": null, + "threshold1Color": "rgba(216, 200, 27, 0.27)", + "threshold2": null, + "threshold2Color": "rgba(234, 112, 112, 0.22)" + }, + "id": 17, + "isNew": true, + "legend": { + "alignAsTable": true, + "avg": false, + "current": true, + "max": true, + "min": true, + "rightSide": true, + "show": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "null", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "span": 12, + "stack": false, + "steppedLine": false, + "targets": [ + { + "refId": "A", + "target": "alias(timeShift($Cloud1.$Node1.$Node1_Process.disk_octets.read, '$Node1_Timeshift'), 'Node1 - $Node1_Process - Disk Read')" + }, + { + "refId": "B", + "target": "alias(timeShift($Cloud1.$Node1.$Node1_Process.disk_octets.write, '$Node1_Timeshift'), 'Node1 - $Node1_Process - Disk Write')" + }, + { + "refId": "C", + "target": "alias(timeShift($Cloud2.$Node2.$Node2_Process.disk_octets.read, '$Node2_Timeshift'), 'Node2 - $Node2_Process - Disk Read')" + }, + { + "refId": "D", + "target": "alias(timeShift($Cloud2.$Node2.$Node2_Process.disk_octets.write, '$Node2_Timeshift'), 'Node2 - $Node2_Process - Disk Write')" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "Disk IO Throughput", + "tooltip": { + "shared": true, + "value_type": "cumulative" + }, + "type": "graph", + "x-axis": true, + "y-axis": true, + "y_formats": [ + "bytes", + "short" + ] } ], "showTitle": true, @@ -1684,8 +1761,8 @@ "name": "Node1", "options": [], "query": "$Cloud1.*", - "regex": "/^(?!stats[d]*[_counts]*$).*$/", "refresh": 2, + "regex": "/^(?!stats[d]*[_counts]*$).*$/", "type": "query" }, { diff --git a/ansible/install/roles/grafana-dashboards/files/gnocchi_performance.json b/ansible/install/roles/grafana-dashboards/files/gnocchi_performance.json index c4a906304..becde099c 100644 --- a/ansible/install/roles/grafana-dashboards/files/gnocchi_performance.json +++ b/ansible/install/roles/grafana-dashboards/files/gnocchi_performance.json @@ -9,7 +9,7 @@ "hideControls": false, "id": null, "links": [], - "refresh": "30s", + "refresh": false, "rows": [ { "collapse": false, @@ -243,15 +243,15 @@ }, { "refId": "B", - "target": "alias(scale($Cloud.overcloud-controller-0.processes-gnocchi-metricd-processing.ps_cputime.user, 0.0001), 'Con0 Metricd Processing CPU %User')" + "target": "alias(sumSeries(scale($Cloud.overcloud-controller-0.processes-gnocchi-metricd-processing.ps_cputime.*, 0.0001)), 'Con0 Metricd Processing CPU %')" }, { "refId": "C", - "target": "alias(scale($Cloud.overcloud-controller-1.processes-gnocchi-metricd-processing.ps_cputime.user, 0.0001), 'Con1 Metricd Processing CPU %User')" + "target": "alias(sumSeries(scale($Cloud.overcloud-controller-1.processes-gnocchi-metricd-processing.ps_cputime.*, 0.0001)), 'Con1 Metricd Processing CPU %')" }, { "refId": "D", - "target": "alias(scale($Cloud.overcloud-controller-2.processes-gnocchi-metricd-processing.ps_cputime.user, 0.0001), 'Con2 Metricd Processing CPU %User')" + "target": "alias(sumSeries(scale($Cloud.overcloud-controller-2.processes-gnocchi-metricd-processing.ps_cputime.*, 0.0001)), 'Con2 Metricd Processing CPU %')" } ], "thresholds": [], @@ -342,20 +342,19 @@ "targets": [ { "refId": "A", - "target": "aliasByNode(aliasSub($Cloud.overcloud-controller-0.gnocchi_status.gauge-*, 'gauge-', ''), 3)", - "textEditor": false + "target": "aliasByNode(aliasSub($Cloud.overcloud-controller-0.gnocchi_status.gauge-*, 'gauge-', ''), 3)" }, { "refId": "B", - "target": "alias($Cloud.overcloud-controller-0.processes-gnocchi-metricd.ps_rss, 'Con0 Metricd RSS')" + "target": "alias(sumSeries($Cloud.overcloud-controller-0.processes-gnocchi-metricd-*.ps_rss), 'Con0 Metricd RSS')" }, { "refId": "C", - "target": "alias($Cloud.overcloud-controller-1.processes-gnocchi-metricd.ps_rss, 'Con1 Metricd RSS')" + "target": "alias(sumSeries($Cloud.overcloud-controller-1.processes-gnocchi-metricd-*.ps_rss), 'Con1 Metricd RSS')" }, { "refId": "D", - "target": "alias($Cloud.overcloud-controller-2.processes-gnocchi-metricd.ps_rss, 'Con2 Metricd RSS')" + "target": "alias(sumSeries($Cloud.overcloud-controller-2.processes-gnocchi-metricd-*.ps_rss), 'Con2 Metricd RSS')" } ], "thresholds": [], @@ -5329,8 +5328,7 @@ "targets": [ { "refId": "A", - "target": "aliasByNode(aliasSub(aliasSub($Cloud.overcloud-controller-0.rabbitmq_monitoring.gauge-queue_total-*-count, 'gauge-queue_total-', ''), '-count', ''), 3)", - "textEditor": false + "target": "aliasByNode(aliasSub(aliasSub($Cloud.overcloud-controller-0.rabbitmq_monitoring.gauge-queue_total-*-count, 'gauge-queue_total-', ''), '-count', ''), 3)" } ], "thresholds": [], @@ -5400,8 +5398,7 @@ "targets": [ { "refId": "A", - "target": "aliasByNode(aliasSub(aliasSub($Cloud.overcloud-controller-0.rabbitmq_monitoring.gauge-queue_total-*-rate, 'gauge-queue_total-', ''), '-rate', ''), 3)", - "textEditor": false + "target": "aliasByNode(aliasSub(aliasSub($Cloud.overcloud-controller-0.rabbitmq_monitoring.gauge-queue_total-*-rate, 'gauge-queue_total-', ''), '-rate', ''), 3)" } ], "thresholds": [], @@ -5471,8 +5468,7 @@ "targets": [ { "refId": "A", - "target": "aliasByNode(aliasSub(aliasSub($Cloud.overcloud-controller-0.rabbitmq_monitoring.gauge-message_total-*-count, 'gauge-message_total-', ''), '-count', ''), 3)", - "textEditor": false + "target": "aliasByNode(aliasSub(aliasSub($Cloud.overcloud-controller-0.rabbitmq_monitoring.gauge-message_total-*-count, 'gauge-message_total-', ''), '-count', ''), 3)" } ], "thresholds": [], @@ -5542,8 +5538,7 @@ "targets": [ { "refId": "A", - "target": "aliasByNode(aliasSub(aliasSub($Cloud.overcloud-controller-0.rabbitmq_monitoring.gauge-message_total-*-rate, 'gauge-message_total-', ''), '-rate', ''), 3)", - "textEditor": false + "target": "aliasByNode(aliasSub(aliasSub($Cloud.overcloud-controller-0.rabbitmq_monitoring.gauge-message_total-*-rate, 'gauge-message_total-', ''), '-rate', ''), 3)" } ], "thresholds": [], @@ -5613,8 +5608,7 @@ "targets": [ { "refId": "A", - "target": "aliasByMetric(aliasSub($Cloud.overcloud-controller-0.rabbitmq_monitoring.*-msg_count-*, 'gauge-msg_count-', ''))", - "textEditor": false + "target": "aliasByMetric(aliasSub($Cloud.overcloud-controller-0.rabbitmq_monitoring.*-msg_count-*, 'gauge-msg_count-', ''))" } ], "thresholds": [], @@ -6801,8 +6795,7 @@ "targets": [ { "refId": "A", - "target": "aliasByNode(aliasSub(aliasSub($Cloud.overcloud-controller-0.swift_stat.gauge-*-containers, 'gauge-', ''), '-containers', ''), 3)", - "textEditor": false + "target": "aliasByNode(aliasSub(aliasSub($Cloud.overcloud-controller-0.swift_stat.gauge-*-containers, 'gauge-', ''), '-containers', ''), 3)" } ], "thresholds": [], @@ -6874,8 +6867,7 @@ "targets": [ { "refId": "A", - "target": "aliasByNode(aliasSub(aliasSub($Cloud.overcloud-controller-0.swift_stat.gauge-*-objects, 'gauge-', ''), '-objects', ''), 3)", - "textEditor": false + "target": "aliasByNode(aliasSub(aliasSub($Cloud.overcloud-controller-0.swift_stat.gauge-*-objects, 'gauge-', ''), '-objects', ''), 3)" } ], "thresholds": [], @@ -6961,8 +6953,7 @@ "targets": [ { "refId": "A", - "target": "aliasByNode(consolidateBy(scale(aliasSub(aliasSub(aliasSub($Cloud.overcloud-controller-*.tail-gnocchi-*.counter-*error, 'overcloud-', ''), 'tail-', ''), 'counter-', ''), 10), 'max'), 1, 2)", - "textEditor": false + "target": "aliasByNode(consolidateBy(scale(aliasSub(aliasSub(aliasSub($Cloud.overcloud-controller-*.tail-gnocchi-*.counter-*error, 'overcloud-', ''), 'tail-', ''), 'counter-', ''), 10), 'max'), 1, 2)" } ], "thresholds": [], @@ -7036,8 +7027,7 @@ "targets": [ { "refId": "A", - "target": "aliasByNode(consolidateBy(scale(aliasSub(aliasSub(aliasSub($Cloud.overcloud-controller-*.tail-gnocchi-*.counter-*warn, 'overcloud-', ''), 'tail-', ''), 'counter-', ''), 10), 'max'), 1, 2)", - "textEditor": false + "target": "aliasByNode(consolidateBy(scale(aliasSub(aliasSub(aliasSub($Cloud.overcloud-controller-*.tail-gnocchi-*.counter-*warn, 'overcloud-', ''), 'tail-', ''), 'counter-', ''), 10), 'max'), 1, 2)" } ], "thresholds": [], @@ -7111,8 +7101,7 @@ "targets": [ { "refId": "A", - "target": "aliasByNode(consolidateBy(scale(aliasSub(aliasSub(aliasSub($Cloud.overcloud-controller-*.tail-gnocchi-*.counter-*info, 'overcloud-', ''), 'tail-', ''), 'counter-', ''), 10), 'max'), 1, 2)", - "textEditor": false + "target": "aliasByNode(consolidateBy(scale(aliasSub(aliasSub(aliasSub($Cloud.overcloud-controller-*.tail-gnocchi-*.counter-*info, 'overcloud-', ''), 'tail-', ''), 'counter-', ''), 10), 'max'), 1, 2)" } ], "thresholds": [], @@ -7198,8 +7187,7 @@ "targets": [ { "refId": "A", - "target": "aliasByNode(consolidateBy(scale(aliasSub(aliasSub(aliasSub($Cloud.overcloud-controller-*.tail-ceilometer-*.counter-*error, 'overcloud-', ''), 'tail-', ''), 'counter-', ''), 10), 'max'), 1, 2)", - "textEditor": false + "target": "aliasByNode(consolidateBy(scale(aliasSub(aliasSub(aliasSub($Cloud.overcloud-controller-*.tail-ceilometer-*.counter-*error, 'overcloud-', ''), 'tail-', ''), 'counter-', ''), 10), 'max'), 1, 2)" } ], "thresholds": [], @@ -7273,8 +7261,7 @@ "targets": [ { "refId": "A", - "target": "aliasByNode(consolidateBy(scale(aliasSub(aliasSub(aliasSub($Cloud.overcloud-controller-*.tail-ceilometer-*.counter-*warn, 'overcloud-', ''), 'tail-', ''), 'counter-', ''), 10), 'max'), 1, 2)", - "textEditor": false + "target": "aliasByNode(consolidateBy(scale(aliasSub(aliasSub(aliasSub($Cloud.overcloud-controller-*.tail-ceilometer-*.counter-*warn, 'overcloud-', ''), 'tail-', ''), 'counter-', ''), 10), 'max'), 1, 2)" } ], "thresholds": [], @@ -7348,8 +7335,7 @@ "targets": [ { "refId": "A", - "target": "aliasByNode(consolidateBy(scale(aliasSub(aliasSub(aliasSub($Cloud.overcloud-controller-*.tail-ceilometer-*.counter-*info, 'overcloud-', ''), 'tail-', ''), 'counter-', ''), 10), 'max'), 1, 2)", - "textEditor": false + "target": "aliasByNode(consolidateBy(scale(aliasSub(aliasSub(aliasSub($Cloud.overcloud-controller-*.tail-ceilometer-*.counter-*info, 'overcloud-', ''), 'tail-', ''), 'counter-', ''), 10), 'max'), 1, 2)" } ], "thresholds": [], @@ -7435,8 +7421,7 @@ "targets": [ { "refId": "A", - "target": "aliasByNode(consolidateBy(scale(aliasSub(aliasSub(aliasSub($Cloud.overcloud-compute-*.tail-ceilometer-*.counter-*error, 'overcloud-', ''), 'tail-', ''), 'counter-', ''), 10), 'max'), 1, 2)", - "textEditor": false + "target": "aliasByNode(consolidateBy(scale(aliasSub(aliasSub(aliasSub($Cloud.overcloud-compute-*.tail-ceilometer-*.counter-*error, 'overcloud-', ''), 'tail-', ''), 'counter-', ''), 10), 'max'), 1, 2)" } ], "thresholds": [], @@ -7510,8 +7495,7 @@ "targets": [ { "refId": "A", - "target": "aliasByNode(consolidateBy(scale(aliasSub(aliasSub(aliasSub($Cloud.overcloud-compute-*.tail-ceilometer-*.counter-*warn, 'overcloud-', ''), 'tail-', ''), 'counter-', ''), 10), 'max'), 1, 2)", - "textEditor": false + "target": "aliasByNode(consolidateBy(scale(aliasSub(aliasSub(aliasSub($Cloud.overcloud-compute-*.tail-ceilometer-*.counter-*warn, 'overcloud-', ''), 'tail-', ''), 'counter-', ''), 10), 'max'), 1, 2)" } ], "thresholds": [], @@ -7585,8 +7569,7 @@ "targets": [ { "refId": "A", - "target": "aliasByNode(consolidateBy(scale(aliasSub(aliasSub(aliasSub($Cloud.overcloud-compute-*.tail-ceilometer-*.counter-*info, 'overcloud-', ''), 'tail-', ''), 'counter-', ''), 10), 'max'), 1, 2)", - "textEditor": false + "target": "aliasByNode(consolidateBy(scale(aliasSub(aliasSub(aliasSub($Cloud.overcloud-compute-*.tail-ceilometer-*.counter-*info, 'overcloud-', ''), 'tail-', ''), 'counter-', ''), 10), 'max'), 1, 2)" } ], "thresholds": [], @@ -7820,8 +7803,7 @@ "targets": [ { "refId": "A", - "target": "aliasByNode(aliasSub(consolidateBy(scale(aliasSub(aliasSub(aliasSub($Cloud.overcloud-controller-*.tail-swift.counter-*info, 'overcloud-', ''), 'tail-', ''), 'counter-', ''), 10), 'max'), '-info', ''), 1, 3)", - "textEditor": false + "target": "aliasByNode(aliasSub(consolidateBy(scale(aliasSub(aliasSub(aliasSub($Cloud.overcloud-controller-*.tail-swift.counter-*info, 'overcloud-', ''), 'tail-', ''), 'counter-', ''), 10), 'max'), '-info', ''), 1, 3)" } ], "thresholds": [], diff --git a/ansible/install/roles/grafana-dashboards/vars/main.yml b/ansible/install/roles/grafana-dashboards/vars/main.yml index 12398a46c..c06bcad10 100644 --- a/ansible/install/roles/grafana-dashboards/vars/main.yml +++ b/ansible/install/roles/grafana-dashboards/vars/main.yml @@ -40,17 +40,25 @@ per_process_metrics: y1units: "iops" metrics: - name: "Read" - query: ".ps_disk_ops.read" + query: ".io_ops.read" - name: "Write" - query: ".ps_disk_ops.write" + query: ".io_ops.write" nullPointMode: "null" - name: "Process IO Throughput(Estimated via SYSCALLS)" + y1units: "bytes" + metrics: + - name: "Rx" + query: ".io_octets.rx" + - name: "Tx" + query: ".io_octets.tx" + nullPointMode: "null" + - name: "Process Disk IO Throughput(Estimated via SYSCALLS)" y1units: "bytes" metrics: - name: "Read" - query: ".ps_disk_octets.read" + query: ".disk_octets.read" - name: "Write" - query: ".ps_disk_octets.write" + query: ".disk_octets.write" nullPointMode: "null" per_process_panels: