From 5ef39f88ddd6b2f26ae080be3a63301f5395a30e Mon Sep 17 00:00:00 2001
From: Alex Krzos <akrzos@redhat.com>
Date: Sat, 7 May 2016 19:32:44 -0400
Subject: [PATCH] Adjusting partition capacity graph to show all partitions %
 used rather than just / in a stacked graph.

+ Move install/group_vars/all to install/group_vars/all.yml

Change-Id: I168210b9b20a89267f65c96cc4848d366988cb1f
---
 ansible/install/group_vars/{all => all.yml}   |  0
 ...remetal_general_system_performance.json.j2 | 25 +++++++------------
 .../cfme_general_system_performance.json.j2   | 25 +++++++------------
 ...llinone_general_system_performance.json.j2 | 25 +++++++------------
 ...raphite_general_system_performance.json.j2 | 25 +++++++------------
 .../guest_general_system_performance.json.j2  | 25 +++++++------------
 .../ose_general_system_performance.json.j2    | 25 +++++++------------
 ...ellite6_general_system_performance.json.j2 | 25 +++++++------------
 ...enstack_general_system_performance.json.j2 | 23 ++++++-----------
 9 files changed, 71 insertions(+), 127 deletions(-)
 rename ansible/install/group_vars/{all => all.yml} (100%)

diff --git a/ansible/install/group_vars/all b/ansible/install/group_vars/all.yml
similarity index 100%
rename from ansible/install/group_vars/all
rename to ansible/install/group_vars/all.yml
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 34fbd890a..9940c7548 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
@@ -1250,11 +1250,11 @@
             "datasource": null,
             "editable": true,
             "error": false,
-            "fill": 1,
+            "fill": 0,
             "grid": {
               "leftLogBase": 1,
-              "leftMax": null,
-              "leftMin": null,
+              "leftMax": 100,
+              "leftMin": 0,
               "rightLogBase": 1,
               "rightMax": null,
               "rightMin": null,
@@ -1263,7 +1263,7 @@
               "threshold2": null,
               "threshold2Color": "rgba(234, 112, 112, 0.22)"
             },
-        {% if vars.update({'panel_idx': (vars.panel_idx + 1)}) %} {% endif %}
+            {% if vars.update({'panel_idx': (vars.panel_idx + 1)}) %} {% endif %}
             "id": {{vars.panel_idx}},
             "isNew": true,
             "legend": {
@@ -1280,7 +1280,7 @@
             "lines": true,
             "linewidth": 2,
             "links": [],
-            "nullPointMode": "connected",
+            "nullPointMode": "null",
             "percentage": false,
             "pointradius": 5,
             "points": false,
@@ -1292,25 +1292,18 @@
               }
             ],
             "span": 12,
-            "stack": true,
+            "stack": false,
             "steppedLine": false,
             "targets": [
               {
                 "refId": "A",
-                "target": "alias($Cloud.$Node.df-root.percent_bytes-reserved, 'Reserved')"
-              },
-              {
-                "refId": "B",
-                "target": "alias($Cloud.$Node.df-root.percent_bytes-used, 'Used')"
-              },
-              {
-                "refId": "C",
-                "target": "alias($Cloud.$Node.df-root.percent_bytes-free, 'Free')"
+                "target": "aliasByNode(aliasSub($Cloud.$Node.df-*.percent_bytes-used, 'df-', ''), 2)",
+                "textEditor": false
               }
             ],
             "timeFrom": null,
             "timeShift": null,
-            "title": "$Cloud - $Node - / Partition Capacity",
+            "title": "$Cloud - $Node -  Partition % Used",
             "tooltip": {
               "shared": true,
               "value_type": "individual"
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 97885b025..35c47a422 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
@@ -1135,11 +1135,11 @@
             "datasource": null,
             "editable": true,
             "error": false,
-            "fill": 1,
+            "fill": 0,
             "grid": {
               "leftLogBase": 1,
-              "leftMax": null,
-              "leftMin": null,
+              "leftMax": 100,
+              "leftMin": 0,
               "rightLogBase": 1,
               "rightMax": null,
               "rightMin": null,
@@ -1148,7 +1148,7 @@
               "threshold2": null,
               "threshold2Color": "rgba(234, 112, 112, 0.22)"
             },
-        {% if vars.update({'panel_idx': (vars.panel_idx + 1)}) %} {% endif %}
+            {% if vars.update({'panel_idx': (vars.panel_idx + 1)}) %} {% endif %}
             "id": {{vars.panel_idx}},
             "isNew": true,
             "legend": {
@@ -1165,7 +1165,7 @@
             "lines": true,
             "linewidth": 2,
             "links": [],
-            "nullPointMode": "connected",
+            "nullPointMode": "null",
             "percentage": false,
             "pointradius": 5,
             "points": false,
@@ -1177,25 +1177,18 @@
               }
             ],
             "span": 12,
