commit 7eabcdecfed2f865839e520cedd8a32e0eadb11e
author Mateusz Matuszkowiak <mmatuszkowiak@mirantis.com> Mon Mar 26 13:52:01 2018 +0200
committer Mateusz Matuszkowiak <mmatuszkowiak@mirantis.com> Mon Mar 26 13:57:19 2018 +0200
tree a6fae162c2430a805172bb5a06064c26cba6a0aa
parent 6130acd2b30d78e7f442fe51f4d320fe6c9269a8

Use max function for openstack_* related metrics

If we use an aggregate func like max, we will avoid the
'multiple series' error, which can happen if for the specific
time period there will be >1 instance of remote agent returned
by the metric.

Change-Id: I27ce7eb1de7c63c6fa1609f89c0ded60f60bc039
Partial-Bug: PROD-17878

neutron/files/grafana_dashboards/neutron_prometheus.json

diff --git a/neutron/files/grafana_dashboards/neutron_prometheus.json b/neutron/files/grafana_dashboards/neutron_prometheus.json
index ec93342..500958e 100755
--- a/neutron/files/grafana_dashboards/neutron_prometheus.json
+++ b/neutron/files/grafana_dashboards/neutron_prometheus.json
@@ -494,7 +494,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "openstack_neutron_networks_total",
+              "expr": "max(openstack_neutron_networks_total)",
               "format": "time_series",
               "intervalFactor": 2,
               "refId": "A",
@@ -570,7 +570,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "openstack_neutron_subnets_total",
+              "expr": "max(openstack_neutron_subnets_total)",
               "format": "time_series",
               "intervalFactor": 2,
               "refId": "A",
@@ -722,7 +722,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "openstack_neutron_routers_total",
+              "expr": "max(openstack_neutron_routers_total)",
               "format": "time_series",
               "intervalFactor": 2,
               "refId": "A",
@@ -798,7 +798,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "openstack_neutron_floatingips_total",
+              "expr": "max(openstack_neutron_floatingips_total)",
               "format": "time_series",
               "intervalFactor": 2,
               "refId": "A",

neutron/files/grafana_dashboards/neutron_prometheus_fluentd.json

diff --git a/neutron/files/grafana_dashboards/neutron_prometheus_fluentd.json b/neutron/files/grafana_dashboards/neutron_prometheus_fluentd.json
index 24da598..7132e80 100755
--- a/neutron/files/grafana_dashboards/neutron_prometheus_fluentd.json
+++ b/neutron/files/grafana_dashboards/neutron_prometheus_fluentd.json
@@ -494,7 +494,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "openstack_neutron_networks_total",
+              "expr": "max(openstack_neutron_networks_total)",
               "format": "time_series",
               "intervalFactor": 2,
               "refId": "A",
@@ -570,7 +570,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "openstack_neutron_subnets_total",
+              "expr": "max(openstack_neutron_subnets_total)",
               "format": "time_series",
               "intervalFactor": 2,
               "refId": "A",
@@ -722,7 +722,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "openstack_neutron_routers_total",
+              "expr": "max(openstack_neutron_routers_total)",
               "format": "time_series",
               "intervalFactor": 2,
               "refId": "A",
@@ -798,7 +798,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "openstack_neutron_floatingips_total",
+              "expr": "max(openstack_neutron_floatingips_total)",
               "format": "time_series",
               "intervalFactor": 2,
               "refId": "A",