diff --git a/grafana/networking-odl.yaml b/grafana/networking-odl.yaml
index ab13b5daea..e99f90c955 100644
--- a/grafana/networking-odl.yaml
+++ b/grafana/networking-odl.yaml
@@ -33,47 +33,35 @@ dashboard:
         - title: Functional/Fullstack Tests Failure Rates (Check queue)
           span: 4
           targets:
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-functional-nitrogen.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-functional-nitrogen.{SUCCESS,FAILURE})),'24hours'), 'networking-odl-functional-nitrogen')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-functional-oxygen.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-functional-oxygen.{SUCCESS,FAILURE})),'24hours'), 'networking-odl-functional-oxygen')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-functional-fluorine.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-functional-fluorine.{SUCCESS,FAILURE})),'24hours'), 'networking-odl-functional-fluorine')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-fullstack-nitrogen.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-fullstack-nitrogen.{SUCCESS,FAILURE})),'24hours'), 'networking-odl-fullstack-nitrogen')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-fullstack-oxygen.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-fullstack-oxygen.{SUCCESS,FAILURE})),'24hours'), 'networking-odl-fullstack-oxygen')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-fullstack-fluorine.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-fullstack-fluorine.{SUCCESS,FAILURE})),'24hours'), 'networking-odl-fullstack-fluorine')
           type: graph
         - title: Functional/Fullstack Tests Failure Rates (Gate queue)
           span: 4
           targets:
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.gate.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-functional-nitrogen.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.gate.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-functional-nitrogen.{SUCCESS,FAILURE})),'24hours'), 'networking-odl-functional-nitrogen')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-functional-oxygen.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-functional-oxygen.{SUCCESS,FAILURE})),'24hours'), 'networking-odl-functional-oxygen')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.gate.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-fullstack-nitrogen.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.gate.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-fullstack-nitrogen.{SUCCESS,FAILURE})),'24hours'), 'networking-odl-fullstack-nitrogen')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-fullstack-oxygen.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-fullstack-oxygen.{SUCCESS,FAILURE})),'24hours'), 'networking-odl-fullstack-oxygen')
           type: graph
         - title: Tempest Failure Rates (Check queue)
           span: 4
           targets:
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-tempest-nitrogen.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-tempest-nitrogen.{SUCCESS,FAILURE})),'24hours'), 'networking-odl-tempest-nitrogen')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-tempest-oxygen.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-tempest-oxygen.{SUCCESS,FAILURE})),'24hours'), 'networking-odl-tempest-oxygen')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-tempest-fluorine.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-tempest-fluorine.{SUCCESS,FAILURE})),'24hours'), 'networking-odl-tempest-fluorine')
           type: graph
         - title: Multi-node Failure Rates (Check queue)
           span: 4
           targets:
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-tempest-nitrogen-multinode.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-tempest-nitrogen-multinode.{SUCCESS,FAILURE})),'24hours'), 'networking-odl-tempest-nitrogen-multinode')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-tempest-oxygen-multinode.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-tempest-oxygen-multinode.{SUCCESS,FAILURE})),'24hours'), 'networking-odl-tempest-oxygen-multinode')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-tempest-fluorine-multinode.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-tempest-fluorine-multinode.{SUCCESS,FAILURE})),'24hours'), 'networking-odl-tempest-fluorine-multinode')
           type: graph
         - title: Rally Failure Rates (Check queue)
           span: 4
           targets:
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-rally-nitrogen.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-rally-nitrogen.{SUCCESS,FAILURE})),'24hours'), 'networking-odl-rally-nitrogen')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-rally-oxygen.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-rally-oxygen.{SUCCESS,FAILURE})),'24hours'), 'networking-odl-rally-oxygen')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-rally-fluorine.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-rally-fluorine.{SUCCESS,FAILURE})),'24hours'), 'networking-odl-rally-fluorine')
           type: graph
-        - title: Rally Failure Rates (Gate queue)
-          span: 4
-          targets:
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.gate.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-rally-nitrogen.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.gate.project.git_openstack_org.openstack_networking-odl.master.job.networking-odl-rally-nitrogen.{SUCCESS,FAILURE})),'24hours'), 'networking-odl-rally-nitrogen')
-          type: graph
         - title: Periodic jobs
           span: 4
           targets: