From e698d683c71f7825c8980f86c64ce6f87996121d Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Fri, 29 Jul 2016 15:46:17 +0200 Subject: [PATCH] grafana: Follow xenial renames Rename the jobs for xenial changes. Change-Id: Ie69c371d6bf92582236eda92d5c99f94a9bbc123 --- grafana/nodepool-bluebox.yaml | 4 ++-- grafana/nodepool-infracloud.yaml | 4 ++-- grafana/nodepool-internap.yaml | 4 ++-- grafana/nodepool-osic.yaml | 4 ++-- grafana/nodepool-ovh.yaml | 8 ++++---- grafana/nodepool-rax-experimental.yaml | 4 ++-- grafana/nodepool-rax.yaml | 12 ++++++------ grafana/nodepool.yaml | 4 ++-- grafana/tempest.yaml | 16 ++++++++-------- grafana/zuul-status.yaml | 2 +- 10 files changed, 31 insertions(+), 31 deletions(-) diff --git a/grafana/nodepool-bluebox.yaml b/grafana/nodepool-bluebox.yaml index 630625bd8c..f0ef921cfb 100644 --- a/grafana/nodepool-bluebox.yaml +++ b/grafana/nodepool-bluebox.yaml @@ -181,7 +181,7 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full.master.ubuntu-trusty.bluebox-sjc1.runtime.mean, '0.001'), 'SJC1') + - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full-ubuntu-xenial.master.ubuntu-xenial.bluebox-sjc1.runtime.mean, '0.001'), 'SJC1') - title: gate-tempest-dsvm-neutron-full type: graph span: 6 @@ -190,4 +190,4 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full.master.ubuntu-trusty.bluebox-sjc1.runtime.mean, '0.001'), 'SJC1') + - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.master.ubuntu-xenial.bluebox-sjc1.runtime.mean, '0.001'), 'SJC1') diff --git a/grafana/nodepool-infracloud.yaml b/grafana/nodepool-infracloud.yaml index c9d59aefbf..eadb68ebfe 100644 --- a/grafana/nodepool-infracloud.yaml +++ b/grafana/nodepool-infracloud.yaml @@ -145,7 +145,7 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full.master.ubuntu-trusty.infracloud-west.runtime.mean, '0.001'), 'WEST') + - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full-ubuntu-xenial.master.ubuntu-xenial.infracloud-west.runtime.mean, '0.001'), 'WEST') - title: gate-tempest-dsvm-neutron-full type: graph span: 6 @@ -154,4 +154,4 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full.master.ubuntu-trusty.infracloud-west.runtime.mean, '0.001'), 'WEST') + - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.master.ubuntu-xenial.infracloud-west.runtime.mean, '0.001'), 'WEST') diff --git a/grafana/nodepool-internap.yaml b/grafana/nodepool-internap.yaml index 6676732ed9..58ed7561ca 100644 --- a/grafana/nodepool-internap.yaml +++ b/grafana/nodepool-internap.yaml @@ -145,7 +145,7 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full.master.ubuntu-trusty.internap-nyj01.runtime.mean, '0.001'), 'NYJ01') + - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full-ubuntu-xenial.master.ubuntu-xenial.internap-nyj01.runtime.mean, '0.001'), 'NYJ01') - title: gate-tempest-dsvm-neutron-full type: graph span: 6 @@ -154,4 +154,4 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full.master.ubuntu-trusty.internap-nyj01.runtime.mean, '0.001'), 'NYJ01') + - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.master.ubuntu-xenial.internap-nyj01.runtime.mean, '0.001'), 'NYJ01') diff --git a/grafana/nodepool-osic.yaml b/grafana/nodepool-osic.yaml index 8572689221..da43a631d0 100644 --- a/grafana/nodepool-osic.yaml +++ b/grafana/nodepool-osic.yaml @@ -145,7 +145,7 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full.master.ubuntu-trusty.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-cloud1.runtime.mean, '0.001'), 'Cloud 1') - title: gate-tempest-dsvm-neutron-full type: graph span: 6 @@ -154,4 +154,4 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full.master.ubuntu-trusty.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-cloud1.runtime.mean, '0.001'), 'Cloud 1') diff --git a/grafana/nodepool-ovh.yaml b/grafana/nodepool-ovh.yaml index eccf3d067a..a28d4f7918 100644 --- a/grafana/nodepool-ovh.yaml +++ b/grafana/nodepool-ovh.yaml @@ -182,8 +182,8 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full.master.ubuntu-trusty.ovh-bhs1.runtime.mean, '0.001'), 'BHS1') - - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full.master.ubuntu-trusty.ovh-gra1.runtime.mean, '0.001'), 'GRA1') + - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full-ubuntu-xenial.master.ubuntu-xenial.ovh-bhs1.runtime.mean, '0.001'), 'BHS1') + - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full-ubuntu-xenial.master.ubuntu-xenial.ovh-gra1.runtime.mean, '0.001'), 'GRA1') - title: gate-tempest-dsvm-neutron-full type: graph span: 6 @@ -192,5 +192,5 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full.master.ubuntu-trusty.ovh-bhs1.runtime.mean, '0.001'), 'BHS1') - - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full.master.ubuntu-trusty.ovh-gra1.runtime.mean, '0.001'), 'GRA1') + - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.master.ubuntu-xenial.ovh-bhs1.runtime.mean, '0.001'), 'BHS1') + - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.master.ubuntu-xenial.ovh-gra1.runtime.mean, '0.001'), 'GRA1') diff --git a/grafana/nodepool-rax-experimental.yaml b/grafana/nodepool-rax-experimental.yaml index 248c7745bd..02dde5dc71 100644 --- a/grafana/nodepool-rax-experimental.yaml +++ b/grafana/nodepool-rax-experimental.yaml @@ -184,7 +184,7 @@ dashboard: - s - none targets: - - target: aliasSub(aliasByNode(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full.master.ubuntu-trusty.$provider.runtime.mean, '0.001'), 7), 'rax-', '') + - target: aliasSub(aliasByNode(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full-ubuntu-xenial.master.ubuntu-xenial.$provider.runtime.mean, '0.001'), 7), 'rax-', '') - title: gate-tempest-dsvm-neutron-full type: graph span: 6 @@ -193,4 +193,4 @@ dashboard: - s - none targets: - - target: aliasSub(aliasByNode(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full.master.ubuntu-trusty.$provider.runtime.mean, '0.001'), 7), 'rax-', '') + - target: aliasSub(aliasByNode(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.master.ubuntu-xenial.$provider.runtime.mean, '0.001'), 7), 'rax-', '') diff --git a/grafana/nodepool-rax.yaml b/grafana/nodepool-rax.yaml index cbe818c722..c60f287c55 100644 --- a/grafana/nodepool-rax.yaml +++ b/grafana/nodepool-rax.yaml @@ -191,9 +191,9 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full.master.ubuntu-trusty.rax-dfw.runtime.mean, '0.001'), 'DFW') - - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full.master.ubuntu-trusty.rax-iad.runtime.mean, '0.001'), 'IAD') - - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full.master.ubuntu-trusty.rax-ord.runtime.mean, '0.001'), 'ORD') + - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full-ubuntu-xenial.master.ubuntu-xenial.rax-dfw.runtime.mean, '0.001'), 'DFW') + - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full-ubuntu-xenial.master.ubuntu-xenial.rax-iad.runtime.mean, '0.001'), 'IAD') + - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full-ubuntu-xenial.master.ubuntu-xenial.rax-ord.runtime.mean, '0.001'), 'ORD') - title: gate-tempest-dsvm-neutron-full type: graph span: 6 @@ -202,6 +202,6 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full.master.ubuntu-trusty.rax-dfw.runtime.mean, '0.001'), 'DFW') - - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full.master.ubuntu-trusty.rax-iad.runtime.mean, '0.001'), 'IAD') - - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full.master.ubuntu-trusty.rax-ord.runtime.mean, '0.001'), 'ORD') + - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.master.ubuntu-xenial.rax-dfw.runtime.mean, '0.001'), 'DFW') + - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.master.ubuntu-xenial.rax-iad.runtime.mean, '0.001'), 'IAD') + - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.master.ubuntu-xenial.rax-ord.runtime.mean, '0.001'), 'ORD') diff --git a/grafana/nodepool.yaml b/grafana/nodepool.yaml index 43ce69bb87..acc7a99b6b 100644 --- a/grafana/nodepool.yaml +++ b/grafana/nodepool.yaml @@ -86,7 +86,7 @@ dashboard: - s - none targets: - - target: alias(scale(averageSeries(stats.timers.nodepool.job.gate-tempest-dsvm-full.master.ubuntu-trusty.runtime.mean), '0.001'), 'Average') + - target: alias(scale(averageSeries(stats.timers.nodepool.job.gate-tempest-dsvm-full-ubuntu-xenial.master.ubuntu-xenial.runtime.mean), '0.001'), 'Average') - title: gate-tempest-dsvm-neutron-full type: graph span: 6 @@ -95,4 +95,4 @@ dashboard: - s - none targets: - - target: alias(scale(averageSeries(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full.master.ubuntu-trusty.runtime.mean), '0.001'), 'Average') + - target: alias(scale(averageSeries(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.master.ubuntu-xenial.runtime.mean), '0.001'), 'Average') diff --git a/grafana/tempest.yaml b/grafana/tempest.yaml index c2237d2ede..c23f1b0c66 100644 --- a/grafana/tempest.yaml +++ b/grafana/tempest.yaml @@ -16,12 +16,12 @@ dashboard: - title: Job Failure Rates span: 4 targets: - - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-full.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-full.{SUCCESS,FAILURE})),'12hours'), 'gate-tempest-dsvm-full (check)') - - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-tempest-dsvm-full.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-tempest-dsvm-full.{SUCCESS,FAILURE})),'12hours'), 'gate-tempest-dsvm-full (gate)') - - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-neutron-full.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-neutron-full.{SUCCESS,FAILURE})),'12hours'), 'gate-tempest-dsvm-neutron-full (check)') - - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-tempest-dsvm-neutron-full.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-tempest-dsvm-neutron-full.{SUCCESS,FAILURE})),'12hours'), 'gate-tempest-dsvm-neutron-full (gate)') - - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-grenade-dsvm.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-grenade-dsvm.{SUCCESS,FAILURE})),'12hours'), 'gate-grenade-dsvm (check)') - - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-grenade-dsvm.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-grenade-dsvm.{SUCCESS,FAILURE})),'12hours'), 'gate-grenade-dsvm (gate)') - - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-grenade-dsvm-neutron.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-grenade-dsvm-neutron.{SUCCESS,FAILURE})),'12hours'), 'gate-grenade-dsvm-neutron (check)') - - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-grenade-dsvm-neutron.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-grenade-dsvm-neutron.{SUCCESS,FAILURE})),'12hours'), 'gate-grenade-dsvm-neutron (gate)') + - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-full-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-full-ubuntu-xenial.{SUCCESS,FAILURE})),'12hours'), 'gate-tempest-dsvm-full-ubuntu-xenial (check)') + - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-tempest-dsvm-full-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-tempest-dsvm-full-ubuntu-xenial.{SUCCESS,FAILURE})),'12hours'), 'gate-tempest-dsvm-full-ubuntu-xenial (gate)') + - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.{SUCCESS,FAILURE})),'12hours'), 'gate-tempest-dsvm-neutron-full-ubuntu-xenial (check)') + - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.{SUCCESS,FAILURE})),'12hours'), 'gate-tempest-dsvm-neutron-full-ubuntu-xenial (gate)') + - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-grenade-dsvm-ubuntu-trusty.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-grenade-dsvm-ubuntu-trusty.{SUCCESS,FAILURE})),'12hours'), 'gate-grenade-dsvm-ubuntu-trusty (check)') + - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-grenade-dsvm-ubuntu-trusty.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-grenade-dsvm-ubuntu-trusty.{SUCCESS,FAILURE})),'12hours'), 'gate-grenade-dsvm-ubuntu-trusty (gate)') + - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-grenade-dsvm-neutron-ubuntu-trusty.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-grenade-dsvm-neutron-ubuntu-trusty.{SUCCESS,FAILURE})),'12hours'), 'gate-grenade-dsvm-neutron-ubuntu-trusty (check)') + - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-grenade-dsvm-neutron-ubuntu-trusty.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-grenade-dsvm-neutron-ubuntu-trusty.{SUCCESS,FAILURE})),'12hours'), 'gate-grenade-dsvm-neutron-ubuntu-trusty (gate)') type: graph diff --git a/grafana/zuul-status.yaml b/grafana/zuul-status.yaml index e83f52a900..2ca57f3954 100644 --- a/grafana/zuul-status.yaml +++ b/grafana/zuul-status.yaml @@ -189,6 +189,6 @@ dashboard: - title: Tempest Check Runs span: 4 targets: - - target: alias(smartSummarize(sumSeries(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-full.SUCCESS,stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-full.FAILURE), '1h', 'avg'), 'Tempest') + - target: alias(smartSummarize(sumSeries(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-full-ubuntu-xenial.SUCCESS,stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-full-ubuntu-xenial.FAILURE), '1h', 'avg'), 'Tempest') type: graph leftYAxisLabel: "Runs / Hour"