From c7f1d1a0e7d6fde857647c50bd3a47790585a51c Mon Sep 17 00:00:00 2001
From: akrzos <akrzos@redhat.com>
Date: Mon, 21 Nov 2016 15:27:23 -0500
Subject: [PATCH] Sum CPU % rather than average % cpu util

This gives a cleaner picture to CPU utilization with the core count varies.

Change-Id: I04ae123d051c0a01fb132b9b42b9e2593e7aaf7b
---
 .../templates/all_cpu_graphs.json.j2             | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ansible/install/roles/grafana-dashboards/templates/all_cpu_graphs.json.j2 b/ansible/install/roles/grafana-dashboards/templates/all_cpu_graphs.json.j2
index 6b715f6a8..ca6485b41 100644
--- a/ansible/install/roles/grafana-dashboards/templates/all_cpu_graphs.json.j2
+++ b/ansible/install/roles/grafana-dashboards/templates/all_cpu_graphs.json.j2
@@ -75,35 +75,35 @@
               "targets": [
                 {
                   "refId": "A",
-                  "target": "alias(averageSeries({{dashboard_cloud_name}}.{{host}}.cpu-*.cpu-system), 'System')"
+                  "target": "alias(sumSeries({{dashboard_cloud_name}}.{{host}}.cpu-*.cpu-system), 'System')"
                 },
                 {
                   "refId": "B",
-                  "target": "alias(averageSeries({{dashboard_cloud_name}}.{{host}}.cpu-*.cpu-user), 'User')"
+                  "target": "alias(sumSeries({{dashboard_cloud_name}}.{{host}}.cpu-*.cpu-user), 'User')"
                 },
                 {
                   "refId": "C",
-                  "target": "alias(averageSeries({{dashboard_cloud_name}}.{{host}}.cpu-*.cpu-nice), 'Nice')"
+                  "target": "alias(sumSeries({{dashboard_cloud_name}}.{{host}}.cpu-*.cpu-nice), 'Nice')"
                 },
                 {
                   "refId": "D",
-                  "target": "alias(averageSeries({{dashboard_cloud_name}}.{{host}}.cpu-*.cpu-steal), 'Steal')"
+                  "target": "alias(sumSeries({{dashboard_cloud_name}}.{{host}}.cpu-*.cpu-steal), 'Steal')"
                 },
                 {
                   "refId": "E",
-                  "target": "alias(averageSeries({{dashboard_cloud_name}}.{{host}}.cpu-*.cpu-softirq), 'SoftIRQ')"
+                  "target": "alias(sumSeries({{dashboard_cloud_name}}.{{host}}.cpu-*.cpu-softirq), 'SoftIRQ')"
                 },
                 {
                   "refId": "F",
-                  "target": "alias(averageSeries({{dashboard_cloud_name}}.{{host}}.cpu-*.cpu-interrupt), 'Interrupt')"
+                  "target": "alias(sumSeries({{dashboard_cloud_name}}.{{host}}.cpu-*.cpu-interrupt), 'Interrupt')"
                 },
                 {
                   "refId": "G",
-                  "target": "alias(averageSeries({{dashboard_cloud_name}}.{{host}}.cpu-*.cpu-wait), 'Wait')"
+                  "target": "alias(sumSeries({{dashboard_cloud_name}}.{{host}}.cpu-*.cpu-wait), 'Wait')"
                 },
                 {
                   "refId": "H",
-                  "target": "alias(averageSeries({{dashboard_cloud_name}}.{{host}}.cpu-*.cpu-idle), 'Idle')"
+                  "target": "alias(sumSeries({{dashboard_cloud_name}}.{{host}}.cpu-*.cpu-idle), 'Idle')"
                 }
               ],
               "timeFrom": null,