From 2e9b0a405aee42da7ab199b0bd19859954325653 Mon Sep 17 00:00:00 2001 From: Alex Krzos Date: Thu, 17 Mar 2016 15:46:09 -0400 Subject: [PATCH] Add cpu-all sum, turbostat c0%, c1% Change-Id: I6da7167f4d47660f32820dc79895c7c8c12dfb9a --- .../roles/grafana-snapshot/vars/main.yml | 36 +- ...remetal_general_system_performance.json.j2 | 260 ++++++++- .../cfme_general_system_performance.json.j2 | 110 +++- ...raphite_general_system_performance.json.j2 | 262 ++++++++- .../guest_general_system_performance.json.j2 | 126 ++++- .../ose_general_system_performance.json.j2 | 260 ++++++++- ...ellite6_general_system_performance.json.j2 | 260 ++++++++- .../openstack_general_system_performance.json | 509 +++++++++++++----- 8 files changed, 1575 insertions(+), 248 deletions(-) diff --git a/ansible/browbeat/roles/grafana-snapshot/vars/main.yml b/ansible/browbeat/roles/grafana-snapshot/vars/main.yml index 7c6be5247..5c117b620 100644 --- a/ansible/browbeat/roles/grafana-snapshot/vars/main.yml +++ b/ansible/browbeat/roles/grafana-snapshot/vars/main.yml @@ -15,11 +15,11 @@ disks: - sda2 disk_panels: - - panelId: 8 - name: disk-iops - panelId: 9 + name: disk-iops + - panelId: 10 name: disk-throughput - - panelId: 13 + - panelId: 14 name: disk-io-time # Task prepends "interface-" prefix for you @@ -67,31 +67,33 @@ interfaces: - vlan204 interface_panels: - - panelId: 15 - name: network-pps - panelId: 16 + name: network-pps + - panelId: 17 name: network-throughput general_panels: - panelId: 1 name: all-cpu - - panelId: 4 - name: memory-bytes + - panelId: 2 + name: all-cpu-sum - panelId: 5 - name: memory-percentage + name: memory-bytes - panelId: 6 + name: memory-percentage + - panelId: 7 name: swap-usage - - panelId: 18 + - panelId: 19 name: conntrack - - panelId: 22 - name: numa - panelId: 23 - name: irq - - panelId: 24 - name: interrupts - - panelId: 25 - name: load-uptime + name: numa - panelId: 26 + name: irq + - panelId: 27 + name: interrupts + - panelId: 28 + name: load-uptime + - panelId: 29 name: processes - - panelId: 106 + - panelId: 109 name: tail-errors diff --git a/ansible/install/roles/dashboard-generic/templates/baremetal_general_system_performance.json.j2 b/ansible/install/roles/dashboard-generic/templates/baremetal_general_system_performance.json.j2 index 66e057ea4..34fbd890a 100644 --- a/ansible/install/roles/dashboard-generic/templates/baremetal_general_system_performance.json.j2 +++ b/ansible/install/roles/dashboard-generic/templates/baremetal_general_system_performance.json.j2 @@ -108,6 +108,100 @@ "percent", "short" ] + }, + { + "aliasColors": {}, + "bars": false, + "datasource": null, + "editable": true, + "error": false, + "fill": 1, + "grid": { + "leftLogBase": 1, + "leftMax": null, + "leftMin": 0, + "rightLogBase": 1, + "rightMax": null, + "rightMin": null, + "threshold1": null, + "threshold1Color": "rgba(216, 200, 27, 0.27)", + "threshold2": null, + "threshold2Color": "rgba(234, 112, 112, 0.22)" + }, + {% if vars.update({'panel_idx': (vars.panel_idx + 1)}) %} {% endif %} + "id": {{vars.panel_idx}}, + "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": "connected", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "span": 12, + "stack": true, + "steppedLine": false, + "targets": [ + { + "refId": "A", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-system), 'System')" + }, + { + "refId": "B", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-user), 'User')" + }, + { + "refId": "C", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-nice), 'Nice')" + }, + { + "refId": "D", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-steal), 'Steal')" + }, + { + "refId": "E", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-softirq), 'SoftIRQ')" + }, + { + "refId": "F", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-interrupt), 'Interrupt')" + }, + { + "refId": "G", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-wait), 'Wait')" + }, + { + "refId": "H", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-idle), 'Idle')" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "$Cloud - $Node - All CPUs Sum", + "tooltip": { + "shared": true, + "value_type": "individual" + }, + "type": "graph", + "x-axis": true, + "y-axis": true, + "y_formats": [ + "percent", + "short" + ] } ], "showTitle": true, @@ -168,42 +262,42 @@ "targets": [ { "refId": "A", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-system), 'System')", + "target": "alias($Cloud.$Node.$cpus0.cpu-system, 'System')", "textEditor": false }, { "refId": "B", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-user), 'User')", + "target": "alias($Cloud.$Node.$cpus0.cpu-user, 'User')", "textEditor": false }, { "refId": "C", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-nice), 'Nice')", + "target": "alias($Cloud.$Node.$cpus0.cpu-nice, 'Nice')", "textEditor": false }, { "refId": "D", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-steal), 'Steal')", + "target": "alias($Cloud.$Node.$cpus0.cpu-steal, 'Steal')", "textEditor": false }, { "refId": "E", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-softirq), 'SoftIRQ')", + "target": "alias($Cloud.$Node.$cpus0.cpu-softirq, 'SoftIRQ')", "textEditor": false }, { "refId": "F", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-interrupt), 'Interrupt')", + "target": "alias($Cloud.$Node.$cpus0.cpu-interrupt, 'Interrupt')", "textEditor": false }, { "refId": "G", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-wait), 'Wait')", + "target": "alias($Cloud.$Node.$cpus0.cpu-wait, 'Wait')", "textEditor": false }, { "refId": "H", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-idle), 'Idle')", + "target": "alias($Cloud.$Node.$cpus0.cpu-idle, 'Idle')", "textEditor": false } ], @@ -281,42 +375,42 @@ "targets": [ { "refId": "A", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-system), 'System')", + "target": "alias($Cloud.$Node.$cpus00.cpu-system, 'System')", "textEditor": false }, { "refId": "B", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-user), 'User')", + "target": "alias($Cloud.$Node.$cpus00.cpu-user, 'User')", "textEditor": false }, { "refId": "C", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-nice), 'Nice')", + "target": "alias($Cloud.$Node.$cpus00.cpu-nice, 'Nice')", "textEditor": false }, { "refId": "D", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-steal), 'Steal')", + "target": "alias($Cloud.$Node.$cpus00.cpu-steal, 'Steal')", "textEditor": false }, { "refId": "E", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-softirq), 'SoftIRQ')", + "target": "alias($Cloud.$Node.$cpus00.cpu-softirq, 'SoftIRQ')", "textEditor": false }, { "refId": "F", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-interrupt), 'Interrupt')", + "target": "alias($Cloud.$Node.$cpus00.cpu-interrupt, 'Interrupt')", "textEditor": false }, { "refId": "G", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-wait), 'Wait')", + "target": "alias($Cloud.$Node.$cpus00.cpu-wait, 'Wait')", "textEditor": false }, { "refId": "H", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-idle), 'Idle')", + "target": "alias($Cloud.$Node.$cpus00.cpu-idle, 'Idle')", "textEditor": false } ], @@ -1680,6 +1774,140 @@ "hertz", "short" ] + }, + { + "aliasColors": {}, + "bars": false, + "datasource": null, + "decimals": 2, + "editable": true, + "error": false, + "fill": 0, + "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)" + }, + {% if vars.update({'panel_idx': (vars.panel_idx + 1)}) %} {% endif %} + "id": {{vars.panel_idx}}, + "isNew": true, + "legend": { + "alignAsTable": true, + "avg": true, + "current": true, + "max": true, + "min": true, + "rightSide": true, + "show": false, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "connected", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "span": 12, + "stack": false, + "steppedLine": false, + "targets": [ + { + "refId": "A", + "target": "aliasByNode($Cloud.$Node.turbostat-cpu*.percent-c0, 2)" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "$Cloud - $Node - turbostat c0%", + "tooltip": { + "shared": true, + "value_type": "cumulative" + }, + "type": "graph", + "x-axis": true, + "y-axis": true, + "y_formats": [ + "percent", + "short" + ] + }, + { + "aliasColors": {}, + "bars": false, + "datasource": null, + "decimals": 2, + "editable": true, + "error": false, + "fill": 0, + "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)" + }, + {% if vars.update({'panel_idx': (vars.panel_idx + 1)}) %} {% endif %} + "id": {{vars.panel_idx}}, + "isNew": true, + "legend": { + "alignAsTable": true, + "avg": true, + "current": true, + "max": true, + "min": true, + "rightSide": true, + "show": false, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "connected", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "span": 12, + "stack": false, + "steppedLine": false, + "targets": [ + { + "refId": "A", + "target": "aliasByNode($Cloud.$Node.turbostat-cpu*.percent-c1, 2)" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "$Cloud - $Node - turbostat c1%", + "tooltip": { + "shared": true, + "value_type": "cumulative" + }, + "type": "graph", + "x-axis": true, + "y-axis": true, + "y_formats": [ + "percent", + "short" + ] } ], "showTitle": true, diff --git a/ansible/install/roles/dashboard-generic/templates/cfme_general_system_performance.json.j2 b/ansible/install/roles/dashboard-generic/templates/cfme_general_system_performance.json.j2 index 6ea2f22e0..bd54ff646 100644 --- a/ansible/install/roles/dashboard-generic/templates/cfme_general_system_performance.json.j2 +++ b/ansible/install/roles/dashboard-generic/templates/cfme_general_system_performance.json.j2 @@ -108,6 +108,100 @@ "percent", "short" ] + }, + { + "aliasColors": {}, + "bars": false, + "datasource": null, + "editable": true, + "error": false, + "fill": 1, + "grid": { + "leftLogBase": 1, + "leftMax": null, + "leftMin": 0, + "rightLogBase": 1, + "rightMax": null, + "rightMin": null, + "threshold1": null, + "threshold1Color": "rgba(216, 200, 27, 0.27)", + "threshold2": null, + "threshold2Color": "rgba(234, 112, 112, 0.22)" + }, + {% if vars.update({'panel_idx': (vars.panel_idx + 1)}) %} {% endif %} + "id": {{vars.panel_idx}}, + "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": "connected", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "span": 12, + "stack": true, + "steppedLine": false, + "targets": [ + { + "refId": "A", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-system), 'System')" + }, + { + "refId": "B", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-user), 'User')" + }, + { + "refId": "C", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-nice), 'Nice')" + }, + { + "refId": "D", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-steal), 'Steal')" + }, + { + "refId": "E", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-softirq), 'SoftIRQ')" + }, + { + "refId": "F", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-interrupt), 'Interrupt')" + }, + { + "refId": "G", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-wait), 'Wait')" + }, + { + "refId": "H", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-idle), 'Idle')" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "$Cloud - $Node - All CPUs Sum", + "tooltip": { + "shared": true, + "value_type": "individual" + }, + "type": "graph", + "x-axis": true, + "y-axis": true, + "y_formats": [ + "percent", + "short" + ] } ], "showTitle": true, @@ -174,35 +268,35 @@ "targets": [ { "refId": "A", - "target": "alias(averageSeries($Cloud.$Node.$cpu0.cpu-system), 'System')" + "target": "alias($Cloud.$Node.$cpu0.cpu-system, 'System')" }, { "refId": "B", - "target": "alias(averageSeries($Cloud.$Node.$cpu0.cpu-user), 'User')" + "target": "alias($Cloud.$Node.$cpu0.cpu-user, 'User')" }, { "refId": "C", - "target": "alias(averageSeries($Cloud.$Node.$cpu0.cpu-nice), 'Nice')" + "target": "alias($Cloud.$Node.$cpu0.cpu-nice, 'Nice')" }, { "refId": "D", - "target": "alias(averageSeries($Cloud.$Node.$cpu0.cpu-steal), 'Steal')" + "target": "alias($Cloud.$Node.$cpu0.cpu-steal, 'Steal')" }, { "refId": "E", - "target": "alias(averageSeries($Cloud.$Node.$cpu0.cpu-softirq), 'SoftIRQ')" + "target": "alias($Cloud.$Node.$cpu0.cpu-softirq, 'SoftIRQ')" }, { "refId": "F", - "target": "alias(averageSeries($Cloud.$Node.$cpu0.cpu-interrupt), 'Interrupt')" + "target": "alias($Cloud.$Node.$cpu0.cpu-interrupt, 'Interrupt')" }, { "refId": "G", - "target": "alias(averageSeries($Cloud.$Node.$cpu0.cpu-wait), 'Wait')" + "target": "alias($Cloud.$Node.$cpu0.cpu-wait, 'Wait')" }, { "refId": "H", - "target": "alias(averageSeries($Cloud.$Node.$cpu0.cpu-idle), 'Idle')" + "target": "alias($Cloud.$Node.$cpu0.cpu-idle, 'Idle')" } ], "timeFrom": null, diff --git a/ansible/install/roles/dashboard-generic/templates/graphite_general_system_performance.json.j2 b/ansible/install/roles/dashboard-generic/templates/graphite_general_system_performance.json.j2 index e3a4fd7c6..f400f8fa5 100644 --- a/ansible/install/roles/dashboard-generic/templates/graphite_general_system_performance.json.j2 +++ b/ansible/install/roles/dashboard-generic/templates/graphite_general_system_performance.json.j2 @@ -108,6 +108,100 @@ "percent", "short" ] + }, + { + "aliasColors": {}, + "bars": false, + "datasource": null, + "editable": true, + "error": false, + "fill": 1, + "grid": { + "leftLogBase": 1, + "leftMax": null, + "leftMin": 0, + "rightLogBase": 1, + "rightMax": null, + "rightMin": null, + "threshold1": null, + "threshold1Color": "rgba(216, 200, 27, 0.27)", + "threshold2": null, + "threshold2Color": "rgba(234, 112, 112, 0.22)" + }, + {% if vars.update({'panel_idx': (vars.panel_idx + 1)}) %} {% endif %} + "id": {{vars.panel_idx}}, + "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": "connected", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "span": 12, + "stack": true, + "steppedLine": false, + "targets": [ + { + "refId": "A", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-system), 'System')" + }, + { + "refId": "B", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-user), 'User')" + }, + { + "refId": "C", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-nice), 'Nice')" + }, + { + "refId": "D", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-steal), 'Steal')" + }, + { + "refId": "E", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-softirq), 'SoftIRQ')" + }, + { + "refId": "F", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-interrupt), 'Interrupt')" + }, + { + "refId": "G", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-wait), 'Wait')" + }, + { + "refId": "H", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-idle), 'Idle')" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "$Cloud - $Node - All CPUs Sum", + "tooltip": { + "shared": true, + "value_type": "individual" + }, + "type": "graph", + "x-axis": true, + "y-axis": true, + "y_formats": [ + "percent", + "short" + ] } ], "showTitle": true, @@ -168,42 +262,42 @@ "targets": [ { "refId": "A", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-system), 'System')", + "target": "alias($Cloud.$Node.$cpus0.cpu-system, 'System')", "textEditor": false }, { "refId": "B", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-user), 'User')", + "target": "alias($Cloud.$Node.$cpus0.cpu-user, 'User')", "textEditor": false }, { "refId": "C", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-nice), 'Nice')", + "target": "alias($Cloud.$Node.$cpus0.cpu-nice, 'Nice')", "textEditor": false }, { "refId": "D", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-steal), 'Steal')", + "target": "alias($Cloud.$Node.$cpus0.cpu-steal, 'Steal')", "textEditor": false }, { "refId": "E", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-softirq), 'SoftIRQ')", + "target": "alias($Cloud.$Node.$cpus0.cpu-softirq, 'SoftIRQ')", "textEditor": false }, { "refId": "F", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-interrupt), 'Interrupt')", + "target": "alias($Cloud.$Node.$cpus0.cpu-interrupt, 'Interrupt')", "textEditor": false }, { "refId": "G", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-wait), 'Wait')", + "target": "alias($Cloud.$Node.$cpus0.cpu-wait, 'Wait')", "textEditor": false }, { "refId": "H", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-idle), 'Idle')", + "target": "alias($Cloud.$Node.$cpus0.cpu-idle, 'Idle')", "textEditor": false } ], @@ -281,42 +375,42 @@ "targets": [ { "refId": "A", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-system), 'System')", + "target": "alias($Cloud.$Node.$cpus00.cpu-system, 'System')", "textEditor": false }, { "refId": "B", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-user), 'User')", + "target": "alias($Cloud.$Node.$cpus00.cpu-user, 'User')", "textEditor": false }, { "refId": "C", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-nice), 'Nice')", + "target": "alias($Cloud.$Node.$cpus00.cpu-nice, 'Nice')", "textEditor": false }, { "refId": "D", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-steal), 'Steal')", + "target": "alias($Cloud.$Node.$cpus00.cpu-steal, 'Steal')", "textEditor": false }, { "refId": "E", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-softirq), 'SoftIRQ')", + "target": "alias($Cloud.$Node.$cpus00.cpu-softirq, 'SoftIRQ')", "textEditor": false }, { "refId": "F", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-interrupt), 'Interrupt')", + "target": "alias($Cloud.$Node.$cpus00.cpu-interrupt, 'Interrupt')", "textEditor": false }, { "refId": "G", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-wait), 'Wait')", + "target": "alias($Cloud.$Node.$cpus00.cpu-wait, 'Wait')", "textEditor": false }, { "refId": "H", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-idle), 'Idle')", + "target": "alias($Cloud.$Node.$cpus00.cpu-idle, 'Idle')", "textEditor": false } ], @@ -1680,6 +1774,140 @@ "hertz", "short" ] + }, + { + "aliasColors": {}, + "bars": false, + "datasource": null, + "decimals": 2, + "editable": true, + "error": false, + "fill": 0, + "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)" + }, + {% if vars.update({'panel_idx': (vars.panel_idx + 1)}) %} {% endif %} + "id": {{vars.panel_idx}}, + "isNew": true, + "legend": { + "alignAsTable": true, + "avg": true, + "current": true, + "max": true, + "min": true, + "rightSide": true, + "show": false, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "connected", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "span": 12, + "stack": false, + "steppedLine": false, + "targets": [ + { + "refId": "A", + "target": "aliasByNode($Cloud.$Node.turbostat-cpu*.percent-c0, 2)" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "$Cloud - $Node - turbostat c0%", + "tooltip": { + "shared": true, + "value_type": "cumulative" + }, + "type": "graph", + "x-axis": true, + "y-axis": true, + "y_formats": [ + "percent", + "short" + ] + }, + { + "aliasColors": {}, + "bars": false, + "datasource": null, + "decimals": 2, + "editable": true, + "error": false, + "fill": 0, + "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)" + }, + {% if vars.update({'panel_idx': (vars.panel_idx + 1)}) %} {% endif %} + "id": {{vars.panel_idx}}, + "isNew": true, + "legend": { + "alignAsTable": true, + "avg": true, + "current": true, + "max": true, + "min": true, + "rightSide": true, + "show": false, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "connected", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "span": 12, + "stack": false, + "steppedLine": false, + "targets": [ + { + "refId": "A", + "target": "aliasByNode($Cloud.$Node.turbostat-cpu*.percent-c1, 2)" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "$Cloud - $Node - turbostat c1%", + "tooltip": { + "shared": true, + "value_type": "cumulative" + }, + "type": "graph", + "x-axis": true, + "y-axis": true, + "y_formats": [ + "percent", + "short" + ] } ], "showTitle": true, @@ -2494,7 +2722,7 @@ "targets": [ { "refId": "A", - "target": "aliasByNode(carbon.agents.*.creates, 2)" + "target": "aliasByNode(carbon.agents.*.creates, 3)" } ], "aliasColors": {}, diff --git a/ansible/install/roles/dashboard-generic/templates/guest_general_system_performance.json.j2 b/ansible/install/roles/dashboard-generic/templates/guest_general_system_performance.json.j2 index b5d6d7eec..2dd119949 100644 --- a/ansible/install/roles/dashboard-generic/templates/guest_general_system_performance.json.j2 +++ b/ansible/install/roles/dashboard-generic/templates/guest_general_system_performance.json.j2 @@ -108,6 +108,100 @@ "percent", "short" ] + }, + { + "aliasColors": {}, + "bars": false, + "datasource": null, + "editable": true, + "error": false, + "fill": 1, + "grid": { + "leftLogBase": 1, + "leftMax": null, + "leftMin": 0, + "rightLogBase": 1, + "rightMax": null, + "rightMin": null, + "threshold1": null, + "threshold1Color": "rgba(216, 200, 27, 0.27)", + "threshold2": null, + "threshold2Color": "rgba(234, 112, 112, 0.22)" + }, + {% if vars.update({'panel_idx': (vars.panel_idx + 1)}) %} {% endif %} + "id": {{vars.panel_idx}}, + "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": "connected", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "span": 12, + "stack": true, + "steppedLine": false, + "targets": [ + { + "refId": "A", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-system), 'System')" + }, + { + "refId": "B", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-user), 'User')" + }, + { + "refId": "C", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-nice), 'Nice')" + }, + { + "refId": "D", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-steal), 'Steal')" + }, + { + "refId": "E", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-softirq), 'SoftIRQ')" + }, + { + "refId": "F", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-interrupt), 'Interrupt')" + }, + { + "refId": "G", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-wait), 'Wait')" + }, + { + "refId": "H", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-idle), 'Idle')" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "$Cloud - $Node - All CPUs Sum", + "tooltip": { + "shared": true, + "value_type": "individual" + }, + "type": "graph", + "x-axis": true, + "y-axis": true, + "y_formats": [ + "percent", + "short" + ] } ], "showTitle": true, @@ -168,42 +262,42 @@ "targets": [ { "refId": "A", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-system), 'System')", + "target": "alias($Cloud.$Node.$cpus0.cpu-system, 'System')", "textEditor": false }, { "refId": "B", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-user), 'User')", + "target": "alias($Cloud.$Node.$cpus0.cpu-user, 'User')", "textEditor": false }, { "refId": "C", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-nice), 'Nice')", + "target": "alias($Cloud.$Node.$cpus0.cpu-nice, 'Nice')", "textEditor": false }, { "refId": "D", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-steal), 'Steal')", + "target": "alias($Cloud.$Node.$cpus0.cpu-steal, 'Steal')", "textEditor": false }, { "refId": "E", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-softirq), 'SoftIRQ')", + "target": "alias($Cloud.$Node.$cpus0.cpu-softirq, 'SoftIRQ')", "textEditor": false }, { "refId": "F", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-interrupt), 'Interrupt')", + "target": "alias($Cloud.$Node.$cpus0.cpu-interrupt, 'Interrupt')", "textEditor": false }, { "refId": "G", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-wait), 'Wait')", + "target": "alias($Cloud.$Node.$cpus0.cpu-wait, 'Wait')", "textEditor": false }, { "refId": "H", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-idle), 'Idle')", + "target": "alias($Cloud.$Node.$cpus0.cpu-idle, 'Idle')", "textEditor": false } ], @@ -281,42 +375,42 @@ "targets": [ { "refId": "A", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-system), 'System')", + "target": "alias($Cloud.$Node.$cpus00.cpu-system, 'System')", "textEditor": false }, { "refId": "B", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-user), 'User')", + "target": "alias($Cloud.$Node.$cpus00.cpu-user, 'User')", "textEditor": false }, { "refId": "C", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-nice), 'Nice')", + "target": "alias($Cloud.$Node.$cpus00.cpu-nice, 'Nice')", "textEditor": false }, { "refId": "D", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-steal), 'Steal')", + "target": "alias($Cloud.$Node.$cpus00.cpu-steal, 'Steal')", "textEditor": false }, { "refId": "E", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-softirq), 'SoftIRQ')", + "target": "alias($Cloud.$Node.$cpus00.cpu-softirq, 'SoftIRQ')", "textEditor": false }, { "refId": "F", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-interrupt), 'Interrupt')", + "target": "alias($Cloud.$Node.$cpus00.cpu-interrupt, 'Interrupt')", "textEditor": false }, { "refId": "G", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-wait), 'Wait')", + "target": "alias($Cloud.$Node.$cpus00.cpu-wait, 'Wait')", "textEditor": false }, { "refId": "H", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-idle), 'Idle')", + "target": "alias($Cloud.$Node.$cpus00.cpu-idle, 'Idle')", "textEditor": false } ], diff --git a/ansible/install/roles/dashboard-generic/templates/ose_general_system_performance.json.j2 b/ansible/install/roles/dashboard-generic/templates/ose_general_system_performance.json.j2 index d3eecd7c0..518ae8a08 100644 --- a/ansible/install/roles/dashboard-generic/templates/ose_general_system_performance.json.j2 +++ b/ansible/install/roles/dashboard-generic/templates/ose_general_system_performance.json.j2 @@ -108,6 +108,100 @@ "percent", "short" ] + }, + { + "aliasColors": {}, + "bars": false, + "datasource": null, + "editable": true, + "error": false, + "fill": 1, + "grid": { + "leftLogBase": 1, + "leftMax": null, + "leftMin": 0, + "rightLogBase": 1, + "rightMax": null, + "rightMin": null, + "threshold1": null, + "threshold1Color": "rgba(216, 200, 27, 0.27)", + "threshold2": null, + "threshold2Color": "rgba(234, 112, 112, 0.22)" + }, + {% if vars.update({'panel_idx': (vars.panel_idx + 1)}) %} {% endif %} + "id": {{vars.panel_idx}}, + "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": "connected", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "span": 12, + "stack": true, + "steppedLine": false, + "targets": [ + { + "refId": "A", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-system), 'System')" + }, + { + "refId": "B", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-user), 'User')" + }, + { + "refId": "C", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-nice), 'Nice')" + }, + { + "refId": "D", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-steal), 'Steal')" + }, + { + "refId": "E", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-softirq), 'SoftIRQ')" + }, + { + "refId": "F", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-interrupt), 'Interrupt')" + }, + { + "refId": "G", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-wait), 'Wait')" + }, + { + "refId": "H", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-idle), 'Idle')" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "$Cloud - $Node - All CPUs Sum", + "tooltip": { + "shared": true, + "value_type": "individual" + }, + "type": "graph", + "x-axis": true, + "y-axis": true, + "y_formats": [ + "percent", + "short" + ] } ], "showTitle": true, @@ -168,42 +262,42 @@ "targets": [ { "refId": "A", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-system), 'System')", + "target": "alias($Cloud.$Node.$cpus0.cpu-system, 'System')", "textEditor": false }, { "refId": "B", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-user), 'User')", + "target": "alias($Cloud.$Node.$cpus0.cpu-user, 'User')", "textEditor": false }, { "refId": "C", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-nice), 'Nice')", + "target": "alias($Cloud.$Node.$cpus0.cpu-nice, 'Nice')", "textEditor": false }, { "refId": "D", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-steal), 'Steal')", + "target": "alias($Cloud.$Node.$cpus0.cpu-steal, 'Steal')", "textEditor": false }, { "refId": "E", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-softirq), 'SoftIRQ')", + "target": "alias($Cloud.$Node.$cpus0.cpu-softirq, 'SoftIRQ')", "textEditor": false }, { "refId": "F", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-interrupt), 'Interrupt')", + "target": "alias($Cloud.$Node.$cpus0.cpu-interrupt, 'Interrupt')", "textEditor": false }, { "refId": "G", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-wait), 'Wait')", + "target": "alias($Cloud.$Node.$cpus0.cpu-wait, 'Wait')", "textEditor": false }, { "refId": "H", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-idle), 'Idle')", + "target": "alias($Cloud.$Node.$cpus0.cpu-idle, 'Idle')", "textEditor": false } ], @@ -281,42 +375,42 @@ "targets": [ { "refId": "A", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-system), 'System')", + "target": "alias($Cloud.$Node.$cpus00.cpu-system, 'System')", "textEditor": false }, { "refId": "B", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-user), 'User')", + "target": "alias($Cloud.$Node.$cpus00.cpu-user, 'User')", "textEditor": false }, { "refId": "C", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-nice), 'Nice')", + "target": "alias($Cloud.$Node.$cpus00.cpu-nice, 'Nice')", "textEditor": false }, { "refId": "D", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-steal), 'Steal')", + "target": "alias($Cloud.$Node.$cpus00.cpu-steal, 'Steal')", "textEditor": false }, { "refId": "E", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-softirq), 'SoftIRQ')", + "target": "alias($Cloud.$Node.$cpus00.cpu-softirq, 'SoftIRQ')", "textEditor": false }, { "refId": "F", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-interrupt), 'Interrupt')", + "target": "alias($Cloud.$Node.$cpus00.cpu-interrupt, 'Interrupt')", "textEditor": false }, { "refId": "G", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-wait), 'Wait')", + "target": "alias($Cloud.$Node.$cpus00.cpu-wait, 'Wait')", "textEditor": false }, { "refId": "H", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-idle), 'Idle')", + "target": "alias($Cloud.$Node.$cpus00.cpu-idle, 'Idle')", "textEditor": false } ], @@ -1680,6 +1774,140 @@ "hertz", "short" ] + }, + { + "aliasColors": {}, + "bars": false, + "datasource": null, + "decimals": 2, + "editable": true, + "error": false, + "fill": 0, + "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)" + }, + {% if vars.update({'panel_idx': (vars.panel_idx + 1)}) %} {% endif %} + "id": {{vars.panel_idx}}, + "isNew": true, + "legend": { + "alignAsTable": true, + "avg": true, + "current": true, + "max": true, + "min": true, + "rightSide": true, + "show": false, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "connected", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "span": 12, + "stack": false, + "steppedLine": false, + "targets": [ + { + "refId": "A", + "target": "aliasByNode($Cloud.$Node.turbostat-cpu*.percent-c0, 2)" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "$Cloud - $Node - turbostat c0%", + "tooltip": { + "shared": true, + "value_type": "cumulative" + }, + "type": "graph", + "x-axis": true, + "y-axis": true, + "y_formats": [ + "percent", + "short" + ] + }, + { + "aliasColors": {}, + "bars": false, + "datasource": null, + "decimals": 2, + "editable": true, + "error": false, + "fill": 0, + "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)" + }, + {% if vars.update({'panel_idx': (vars.panel_idx + 1)}) %} {% endif %} + "id": {{vars.panel_idx}}, + "isNew": true, + "legend": { + "alignAsTable": true, + "avg": true, + "current": true, + "max": true, + "min": true, + "rightSide": true, + "show": false, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "connected", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "span": 12, + "stack": false, + "steppedLine": false, + "targets": [ + { + "refId": "A", + "target": "aliasByNode($Cloud.$Node.turbostat-cpu*.percent-c1, 2)" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "$Cloud - $Node - turbostat c1%", + "tooltip": { + "shared": true, + "value_type": "cumulative" + }, + "type": "graph", + "x-axis": true, + "y-axis": true, + "y_formats": [ + "percent", + "short" + ] } ], "showTitle": true, diff --git a/ansible/install/roles/dashboard-generic/templates/satellite6_general_system_performance.json.j2 b/ansible/install/roles/dashboard-generic/templates/satellite6_general_system_performance.json.j2 index a12a5e335..6e5b378b1 100644 --- a/ansible/install/roles/dashboard-generic/templates/satellite6_general_system_performance.json.j2 +++ b/ansible/install/roles/dashboard-generic/templates/satellite6_general_system_performance.json.j2 @@ -108,6 +108,100 @@ "percent", "short" ] + }, + { + "aliasColors": {}, + "bars": false, + "datasource": null, + "editable": true, + "error": false, + "fill": 1, + "grid": { + "leftLogBase": 1, + "leftMax": null, + "leftMin": 0, + "rightLogBase": 1, + "rightMax": null, + "rightMin": null, + "threshold1": null, + "threshold1Color": "rgba(216, 200, 27, 0.27)", + "threshold2": null, + "threshold2Color": "rgba(234, 112, 112, 0.22)" + }, + {% if vars.update({'panel_idx': (vars.panel_idx + 1)}) %} {% endif %} + "id": {{vars.panel_idx}}, + "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": "connected", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "span": 12, + "stack": true, + "steppedLine": false, + "targets": [ + { + "refId": "A", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-system), 'System')" + }, + { + "refId": "B", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-user), 'User')" + }, + { + "refId": "C", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-nice), 'Nice')" + }, + { + "refId": "D", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-steal), 'Steal')" + }, + { + "refId": "E", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-softirq), 'SoftIRQ')" + }, + { + "refId": "F", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-interrupt), 'Interrupt')" + }, + { + "refId": "G", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-wait), 'Wait')" + }, + { + "refId": "H", + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-idle), 'Idle')" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "$Cloud - $Node - All CPUs Sum", + "tooltip": { + "shared": true, + "value_type": "individual" + }, + "type": "graph", + "x-axis": true, + "y-axis": true, + "y_formats": [ + "percent", + "short" + ] } ], "showTitle": true, @@ -168,42 +262,42 @@ "targets": [ { "refId": "A", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-system), 'System')", + "target": "alias($Cloud.$Node.$cpus0.cpu-system, 'System')", "textEditor": false }, { "refId": "B", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-user), 'User')", + "target": "alias($Cloud.$Node.$cpus0.cpu-user, 'User')", "textEditor": false }, { "refId": "C", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-nice), 'Nice')", + "target": "alias($Cloud.$Node.$cpus0.cpu-nice, 'Nice')", "textEditor": false }, { "refId": "D", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-steal), 'Steal')", + "target": "alias($Cloud.$Node.$cpus0.cpu-steal, 'Steal')", "textEditor": false }, { "refId": "E", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-softirq), 'SoftIRQ')", + "target": "alias($Cloud.$Node.$cpus0.cpu-softirq, 'SoftIRQ')", "textEditor": false }, { "refId": "F", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-interrupt), 'Interrupt')", + "target": "alias($Cloud.$Node.$cpus0.cpu-interrupt, 'Interrupt')", "textEditor": false }, { "refId": "G", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-wait), 'Wait')", + "target": "alias($Cloud.$Node.$cpus0.cpu-wait, 'Wait')", "textEditor": false }, { "refId": "H", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-idle), 'Idle')", + "target": "alias($Cloud.$Node.$cpus0.cpu-idle, 'Idle')", "textEditor": false } ], @@ -281,42 +375,42 @@ "targets": [ { "refId": "A", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-system), 'System')", + "target": "alias($Cloud.$Node.$cpus00.cpu-system, 'System')", "textEditor": false }, { "refId": "B", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-user), 'User')", + "target": "alias($Cloud.$Node.$cpus00.cpu-user, 'User')", "textEditor": false }, { "refId": "C", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-nice), 'Nice')", + "target": "alias($Cloud.$Node.$cpus00.cpu-nice, 'Nice')", "textEditor": false }, { "refId": "D", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-steal), 'Steal')", + "target": "alias($Cloud.$Node.$cpus00.cpu-steal, 'Steal')", "textEditor": false }, { "refId": "E", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-softirq), 'SoftIRQ')", + "target": "alias($Cloud.$Node.$cpus00.cpu-softirq, 'SoftIRQ')", "textEditor": false }, { "refId": "F", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-interrupt), 'Interrupt')", + "target": "alias($Cloud.$Node.$cpus00.cpu-interrupt, 'Interrupt')", "textEditor": false }, { "refId": "G", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-wait), 'Wait')", + "target": "alias($Cloud.$Node.$cpus00.cpu-wait, 'Wait')", "textEditor": false }, { "refId": "H", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-idle), 'Idle')", + "target": "alias($Cloud.$Node.$cpus00.cpu-idle, 'Idle')", "textEditor": false } ], @@ -1680,6 +1774,140 @@ "hertz", "short" ] + }, + { + "aliasColors": {}, + "bars": false, + "datasource": null, + "decimals": 2, + "editable": true, + "error": false, + "fill": 0, + "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)" + }, + {% if vars.update({'panel_idx': (vars.panel_idx + 1)}) %} {% endif %} + "id": {{vars.panel_idx}}, + "isNew": true, + "legend": { + "alignAsTable": true, + "avg": true, + "current": true, + "max": true, + "min": true, + "rightSide": true, + "show": false, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "connected", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "span": 12, + "stack": false, + "steppedLine": false, + "targets": [ + { + "refId": "A", + "target": "aliasByNode($Cloud.$Node.turbostat-cpu*.percent-c0, 2)" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "$Cloud - $Node - turbostat c0%", + "tooltip": { + "shared": true, + "value_type": "cumulative" + }, + "type": "graph", + "x-axis": true, + "y-axis": true, + "y_formats": [ + "percent", + "short" + ] + }, + { + "aliasColors": {}, + "bars": false, + "datasource": null, + "decimals": 2, + "editable": true, + "error": false, + "fill": 0, + "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)" + }, + {% if vars.update({'panel_idx': (vars.panel_idx + 1)}) %} {% endif %} + "id": {{vars.panel_idx}}, + "isNew": true, + "legend": { + "alignAsTable": true, + "avg": true, + "current": true, + "max": true, + "min": true, + "rightSide": true, + "show": false, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "connected", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "span": 12, + "stack": false, + "steppedLine": false, + "targets": [ + { + "refId": "A", + "target": "aliasByNode($Cloud.$Node.turbostat-cpu*.percent-c1, 2)" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "$Cloud - $Node - turbostat c1%", + "tooltip": { + "shared": true, + "value_type": "cumulative" + }, + "type": "graph", + "x-axis": true, + "y-axis": true, + "y_formats": [ + "percent", + "short" + ] } ], "showTitle": true, diff --git a/ansible/install/roles/dashboard-openstack/files/openstack_general_system_performance.json b/ansible/install/roles/dashboard-openstack/files/openstack_general_system_performance.json index b388d70b7..ba716f123 100644 --- a/ansible/install/roles/dashboard-openstack/files/openstack_general_system_performance.json +++ b/ansible/install/roles/dashboard-openstack/files/openstack_general_system_performance.json @@ -106,16 +106,7 @@ "percent", "short" ] - } - ], - "showTitle": true, - "title": "CPU" - }, - { - "collapse": true, - "editable": true, - "height": "200px", - "panels": [ + }, { "aliasColors": {}, "bars": false, @@ -156,57 +147,47 @@ "pointradius": 5, "points": false, "renderer": "flot", - "repeat": "cpus0", - "scopedVars": {}, "seriesOverrides": [], - "span": null, + "span": 12, "stack": true, "steppedLine": false, "targets": [ { "refId": "A", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-system), 'System')", - "textEditor": false + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-system), 'System')" }, { "refId": "B", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-user), 'User')", - "textEditor": false + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-user), 'User')" }, { "refId": "C", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-nice), 'Nice')", - "textEditor": false + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-nice), 'Nice')" }, { "refId": "D", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-steal), 'Steal')", - "textEditor": false + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-steal), 'Steal')" }, { "refId": "E", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-softirq), 'SoftIRQ')", - "textEditor": false + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-softirq), 'SoftIRQ')" }, { "refId": "F", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-interrupt), 'Interrupt')", - "textEditor": false + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-interrupt), 'Interrupt')" }, { "refId": "G", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-wait), 'Wait')", - "textEditor": false + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-wait), 'Wait')" }, { "refId": "H", - "target": "alias(averageSeries($Cloud.$Node.$cpus0.cpu-idle), 'Idle')", - "textEditor": false + "target": "alias(sumSeries($Cloud.$Node.cpu-*.cpu-idle), 'Idle')" } ], "timeFrom": null, "timeShift": null, - "title": "$Cloud - $Node - $cpus0", + "title": "$Cloud - $Node - All CPUs Sum", "tooltip": { "shared": true, "value_type": "individual" @@ -221,7 +202,7 @@ } ], "showTitle": true, - "title": "Per CPU Logical CPU Core (0-9)" + "title": "CPU" }, { "collapse": true, @@ -268,6 +249,118 @@ "pointradius": 5, "points": false, "renderer": "flot", + "repeat": "cpus0", + "scopedVars": {}, + "seriesOverrides": [], + "span": null, + "stack": true, + "steppedLine": false, + "targets": [ + { + "refId": "A", + "target": "alias($Cloud.$Node.$cpus0.cpu-system, 'System')", + "textEditor": false + }, + { + "refId": "B", + "target": "alias($Cloud.$Node.$cpus0.cpu-user, 'User')", + "textEditor": false + }, + { + "refId": "C", + "target": "alias($Cloud.$Node.$cpus0.cpu-nice, 'Nice')", + "textEditor": false + }, + { + "refId": "D", + "target": "alias($Cloud.$Node.$cpus0.cpu-steal, 'Steal')", + "textEditor": false + }, + { + "refId": "E", + "target": "alias($Cloud.$Node.$cpus0.cpu-softirq, 'SoftIRQ')", + "textEditor": false + }, + { + "refId": "F", + "target": "alias($Cloud.$Node.$cpus0.cpu-interrupt, 'Interrupt')", + "textEditor": false + }, + { + "refId": "G", + "target": "alias($Cloud.$Node.$cpus0.cpu-wait, 'Wait')", + "textEditor": false + }, + { + "refId": "H", + "target": "alias($Cloud.$Node.$cpus0.cpu-idle, 'Idle')", + "textEditor": false + } + ], + "timeFrom": null, + "timeShift": null, + "title": "$Cloud - $Node - $cpus0", + "tooltip": { + "shared": true, + "value_type": "individual" + }, + "type": "graph", + "x-axis": true, + "y-axis": true, + "y_formats": [ + "percent", + "short" + ] + } + ], + "showTitle": true, + "title": "Per CPU Logical CPU Core (0-9)" + }, + { + "collapse": true, + "editable": true, + "height": "200px", + "panels": [ + { + "aliasColors": {}, + "bars": false, + "datasource": null, + "editable": true, + "error": false, + "fill": 1, + "grid": { + "leftLogBase": 1, + "leftMax": null, + "leftMin": 0, + "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": 4, + "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": "connected", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", "repeat": "cpus00", "scopedVars": {}, "seriesOverrides": [], @@ -277,42 +370,42 @@ "targets": [ { "refId": "A", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-system), 'System')", + "target": "alias($Cloud.$Node.$cpus00.cpu-system, 'System')", "textEditor": false }, { "refId": "B", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-user), 'User')", + "target": "alias($Cloud.$Node.$cpus00.cpu-user, 'User')", "textEditor": false }, { "refId": "C", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-nice), 'Nice')", + "target": "alias($Cloud.$Node.$cpus00.cpu-nice, 'Nice')", "textEditor": false }, { "refId": "D", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-steal), 'Steal')", + "target": "alias($Cloud.$Node.$cpus00.cpu-steal, 'Steal')", "textEditor": false }, { "refId": "E", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-softirq), 'SoftIRQ')", + "target": "alias($Cloud.$Node.$cpus00.cpu-softirq, 'SoftIRQ')", "textEditor": false }, { "refId": "F", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-interrupt), 'Interrupt')", + "target": "alias($Cloud.$Node.$cpus00.cpu-interrupt, 'Interrupt')", "textEditor": false }, { "refId": "G", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-wait), 'Wait')", + "target": "alias($Cloud.$Node.$cpus00.cpu-wait, 'Wait')", "textEditor": false }, { "refId": "H", - "target": "alias(averageSeries($Cloud.$Node.$cpus00.cpu-idle), 'Idle')", + "target": "alias($Cloud.$Node.$cpus00.cpu-idle, 'Idle')", "textEditor": false } ], @@ -359,7 +452,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 4, + "id": 5, "isNew": true, "legend": { "alignAsTable": true, @@ -444,7 +537,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 5, + "id": 6, "isNew": true, "legend": { "alignAsTable": true, @@ -564,7 +657,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 6, + "id": 7, "isNew": true, "legend": { "alignAsTable": true, @@ -637,7 +730,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 7, + "id": 8, "isNew": true, "legend": { "alignAsTable": true, @@ -715,7 +808,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 8, + "id": 9, "isNew": true, "legend": { "alignAsTable": true, @@ -789,7 +882,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 9, + "id": 10, "isNew": true, "legend": { "alignAsTable": true, @@ -863,7 +956,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 10, + "id": 11, "isNew": true, "legend": { "alignAsTable": true, @@ -937,7 +1030,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 11, + "id": 12, "isNew": true, "legend": { "alignAsTable": true, @@ -1007,7 +1100,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 12, + "id": 13, "isNew": true, "legend": { "alignAsTable": true, @@ -1081,7 +1174,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 13, + "id": 14, "isNew": true, "legend": { "alignAsTable": true, @@ -1155,7 +1248,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 14, + "id": 15, "isNew": true, "legend": { "alignAsTable": true, @@ -1242,7 +1335,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 15, + "id": 16, "isNew": true, "legend": { "alignAsTable": true, @@ -1316,7 +1409,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 16, + "id": 17, "isNew": true, "legend": { "alignAsTable": true, @@ -1390,7 +1483,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 17, + "id": 18, "isNew": true, "legend": { "alignAsTable": true, @@ -1464,7 +1557,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 18, + "id": 19, "isNew": true, "legend": { "alignAsTable": true, @@ -1552,7 +1645,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 19, + "id": 20, "isNew": true, "legend": { "alignAsTable": false, @@ -1626,7 +1719,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 20, + "id": 21, "isNew": true, "legend": { "alignAsTable": true, @@ -1692,7 +1785,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 21, + "id": 22, "isNew": true, "legend": { "alignAsTable": true, @@ -1737,6 +1830,138 @@ "hertz", "short" ] + }, + { + "aliasColors": {}, + "bars": false, + "datasource": null, + "decimals": 2, + "editable": true, + "error": false, + "fill": 0, + "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": 23, + "isNew": true, + "legend": { + "alignAsTable": true, + "avg": true, + "current": true, + "max": true, + "min": true, + "rightSide": true, + "show": false, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "connected", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "span": 12, + "stack": false, + "steppedLine": false, + "targets": [ + { + "refId": "A", + "target": "aliasByNode($Cloud.$Node.turbostat-cpu*.percent-c0, 2)" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "$Cloud - $Node - turbostat c0%", + "tooltip": { + "shared": true, + "value_type": "cumulative" + }, + "type": "graph", + "x-axis": true, + "y-axis": true, + "y_formats": [ + "percent", + "short" + ] + }, + { + "aliasColors": {}, + "bars": false, + "datasource": null, + "decimals": 2, + "editable": true, + "error": false, + "fill": 0, + "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": 24, + "isNew": true, + "legend": { + "alignAsTable": true, + "avg": true, + "current": true, + "max": true, + "min": true, + "rightSide": true, + "show": false, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "connected", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "span": 12, + "stack": false, + "steppedLine": false, + "targets": [ + { + "refId": "A", + "target": "aliasByNode($Cloud.$Node.turbostat-cpu*.percent-c1, 2)" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "$Cloud - $Node - turbostat c1%", + "tooltip": { + "shared": true, + "value_type": "cumulative" + }, + "type": "graph", + "x-axis": true, + "y-axis": true, + "y_formats": [ + "percent", + "short" + ] } ], "showTitle": true, @@ -1766,7 +1991,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 22, + "id": 25, "isNew": true, "legend": { "alignAsTable": true, @@ -1860,7 +2085,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 23, + "id": 26, "isNew": true, "legend": { "alignAsTable": true, @@ -1926,7 +2151,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 24, + "id": 27, "isNew": true, "legend": { "alignAsTable": true, @@ -2002,7 +2227,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 25, + "id": 28, "isNew": true, "legend": { "alignAsTable": true, @@ -2094,7 +2319,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 26, + "id": 29, "isNew": true, "legend": { "alignAsTable": true, @@ -2179,7 +2404,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 27, + "id": 30, "isNew": true, "legend": { "alignAsTable": true, @@ -2253,7 +2478,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 28, + "id": 31, "isNew": true, "legend": { "alignAsTable": true, @@ -2409,7 +2634,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 29, + "id": 32, "isNew": true, "legend": { "alignAsTable": true, @@ -2525,7 +2750,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 30, + "id": 33, "isNew": true, "legend": { "alignAsTable": true, @@ -2633,7 +2858,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 31, + "id": 34, "isNew": true, "legend": { "alignAsTable": true, @@ -2701,7 +2926,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 32, + "id": 35, "isNew": true, "legend": { "alignAsTable": true, @@ -2785,7 +3010,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 33, + "id": 36, "isNew": true, "legend": { "alignAsTable": true, @@ -2877,7 +3102,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 34, + "id": 37, "isNew": true, "legend": { "alignAsTable": true, @@ -2953,7 +3178,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 35, + "id": 38, "isNew": true, "legend": { "alignAsTable": true, @@ -3117,7 +3342,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 36, + "id": 39, "isNew": true, "legend": { "alignAsTable": true, @@ -3233,7 +3458,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 37, + "id": 40, "isNew": true, "legend": { "alignAsTable": true, @@ -3301,7 +3526,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 38, + "id": 41, "isNew": true, "legend": { "alignAsTable": true, @@ -3385,7 +3610,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 39, + "id": 42, "isNew": true, "legend": { "alignAsTable": true, @@ -3477,7 +3702,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 40, + "id": 43, "isNew": true, "legend": { "alignAsTable": true, @@ -3619,7 +3844,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 41, + "id": 44, "isNew": true, "legend": { "alignAsTable": true, @@ -3782,7 +4007,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 42, + "id": 45, "isNew": true, "legend": { "alignAsTable": true, @@ -3905,7 +4130,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 43, + "id": 46, "isNew": true, "legend": { "alignAsTable": true, @@ -4020,7 +4245,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 44, + "id": 47, "isNew": true, "legend": { "alignAsTable": true, @@ -4095,7 +4320,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 45, + "id": 48, "isNew": true, "legend": { "alignAsTable": true, @@ -4186,7 +4411,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 46, + "id": 49, "isNew": true, "legend": { "alignAsTable": true, @@ -4285,7 +4510,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 47, + "id": 50, "isNew": true, "legend": { "alignAsTable": true, @@ -4368,7 +4593,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 48, + "id": 51, "isNew": true, "legend": { "alignAsTable": true, @@ -4539,7 +4764,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 49, + "id": 52, "isNew": true, "legend": { "alignAsTable": true, @@ -4662,7 +4887,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 50, + "id": 53, "isNew": true, "legend": { "alignAsTable": true, @@ -4737,7 +4962,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 51, + "id": 54, "isNew": true, "legend": { "alignAsTable": true, @@ -4828,7 +5053,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 52, + "id": 55, "isNew": true, "legend": { "alignAsTable": true, @@ -4927,7 +5152,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 53, + "id": 56, "isNew": true, "legend": { "alignAsTable": true, @@ -5074,7 +5299,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 54, + "id": 57, "isNew": true, "legend": { "alignAsTable": true, @@ -5231,7 +5456,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 55, + "id": 58, "isNew": true, "legend": { "alignAsTable": true, @@ -5348,7 +5573,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 56, + "id": 59, "isNew": true, "legend": { "alignAsTable": true, @@ -5457,7 +5682,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 57, + "id": 60, "isNew": true, "legend": { "alignAsTable": true, @@ -5526,7 +5751,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 58, + "id": 61, "isNew": true, "legend": { "alignAsTable": true, @@ -5611,7 +5836,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 59, + "id": 62, "isNew": true, "legend": { "alignAsTable": true, @@ -5704,7 +5929,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 60, + "id": 63, "isNew": true, "legend": { "alignAsTable": true, @@ -5781,7 +6006,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 61, + "id": 64, "isNew": true, "legend": { "alignAsTable": true, @@ -5946,7 +6171,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 62, + "id": 65, "isNew": true, "legend": { "alignAsTable": true, @@ -6063,7 +6288,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 63, + "id": 66, "isNew": true, "legend": { "alignAsTable": true, @@ -6132,7 +6357,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 64, + "id": 67, "isNew": true, "legend": { "alignAsTable": true, @@ -6217,7 +6442,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 65, + "id": 68, "isNew": true, "legend": { "alignAsTable": true, @@ -6310,7 +6535,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 66, + "id": 69, "isNew": true, "legend": { "alignAsTable": true, @@ -6452,7 +6677,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 67, + "id": 70, "isNew": true, "legend": { "alignAsTable": true, @@ -6609,7 +6834,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 68, + "id": 71, "isNew": true, "legend": { "alignAsTable": true, @@ -6726,7 +6951,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 69, + "id": 72, "isNew": true, "legend": { "alignAsTable": true, @@ -6835,7 +7060,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 70, + "id": 73, "isNew": true, "legend": { "alignAsTable": true, @@ -6904,7 +7129,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 71, + "id": 74, "isNew": true, "legend": { "alignAsTable": true, @@ -6989,7 +7214,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 72, + "id": 75, "isNew": true, "legend": { "alignAsTable": true, @@ -7082,7 +7307,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 73, + "id": 76, "isNew": true, "legend": { "alignAsTable": true, @@ -7159,7 +7384,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 74, + "id": 77, "isNew": true, "legend": { "alignAsTable": true, @@ -7324,7 +7549,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 75, + "id": 78, "isNew": true, "legend": { "alignAsTable": true, @@ -7441,7 +7666,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 76, + "id": 79, "isNew": true, "legend": { "alignAsTable": true, @@ -7510,7 +7735,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 77, + "id": 80, "isNew": true, "legend": { "alignAsTable": true, @@ -7595,7 +7820,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 78, + "id": 81, "isNew": true, "legend": { "alignAsTable": true, @@ -7688,7 +7913,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 79, + "id": 82, "isNew": true, "legend": { "alignAsTable": true, @@ -7830,7 +8055,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 80, + "id": 83, "isNew": true, "legend": { "alignAsTable": true, @@ -7987,7 +8212,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 81, + "id": 84, "isNew": true, "legend": { "alignAsTable": true, @@ -8104,7 +8329,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 82, + "id": 85, "isNew": true, "legend": { "alignAsTable": true, @@ -8213,7 +8438,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 83, + "id": 86, "isNew": true, "legend": { "alignAsTable": true, @@ -8282,7 +8507,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 84, + "id": 87, "isNew": true, "legend": { "alignAsTable": true, @@ -8367,7 +8592,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 85, + "id": 88, "isNew": true, "legend": { "alignAsTable": true, @@ -8460,7 +8685,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 86, + "id": 89, "isNew": true, "legend": { "alignAsTable": true, @@ -8537,7 +8762,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 87, + "id": 90, "isNew": true, "legend": { "alignAsTable": true, @@ -8702,7 +8927,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 88, + "id": 91, "isNew": true, "legend": { "alignAsTable": true, @@ -8819,7 +9044,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 89, + "id": 92, "isNew": true, "legend": { "alignAsTable": true, @@ -8888,7 +9113,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 90, + "id": 93, "isNew": true, "legend": { "alignAsTable": true, @@ -8973,7 +9198,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 91, + "id": 94, "isNew": true, "legend": { "alignAsTable": true, @@ -9066,7 +9291,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 92, + "id": 95, "isNew": true, "legend": { "alignAsTable": true, @@ -9208,7 +9433,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 93, + "id": 96, "isNew": true, "legend": { "alignAsTable": true, @@ -9365,7 +9590,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 94, + "id": 97, "isNew": true, "legend": { "alignAsTable": true, @@ -9482,7 +9707,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 95, + "id": 98, "isNew": true, "legend": { "alignAsTable": true, @@ -9591,7 +9816,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 96, + "id": 99, "isNew": true, "legend": { "alignAsTable": true, @@ -9660,7 +9885,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 97, + "id": 100, "isNew": true, "legend": { "alignAsTable": true, @@ -9745,7 +9970,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 98, + "id": 101, "isNew": true, "legend": { "alignAsTable": true, @@ -9838,7 +10063,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 99, + "id": 102, "isNew": true, "legend": { "alignAsTable": true, @@ -9915,7 +10140,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 100, + "id": 103, "isNew": true, "legend": { "alignAsTable": true, @@ -10080,7 +10305,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 101, + "id": 104, "isNew": true, "legend": { "alignAsTable": true, @@ -10197,7 +10422,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 102, + "id": 105, "isNew": true, "legend": { "alignAsTable": true, @@ -10266,7 +10491,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 103, + "id": 106, "isNew": true, "legend": { "alignAsTable": true, @@ -10351,7 +10576,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 104, + "id": 107, "isNew": true, "legend": { "alignAsTable": true, @@ -10444,7 +10669,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 105, + "id": 108, "isNew": true, "legend": { "alignAsTable": true, @@ -10586,7 +10811,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 106, + "id": 109, "isNew": true, "legend": { "alignAsTable": true,