From 393f6d92015c3ac195710699adb27c1d500c60a2 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Sun, 17 Apr 2016 09:31:04 -0400 Subject: [PATCH] Switch to shade specific statsd for ServerTasks Now that nodepool has been switch to use shade, we need to update grafana to use the new shade syntax for Server related tasks. Change-Id: I7698d54d89bda5327ac434fd8e662f0fe58d7f5e Signed-off-by: Paul Belanger --- grafana/nodepool-bluebox.yaml | 6 +++--- grafana/nodepool-infracloud.yaml | 6 +++--- grafana/nodepool-internap.yaml | 6 +++--- grafana/nodepool-osic.yaml | 6 +++--- grafana/nodepool-ovh.yaml | 12 ++++++------ grafana/nodepool-rax-experimental.yaml | 6 +++--- grafana/nodepool-rax.yaml | 18 +++++++++--------- grafana/nodepool-vexxhost.yaml | 6 +++--- 8 files changed, 33 insertions(+), 33 deletions(-) diff --git a/grafana/nodepool-bluebox.yaml b/grafana/nodepool-bluebox.yaml index 2f50912e76..56f3f0bc3d 100644 --- a/grafana/nodepool-bluebox.yaml +++ b/grafana/nodepool-bluebox.yaml @@ -62,7 +62,7 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.task.bluebox-sjc1.CreateServerTask.mean, '0.001'), 'SJC1') + - target: alias(scale(stats.timers.nodepool.task.bluebox-sjc1.ServerCreate.mean, '0.001'), 'SJC1') - title: Delete Server type: graph span: 4 @@ -71,7 +71,7 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.task.bluebox-sjc1.DeleteServerTask.mean, '0.001'), 'SJC1') + - target: alias(scale(stats.timers.nodepool.task.bluebox-sjc1.ServerDelete.mean, '0.001'), 'SJC1') - title: List Servers type: graph span: 4 @@ -80,7 +80,7 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.task.bluebox-sjc1.ListServersTask.mean, '0.001'), 'SJC1') + - target: alias(scale(stats.timers.nodepool.task.bluebox-sjc1.ServerList.mean, '0.001'), 'SJC1') - title: Create Floating IP type: graph span: 4 diff --git a/grafana/nodepool-infracloud.yaml b/grafana/nodepool-infracloud.yaml index 8f8a491e72..740a51867c 100644 --- a/grafana/nodepool-infracloud.yaml +++ b/grafana/nodepool-infracloud.yaml @@ -62,7 +62,7 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.task.infracloud-west.CreateServerTask.mean, '0.001'), 'WEST') + - target: alias(scale(stats.timers.nodepool.task.infracloud-west.ServerCreate.mean, '0.001'), 'WEST') - title: Delete Server type: graph span: 4 @@ -71,7 +71,7 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.task.infracloud-west.DeleteServerTask.mean, '0.001'), 'WEST') + - target: alias(scale(stats.timers.nodepool.task.infracloud-west.ServerDelete.mean, '0.001'), 'WEST') - title: List Servers type: graph span: 4 @@ -80,7 +80,7 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.task.infracloud-west.ListServersTask.mean, '0.001'), 'WEST') + - target: alias(scale(stats.timers.nodepool.task.infracloud-west.ServerList.mean, '0.001'), 'WEST') - title: Node Launches showTitle: true height: 250px diff --git a/grafana/nodepool-internap.yaml b/grafana/nodepool-internap.yaml index 6115f5f707..fa83193c77 100644 --- a/grafana/nodepool-internap.yaml +++ b/grafana/nodepool-internap.yaml @@ -62,7 +62,7 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.task.internap-nyj01.CreateServerTask.mean, '0.001'), 'NYJ01') + - target: alias(scale(stats.timers.nodepool.task.internap-nyj01.ServerCreate.mean, '0.001'), 'NYJ01') - title: Delete Server type: graph span: 4 @@ -71,7 +71,7 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.task.internap-nyj01.DeleteServerTask.mean, '0.001'), 'NYJ01') + - target: alias(scale(stats.timers.nodepool.task.internap-nyj01.ServerDelete.mean, '0.001'), 'NYJ01') - title: List Servers type: graph span: 4 @@ -80,7 +80,7 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.task.internap-nyj01.ListServersTask.mean, '0.001'), 'NYJ01') + - target: alias(scale(stats.timers.nodepool.task.internap-nyj01.ServerList.mean, '0.001'), 'NYJ01') - title: Node Launches showTitle: true height: 250px diff --git a/grafana/nodepool-osic.yaml b/grafana/nodepool-osic.yaml index bf0e54e473..985b7a37f9 100644 --- a/grafana/nodepool-osic.yaml +++ b/grafana/nodepool-osic.yaml @@ -62,7 +62,7 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.task.osic-cloud1.CreateServerTask.mean, '0.001'), 'Cloud 1') + - target: alias(scale(stats.timers.nodepool.task.osic-cloud1.ServerCreate.mean, '0.001'), 'Cloud 1') - title: Delete Server type: graph span: 4 @@ -71,7 +71,7 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.task.osic-cloud1.DeleteServerTask.mean, '0.001'), 'Cloud 1') + - target: alias(scale(stats.timers.nodepool.task.osic-cloud1.ServerDelete.mean, '0.001'), 'Cloud 1') - title: List Servers type: graph span: 4 @@ -80,7 +80,7 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.task.osic-cloud1.ListServersTask.mean, '0.001'), 'Cloud 1') + - target: alias(scale(stats.timers.nodepool.task.osic-cloud1.ServerList.mean, '0.001'), 'Cloud 1') - title: Create Floating IP type: graph span: 4 diff --git a/grafana/nodepool-ovh.yaml b/grafana/nodepool-ovh.yaml index 2e33bd7e38..2c21306ead 100644 --- a/grafana/nodepool-ovh.yaml +++ b/grafana/nodepool-ovh.yaml @@ -62,8 +62,8 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.task.ovh-bhs1.CreateServerTask.mean, '0.001'), 'BHS1') - - target: alias(scale(stats.timers.nodepool.task.ovh-gra1.CreateServerTask.mean, '0.001'), 'GRA1') + - target: alias(scale(stats.timers.nodepool.task.ovh-bhs1.ServerCreate.mean, '0.001'), 'BHS1') + - target: alias(scale(stats.timers.nodepool.task.ovh-gra1.ServerCreate.mean, '0.001'), 'GRA1') - title: Delete Server type: graph span: 4 @@ -72,8 +72,8 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.task.ovh-bhs1.DeleteServerTask.mean, '0.001'), 'BHS1') - - target: alias(scale(stats.timers.nodepool.task.ovh-gra1.DeleteServerTask.mean, '0.001'), 'GRA1') + - target: alias(scale(stats.timers.nodepool.task.ovh-bhs1.ServerDelete.mean, '0.001'), 'BHS1') + - target: alias(scale(stats.timers.nodepool.task.ovh-gra1.ServerDelete.mean, '0.001'), 'GRA1') - title: List Servers type: graph span: 4 @@ -82,8 +82,8 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.task.ovh-bhs1.ListServersTask.mean, '0.001'), 'BHS1') - - target: alias(scale(stats.timers.nodepool.task.ovh-gra1.ListServersTask.mean, '0.001'), 'GRA1') + - target: alias(scale(stats.timers.nodepool.task.ovh-bhs1.ServerList.mean, '0.001'), 'BHS1') + - target: alias(scale(stats.timers.nodepool.task.ovh-gra1.ServerList.mean, '0.001'), 'GRA1') - title: Node Launches showTitle: true height: 250px diff --git a/grafana/nodepool-rax-experimental.yaml b/grafana/nodepool-rax-experimental.yaml index b8fd86f284..314bc201f9 100644 --- a/grafana/nodepool-rax-experimental.yaml +++ b/grafana/nodepool-rax-experimental.yaml @@ -69,7 +69,7 @@ dashboard: - s - none targets: - - target: aliasSub(aliasByNode(scale(stats.timers.nodepool.task.$provider.CreateServerTask.mean, '0.001'), 4), 'rax-', '') + - target: aliasSub(aliasByNode(scale(stats.timers.nodepool.task.$provider.ServerCreate.mean, '0.001'), 4), 'rax-', '') - title: Delete Server type: graph span: 4 @@ -78,7 +78,7 @@ dashboard: - s - none targets: - - target: aliasSub(aliasByNode(scale(stats.timers.nodepool.task.$provider.DeleteServerTask.mean, '0.001'), 4), 'rax-', '') + - target: aliasSub(aliasByNode(scale(stats.timers.nodepool.task.$provider.ServerDelete.mean, '0.001'), 4), 'rax-', '') - title: List Servers type: graph span: 4 @@ -87,7 +87,7 @@ dashboard: - s - none targets: - - target: aliasSub(aliasByNode(scale(stats.timers.nodepool.task.$provider.ListServersTask.mean, '0.001'), 4), 'rax-', '') + - target: aliasSub(aliasByNode(scale(stats.timers.nodepool.task.$provider.ServerList.mean, '0.001'), 4), 'rax-', '') - title: Node Launches showTitle: true height: 250px diff --git a/grafana/nodepool-rax.yaml b/grafana/nodepool-rax.yaml index e10f6be0b9..b85a814baf 100644 --- a/grafana/nodepool-rax.yaml +++ b/grafana/nodepool-rax.yaml @@ -62,9 +62,9 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.task.rax-dfw.CreateServerTask.mean, '0.001'), 'DFW') - - target: alias(scale(stats.timers.nodepool.task.rax-iad.CreateServerTask.mean, '0.001'), 'IAD') - - target: alias(scale(stats.timers.nodepool.task.rax-ord.CreateServerTask.mean, '0.001'), 'ORD') + - target: alias(scale(stats.timers.nodepool.task.rax-dfw.ServerCreate.mean, '0.001'), 'DFW') + - target: alias(scale(stats.timers.nodepool.task.rax-iad.ServerCreate.mean, '0.001'), 'IAD') + - target: alias(scale(stats.timers.nodepool.task.rax-ord.ServerCreate.mean, '0.001'), 'ORD') - title: Delete Server type: graph span: 4 @@ -73,9 +73,9 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.task.rax-dfw.DeleteServerTask.mean, '0.001'), 'DFW') - - target: alias(scale(stats.timers.nodepool.task.rax-iad.DeleteServerTask.mean, '0.001'), 'IAD') - - target: alias(scale(stats.timers.nodepool.task.rax-ord.DeleteServerTask.mean, '0.001'), 'ORD') + - target: alias(scale(stats.timers.nodepool.task.rax-dfw.ServerDelete.mean, '0.001'), 'DFW') + - target: alias(scale(stats.timers.nodepool.task.rax-iad.ServerDelete.mean, '0.001'), 'IAD') + - target: alias(scale(stats.timers.nodepool.task.rax-ord.ServerDelete.mean, '0.001'), 'ORD') - title: List Servers type: graph span: 4 @@ -84,9 +84,9 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.task.rax-dfw.ListServersTask.mean, '0.001'), 'DFW') - - target: alias(scale(stats.timers.nodepool.task.rax-iad.ListServersTask.mean, '0.001'), 'IAD') - - target: alias(scale(stats.timers.nodepool.task.rax-ord.ListServersTask.mean, '0.001'), 'ORD') + - target: alias(scale(stats.timers.nodepool.task.rax-dfw.ServerList.mean, '0.001'), 'DFW') + - target: alias(scale(stats.timers.nodepool.task.rax-iad.ServerList.mean, '0.001'), 'IAD') + - target: alias(scale(stats.timers.nodepool.task.rax-ord.ServerList.mean, '0.001'), 'ORD') - title: Node Launches showTitle: true height: 250px diff --git a/grafana/nodepool-vexxhost.yaml b/grafana/nodepool-vexxhost.yaml index 8e92b3e4f8..653628b18b 100644 --- a/grafana/nodepool-vexxhost.yaml +++ b/grafana/nodepool-vexxhost.yaml @@ -62,7 +62,7 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.task.vexxhost-ca-ymq-1.CreateServerTask.mean, '0.001'), 'YMQ') + - target: alias(scale(stats.timers.nodepool.task.vexxhost-ca-ymq-1.ServerCreate.mean, '0.001'), 'YMQ') - title: Delete Server type: graph span: 4 @@ -71,7 +71,7 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.task.vexxhost-ca-ymq-1.DeleteServerTask.mean, '0.001'), 'YMQ') + - target: alias(scale(stats.timers.nodepool.task.vexxhost-ca-ymq-1.ServerDelete.mean, '0.001'), 'YMQ') - title: List Servers type: graph span: 4 @@ -80,7 +80,7 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.task.vexxhost-ca-ymq-1.ListServersTask.mean, '0.001'), 'YMQ') + - target: alias(scale(stats.timers.nodepool.task.vexxhost-ca-ymq-1.ServerList.mean, '0.001'), 'YMQ') - title: Node Launches showTitle: true height: 250px