-            "stack": true,
+            "stack": false,
             "steppedLine": false,
             "targets": [
               {
                 "refId": "A",
-                "target": "alias($Cloud.$Node.df-root.percent_bytes-reserved, 'Reserved')"
-              },
-              {
-                "refId": "B",
-                "target": "alias($Cloud.$Node.df-root.percent_bytes-used, 'Used')"
-              },
-              {
-                "refId": "C",
-                "target": "alias($Cloud.$Node.df-root.percent_bytes-free, 'Free')"
+                "target": "aliasByNode(aliasSub($Cloud.$Node.df-*.percent_bytes-used, 'df-', ''), 2)",
+                "textEditor": false
               }
             ],
             "timeFrom": null,
             "timeShift": null,
-            "title": "$Cloud - $Node - / Partition Capacity",
+            "title": "$Cloud - $Node -  Partition % Used",
             "tooltip": {
               "shared": true,
               "value_type": "individual"
diff --git a/ansible/install/roles/dashboard-generic/templates/cfmeallinone_general_system_performance.json.j2 b/ansible/install/roles/dashboard-generic/templates/cfmeallinone_general_system_performance.json.j2
index d2e004e2b..5c79b9e5b 100644
--- a/ansible/install/roles/dashboard-generic/templates/cfmeallinone_general_system_performance.json.j2
+++ b/ansible/install/roles/dashboard-generic/templates/cfmeallinone_general_system_performance.json.j2
@@ -1135,11 +1135,11 @@
             "datasource": null,
             "editable": true,
             "error": false,
-            "fill": 1,
+            "fill": 0,
             "grid": {
               "leftLogBase": 1,
-              "leftMax": null,
-              "leftMin": null,
+              "leftMax": 100,
+              "leftMin": 0,
               "rightLogBase": 1,
               "rightMax": null,
               "rightMin": null,
@@ -1148,7 +1148,7 @@
               "threshold2": null,
               "threshold2Color": "rgba(234, 112, 112, 0.22)"
             },
-        {% if vars.update({'panel_idx': (vars.panel_idx + 1)}) %} {% endif %}
+            {% if vars.update({'panel_idx': (vars.panel_idx + 1)}) %} {% endif %}
             "id": {{vars.panel_idx}},
             "isNew": true,
             "legend": {
@@ -1165,7 +1165,7 @@
             "lines": true,
             "linewidth": 2,
             "links": [],
-            "nullPointMode": "connected",
+            "nullPointMode": "null",
             "percentage": false,
             "pointradius": 5,
             "points": false,
@@ -1177,25 +1177,18 @@
               }
             ],
             "span": 12,
-            "stack": true,
+            "stack": false,
             "steppedLine": false,
             "targets": [
               {
                 "refId": "A",
-                "target": "alias($Cloud.$Node.df-root.percent_bytes-reserved, 'Reserved')"
-              },
-              {
-                "refId": "B",
-                "target": "alias($Cloud.$Node.df-root.percent_bytes-used, 'Used')"
-              },
-              {
-                "refId": "C",
-                "target": "alias($Cloud.$Node.df-root.percent_bytes-free, 'Free')"
+                "target": "aliasByNode(aliasSub($Cloud.$Node.df-*.percent_bytes-used, 'df-', ''), 2)",
+                "textEditor": false
               }
             ],
             "timeFrom": null,
             "timeShift": null,
-            "title": "$Cloud - $Node - / Partition Capacity",
+            "title": "$Cloud - $Node -  Partition % Used",
             "tooltip": {
               "shared": true,
               "value_type": "individual"
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 b9d311ccd..d6f0fc4b2 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
@@ -1250,11 +1250,11 @@
             "datasource": null,
             "editable": true,
             "error": false,
-            "fill": 1,
+            "fill": 0,
             "grid": {
               "leftLogBase": 1,
-              "leftMax": null,
-              "leftMin": null,
+              "leftMax": 100,
+              "leftMin": 0,
               "rightLogBase": 1,
               "rightMax": null,
               "rightMin": null,
@@ -1263,7 +1263,7 @@
               "threshold2": null,
               "threshold2Color": "rgba(234, 112, 112, 0.22)"
             },
-        {% if vars.update({'panel_idx': (vars.panel_idx + 1)}) %} {% endif %}
+            {% if vars.update({'panel_idx': (vars.panel_idx + 1)}) %} {% endif %}
             "id": {{vars.panel_idx}},
             "isNew": true,
             "legend": {
@@ -1280,7 +1280,7 @@
             "lines": true,
             "linewidth": 2,
             "links": [],
-            "nullPointMode": "connected",
+            "nullPointMode": "null",
             "percentage": false,
             "pointradius": 5,
             "points": false,
@@ -1292,25 +1292,18 @@
               }
             ],
             "span": 12,
