commit 7f36d1a5cd75b1ef923b3b54c66f733a91ed314d
author mcp-jenkins <mcp-jenkins@mirantis.com> Wed Mar 28 10:21:04 2018 +0000
committer Gerrit Code Review <gerrit2@11c41ac357c9> Wed Mar 28 10:21:04 2018 +0000
tree f3fefb804ae92252bc854451575ef41bfac56e19
parent 1023ea0b107ca51fe61c9526644001e547773771
parent ef567c5ca56426fa4787e65ca4dbb1e6553dce10

Merge "Use max function for openstack_* related metrics"

nova/files/grafana_dashboards/nova_prometheus.json

diff --git a/nova/files/grafana_dashboards/nova_prometheus.json b/nova/files/grafana_dashboards/nova_prometheus.json
index 0b6c26a..76e45d6 100644
--- a/nova/files/grafana_dashboards/nova_prometheus.json
+++ b/nova/files/grafana_dashboards/nova_prometheus.json
@@ -2783,7 +2783,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "openstack_nova_total_used_vcpus",
+              "expr": "max(openstack_nova_total_used_vcpus)",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "",
@@ -2861,7 +2861,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "openstack_nova_total_used_disk",
+              "expr": "max(openstack_nova_total_used_disk)",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "",
@@ -2939,7 +2939,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "openstack_nova_total_used_ram",
+              "expr": "max(openstack_nova_total_used_ram)",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "",
@@ -3017,7 +3017,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "openstack_nova_total_free_vcpus",
+              "expr": "max(openstack_nova_total_free_vcpus)",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "",
@@ -3095,7 +3095,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "openstack_nova_total_free_disk",
+              "expr": "max(openstack_nova_total_free_disk)",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "",
@@ -3173,7 +3173,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "openstack_nova_total_free_ram",
+              "expr": "max(openstack_nova_total_free_ram)",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "",

nova/files/grafana_dashboards/nova_prometheus_fluentd.json

diff --git a/nova/files/grafana_dashboards/nova_prometheus_fluentd.json b/nova/files/grafana_dashboards/nova_prometheus_fluentd.json
index 6eaf31d..ce5257b 100644
--- a/nova/files/grafana_dashboards/nova_prometheus_fluentd.json
+++ b/nova/files/grafana_dashboards/nova_prometheus_fluentd.json
@@ -2607,7 +2607,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "openstack_nova_total_used_vcpus",
+              "expr": "max(openstack_nova_total_used_vcpus)",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "",
@@ -2685,7 +2685,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "openstack_nova_total_used_disk",
+              "expr": "max(openstack_nova_total_used_disk)",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "",
@@ -2763,7 +2763,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "openstack_nova_total_used_ram",
+              "expr": "max(openstack_nova_total_used_ram)",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "",
@@ -2841,7 +2841,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "openstack_nova_total_free_vcpus",
+              "expr": "max(openstack_nova_total_free_vcpus)",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "",
@@ -2919,7 +2919,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "openstack_nova_total_free_disk",
+              "expr": "max(openstack_nova_total_free_disk)",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "",
@@ -2997,7 +2997,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "openstack_nova_total_free_ram",
+              "expr": "max(openstack_nova_total_free_ram)",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "",