diff --git a/grafana/horizon.yaml b/grafana/horizon.yaml
index e108b82e9f..b0081833d1 100644
--- a/grafana/horizon.yaml
+++ b/grafana/horizon.yaml
@@ -22,13 +22,11 @@ dashboard:
           span: 4
           targets:
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-horizon-python27{,-ubuntu-trusty,-ubuntu-xenial}.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-horizon-python27{,-ubuntu-trusty,-ubuntu-xenial}.{SUCCESS,FAILURE})),'24hours'), 'gate-horizon-python27')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-horizon-python34.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-horizon-python34.{SUCCESS,FAILURE})),'24hours'), 'gate-horizon-python34')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-horizon-python35.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-horizon-python35.{SUCCESS,FAILURE})),'24hours'), 'gate-horizon-python35')
           type: graph
         - title: Unit Tests Failure Rates (Gate queue)
           span: 4
           targets:
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-horizon-python27{,-ubuntu-trusty,-ubuntu-xenial}.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-horizon-python27{,-ubuntu-trusty,-ubuntu-xenial}.{SUCCESS,FAILURE})),'24hours'), 'gate-horizon-python27')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-horizon-python34.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-horizon-python34.{SUCCESS,FAILURE})),'24hours'), 'gate-horizon-python34')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-horizon-python35.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-horizon-python35.{SUCCESS,FAILURE})),'24hours'), 'gate-horizon-python35')
           type: graph
diff --git a/grafana/networking-midonet.yaml b/grafana/networking-midonet.yaml
index 9f22ecd14c..35a266f9e4 100644
--- a/grafana/networking-midonet.yaml
+++ b/grafana/networking-midonet.yaml
@@ -17,14 +17,12 @@ dashboard:
           span: 4
           targets:
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-networking-midonet-python27-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-networking-midonet-python27-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-midonet-python27-ubuntu-xenial')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-networking-midonet-python34.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-networking-midonet-python34.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-midonet-python34')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-networking-midonet-python35.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-networking-midonet-python35.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-midonet-python35')
           type: graph
         - title: Unit Tests Failure Rates (Gate queue)
           span: 4
           targets:
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-networking-midonet-python27-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-networking-midonet-python27-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-midonet-python27-ubuntu-xenial')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-networking-midonet-python34.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-networking-midonet-python34.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-midonet-python34')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-networking-midonet-python35.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-networking-midonet-python35.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-midonet-python35')
           type: graph
         - title: Tempest Failure Rates (Check queue)
diff --git a/grafana/networking-odl.yaml b/grafana/networking-odl.yaml
index 89a0e12df2..f371ed66a3 100644
--- a/grafana/networking-odl.yaml
+++ b/grafana/networking-odl.yaml
@@ -17,14 +17,12 @@ dashboard:
           span: 4
           targets:
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-networking-odl-python27-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-networking-odl-python27-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-odl-python27-ubuntu-xenial')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-networking-odl-python34.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-networking-odl-python34.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-odl-python34')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-networking-odl-python35.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-networking-odl-python35.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-odl-python35')
           type: graph
         - title: Unit Tests Failure Rates (Gate queue)
           span: 4
           targets:
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-networking-odl-python27-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-networking-odl-python27-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-odl-python27-ubuntu-xenial')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-networking-odl-python34.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-networking-odl-python34.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-odl-python34')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-networking-odl-python35.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-networking-odl-python35.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-odl-python35')
           type: graph
         - title: Grenade Tests Failure Rates (Check queue)
diff --git a/grafana/networking-ovn.yaml b/grafana/networking-ovn.yaml
index 0c8fb27aa6..66a73f49ef 100644
--- a/grafana/networking-ovn.yaml
+++ b/grafana/networking-ovn.yaml
@@ -17,14 +17,12 @@ dashboard:
           span: 4
           targets:
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-networking-ovn-python27-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-networking-ovn-python27-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-ovn-python27-ubuntu-xenial')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-networking-ovn-python34.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-networking-ovn-python34.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-ovn-python34')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-networking-ovn-python35.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-networking-ovn-python35.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-ovn-python35')
           type: graph
         - title: Unit Test Failure Rates (Gate queue)
           span: 4
           targets:
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-networking-ovn-python27-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-networking-ovn-python27-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-ovn-python27-ubuntu-xenial')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-networking-ovn-python34.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-networking-ovn-python34.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-ovn-python34')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-networking-ovn-python35.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-networking-ovn-python35.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-ovn-python35')
           type: graph
         - title: Periodic Job Failure Rates
diff --git a/grafana/networking-sfc.yaml b/grafana/networking-sfc.yaml
index 91c5d87380..9f09748b27 100644
--- a/grafana/networking-sfc.yaml
+++ b/grafana/networking-sfc.yaml
@@ -17,14 +17,12 @@ dashboard:
           span: 4
           targets:
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-networking-sfc-python27-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-networking-sfc-python27-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-sfc-python27-ubuntu-xenial')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-networking-sfc-python34.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-networking-sfc-python34.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-sfc-python34')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-networking-sfc-python35.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-networking-sfc-python35.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-sfc-python35')
           type: graph
         - title: Unit Test Failure Rates (Gate queue)
           span: 4
           targets:
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-networking-sfc-python27-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-networking-sfc-python27-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-sfc-python27-ubuntu-xenial')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-networking-sfc-python34.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-networking-sfc-python34.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-sfc-python34')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-networking-sfc-python35.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-networking-sfc-python35.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-sfc-python35')
           type: graph
         - title: Periodic Job Failure Rates
diff --git a/grafana/neutron-dynamic-routing.yaml b/grafana/neutron-dynamic-routing.yaml
index 479bd9d506..ca0402c6af 100644
--- a/grafana/neutron-dynamic-routing.yaml
+++ b/grafana/neutron-dynamic-routing.yaml
@@ -17,14 +17,12 @@ dashboard:
           span: 4
           targets:
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-neutron-dynamic-routing-python27-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-neutron-dynamic-routing-python27-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-dynamic-routing-python27-ubuntu-xenial')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-neutron-dynamic-routing-python34.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-neutron-dynamic-routing-python34.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-dynamic-routing-python34')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-neutron-dynamic-routing-python35.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-neutron-dynamic-routing-python35.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-dynamic-routing-python35')
           type: graph
         - title: Unit Test Failure Rates (Gate queue)
           span: 4
           targets:
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-neutron-dynamic-routing-python27-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-neutron-dynamic-routing-python27-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-dynamic-routing-python27-ubuntu-xenial')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-neutron-dynamic-routing-python34.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-neutron-dynamic-routing-python34.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-dynamic-routing-python34')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-neutron-dynamic-routing-python35.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-neutron-dynamic-routing-python35.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-dynamic-routing-python35')
           type: graph
         - title: Periodic Job Failure Rates
diff --git a/grafana/neutron-fwaas.yaml b/grafana/neutron-fwaas.yaml
index c7fe3c2413..a69e6f04df 100644
--- a/grafana/neutron-fwaas.yaml
+++ b/grafana/neutron-fwaas.yaml
@@ -17,7 +17,6 @@ dashboard:
           span: 4
           targets:
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-neutron-fwaas-python27{,-ubuntu-trusty,-ubuntu-xenial}.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-neutron-fwaas-python27{,-ubuntu-trusty,-ubuntu-xenial}.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-fwaas-python27')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-neutron-fwaas-python34.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-neutron-fwaas-python34.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-fwaas-python34')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-neutron-fwaas-python35.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-neutron-fwaas-python35.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-fwaas-python35')
           type: graph
         - title: Docs/Pep8/Functional Failure Rates (check)
@@ -42,7 +41,6 @@ dashboard:
           span: 4
           targets:
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-neutron-fwaas-python27{,-ubuntu-trusty,-ubuntu-xenial}.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-neutron-fwaas-python27{,-ubuntu-trusty,-ubuntu-xenial}.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-fwaas-python27')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-neutron-fwaas-python34.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-neutron-fwaas-python34.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-fwaas-python34')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-neutron-fwaas-python35.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-neutron-fwaas-python35.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-fwaas-python35')
           type: graph
         - title: Docs/Pep8/Functional Failure Rates (gate)
diff --git a/grafana/neutron-lib.yaml b/grafana/neutron-lib.yaml
index d12651788f..02a5dce531 100644
--- a/grafana/neutron-lib.yaml
+++ b/grafana/neutron-lib.yaml
@@ -17,14 +17,12 @@ dashboard:
           span: 4
           targets:
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-neutron-lib-python27-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-neutron-lib-python27-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-lib-python27-ubuntu-xenial')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-neutron-lib-python34.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-neutron-lib-python34.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-lib-python34')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-neutron-lib-python35.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-neutron-lib-python35.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-lib-python35')
           type: graph
         - title: Unit Tests Failure Rates (Gate queue)
           span: 4
           targets:
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-neutron-lib-python27-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-neutron-lib-python27-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-lib-python27-ubuntu-xenial')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-neutron-lib-python34.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-neutron-lib-python34.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-lib-python34')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-neutron-lib-python35.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-neutron-lib-python35.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-lib-python35')
           type: graph
         - title: Periodic jobs
diff --git a/grafana/neutron-vpnaas.yaml b/grafana/neutron-vpnaas.yaml
index 5dc499a8ef..d26f8f1dfc 100644
--- a/grafana/neutron-vpnaas.yaml
+++ b/grafana/neutron-vpnaas.yaml
@@ -17,7 +17,6 @@ dashboard:
           span: 4
           targets:
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-neutron-vpnaas-python27-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-neutron-vpnaas-python27-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-vpnaas-python27-ubuntu-xenial')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-neutron-vpnaas-python34.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-neutron-vpnaas-python34.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-vpnaas-python34')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-neutron-vpnaas-python35.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-neutron-vpnaas-python35.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-vpnaas-python35')
           type: graph
         - title: Docs/Pep8/Functional Failure Rates (check)
@@ -41,7 +40,6 @@ dashboard:
           span: 4
           targets:
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-neutron-vpnaas-python27-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-neutron-vpnaas-python27-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-vpnaas-python27-ubuntu-xenial')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-neutron-vpnaas-python34.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-neutron-vpnaas-python34.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-vpnaas-python34')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-neutron-vpnaas-python35.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-neutron-vpnaas-python35.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-vpnaas-python35')
           type: graph
         - title: Docs/Pep8/Functional Failure Rates (gate)
diff --git a/grafana/neutron.yaml b/grafana/neutron.yaml
index 78d72e169e..32f05e6b57 100644
--- a/grafana/neutron.yaml
+++ b/grafana/neutron.yaml
@@ -18,7 +18,6 @@ dashboard:
           targets:
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-neutron-python27-ubuntu-trusty.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-neutron-python27-ubuntu-trusty.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-python27-ubuntu-trusty')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-neutron-python27-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-neutron-python27-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-python27-ubuntu-xenial')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-neutron-python34.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-neutron-python34.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-python34')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-neutron-python35.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-neutron-python35.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-python35')
           type: graph
         - title: Unit Tests Failure Rates (Gate queue)
@@ -26,7 +25,6 @@ dashboard:
           targets:
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-neutron-python27-ubuntu-trusty.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-neutron-python27-ubuntu-trusty.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-python27-ubuntu-trusty')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-neutron-python27-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-neutron-python27-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-python27-ubuntu-xenial')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-neutron-python34.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-neutron-python34.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-python34')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-neutron-python35.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-neutron-python35.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-python35')
           type: graph
         - title: Periodic jobs
diff --git a/grafana/octavia.yaml b/grafana/octavia.yaml
index 4eae935691..65a4518039 100644
--- a/grafana/octavia.yaml
+++ b/grafana/octavia.yaml
@@ -17,14 +17,12 @@ dashboard:
           span: 4
           targets:
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-octavia-python27-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-octavia-python27-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-octavia-python27')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-octavia-python34.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-octavia-python34.{SUCCESS,FAILURE})),'24hours'), 'gate-octavia-python34')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-octavia-python35.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-octavia-python35.{SUCCESS,FAILURE})),'24hours'), 'gate-octavia-python35')
           type: graph
         - title: Unit Test Failure Rates (Gate queue)
           span: 4
           targets:
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-octavia-python27-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-octavia-python27-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-octavia-python27')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-octavia-python34.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-octavia-python34.{SUCCESS,FAILURE})),'24hours'), 'gate-octavia-python34')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-octavia-python35.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-octavia-python35.{SUCCESS,FAILURE})),'24hours'), 'gate-octavia-python35')
           type: graph
         - title: Periodic jobs