From a281b06c27d3fcaf1044d12f273e14f51223dc7a Mon Sep 17 00:00:00 2001 From: David Moreau-Simard Date: Thu, 28 Sep 2017 18:41:31 -0400 Subject: [PATCH] Update Nodepool graphite metric names Following the update to Zuul v3 some things changed: - nodes.delete became nodes.deleting - nodes.used became nodes.in-use but nodes.used is still relevant as it's the status between 'in-use' and 'deleting' - Add a panel for displaying failed nodes Change-Id: I240d082115bd9078e45984d8fcff212a4e40e842 Depends-On: I6a89752d74ed7424267c3af3937ad01fb4bb8f86 --- grafana/nodepool-citycloud.yaml | 24 ++++++++++-------- grafana/nodepool-datacentred.yaml | 9 ++++--- grafana/nodepool-entercloud.yaml | 19 ++++++++------ grafana/nodepool-inap.yaml | 9 ++++--- grafana/nodepool-infracloud.yaml | 14 ++++++----- grafana/nodepool-ovh.yaml | 14 ++++++----- grafana/nodepool-rax-experimental.yaml | 19 ++++++++------ grafana/nodepool-rax.yaml | 19 ++++++++------ grafana/nodepool-tripleo-test-cloud.yaml | 9 ++++--- grafana/nodepool-vexxhost.yaml | 9 ++++--- grafana/nodepool.yaml | 32 ++++++++++++++++++------ 11 files changed, 108 insertions(+), 69 deletions(-) diff --git a/grafana/nodepool-citycloud.yaml b/grafana/nodepool-citycloud.yaml index b03b3b7a47..a533d6f1da 100644 --- a/grafana/nodepool-citycloud.yaml +++ b/grafana/nodepool-citycloud.yaml @@ -45,7 +45,7 @@ dashboard: full: true show: true targets: - - target: sumSeries(stats.gauges.nodepool.provider.$provider.nodes.used) + - target: sumSeries(stats.gauges.nodepool.provider.$provider.nodes.in-use) type: singlestat valueName: current - title: Deleting @@ -54,7 +54,7 @@ dashboard: full: true show: true targets: - - target: sumSeries(stats.gauges.nodepool.provider.$provider.nodes.delete) + - target: sumSeries(stats.gauges.nodepool.provider.$provider.nodes.deleting) type: singlestat valueName: current - title: API Operations @@ -134,8 +134,9 @@ dashboard: targets: - target: alias(stats.gauges.nodepool.provider.citycloud-kna1.nodes.building, 'Building') - target: alias(stats.gauges.nodepool.provider.citycloud-kna1.nodes.ready, 'Available') - - target: alias(stats.gauges.nodepool.provider.citycloud-kna1.nodes.used, 'In Use') - - target: alias(stats.gauges.nodepool.provider.citycloud-kna1.nodes.delete, 'Deleting') + - target: alias(stats.gauges.nodepool.provider.citycloud-kna1.nodes.in-use, 'In Use') + - target: alias(stats.gauges.nodepool.provider.citycloud-kna1.nodes.used, 'Used') + - target: alias(stats.gauges.nodepool.provider.citycloud-kna1.nodes.deleting, 'Deleting') - target: alias(stats.gauges.nodepool.provider.citycloud-kna1.max_servers, 'Max') seriesOverrides: - alias: Max @@ -150,8 +151,9 @@ dashboard: 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.nodes.in-use, 'In Use') + - target: alias(stats.gauges.nodepool.provider.citycloud-la1.nodes.used, 'Used') + - target: alias(stats.gauges.nodepool.provider.citycloud-la1.nodes.deleting, 'Deleting') - target: alias(stats.gauges.nodepool.provider.citycloud-la1.max_servers, 'Max') seriesOverrides: - alias: Max @@ -166,8 +168,9 @@ dashboard: targets: - target: alias(stats.gauges.nodepool.provider.citycloud-lon1.nodes.building, 'Building') - target: alias(stats.gauges.nodepool.provider.citycloud-lon1.nodes.ready, 'Available') - - target: alias(stats.gauges.nodepool.provider.citycloud-lon1.nodes.used, 'In Use') - - target: alias(stats.gauges.nodepool.provider.citycloud-lon1.nodes.delete, 'Deleting') + - target: alias(stats.gauges.nodepool.provider.citycloud-lon1.nodes.in-use, 'In Use') + - target: alias(stats.gauges.nodepool.provider.citycloud-lon1.nodes.used, 'Used') + - target: alias(stats.gauges.nodepool.provider.citycloud-lon1.nodes.deleting, 'Deleting') - target: alias(stats.gauges.nodepool.provider.citycloud-lon1.max_servers, 'Max') seriesOverrides: - alias: Max @@ -182,8 +185,9 @@ dashboard: 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.nodes.in-use, 'In Use') + - target: alias(stats.gauges.nodepool.provider.citycloud-sto2.nodes.used, 'Used') + - target: alias(stats.gauges.nodepool.provider.citycloud-sto2.nodes.deleting, 'Deleting') - target: alias(stats.gauges.nodepool.provider.citycloud-sto2.max_servers, 'Max') seriesOverrides: - alias: Max diff --git a/grafana/nodepool-datacentred.yaml b/grafana/nodepool-datacentred.yaml index 83973a5e32..4b1123e0e1 100644 --- a/grafana/nodepool-datacentred.yaml +++ b/grafana/nodepool-datacentred.yaml @@ -45,7 +45,7 @@ dashboard: full: true show: true targets: - - target: sumSeries(stats.gauges.nodepool.provider.$provider.nodes.used) + - target: sumSeries(stats.gauges.nodepool.provider.$provider.nodes.in-use) type: singlestat valueName: current - title: Deleting @@ -54,7 +54,7 @@ dashboard: full: true show: true targets: - - target: sumSeries(stats.gauges.nodepool.provider.$provider.nodes.delete) + - target: sumSeries(stats.gauges.nodepool.provider.$provider.nodes.deleting) type: singlestat valueName: current - title: API Operations @@ -134,8 +134,9 @@ dashboard: targets: - target: alias(stats.gauges.nodepool.provider.datacentred-sal01.nodes.building, 'Building') - target: alias(stats.gauges.nodepool.provider.datacentred-sal01.nodes.ready, 'Available') - - target: alias(stats.gauges.nodepool.provider.datacentred-sal01.nodes.used, 'In Use') - - target: alias(stats.gauges.nodepool.provider.datacentred-sal01.nodes.delete, 'Deleting') + - target: alias(stats.gauges.nodepool.provider.datacentred-sal01.nodes.in-use, 'In Use') + - target: alias(stats.gauges.nodepool.provider.datacentred-sal01.nodes.used, 'Used') + - target: alias(stats.gauges.nodepool.provider.datacentred-sal01.nodes.deleting, 'Deleting') - target: alias(stats.gauges.nodepool.provider.datacentred-sal01.max_servers, 'Max') seriesOverrides: - alias: Max diff --git a/grafana/nodepool-entercloud.yaml b/grafana/nodepool-entercloud.yaml index 873937e39e..0a8ddd52a6 100644 --- a/grafana/nodepool-entercloud.yaml +++ b/grafana/nodepool-entercloud.yaml @@ -45,7 +45,7 @@ dashboard: full: true show: true targets: - - target: sumSeries(stats.gauges.nodepool.provider.$provider.nodes.used) + - target: sumSeries(stats.gauges.nodepool.provider.$provider.nodes.in-use) type: singlestat valueName: current - title: Deleting @@ -54,7 +54,7 @@ dashboard: full: true show: true targets: - - target: sumSeries(stats.gauges.nodepool.provider.$provider.nodes.delete) + - target: sumSeries(stats.gauges.nodepool.provider.$provider.nodes.deleting) type: singlestat valueName: current - title: API Operations @@ -134,8 +134,9 @@ dashboard: targets: - target: alias(stats.gauges.nodepool.provider.entercloud-nlams1.nodes.building, 'Building') - target: alias(stats.gauges.nodepool.provider.entercloud-nlams1.nodes.ready, 'Available') - - target: alias(stats.gauges.nodepool.provider.entercloud-nlams1.nodes.used, 'In Use') - - target: alias(stats.gauges.nodepool.provider.entercloud-nlams1.nodes.delete, 'Deleting') + - target: alias(stats.gauges.nodepool.provider.entercloud-nlams1.nodes.in-use, 'In Use') + - target: alias(stats.gauges.nodepool.provider.entercloud-nlams1.nodes.used, 'Used') + - target: alias(stats.gauges.nodepool.provider.entercloud-nlams1.nodes.deleting, 'Deleting') - target: alias(stats.gauges.nodepool.provider.entercloud-nlams1.max_servers, 'Max') seriesOverrides: - alias: Max @@ -150,8 +151,9 @@ dashboard: targets: - target: alias(stats.gauges.nodepool.provider.entercloud-defra1.nodes.building, 'Building') - target: alias(stats.gauges.nodepool.provider.entercloud-defra1.nodes.ready, 'Available') - - target: alias(stats.gauges.nodepool.provider.entercloud-defra1.nodes.used, 'In Use') - - target: alias(stats.gauges.nodepool.provider.entercloud-defra1.nodes.delete, 'Deleting') + - target: alias(stats.gauges.nodepool.provider.entercloud-defra1.nodes.in-use, 'In Use') + - target: alias(stats.gauges.nodepool.provider.entercloud-defra1.nodes.used, 'Used') + - target: alias(stats.gauges.nodepool.provider.entercloud-defra1.nodes.deleting, 'Deleting') - target: alias(stats.gauges.nodepool.provider.entercloud-defra1.max_servers, 'Max') seriesOverrides: - alias: Max @@ -166,8 +168,9 @@ dashboard: targets: - target: alias(stats.gauges.nodepool.provider.entercloud-itmil1.nodes.building, 'Building') - target: alias(stats.gauges.nodepool.provider.entercloud-itmil1.nodes.ready, 'Available') - - target: alias(stats.gauges.nodepool.provider.entercloud-itmil1.nodes.used, 'In Use') - - target: alias(stats.gauges.nodepool.provider.entercloud-itmil1.nodes.delete, 'Deleting') + - target: alias(stats.gauges.nodepool.provider.entercloud-itmil1.nodes.in-use, 'In Use') + - target: alias(stats.gauges.nodepool.provider.entercloud-itmil1.nodes.used, 'Used') + - target: alias(stats.gauges.nodepool.provider.entercloud-itmil1.nodes.deleting, 'Deleting') - target: alias(stats.gauges.nodepool.provider.entercloud-itmil1.max_servers, 'Max') seriesOverrides: - alias: Max diff --git a/grafana/nodepool-inap.yaml b/grafana/nodepool-inap.yaml index a493cfc61c..583b9677ee 100644 --- a/grafana/nodepool-inap.yaml +++ b/grafana/nodepool-inap.yaml @@ -45,7 +45,7 @@ dashboard: full: true show: true targets: - - target: sumSeries(stats.gauges.nodepool.provider.$provider.nodes.used) + - target: sumSeries(stats.gauges.nodepool.provider.$provider.nodes.in-use) type: singlestat valueName: current - title: Deleting @@ -54,7 +54,7 @@ dashboard: full: true show: true targets: - - target: sumSeries(stats.gauges.nodepool.provider.$provider.nodes.delete) + - target: sumSeries(stats.gauges.nodepool.provider.$provider.nodes.deleting) type: singlestat valueName: current - title: API Operations @@ -134,8 +134,9 @@ dashboard: targets: - target: alias(stats.gauges.nodepool.provider.inap-mtl01.nodes.building, 'Building') - target: alias(stats.gauges.nodepool.provider.inap-mtl01.nodes.ready, 'Available') - - target: alias(stats.gauges.nodepool.provider.inap-mtl01.nodes.used, 'In Use') - - target: alias(stats.gauges.nodepool.provider.inap-mtl01.nodes.delete, 'Deleting') + - target: alias(stats.gauges.nodepool.provider.inap-mtl01.nodes.in-use, 'In Use') + - target: alias(stats.gauges.nodepool.provider.inap-mtl01.nodes.used, 'Used') + - target: alias(stats.gauges.nodepool.provider.inap-mtl01.nodes.deleting, 'Deleting') - target: alias(stats.gauges.nodepool.provider.inap-mtl01.max_servers, 'Max') seriesOverrides: - alias: Max diff --git a/grafana/nodepool-infracloud.yaml b/grafana/nodepool-infracloud.yaml index 10442a267d..b25ad81015 100644 --- a/grafana/nodepool-infracloud.yaml +++ b/grafana/nodepool-infracloud.yaml @@ -45,7 +45,7 @@ dashboard: full: true show: true targets: - - target: sumSeries(stats.gauges.nodepool.provider.$provider.nodes.used) + - target: sumSeries(stats.gauges.nodepool.provider.$provider.nodes.in-use) type: singlestat valueName: current - title: Deleting @@ -54,7 +54,7 @@ dashboard: full: true show: true targets: - - target: sumSeries(stats.gauges.nodepool.provider.$provider.nodes.delete) + - target: sumSeries(stats.gauges.nodepool.provider.$provider.nodes.deleting) type: singlestat valueName: current - title: API Operations @@ -134,8 +134,9 @@ dashboard: targets: - target: alias(stats.gauges.nodepool.provider.infracloud-chocolate.nodes.building, 'Building') - target: alias(stats.gauges.nodepool.provider.infracloud-chocolate.nodes.ready, 'Available') - - target: alias(stats.gauges.nodepool.provider.infracloud-chocolate.nodes.used, 'In Use') - - target: alias(stats.gauges.nodepool.provider.infracloud-chocolate.nodes.delete, 'Deleting') + - target: alias(stats.gauges.nodepool.provider.infracloud-chocolate.nodes.in-use, 'In Use') + - target: alias(stats.gauges.nodepool.provider.infracloud-chocolate.nodes.used, 'Used') + - target: alias(stats.gauges.nodepool.provider.infracloud-chocolate.nodes.deleting, 'Deleting') - target: alias(stats.gauges.nodepool.provider.infracloud-chocolate.max_servers, 'Max') seriesOverrides: - alias: Max @@ -150,8 +151,9 @@ dashboard: targets: - target: alias(stats.gauges.nodepool.provider.infracloud-vanilla.nodes.building, 'Building') - target: alias(stats.gauges.nodepool.provider.infracloud-vanilla.nodes.ready, 'Available') - - target: alias(stats.gauges.nodepool.provider.infracloud-vanilla.nodes.used, 'In Use') - - target: alias(stats.gauges.nodepool.provider.infracloud-vanilla.nodes.delete, 'Deleting') + - target: alias(stats.gauges.nodepool.provider.infracloud-vanilla.nodes.in-use, 'In Use') + - target: alias(stats.gauges.nodepool.provider.infracloud-vanilla.nodes.used, 'Used') + - target: alias(stats.gauges.nodepool.provider.infracloud-vanilla.nodes.deleting, 'Deleting') - target: alias(stats.gauges.nodepool.provider.infracloud-vanilla.max_servers, 'Max') seriesOverrides: - alias: Max diff --git a/grafana/nodepool-ovh.yaml b/grafana/nodepool-ovh.yaml index 3df0e383c0..1e4fbb4700 100644 --- a/grafana/nodepool-ovh.yaml +++ b/grafana/nodepool-ovh.yaml @@ -38,7 +38,7 @@ dashboard: full: true show: true targets: - - target: sumSeries(stats.gauges.nodepool.provider.ovh-*.nodes.used) + - target: sumSeries(stats.gauges.nodepool.provider.ovh-*.nodes.in-use) type: singlestat valueName: current - title: Deleting @@ -47,7 +47,7 @@ dashboard: full: true show: true targets: - - target: sumSeries(stats.gauges.nodepool.provider.ovh-*.nodes.delete) + - target: sumSeries(stats.gauges.nodepool.provider.ovh-*.nodes.deleting) type: singlestat valueName: current - title: API Operations @@ -134,8 +134,9 @@ dashboard: targets: - target: alias(stats.gauges.nodepool.provider.ovh-bhs1.nodes.building, 'Building') - target: alias(stats.gauges.nodepool.provider.ovh-bhs1.nodes.ready, 'Available') - - target: alias(stats.gauges.nodepool.provider.ovh-bhs1.nodes.used, 'In Use') - - target: alias(stats.gauges.nodepool.provider.ovh-bhs1.nodes.delete, 'Deleting') + - target: alias(stats.gauges.nodepool.provider.ovh-bhs1.nodes.in-use, 'In Use') + - target: alias(stats.gauges.nodepool.provider.ovh-bhs1.nodes.used, 'Used') + - target: alias(stats.gauges.nodepool.provider.ovh-bhs1.nodes.deleting, 'Deleting') - target: alias(stats.gauges.nodepool.provider.ovh-bhs1.max_servers, 'Max') seriesOverrides: - alias: Max @@ -150,8 +151,9 @@ dashboard: targets: - target: alias(stats.gauges.nodepool.provider.ovh-gra1.nodes.building, 'Building') - target: alias(stats.gauges.nodepool.provider.ovh-gra1.nodes.ready, 'Available') - - target: alias(stats.gauges.nodepool.provider.ovh-gra1.nodes.used, 'In Use') - - target: alias(stats.gauges.nodepool.provider.ovh-gra1.nodes.delete, 'Deleting') + - target: alias(stats.gauges.nodepool.provider.ovh-gra1.nodes.in-use, 'In Use') + - target: alias(stats.gauges.nodepool.provider.ovh-gra1.nodes.used, 'Used') + - target: alias(stats.gauges.nodepool.provider.ovh-gra1.nodes.deleting, 'Deleting') - target: alias(stats.gauges.nodepool.provider.ovh-gra1.max_servers, 'Max') seriesOverrides: - alias: Max diff --git a/grafana/nodepool-rax-experimental.yaml b/grafana/nodepool-rax-experimental.yaml index d31f15d8c8..e03a4dfb02 100644 --- a/grafana/nodepool-rax-experimental.yaml +++ b/grafana/nodepool-rax-experimental.yaml @@ -45,7 +45,7 @@ dashboard: full: true show: true targets: - - target: sumSeries(stats.gauges.nodepool.provider.$provider.nodes.used) + - target: sumSeries(stats.gauges.nodepool.provider.$provider.nodes.in-use) type: singlestat valueName: current - title: Deleting @@ -54,7 +54,7 @@ dashboard: full: true show: true targets: - - target: sumSeries(stats.gauges.nodepool.provider.$provider.nodes.delete) + - target: sumSeries(stats.gauges.nodepool.provider.$provider.nodes.deleting) type: singlestat valueName: current - title: API Operations @@ -134,8 +134,9 @@ dashboard: targets: - target: alias(stats.gauges.nodepool.provider.rax-dfw.nodes.building, 'Building') - target: alias(stats.gauges.nodepool.provider.rax-dfw.nodes.ready, 'Available') - - target: alias(stats.gauges.nodepool.provider.rax-dfw.nodes.used, 'In Use') - - target: alias(stats.gauges.nodepool.provider.rax-dfw.nodes.delete, 'Deleting') + - target: alias(stats.gauges.nodepool.provider.rax-dfw.nodes.in-use, 'In Use') + - target: alias(stats.gauges.nodepool.provider.rax-dfw.nodes.used, 'Used') + - target: alias(stats.gauges.nodepool.provider.rax-dfw.nodes.deleting, 'Deleting') - target: alias(stats.gauges.nodepool.provider.rax-dfw.max_servers, 'Max') seriesOverrides: - alias: Max @@ -150,8 +151,9 @@ dashboard: targets: - target: alias(stats.gauges.nodepool.provider.rax-iad.nodes.building, 'Building') - target: alias(stats.gauges.nodepool.provider.rax-iad.nodes.ready, 'Available') - - target: alias(stats.gauges.nodepool.provider.rax-iad.nodes.used, 'In Use') - - target: alias(stats.gauges.nodepool.provider.rax-iad.nodes.delete, 'Deleting') + - target: alias(stats.gauges.nodepool.provider.rax-iad.nodes.in-use, 'In Use') + - target: alias(stats.gauges.nodepool.provider.rax-iad.nodes.used, 'Used') + - target: alias(stats.gauges.nodepool.provider.rax-iad.nodes.deleting, 'Deleting') - target: alias(stats.gauges.nodepool.provider.rax-iad.max_servers, 'Max') seriesOverrides: - alias: Max @@ -166,8 +168,9 @@ dashboard: targets: - target: alias(stats.gauges.nodepool.provider.rax-ord.nodes.building, 'Building') - target: alias(stats.gauges.nodepool.provider.rax-ord.nodes.ready, 'Available') - - target: alias(stats.gauges.nodepool.provider.rax-ord.nodes.used, 'In Use') - - target: alias(stats.gauges.nodepool.provider.rax-ord.nodes.delete, 'Deleting') + - target: alias(stats.gauges.nodepool.provider.rax-ord.nodes.in-use, 'In Use') + - target: alias(stats.gauges.nodepool.provider.rax-ord.nodes.in-use, 'Used') + - target: alias(stats.gauges.nodepool.provider.rax-ord.nodes.deleting, 'Deleting') - target: alias(stats.gauges.nodepool.provider.rax-ord.max_servers, 'Max') seriesOverrides: - alias: Max diff --git a/grafana/nodepool-rax.yaml b/grafana/nodepool-rax.yaml index 1c88cb25a0..bd6f0610d1 100644 --- a/grafana/nodepool-rax.yaml +++ b/grafana/nodepool-rax.yaml @@ -38,7 +38,7 @@ dashboard: full: true show: true targets: - - target: sumSeries(stats.gauges.nodepool.provider.rax-*.nodes.used) + - target: sumSeries(stats.gauges.nodepool.provider.rax-*.nodes.in-use) type: singlestat valueName: current - title: Deleting @@ -47,7 +47,7 @@ dashboard: full: true show: true targets: - - target: sumSeries(stats.gauges.nodepool.provider.rax-*.nodes.delete) + - target: sumSeries(stats.gauges.nodepool.provider.rax-*.nodes.deleting) type: singlestat valueName: current - title: API Operations @@ -141,8 +141,9 @@ dashboard: targets: - target: alias(stats.gauges.nodepool.provider.rax-dfw.nodes.building, 'Building') - target: alias(stats.gauges.nodepool.provider.rax-dfw.nodes.ready, 'Available') - - target: alias(stats.gauges.nodepool.provider.rax-dfw.nodes.used, 'In Use') - - target: alias(stats.gauges.nodepool.provider.rax-dfw.nodes.delete, 'Deleting') + - target: alias(stats.gauges.nodepool.provider.rax-dfw.nodes.in-use, 'In Use') + - target: alias(stats.gauges.nodepool.provider.rax-dfw.nodes.used, 'Used') + - target: alias(stats.gauges.nodepool.provider.rax-dfw.nodes.deleting, 'Deleting') - target: alias(stats.gauges.nodepool.provider.rax-dfw.max_servers, 'Max') seriesOverrides: - alias: Max @@ -157,8 +158,9 @@ dashboard: targets: - target: alias(stats.gauges.nodepool.provider.rax-iad.nodes.building, 'Building') - target: alias(stats.gauges.nodepool.provider.rax-iad.nodes.ready, 'Available') - - target: alias(stats.gauges.nodepool.provider.rax-iad.nodes.used, 'In Use') - - target: alias(stats.gauges.nodepool.provider.rax-iad.nodes.delete, 'Deleting') + - target: alias(stats.gauges.nodepool.provider.rax-iad.nodes.in-use, 'In Use') + - target: alias(stats.gauges.nodepool.provider.rax-iad.nodes.used, 'Used') + - target: alias(stats.gauges.nodepool.provider.rax-iad.nodes.deleting, 'Deleting') - target: alias(stats.gauges.nodepool.provider.rax-iad.max_servers, 'Max') seriesOverrides: - alias: Max @@ -173,8 +175,9 @@ dashboard: targets: - target: alias(stats.gauges.nodepool.provider.rax-ord.nodes.building, 'Building') - target: alias(stats.gauges.nodepool.provider.rax-ord.nodes.ready, 'Available') - - target: alias(stats.gauges.nodepool.provider.rax-ord.nodes.used, 'In Use') - - target: alias(stats.gauges.nodepool.provider.rax-ord.nodes.delete, 'Deleting') + - target: alias(stats.gauges.nodepool.provider.rax-ord.nodes.in-use, 'In Use') + - target: alias(stats.gauges.nodepool.provider.rax-ord.nodes.used, 'Used') + - target: alias(stats.gauges.nodepool.provider.rax-ord.nodes.deleting, 'Deleting') - target: alias(stats.gauges.nodepool.provider.rax-ord.max_servers, 'Max') seriesOverrides: - alias: Max diff --git a/grafana/nodepool-tripleo-test-cloud.yaml b/grafana/nodepool-tripleo-test-cloud.yaml index f80cf3324d..0e0e7065d1 100644 --- a/grafana/nodepool-tripleo-test-cloud.yaml +++ b/grafana/nodepool-tripleo-test-cloud.yaml @@ -38,7 +38,7 @@ dashboard: full: true show: true targets: - - target: sumSeries(stats.gauges.nodepool.provider.tripleo-test-cloud-rh1.nodes.used) + - target: sumSeries(stats.gauges.nodepool.provider.tripleo-test-cloud-rh1.nodes.in-use) type: singlestat valueName: current - title: Deleting @@ -47,7 +47,7 @@ dashboard: full: true show: true targets: - - target: sumSeries(stats.gauges.nodepool.provider.tripleo-test-cloud-rh1.nodes.delete) + - target: sumSeries(stats.gauges.nodepool.provider.tripleo-test-cloud-rh1.nodes.deleting) type: singlestat valueName: current - title: API Operations @@ -163,8 +163,9 @@ dashboard: targets: - target: alias(stats.gauges.nodepool.provider.tripleo-test-cloud-rh1.nodes.building, 'Building') - target: alias(stats.gauges.nodepool.provider.tripleo-test-cloud-rh1.nodes.ready, 'Available') - - target: alias(stats.gauges.nodepool.provider.tripleo-test-cloud-rh1.nodes.used, 'In Use') - - target: alias(stats.gauges.nodepool.provider.tripleo-test-cloud-rh1.nodes.delete, 'Deleting') + - target: alias(stats.gauges.nodepool.provider.tripleo-test-cloud-rh1.nodes.in-use, 'In Use') + - target: alias(stats.gauges.nodepool.provider.tripleo-test-cloud-rh1.nodes.used, 'Used') + - target: alias(stats.gauges.nodepool.provider.tripleo-test-cloud-rh1.nodes.deleting, 'Deleting') - target: alias(stats.gauges.nodepool.provider.tripleo-test-cloud-rh1.max_servers, 'Max') seriesOverrides: - alias: Max diff --git a/grafana/nodepool-vexxhost.yaml b/grafana/nodepool-vexxhost.yaml index 4531215b0d..fdd478b0ef 100644 --- a/grafana/nodepool-vexxhost.yaml +++ b/grafana/nodepool-vexxhost.yaml @@ -38,7 +38,7 @@ dashboard: full: true show: true targets: - - target: sumSeries(stats.gauges.nodepool.provider.vexxhost-*.nodes.used) + - target: sumSeries(stats.gauges.nodepool.provider.vexxhost-*.nodes.in-use) type: singlestat valueName: current - title: Deleting @@ -47,7 +47,7 @@ dashboard: full: true show: true targets: - - target: sumSeries(stats.gauges.nodepool.provider.vexxhost-*.nodes.delete) + - target: sumSeries(stats.gauges.nodepool.provider.vexxhost-*.nodes.deleting) type: singlestat valueName: current - title: API Operations @@ -127,8 +127,9 @@ dashboard: targets: - target: alias(stats.gauges.nodepool.provider.vexxhost-ca-ymq-1.nodes.building, 'Building') - target: alias(stats.gauges.nodepool.provider.vexxhost-ca-ymq-1.nodes.ready, 'Available') - - target: alias(stats.gauges.nodepool.provider.vexxhost-ca-ymq-1.nodes.used, 'In Use') - - target: alias(stats.gauges.nodepool.provider.vexxhost-ca-ymq-1.nodes.delete, 'Deleting') + - target: alias(stats.gauges.nodepool.provider.vexxhost-ca-ymq-1.nodes.in-use, 'In Use') + - target: alias(stats.gauges.nodepool.provider.vexxhost-ca-ymq-1.nodes.used, 'Used') + - target: alias(stats.gauges.nodepool.provider.vexxhost-ca-ymq-1.nodes.deleting, 'Deleting') - target: alias(stats.gauges.nodepool.provider.vexxhost-ca-ymq-1.max_servers, 'Max') seriesOverrides: - alias: Max diff --git a/grafana/nodepool.yaml b/grafana/nodepool.yaml index 612727b3ba..12f15e4158 100644 --- a/grafana/nodepool.yaml +++ b/grafana/nodepool.yaml @@ -15,7 +15,7 @@ dashboard: height: 150px panels: - title: Building - span: 3 + span: 2 sparkline: full: true show: true @@ -33,7 +33,16 @@ dashboard: type: singlestat valueName: current - title: In Use - span: 2 + span: 1 + sparkline: + full: true + show: true + targets: + - target: sumSeries(stats.gauges.nodepool.provider.*.nodes.in-use) + type: singlestat + valueName: current + - title: Used + span: 1 sparkline: full: true show: true @@ -47,11 +56,11 @@ dashboard: full: true show: true targets: - - target: sumSeries(stats.gauges.nodepool.provider.*.nodes.delete) + - target: sumSeries(stats.gauges.nodepool.provider.*.nodes.deleting) type: singlestat valueName: current - title: Hold - span: 3 + span: 2 sparkline: full: true show: true @@ -59,6 +68,15 @@ dashboard: - target: sumSeries(stats.gauges.nodepool.provider.*.nodes.hold) type: singlestat valueName: current + - title: Failed + span: 2 + sparkline: + full: true + show: true + targets: + - target: sumSeries(stats.gauges.nodepool.provider.*.nodes.failed) + type: singlestat + valueName: current - title: Zuul Launchers showTitle: true height: 320px @@ -97,15 +115,15 @@ dashboard: targets: - target: aliasByNode(stats.gauges.nodepool.label.*.nodes.ready, 4) type: graph - - title: Used Nodes + - title: In-use Nodes span: 3 targets: - - target: aliasByNode(stats.gauges.nodepool.label.*.nodes.used, 4) + - target: aliasByNode(stats.gauges.nodepool.label.*.nodes.in-use, 4) type: graph - title: Deleting Nodes span: 3 targets: - - target: aliasByNode(stats.gauges.nodepool.label.*.nodes.delete, 4) + - target: aliasByNode(stats.gauges.nodepool.label.*.nodes.deleting, 4) type: graph - title: Node Launches showTitle: true