-            "stack": true,
+            "stack": false,
             "steppedLine": false,
             "targets": [
               {
                 "refId": "A",
-                "target": "alias($Cloud.$Node.df-root.percent_bytes-reserved, 'Reserved')"
-              },
-              {
-                "refId": "B",
-                "target": "alias($Cloud.$Node.df-root.percent_bytes-used, 'Used')"
-              },
-              {
-                "refId": "C",
-                "target": "alias($Cloud.$Node.df-root.percent_bytes-free, 'Free')"
+                "target": "aliasByNode(aliasSub($Cloud.$Node.df-*.percent_bytes-used, 'df-', ''), 2)",
+                "textEditor": false
               }
             ],
             "timeFrom": null,
             "timeShift": null,
-            "title": "$Cloud - $Node - / Partition Capacity",
+            "title": "$Cloud - $Node -  Partition % Used",
             "tooltip": {
               "shared": true,
               "value_type": "individual"
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 2dd119949..782fd783f 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
@@ -1250,11 +1250,11 @@
             "datasource": null,
             "editable": true,
             "error": false,
-            "fill": 1,
+            "fill": 0,
             "grid": {
               "leftLogBase": 1,
-              "leftMax": null,
-              "leftMin": null,
+              "leftMax": 100,
+              "leftMin": 0,
               "rightLogBase": 1,
               "rightMax": null,
               "rightMin": null,
@@ -1263,7 +1263,7 @@
               "threshold2": null,
               "threshold2Color": "rgba(234, 112, 112, 0.22)"
             },
-        {% if vars.update({'panel_idx': (vars.panel_idx + 1)}) %} {% endif %}
+            {% if vars.update({'panel_idx': (vars.panel_idx + 1)}) %} {% endif %}
             "id": {{vars.panel_idx}},
             "isNew": true,
             "legend": {
@@ -1280,7 +1280,7 @@
             "lines": true,
             "linewidth": 2,
             "links": [],
-            "nullPointMode": "connected",
+            "nullPointMode": "null",
             "percentage": false,
             "pointradius": 5,
             "points": false,
@@ -1292,25 +1292,18 @@
               }
             ],
             "span": 12,
-            "stack": true,
+            "stack": false,
             "steppedLine": false,
             "targets": [
               {
                 "refId": "A",
-                "target": "alias($Cloud.$Node.df-root.percent_bytes-reserved, 'Reserved')"
-              },
-              {
-                "refId": "B",
-                "target": "alias($Cloud.$Node.df-root.percent_bytes-used, 'Used')"
-              },
-              {
-                "refId": "C",
-                "target": "alias($Cloud.$Node.df-root.percent_bytes-free, 'Free')"
+                "target": "aliasByNode(aliasSub($Cloud.$Node.df-*.percent_bytes-used, 'df-', ''), 2)",
+                "textEditor": false
               }
             ],
             "timeFrom": null,
             "timeShift": null,
-            "title": "$Cloud - $Node - / Partition Capacity",
+            "title": "$Cloud - $Node -  Partition % Used",
             "tooltip": {
               "shared": true,
               "value_type": "individual"
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 518ae8a08..fd71d865f 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
@@ -1250,11 +1250,11 @@
             "datasource": null,
             "editable": true,
             "error": false,
-            "fill": 1,
+            "fill": 0,
             "grid": {
               "leftLogBase": 1,
-              "leftMax": null,
-              "leftMin": null,
+              "leftMax": 100,
+              "leftMin": 0,
               "rightLogBase": 1,
               "rightMax": null,
               "rightMin": null,
@@ -1263,7 +1263,7 @@
               "threshold2": null,
               "threshold2Color": "rgba(234, 112, 112, 0.22)"
             },
-        {% if vars.update({'panel_idx': (vars.panel_idx + 1)}) %} {% endif %}
+            {% if vars.update({'panel_idx': (vars.panel_idx + 1)}) %} {% endif %}
             "id": {{vars.panel_idx}},
             "isNew": true,
             "legend": {
@@ -1280,7 +1280,7 @@
             "lines": true,
             "linewidth": 2,
             "links": [],
-            "nullPointMode": "connected",
+            "nullPointMode": "null",
             "percentage": false,
             "pointradius": 5,
             "points": false,
@@ -1292,25 +1292,18 @@
               }
             ],
             "span": 12,
-            "stack": true,
+            "stack": false,
             "steppedLine": false,
             "targets": [
               {
                 "refId": "A",
-                "target": "alias($Cloud.$Node.df-root.percent_bytes-reserved, 'Reserved')"
-              },
-              {
-                "refId": "B",
-                "target": "alias($Cloud.$Node.df-root.percent_bytes-used, 'Used')"
-              },
-              {
-                "refId": "C",
-                "target": "alias($Cloud.$Node.df-root.percent_bytes-free, 'Free')"
+                "target": "aliasByNode(aliasSub($Cloud.$Node.df-*.percent_bytes-used, 'df-', ''), 2)",
+                "textEditor": false
               }
             ],
             "timeFrom": null,
             "timeShift": null,
