From 81071e975d1072372ad4ae82da551619a54e4ef2 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Mon, 25 Feb 2019 15:43:37 +1100
Subject: [PATCH] DIB grafana dashboard small fixes

Alias the legend for the build size

A more useful view is -7 days, rather than last week, which starts
fresh each week.

Change-Id: I65f6f601a47dd33e5205ac3530c47a5a58deb5b8
---
 grafana/nodepool-dib.base.template  |  4 ++--
 grafana/nodepool-dib.image.template |  2 +-
 grafana/nodepool-dib.yaml           | 26 +++++++++++++-------------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/grafana/nodepool-dib.base.template b/grafana/nodepool-dib.base.template
index 6093cac079..5254d7192c 100644
--- a/grafana/nodepool-dib.base.template
+++ b/grafana/nodepool-dib.base.template
@@ -6,8 +6,8 @@
 dashboard:
   title: 'Nodepool: DIB Status'
   time:
-    from: "now/w"
-    to: "now/w"
+    from: "now-7d"
+    to: "now"
   rows:
     - title: Description
       height: 100px
diff --git a/grafana/nodepool-dib.image.template b/grafana/nodepool-dib.image.template
index 561f364899..fb023bbac5 100644
--- a/grafana/nodepool-dib.image.template
+++ b/grafana/nodepool-dib.image.template
@@ -28,7 +28,7 @@
             - format: decbytes
               min: 0
           targets:
-            - target: alias(stats.gauges.nodepool.dib_image_build.%KEY%.*.size, "Size")
+            - target: aliasByNode(stats.gauges.nodepool.dib_image_build.%KEY%.*.size, 5)
               refId: A
 
         - title: Build duration
diff --git a/grafana/nodepool-dib.yaml b/grafana/nodepool-dib.yaml
index 50ac69bdbf..66c99fab83 100644
--- a/grafana/nodepool-dib.yaml
+++ b/grafana/nodepool-dib.yaml
@@ -6,8 +6,8 @@
 dashboard:
   title: 'Nodepool: DIB Status'
   time:
-    from: "now/w"
-    to: "now/w"
+    from: "now-7d"
+    to: "now"
   rows:
     - title: Description
       height: 100px
@@ -49,7 +49,7 @@ dashboard:
             - format: decbytes
               min: 0
           targets:
-            - target: alias(stats.gauges.nodepool.dib_image_build.ubuntu-bionic.*.size, "Size")
+            - target: aliasByNode(stats.gauges.nodepool.dib_image_build.ubuntu-bionic.*.size, 5)
               refId: A
 
         - title: Build duration
@@ -93,7 +93,7 @@ dashboard:
             - format: decbytes
               min: 0
           targets:
-            - target: alias(stats.gauges.nodepool.dib_image_build.ubuntu-xenial.*.size, "Size")
+            - target: aliasByNode(stats.gauges.nodepool.dib_image_build.ubuntu-xenial.*.size, 5)
               refId: A
 
         - title: Build duration
@@ -137,7 +137,7 @@ dashboard:
             - format: decbytes
               min: 0
           targets:
-            - target: alias(stats.gauges.nodepool.dib_image_build.ubuntu-trusty.*.size, "Size")
+            - target: aliasByNode(stats.gauges.nodepool.dib_image_build.ubuntu-trusty.*.size, 5)
               refId: A
 
         - title: Build duration
@@ -181,7 +181,7 @@ dashboard:
             - format: decbytes
               min: 0
           targets:
-            - target: alias(stats.gauges.nodepool.dib_image_build.centos-7.*.size, "Size")
+            - target: aliasByNode(stats.gauges.nodepool.dib_image_build.centos-7.*.size, 5)
               refId: A
 
         - title: Build duration
@@ -225,7 +225,7 @@ dashboard:
             - format: decbytes
               min: 0
           targets:
-            - target: alias(stats.gauges.nodepool.dib_image_build.fedora-29.*.size, "Size")
+            - target: aliasByNode(stats.gauges.nodepool.dib_image_build.fedora-29.*.size, 5)
               refId: A
 
         - title: Build duration
@@ -269,7 +269,7 @@ dashboard:
             - format: decbytes
               min: 0
           targets:
-            - target: alias(stats.gauges.nodepool.dib_image_build.debian-stretch.*.size, "Size")
+            - target: aliasByNode(stats.gauges.nodepool.dib_image_build.debian-stretch.*.size, 5)
               refId: A
 
         - title: Build duration
@@ -313,7 +313,7 @@ dashboard:
             - format: decbytes
               min: 0
           targets:
-            - target: alias(stats.gauges.nodepool.dib_image_build.gentoo-17-0-systemd.*.size, "Size")
+            - target: aliasByNode(stats.gauges.nodepool.dib_image_build.gentoo-17-0-systemd.*.size, 5)
               refId: A
 
         - title: Build duration
@@ -357,7 +357,7 @@ dashboard:
             - format: decbytes
               min: 0
           targets:
-            - target: alias(stats.gauges.nodepool.dib_image_build.opensuse-150.*.size, "Size")
+            - target: aliasByNode(stats.gauges.nodepool.dib_image_build.opensuse-150.*.size, 5)
               refId: A
 
         - title: Build duration
@@ -401,7 +401,7 @@ dashboard:
             - format: decbytes
               min: 0
           targets:
-            - target: alias(stats.gauges.nodepool.dib_image_build.opensuse-423.*.size, "Size")
+            - target: aliasByNode(stats.gauges.nodepool.dib_image_build.opensuse-423.*.size, 5)
               refId: A
 
         - title: Build duration
@@ -445,7 +445,7 @@ dashboard:
             - format: decbytes
               min: 0
           targets:
-            - target: alias(stats.gauges.nodepool.dib_image_build.ubuntu-bionic-arm64.*.size, "Size")
+            - target: aliasByNode(stats.gauges.nodepool.dib_image_build.ubuntu-bionic-arm64.*.size, 5)
               refId: A
 
         - title: Build duration
@@ -489,7 +489,7 @@ dashboard:
             - format: decbytes
               min: 0
           targets:
-            - target: alias(stats.gauges.nodepool.dib_image_build.ubuntu-xenial-arm64.*.size, "Size")
+            - target: aliasByNode(stats.gauges.nodepool.dib_image_build.ubuntu-xenial-arm64.*.size, 5)
               refId: A
 
         - title: Build duration