Update grafana resource usage graphs to match new paths

Zuul 5.2.0 [0] updated some resource usage stats paths. Update our
grafana graphs to match this update. Without this update our graphs are
empty after March 25.

[0] https://zuul-ci.org/docs/zuul/latest/releasenotes.html#relnotes-5-2-0-upgrade-notes

Change-Id: Ia79baae4f3a21e6bec7f9edf8ba66fabcc1c71b2
This commit is contained in:
Clark Boylan
2022-04-06 08:31:38 -07:00
parent 71b0e43491
commit 10bef967cb

View File

@@ -26,11 +26,11 @@ dashboard:
format: percent
- show: false
targets:
- target: alias(asPercent(transformNull(summarize(stats_counts.zuul.nodepool.resources.tenant.opendev.instances, '24h')),summarize(sum(stats_counts.zuul.nodepool.resources.tenant.*.instances), '24h')), 'opendev')
- target: alias(asPercent(transformNull(summarize(stats_counts.zuul.nodepool.resources.tenant.openstack.instances, '24h')),summarize(sum(stats_counts.zuul.nodepool.resources.tenant.*.instances), '24h')), 'openstack')
- target: alias(asPercent(transformNull(summarize(stats_counts.zuul.nodepool.resources.tenant.pyca.instances, '24h')),summarize(sum(stats_counts.zuul.nodepool.resources.tenant.*.instances), '24h')), 'pyca')
- target: alias(asPercent(transformNull(summarize(stats_counts.zuul.nodepool.resources.tenant.vexxhost.instances, '24h')),summarize(sum(stats_counts.zuul.nodepool.resources.tenant.*.instances), '24h')), 'vexxhost')
- target: alias(asPercent(transformNull(summarize(stats_counts.zuul.nodepool.resources.tenant.zuul.instances, '24h')),summarize(sum(stats_counts.zuul.nodepool.resources.tenant.*.instances), '24h')), 'zuul')
- target: alias(asPercent(transformNull(summarize(stats_counts.zuul.nodepool.resources.in_use.tenant.opendev.instances, '24h')),summarize(sum(stats_counts.zuul.nodepool.resources.in_use.tenant.*.instances), '24h')), 'opendev')
- target: alias(asPercent(transformNull(summarize(stats_counts.zuul.nodepool.resources.in_use.tenant.openstack.instances, '24h')),summarize(sum(stats_counts.zuul.nodepool.resources.in_use.tenant.*.instances), '24h')), 'openstack')
- target: alias(asPercent(transformNull(summarize(stats_counts.zuul.nodepool.resources.in_use.tenant.pyca.instances, '24h')),summarize(sum(stats_counts.zuul.nodepool.resources.in_use.tenant.*.instances), '24h')), 'pyca')
- target: alias(asPercent(transformNull(summarize(stats_counts.zuul.nodepool.resources.in_use.tenant.vexxhost.instances, '24h')),summarize(sum(stats_counts.zuul.nodepool.resources.in_use.tenant.*.instances), '24h')), 'vexxhost')
- target: alias(asPercent(transformNull(summarize(stats_counts.zuul.nodepool.resources.in_use.tenant.zuul.instances, '24h')),summarize(sum(stats_counts.zuul.nodepool.resources.in.use.tenant.*.instances), '24h')), 'zuul')
- title: Instance Usage by Tenants (5d)
span: 6
type: graph
@@ -39,11 +39,11 @@ dashboard:
format: percent
- show: false
targets:
- target: alias(asPercent(transformNull(summarize(stats_counts.zuul.nodepool.resources.tenant.opendev.instances, '5d')),summarize(sum(stats_counts.zuul.nodepool.resources.tenant.*.instances), '5d')), 'opendev')
- target: alias(asPercent(transformNull(summarize(stats_counts.zuul.nodepool.resources.tenant.openstack.instances, '5d')),summarize(sum(stats_counts.zuul.nodepool.resources.tenant.*.instances), '5d')), 'openstack')
- target: alias(asPercent(transformNull(summarize(stats_counts.zuul.nodepool.resources.tenant.pyca.instances, '5d')),summarize(sum(stats_counts.zuul.nodepool.resources.tenant.*.instances), '5d')), 'pyca')
- target: alias(asPercent(transformNull(summarize(stats_counts.zuul.nodepool.resources.tenant.vexxhost.instances, '5d')),summarize(sum(stats_counts.zuul.nodepool.resources.tenant.*.instances), '5d')), 'vexxhost')
- target: alias(asPercent(transformNull(summarize(stats_counts.zuul.nodepool.resources.tenant.zuul.instances, '5d')),summarize(sum(stats_counts.zuul.nodepool.resources.tenant.*.instances), '5d')), 'zuul')
- target: alias(asPercent(transformNull(summarize(stats_counts.zuul.nodepool.resources.in_use.tenant.opendev.instances, '5d')),summarize(sum(stats_counts.zuul.nodepool.resources.in_use.tenant.*.instances), '5d')), 'opendev')
- target: alias(asPercent(transformNull(summarize(stats_counts.zuul.nodepool.resources.in_use.tenant.openstack.instances, '5d')),summarize(sum(stats_counts.zuul.nodepool.resources.in_use.tenant.*.instances), '5d')), 'openstack')
- target: alias(asPercent(transformNull(summarize(stats_counts.zuul.nodepool.resources.in_use.tenant.pyca.instances, '5d')),summarize(sum(stats_counts.zuul.nodepool.resources.in_use.tenant.*.instances), '5d')), 'pyca')
- target: alias(asPercent(transformNull(summarize(stats_counts.zuul.nodepool.resources.in_use.tenant.vexxhost.instances, '5d')),summarize(sum(stats_counts.zuul.nodepool.resources.in_use.tenant.*.instances), '5d')), 'vexxhost')
- target: alias(asPercent(transformNull(summarize(stats_counts.zuul.nodepool.resources.in_use.tenant.zuul.instances, '5d')),summarize(sum(stats_counts.zuul.nodepool.resources.in_use.tenant.*.instances), '5d')), 'zuul')
- title: Instance Usage by Projects (24h)
span: 6
type: graph
@@ -52,11 +52,11 @@ dashboard:
format: percent
- show: false
targets:
- target: alias(asPercent(transformNull(summarize(sum(stats_counts.zuul.nodepool.resources.project.opendev_org-openstack-neutron.instances), '24h')),summarize(stats_counts.zuul.nodepool.resources.tenant.openstack.instances, '24h')), 'neutron')
- target: alias(asPercent(transformNull(summarize(sum(stats_counts.zuul.nodepool.resources.project.opendev_org-openstack-neutron*.instances), '24h')),summarize(stats_counts.zuul.nodepool.resources.tenant.openstack.instances, '24h')), 'neutron-all')
- target: alias(asPercent(transformNull(summarize(sum(stats_counts.zuul.nodepool.resources.project.opendev_org-openstack-networking*.instances), '24h')),summarize(stats_counts.zuul.nodepool.resources.tenant.openstack.instances, '24h')), 'networking-all')
- target: alias(asPercent(transformNull(summarize(sum(stats_counts.zuul.nodepool.resources.project.opendev_org-openstack-nova.instances), '24h')),summarize(stats_counts.zuul.nodepool.resources.tenant.openstack.instances, '24h')), 'nova')
- target: alias(asPercent(transformNull(summarize(sum(stats_counts.zuul.nodepool.resources.project.opendev_org-openstack-tripleo*.instances), '24h')),summarize(stats_counts.zuul.nodepool.resources.tenant.openstack.instances, '24h')), 'tripleo-all')
- target: alias(asPercent(transformNull(summarize(sum(stats_counts.zuul.nodepool.resources.in_use.project.opendev_org-openstack-neutron.instances), '24h')),summarize(stats_counts.zuul.nodepool.resources.in_use.tenant.openstack.instances, '24h')), 'neutron')
- target: alias(asPercent(transformNull(summarize(sum(stats_counts.zuul.nodepool.resources.in_use.project.opendev_org-openstack-neutron*.instances), '24h')),summarize(stats_counts.zuul.nodepool.resources.in_use.tenant.openstack.instances, '24h')), 'neutron-all')
- target: alias(asPercent(transformNull(summarize(sum(stats_counts.zuul.nodepool.resources.in_use.project.opendev_org-openstack-networking*.instances), '24h')),summarize(stats_counts.zuul.nodepool.resources.in_use.tenant.openstack.instances, '24h')), 'networking-all')
- target: alias(asPercent(transformNull(summarize(sum(stats_counts.zuul.nodepool.resources.in_use.project.opendev_org-openstack-nova.instances), '24h')),summarize(stats_counts.zuul.nodepool.resources.in_use.tenant.openstack.instances, '24h')), 'nova')
- target: alias(asPercent(transformNull(summarize(sum(stats_counts.zuul.nodepool.resources.in_use.project.opendev_org-openstack-tripleo*.instances), '24h')),summarize(stats_counts.zuul.nodepool.resources.in_use.tenant.openstack.instances, '24h')), 'tripleo-all')
- title: Instance Usage by Projects (5d)
span: 6
type: graph
@@ -65,8 +65,8 @@ dashboard:
format: percent
- show: false
targets:
- target: alias(asPercent(transformNull(summarize(sum(stats_counts.zuul.nodepool.resources.project.opendev_org-openstack-neutron.instances), '5d')),summarize(stats_counts.zuul.nodepool.resources.tenant.openstack.instances, '5d')), 'neutron')
- target: alias(asPercent(transformNull(summarize(sum(stats_counts.zuul.nodepool.resources.project.opendev_org-openstack-neutron*.instances), '5d')),summarize(stats_counts.zuul.nodepool.resources.tenant.openstack.instances, '5d')), 'neutron-all')
- target: alias(asPercent(transformNull(summarize(sum(stats_counts.zuul.nodepool.resources.project.opendev_org-openstack-networking*.instances), '5d')),summarize(stats_counts.zuul.nodepool.resources.tenant.openstack.instances, '5d')), 'networking-all')
- target: alias(asPercent(transformNull(summarize(sum(stats_counts.zuul.nodepool.resources.project.opendev_org-openstack-nova.instances), '5d')),summarize(stats_counts.zuul.nodepool.resources.tenant.openstack.instances, '5d')), 'nova')
- target: alias(asPercent(transformNull(summarize(sum(stats_counts.zuul.nodepool.resources.project.opendev_org-openstack-tripleo*.instances), '5d')),summarize(stats_counts.zuul.nodepool.resources.tenant.openstack.instances, '5d')), 'tripleo-all')
- target: alias(asPercent(transformNull(summarize(sum(stats_counts.zuul.nodepool.resources.in_use.project.opendev_org-openstack-neutron.instances), '5d')),summarize(stats_counts.zuul.nodepool.resources.in_use.tenant.openstack.instances, '5d')), 'neutron')
- target: alias(asPercent(transformNull(summarize(sum(stats_counts.zuul.nodepool.resources.in_use.project.opendev_org-openstack-neutron*.instances), '5d')),summarize(stats_counts.zuul.nodepool.resources.in_use.tenant.openstack.instances, '5d')), 'neutron-all')
- target: alias(asPercent(transformNull(summarize(sum(stats_counts.zuul.nodepool.resources.in_use.project.opendev_org-openstack-networking*.instances), '5d')),summarize(stats_counts.zuul.nodepool.resources.in_use.tenant.openstack.instances, '5d')), 'networking-all')
- target: alias(asPercent(transformNull(summarize(sum(stats_counts.zuul.nodepool.resources.in_use.project.opendev_org-openstack-nova.instances), '5d')),summarize(stats_counts.zuul.nodepool.resources.in_use.tenant.openstack.instances, '5d')), 'nova')
- target: alias(asPercent(transformNull(summarize(sum(stats_counts.zuul.nodepool.resources.in_use.project.opendev_org-openstack-tripleo*.instances), '5d')),summarize(stats_counts.zuul.nodepool.resources.in_use.tenant.openstack.instances, '5d')), 'tripleo-all')