diff --git a/grafana/kolla.yaml b/grafana/kolla.yaml
index 81f30ab459..a429a8199c 100644
--- a/grafana/kolla.yaml
+++ b/grafana/kolla.yaml
@@ -20,34 +20,42 @@ dashboard:
         - title: Kolla Build Failure Rates (Check queue)
           span: 6
           targets:
-            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-build-debian.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-build-debian.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'kolla-build-debian')
-            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-build-ubuntu.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-build-ubuntu.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'kolla-build-ubuntu')
-            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-build-centos8.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-build-centos8.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'kolla-build-centos8')
+            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-build-debian.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-build-debian.{SUCCESS,FAILURE,TIMED_OUT})),'72hours'), 'kolla-build-debian')
+            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-build-ubuntu.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-build-ubuntu.{SUCCESS,FAILURE,TIMED_OUT})),'72hours'), 'kolla-build-ubuntu')
+            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-build-centos8s.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-build-centos8s.{SUCCESS,FAILURE,TIMED_OUT})),'72hours'), 'kolla-build-centos8s')
           type: graph
         - title: Kolla Build ARM Failure Rates (Check-arm64 queue)
           span: 6
           targets:
-            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.check-arm64.project.opendev_org.openstack_kolla.master.job.kolla-build-debian-aarch64.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.check-arm64.project.opendev_org.openstack_kolla.master.job.kolla-build-debian-aarch64.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'kolla-build-debian-aarch64')
-            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.check-arm64.project.opendev_org.openstack_kolla.master.job.kolla-build-ubuntu-aarch64.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.check-arm64.project.opendev_org.openstack_kolla.master.job.kolla-build-ubuntu-aarch64.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'kolla-build-ubuntu-aarch64')
+            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.check-arm64.project.opendev_org.openstack_kolla.master.job.kolla-build-debian-aarch64.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.check-arm64.project.opendev_org.openstack_kolla.master.job.kolla-build-debian-aarch64.{SUCCESS,FAILURE,TIMED_OUT})),'72hours'), 'kolla-build-debian-aarch64')
+            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.check-arm64.project.opendev_org.openstack_kolla.master.job.kolla-build-ubuntu-aarch64.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.check-arm64.project.opendev_org.openstack_kolla.master.job.kolla-build-ubuntu-aarch64.{SUCCESS,FAILURE,TIMED_OUT})),'72hours'), 'kolla-build-ubuntu-aarch64')
           type: graph
         - title: Kolla-Ansible Source Failure Rates (Check queue)
           span: 6
           targets:
-            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-ansible-debian-source.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-ansible-debian-source.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'kolla-ansible-debian-source')
-            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-ansible-ubuntu-source.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-ansible-ubuntu-source.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'kolla-ansible-ubuntu-source')
-            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-ansible-centos8-source.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-ansible-centos8-source.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'kolla-ansible-centos8-source')
+            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-ansible-debian-source.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-ansible-debian-source.{SUCCESS,FAILURE,TIMED_OUT})),'72hours'), 'kolla-ansible-debian-source')
+            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-ansible-ubuntu-source.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-ansible-ubuntu-source.{SUCCESS,FAILURE,TIMED_OUT})),'72hours'), 'kolla-ansible-ubuntu-source')
+            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-ansible-centos8s-source.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-ansible-centos8s-source.{SUCCESS,FAILURE,TIMED_OUT})),'72hours'), 'kolla-ansible-centos8s-source')
           type: graph
         - title: Kolla-Ansible Source Upgrade Failure Rates (Check queue)
           span: 6
           targets:
-            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-ansible-debian-source-upgrade.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-ansible-debian-source-upgrade.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'kolla-ansible-debian-source-upgrade')
-            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-ansible-ubuntu-source-upgrade.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-ansible-ubuntu-source-upgrade.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'kolla-ansible-ubuntu-source-upgrade')
-            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-ansible-centos8-source-upgrade.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-ansible-centos8-source-upgrade.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'kolla-ansible-centos8-source-upgrade')
+            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-ansible-debian-source-upgrade.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-ansible-debian-source-upgrade.{SUCCESS,FAILURE,TIMED_OUT})),'72hours'), 'kolla-ansible-debian-source-upgrade')
+            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-ansible-ubuntu-source-upgrade.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-ansible-ubuntu-source-upgrade.{SUCCESS,FAILURE,TIMED_OUT})),'72hours'), 'kolla-ansible-ubuntu-source-upgrade')
+            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-ansible-centos8s-source-upgrade.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-ansible-centos8s-source-upgrade.{SUCCESS,FAILURE,TIMED_OUT})),'72hours'), 'kolla-ansible-centos8s-source-upgrade')
+          type: graph
+        - title: Kolla-Ansible Source Cephadm Failure Rates (Check queue)
+          span: 6
+          targets:
+            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-ansible-debian-source-cephadm.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-ansible-debian-source-cephadm.{SUCCESS,FAILURE,TIMED_OUT})),'72hours'), 'kolla-ansible-debian-source-cephadm')
+            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-ansible-ubuntu-source-cephadm.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-ansible-ubuntu-source-cephadm.{SUCCESS,FAILURE,TIMED_OUT})),'72hours'), 'kolla-ansible-ubuntu-source-cephadm')
+            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-ansible-debian-source-upgrade-cephadm.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-ansible-debian-source-upgrade-cephadm.{SUCCESS,FAILURE,TIMED_OUT})),'72hours'), 'kolla-ansible-debian-source-upgrade-cephadm')
+            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-ansible-ubuntu-source-upgrade-cephadm.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_kolla.master.job.kolla-ansible-ubuntu-source-upgrade-cephadm.{SUCCESS,FAILURE,TIMED_OUT})),'72hours'), 'kolla-ansible-ubuntu-source-upgrade-cephadm')
           type: graph
         - title: Kolla Publish Failure Rates (Periodic queue)
           span: 6
           targets:
-            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.opendev_org.openstack_kolla.master.job.kolla-publish-debian-quay.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.opendev_org.openstack_kolla.master.job.kolla-publish-debian-quay.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'kolla-publish-debian-quay')
-            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.opendev_org.openstack_kolla.master.job.kolla-publish-ubuntu-quay.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.opendev_org.openstack_kolla.master.job.kolla-publish-ubuntu-quay.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'kolla-publish-ubuntu-quay')
-            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.opendev_org.openstack_kolla.master.job.kolla-publish-centos8-quay.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.opendev_org.openstack_kolla.master.job.kolla-publish-centos8-quay.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'kolla-publish-centos8-quay')
+            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.opendev_org.openstack_kolla.master.job.kolla-publish-debian-quay.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.opendev_org.openstack_kolla.master.job.kolla-publish-debian-quay.{SUCCESS,FAILURE,TIMED_OUT})),'72hours'), 'kolla-publish-debian-quay')
+            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.opendev_org.openstack_kolla.master.job.kolla-publish-ubuntu-quay.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.opendev_org.openstack_kolla.master.job.kolla-publish-ubuntu-quay.{SUCCESS,FAILURE,TIMED_OUT})),'72hours'), 'kolla-publish-ubuntu-quay')
+            - target: alias(movingAverage(asPercent(transformNull(sum(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.opendev_org.openstack_kolla.master.job.kolla-publish-centos8s-quay.{FAILURE,TIMED_OUT})),sum(stats_counts.zuul.tenant.openstack.pipeline.periodic.project.opendev_org.openstack_kolla.master.job.kolla-publish-centos8s-quay.{SUCCESS,FAILURE,TIMED_OUT})),'72hours'), 'kolla-publish-centos8s-quay')
           type: graph