From 539ef91063da7fe963b3643c6a6a958cf603dfb8 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Fri, 12 May 2017 14:22:40 -0400
Subject: [PATCH] Update citycloud dashboard with new regions

We have 4 region now for citycloud.

Change-Id: I62f575f501ad29e2dda87464773035876a0fafdb
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 grafana/nodepool-citycloud.yaml | 54 ++++++++++++++++++++++-----------
 1 file changed, 36 insertions(+), 18 deletions(-)

diff --git a/grafana/nodepool-citycloud.yaml b/grafana/nodepool-citycloud.yaml
index 947e8174b7..fe48185e87 100644
--- a/grafana/nodepool-citycloud.yaml
+++ b/grafana/nodepool-citycloud.yaml
@@ -124,22 +124,6 @@ dashboard:
             - none
           targets:
             - target: aliasSub(aliasByNode(scale(stats.timers.nodepool.launch.provider.$provider.ready.mean, '0.001'), 5), 'citycloud-', '')
-        - title: Test Nodes (Fra1)
-          type: graph
-          span: 4
-          stack: true
-          tooltip:
-            value_type: individual
-          leftYAxisLabel: "nodes"
-          targets:
-            - target: alias(stats.gauges.nodepool.provider.citycloud-fra1.nodes.building, 'Building')
-            - target: alias(stats.gauges.nodepool.provider.citycloud-fra1.nodes.ready, 'Available')
-            - target: alias(stats.gauges.nodepool.provider.citycloud-fra1.nodes.used, 'In Use')
-            - target: alias(stats.gauges.nodepool.provider.citycloud-fra1.nodes.delete, 'Deleting')
-            - target: alias(stats.gauges.nodepool.provider.citycloud-fra1.max_servers, 'Max')
-          seriesOverrides:
-            - alias: Max
-              stack: False
         - title: Test Nodes (Kna1)
           type: graph
           span: 4
@@ -156,6 +140,22 @@ dashboard:
           seriesOverrides:
             - alias: Max
               stack: False
+        - title: Test Nodes (La1)
+          type: graph
+          span: 4
+          stack: true
+          tooltip:
+            value_type: individual
+          leftYAxisLabel: "nodes"
+          targets:
+            - target: alias(stats.gauges.nodepool.provider.citycloud-la1.nodes.building, 'Building')
+            - target: alias(stats.gauges.nodepool.provider.citycloud-la1.nodes.ready, 'Available')
+            - target: alias(stats.gauges.nodepool.provider.citycloud-la1.nodes.used, 'In Use')
+            - target: alias(stats.gauges.nodepool.provider.citycloud-la1.nodes.delete, 'Deleting')
+            - target: alias(stats.gauges.nodepool.provider.citycloud-la1.max_servers, 'Max')
+          seriesOverrides:
+            - alias: Max
+              stack: False
         - title: Test Nodes (Lon1)
           type: graph
           span: 4
@@ -172,6 +172,22 @@ dashboard:
           seriesOverrides:
             - alias: Max
               stack: False
+        - title: Test Nodes (Sto2)
+          type: graph
+          span: 4
+          stack: true
+          tooltip:
+            value_type: individual
+          leftYAxisLabel: "nodes"
+          targets:
+            - target: alias(stats.gauges.nodepool.provider.citycloud-sto2.nodes.building, 'Building')
+            - target: alias(stats.gauges.nodepool.provider.citycloud-sto2.nodes.ready, 'Available')
+            - target: alias(stats.gauges.nodepool.provider.citycloud-sto2.nodes.used, 'In Use')
+            - target: alias(stats.gauges.nodepool.provider.citycloud-sto2.nodes.delete, 'Deleting')
+            - target: alias(stats.gauges.nodepool.provider.citycloud-sto2.max_servers, 'Max')
+          seriesOverrides:
+            - alias: Max
+              stack: False
     - title: Job Runtimes
       showTitle: true
       height: 250px
@@ -184,9 +200,10 @@ dashboard:
             - s
             - none
           targets:
-            - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full-ubuntu-xenial.master.ubuntu-xenial.citycloud-fra1.runtime.mean, '0.001'), 'fra1')
             - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full-ubuntu-xenial.master.ubuntu-xenial.citycloud-kna1.runtime.mean, '0.001'), 'kna1')
+            - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full-ubuntu-xenial.master.ubuntu-xenial.citycloud-la1.runtime.mean, '0.001'), 'la1')
             - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full-ubuntu-xenial.master.ubuntu-xenial.citycloud-lon1.runtime.mean, '0.001'), 'lon1')
+            - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full-ubuntu-xenial.master.ubuntu-xenial.citycloud-sto2.runtime.mean, '0.001'), 'sto2')
         - title: gate-tempest-dsvm-neutron-full
           type: graph
           span: 6
@@ -195,6 +212,7 @@ dashboard:
             - s
             - none
           targets:
-            - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.master.ubuntu-xenial.citycloud-fra1.runtime.mean, '0.001'), 'fra1')
             - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.master.ubuntu-xenial.citycloud-kna1.runtime.mean, '0.001'), 'kna1')
+            - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.master.ubuntu-xenial.citycloud-la1.runtime.mean, '0.001'), 'la1')
             - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.master.ubuntu-xenial.citycloud-lon1.runtime.mean, '0.001'), 'lon1')
+            - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.master.ubuntu-xenial.citycloud-sto2.runtime.mean, '0.001'), 'sto2')