diff --git a/neutron/files/grafana_dashboards/neutron_l2_prometheus_fluentd.json b/neutron/files/grafana_dashboards/neutron_l2_prometheus_fluentd.json
index 547aa91..c205c33 100755
--- a/neutron/files/grafana_dashboards/neutron_l2_prometheus_fluentd.json
+++ b/neutron/files/grafana_dashboards/neutron_l2_prometheus_fluentd.json
@@ -1193,28 +1193,28 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "max(count(openstack_neutron_agent_state{binary=\"neutron-openvswitch-agent|neutron-linuxbridge-agent\"} == 1 and openstack_neutron_agent_status{binary=\"neutron-openvswitch-agent|neutron-linuxbridge-agent\"} == 1) by (instance))",
+          "expr": "max(count(openstack_neutron_agent_state{binary=~\"neutron-openvswitch-agent|neutron-linuxbridge-agent\"} == 1 and openstack_neutron_agent_status{binary=~\"neutron-openvswitch-agent|neutron-linuxbridge-agent\"} == 1) by (instance))",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "enabled/up",
           "refId": "A"
         },
         {
-          "expr": "max(count(openstack_neutron_agent_state{binary=\"neutron-openvswitch-agent|neutron-linuxbridge-agent\"} == 1 and openstack_neutron_agent_status{binary=\"neutron-openvswitch-agent|neutron-linuxbridge-agent\"} == 0) by (instance))",
+          "expr": "max(count(openstack_neutron_agent_state{binary=~\"neutron-openvswitch-agent|neutron-linuxbridge-agent\"} == 1 and openstack_neutron_agent_status{binary=~\"neutron-openvswitch-agent|neutron-linuxbridge-agent\"} == 0) by (instance))",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "enabled/down",
           "refId": "B"
         },
         {
-          "expr": "max(count(openstack_neutron_agent_state{binary=\"neutron-openvswitch-agent|neutron-linuxbridge-agent\"} == 0 and openstack_neutron_agent_status{binary=\"neutron-openvswitch-agent|neutron-linuxbridge-agent\"} == 1) by (instance))",
+          "expr": "max(count(openstack_neutron_agent_state{binary=~\"neutron-openvswitch-agent|neutron-linuxbridge-agent\"} == 0 and openstack_neutron_agent_status{binary=~\"neutron-openvswitch-agent|neutron-linuxbridge-agent\"} == 1) by (instance))",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "disabled/up",
           "refId": "C"
         },
         {
-          "expr": "max(count(openstack_neutron_agent_state{binary=\"neutron-openvswitch-agent|neutron-linuxbridge-agent\"} == 0 and openstack_neutron_agent_status{binary=\"neutron-openvswitch-agent|neutron-linuxbridge-agent\"} == 0) by (instance))",
+          "expr": "max(count(openstack_neutron_agent_state{binary=~\"neutron-openvswitch-agent|neutron-linuxbridge-agent\"} == 0 and openstack_neutron_agent_status{binary=~\"neutron-openvswitch-agent|neutron-linuxbridge-agent\"} == 0) by (instance))",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "disabled/down",