Merge "RabbitMQ TLS support"
diff --git a/neutron/files/grafana_dashboards/neutron_openvswitch_prometheus.json b/neutron/files/grafana_dashboards/neutron_openvswitch_prometheus.json
index 4f05892..bf06c4c 100755
--- a/neutron/files/grafana_dashboards/neutron_openvswitch_prometheus.json
+++ b/neutron/files/grafana_dashboards/neutron_openvswitch_prometheus.json
@@ -1625,7 +1625,7 @@
"tableColumn": "",
"targets": [
{
- "expr": "openstack_neutron_ports{owner=~\"compute:.*\"}",
+ "expr": "sum(openstack_neutron_ports{owner=~\"compute:.*\",state=\"active\"})",
"format": "time_series",
"intervalFactor": 2,
"refId": "A",
diff --git a/neutron/files/grafana_dashboards/neutron_prometheus.json b/neutron/files/grafana_dashboards/neutron_prometheus.json
index 91d4fa1..b103b68 100755
--- a/neutron/files/grafana_dashboards/neutron_prometheus.json
+++ b/neutron/files/grafana_dashboards/neutron_prometheus.json
@@ -641,7 +641,7 @@
"tableColumn": "",
"targets": [
{
- "expr": "openstack_neutron_ports{owner=~\"compute:.*\",state=\"active\"}",
+ "expr": "sum(openstack_neutron_ports{owner=~\"compute:.*\",state=\"active\"})",
"format": "time_series",
"intervalFactor": 2,
"refId": "A",