diff --git a/grafana/horizon.yaml b/grafana/horizon.yaml
index e7002207a6..459ba310a9 100644
--- a/grafana/horizon.yaml
+++ b/grafana/horizon.yaml
@@ -13,30 +13,53 @@ dashboard:
     - title: Graphs
       height: 320px
       panels:
-        - title: npm test Failure Rates (Gate queue)
-          span: 4
-          targets:
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_horizon.master.job.nodejs-npm-run-test.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_horizon.master.job.nodejs-npm-run-test.{SUCCESS,FAILURE})),'24hours'), 'nodejs4-npm-run-test')
-          type: graph
         - title: Unit Tests Failure Rates (Check queue)
-          span: 4
+          span: 6
           targets:
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_horizon.master.job.openstack-tox-py27.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_horizon.master.job.openstack-tox-py27.{SUCCESS,FAILURE})),'24hours'), 'openstack-tox-py27')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_horizon.master.job.openstack-tox-py35.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_horizon.master.job.openstack-tox-py35.{SUCCESS,FAILURE})),'24hours'), 'openstack-tox-py35')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_horizon.master.job.openstack-tox-py36.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_horizon.master.job.openstack-tox-py36.{SUCCESS,FAILURE})),'24hours'), 'openstack-tox-py36')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_horizon.master.job.openstack-tox-py37.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_horizon.master.job.openstack-tox-py37.{SUCCESS,FAILURE})),'24hours'), 'openstack-tox-py37')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_horizon.master.job.horizon-openstack-tox-python3-django111.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_horizon.master.job.horizon-openstack-tox-python3-django111.{SUCCESS,FAILURE})),'24hours'), 'horizon-openstack-tox-python3-django111')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_horizon.master.job.horizon-openstack-tox-python3-django22.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_horizon.master.job.horizon-openstack-tox-python3-django22.{SUCCESS,FAILURE})),'24hours'), 'horizon-openstack-tox-python3-django22')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_horizon.master.job.openstack-tox-lower-constraints.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_horizon.master.job.openstack-tox-lower-constraints.{SUCCESS,FAILURE})),'24hours'), 'openstack-tox-lower-constraints')
           type: graph
         - title: Unit Tests Failure Rates (Gate queue)
-          span: 4
+          span: 6
           targets:
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_horizon.master.job.openstack-tox-py27.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_horizon.master.job.openstack-tox-py27.{SUCCESS,FAILURE})),'24hours'), 'openstack-tox-py27')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_horizon.master.job.openstack-tox-py35.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_horizon.master.job.openstack-tox-py35.{SUCCESS,FAILURE})),'24hours'), 'openstack-tox-py35')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_horizon.master.job.openstack-tox-py36.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_horizon.master.job.openstack-tox-py36.{SUCCESS,FAILURE})),'24hours'), 'openstack-tox-py36')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_horizon.master.job.openstack-tox-py37.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_horizon.master.job.openstack-tox-py37.{SUCCESS,FAILURE})),'24hours'), 'openstack-tox-py37')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_horizon.master.job.horizon-openstack-tox-python3-django111.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_horizon.master.job.horizon-openstack-tox-python3-django111.{SUCCESS,FAILURE})),'24hours'), 'horizon-openstack-tox-python3-django111')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_horizon.master.job.horizon-openstack-tox-python3-django22.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_horizon.master.job.horizon-openstack-tox-python3-django22.{SUCCESS,FAILURE})),'24hours'), 'horizon-openstack-tox-python3-django22')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_horizon.master.job.openstack-tox-lower-constraints.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_horizon.master.job.openstack-tox-lower-constraints.{SUCCESS,FAILURE})),'24hours'), 'openstack-tox-lower-constraints')
           type: graph
-        - title: Tempest Failure Rates (Check queue)
-          span: 4
+        - title: Tempest/Integration Tests Failure Rates (Check queue)
+          span: 6
           targets:
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_horizon.master.job.horizon-dsvm-tempest-plugin.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_horizon.master.job.horizon-dsvm-tempest-plugin.{SUCCESS,FAILURE})),'24hours'), 'horizon-dsvm-tempest-plugin')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_horizon.master.job.horizon-dsvm-tempest-plugin-py27.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_horizon.master.job.horizon-dsvm-tempest-plugin-py27.{SUCCESS,FAILURE})),'24hours'), 'horizon-dsvm-tempest-plugin-py27')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_horizon.master.job.horizon-tempest-plugin-ipv6.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_horizon.master.job.horizon-tempest-plugin-ipv6.{SUCCESS,FAILURE})),'24hours'), 'horizon-tempest-plugin-ipv6')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_horizon.master.job.horizon-integration-tests.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_horizon.master.job.horizon-integration-tests.{SUCCESS,FAILURE})),'24hours'), 'horizon-integration-tests')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_horizon.master.job.horizon-selenium-headless.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_horizon.master.job.horizon-selenium-headless.{SUCCESS,FAILURE})),'24hours'), 'horizon-selenium-headless')
           type: graph
-        - title: Tempest Failure Rates (Gate queue)
-          span: 4
+        - title: Tempest/Integration Tests Failure Rates (Gate queue)
+          span: 6
           targets:
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_horizon.master.job.horizon-dsvm-tempest-plugin.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_horizon.master.job.horizon-dsvm-tempest-plugin.{SUCCESS,FAILURE})),'24hours'), 'horizon-dsvm-tempest-plugin')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_horizon.master.job.horizon-dsvm-tempest-plugin-py27.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_horizon.master.job.horizon-dsvm-tempest-plugin-py27.{SUCCESS,FAILURE})),'24hours'), 'horizon-dsvm-tempest-plugin-py27')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_horizon.master.job.horizon-tempest-plugin-ipv6.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_horizon.master.job.horizon-tempest-plugin-ipv6.{SUCCESS,FAILURE})),'24hours'), 'horizon-tempest-plugin-ipv6')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_horizon.master.job.horizon-integration-tests.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_horizon.master.job.horizon-integration-tests.{SUCCESS,FAILURE})),'24hours'), 'horizon-integration-tests')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_horizon.master.job.horizon-selenium-headless.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_horizon.master.job.horizon-selenium-headless.{SUCCESS,FAILURE})),'24hours'), 'horizon-selenium-headless')
+          type: graph
+        - title: npm test Failure Rates (Check queue)
+          span: 6
+          targets:
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_horizon.master.job.nodejs10-npm-run-test.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_horizon.master.job.nodejs10-npm-run-test.{SUCCESS,FAILURE})),'24hours'), 'nodejs10-npm-run-test')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_horizon.master.job.nodejs10-npm-run-lint.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_horizon.master.job.nodejs10-npm-run-lint.{SUCCESS,FAILURE})),'24hours'), 'nodejs10-npm-run-lint')
+          type: graph
+        - title: npm test Failure Rates (Gate queue)
+          span: 6
+          targets:
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_horizon.master.job.nodejs10-npm-run-test.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_horizon.master.job.nodejs10-npm-run-test.{SUCCESS,FAILURE})),'24hours'), 'nodejs10-npm-run-test')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_horizon.master.job.nodejs10-npm-run-lint.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.gate.project.opendev_org.openstack_horizon.master.job.nodejs10-npm-run-lint.{SUCCESS,FAILURE})),'24hours'), 'nodejs10-npm-run-lint')
           type: graph