-            "title": "$Cloud - $Node - / Partition Capacity",
+            "title": "$Cloud - $Node -  Partition % Used",
             "tooltip": {
               "shared": true,
               "value_type": "individual"
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 6e5b378b1..71c5bb6ff 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
@@ -1250,11 +1250,11 @@
             "datasource": null,
             "editable": true,
             "error": false,
-            "fill": 1,
+            "fill": 0,
             "grid": {
               "leftLogBase": 1,
-              "leftMax": null,
-              "leftMin": null,
+              "leftMax": 100,
+              "leftMin": 0,
               "rightLogBase": 1,
               "rightMax": null,
               "rightMin": null,
@@ -1263,7 +1263,7 @@
               "threshold2": null,
               "threshold2Color": "rgba(234, 112, 112, 0.22)"
             },
-        {% if vars.update({'panel_idx': (vars.panel_idx + 1)}) %} {% endif %}
+            {% if vars.update({'panel_idx': (vars.panel_idx + 1)}) %} {% endif %}
             "id": {{vars.panel_idx}},
             "isNew": true,
             "legend": {
@@ -1280,7 +1280,7 @@
             "lines": true,
             "linewidth": 2,
             "links": [],
-            "nullPointMode": "connected",
+            "nullPointMode": "null",
             "percentage": false,
             "pointradius": 5,
             "points": false,
@@ -1292,25 +1292,18 @@
               }
             ],
             "span": 12,
-            "stack": true,
+            "stack": false,
             "steppedLine": false,
             "targets": [
               {
                 "refId": "A",
-                "target": "alias($Cloud.$Node.df-root.percent_bytes-reserved, 'Reserved')"
-              },
-              {
-                "refId": "B",
-                "target": "alias($Cloud.$Node.df-root.percent_bytes-used, 'Used')"
-              },
-              {
-                "refId": "C",
-                "target": "alias($Cloud.$Node.df-root.percent_bytes-free, 'Free')"
+                "target": "aliasByNode(aliasSub($Cloud.$Node.df-*.percent_bytes-used, 'df-', ''), 2)",
+                "textEditor": false
               }
             ],
             "timeFrom": null,
             "timeShift": null,
-            "title": "$Cloud - $Node - / Partition Capacity",
+            "title": "$Cloud - $Node -  Partition % Used",
             "tooltip": {
               "shared": true,
               "value_type": "individual"
diff --git a/ansible/install/roles/dashboard-openstack/templates/openstack_general_system_performance.json.j2 b/ansible/install/roles/dashboard-openstack/templates/openstack_general_system_performance.json.j2
index 10c2dea7e..da751d03c 100644
--- a/ansible/install/roles/dashboard-openstack/templates/openstack_general_system_performance.json.j2
+++ b/ansible/install/roles/dashboard-openstack/templates/openstack_general_system_performance.json.j2
@@ -1261,11 +1261,11 @@
             "datasource": null,
             "editable": true,
             "error": false,
-            "fill": 1,
+            "fill": 0,
             "grid": {
               "leftLogBase": 1,
-              "leftMax": null,
-              "leftMin": null,
+              "leftMax": 100,
+              "leftMin": 0,
               "rightLogBase": 1,
               "rightMax": null,
               "rightMin": null,
@@ -1291,7 +1291,7 @@
             "lines": true,
             "linewidth": 2,
             "links": [],
-            "nullPointMode": "connected",
+            "nullPointMode": "null",
             "percentage": false,
             "pointradius": 5,
             "points": false,
@@ -1303,25 +1303,18 @@
               }
             ],
             "span": 12,
-            "stack": true,
+            "stack": false,
             "steppedLine": false,
             "targets": [
               {
                 "refId": "A",
-                "target": "alias($Cloud.$Node.df-root.percent_bytes-reserved, 'Reserved')"
-              },
-              {
-                "refId": "B",
-                "target": "alias($Cloud.$Node.df-root.percent_bytes-used, 'Used')"
-              },
-              {
-                "refId": "C",
-                "target": "alias($Cloud.$Node.df-root.percent_bytes-free, 'Free')"
+                "target": "aliasByNode(aliasSub($Cloud.$Node.df-*.percent_bytes-used, 'df-', ''), 2)",
+                "textEditor": false
               }
             ],
             "timeFrom": null,
             "timeShift": null,
-            "title": "$Cloud - $Node - / Partition Capacity",
+            "title": "$Cloud - $Node -  Partition % Used",
             "tooltip": {
               "shared": true,
               "value_type": "individual"