From c219a396a8b1fb04a40df2f101846e67032101cd Mon Sep 17 00:00:00 2001
From: Kevin Carter <kevin.carter@rackspace.com>
Date: Tue, 27 Sep 2016 22:37:29 -0500
Subject: [PATCH] Added additional (disk|s3500|s3700) to entries

Change-Id: Ie8cd97e559b3af09017b715b21729f9a93e28ca4
Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
---
 grafana/nodepool-osic.yaml | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/grafana/nodepool-osic.yaml b/grafana/nodepool-osic.yaml
index 0cc475014f..40e5c38183 100644
--- a/grafana/nodepool-osic.yaml
+++ b/grafana/nodepool-osic.yaml
@@ -114,7 +114,11 @@ dashboard:
           nullPointMode: null as zero
           leftYAxisLabel: "events / min"
           targets:
-            - target: aliasSub(aliasByNode(smartSummarize(sumSeries(stats_counts.nodepool.launch.provider.$provider.error.*), '1m'), 4), 'osic-', '')
+            - target: alias(smartSummarize(sumSeries(stats_counts.nodepool.launch.provider.osic-cloud1.error.*), '1m'), 'CLOUD1')
+            - target: alias(smartSummarize(sumSeries(stats_counts.nodepool.launch.provider.osic-cloud1-disk.error.*), '1m'), 'CLOUD1-DISK')
+            - target: alias(smartSummarize(sumSeries(stats_counts.nodepool.launch.provider.osic-cloud1-s3500.error.*), '1m'), 'CLOUD1-S3500')
+            - target: alias(smartSummarize(sumSeries(stats_counts.nodepool.launch.provider.osic-cloud1-s3700.error.*), '1m'), 'CLOUD1-S3700')
+            - target: alias(smartSummarize(sumSeries(stats_counts.nodepool.launch.provider.osic-cloud8.error.*), '1m'), 'CLOUD8')
         - title: Time to Ready
           type: graph
           span: 4
@@ -216,8 +220,11 @@ dashboard:
             - s
             - none
           targets:
-            - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full-ubuntu-xenial.master.ubuntu-xenial.osic-cloud1.runtime.mean, '0.001'), 'Cloud 1')
-            - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full-ubuntu-xenial.master.ubuntu-xenial.osic-cloud8.runtime.mean, '0.001'), 'Cloud 8')
+            - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full-ubuntu-xenial.master.ubuntu-xenial.osic-cloud1.runtime.mean, '0.001'), 'CLOUD1')
+            - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full-ubuntu-xenial.master.ubuntu-xenial.osic-cloud1-disk.runtime.mean, '0.001'), 'CLOUD1-DISK')
+            - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full-ubuntu-xenial.master.ubuntu-xenial.osic-cloud1-s3700.runtime.mean, '0.001'), 'CLOUD1-S3700')
+            - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full-ubuntu-xenial.master.ubuntu-xenial.osic-cloud1-s3500.runtime.mean, '0.001'), 'CLOUD1-S3500')
+            - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full-ubuntu-xenial.master.ubuntu-xenial.osic-cloud8.runtime.mean, '0.001'), 'CLOUD8')
         - title: gate-tempest-dsvm-neutron-full
           type: graph
           span: 6
@@ -226,5 +233,8 @@ dashboard:
             - s
             - none
           targets:
-            - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.master.ubuntu-xenial.osic-cloud1.runtime.mean, '0.001'), 'Cloud 1')
-            - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.master.ubuntu-xenial.osic-cloud8.runtime.mean, '0.001'), 'Cloud 8')
+            - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.master.ubuntu-xenial.osic-cloud1.runtime.mean, '0.001'), 'CLOUD1')
+            - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.master.ubuntu-xenial.osic-cloud1-disk.runtime.mean, '0.001'), 'CLOUD1-DISK')
+            - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.master.ubuntu-xenial.osic-cloud1-s3700.runtime.mean, '0.001'), 'CLOUD1-S3700')
+            - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.master.ubuntu-xenial.osic-cloud1-s3500.runtime.mean, '0.001'), 'CLOUD1-S3500')
+            - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.master.ubuntu-xenial.osic-cloud8.runtime.mean, '0.001'), 'CLOUD8')