Change the function imposed on instances/tasks

The number of instances/tasks should be cumulated instead of
averaging.

Change-Id: If63244ea086de8ba6a74865e5bad23feec01b3d6
Signed-off-by: Yang (Gabriel) Yu <Gabriel.yuyang@huawei.com>
(cherry picked from commit f6ca90e950a3b007b118cad702616267fab91916)

diff --git a/monitor/dashboard/openstack_stats.json b/monitor/dashboard/openstack_stats.json
index b73f18e..ce2c360 100644 (file)
--- a/monitor/dashboard/openstack_stats.json
+++ b/monitor/dashboard/openstack_stats.json
@@ -1948,7 +1948,7 @@
               "format": "time_series",
               "intervalFactor": 2,
               "refId": "A",
-              "step": 60
+              "step": 40
             }
           ],
           "thresholds": "20,40",
@@ -1962,7 +1962,7 @@
               "value": "null"
             }
           ],
-          "valueName": "avg"
+          "valueName": "current"
         },
         {
           "cacheTimeout": null,
@@ -2024,7 +2024,7 @@
               "format": "time_series",
               "intervalFactor": 2,
               "refId": "A",
-              "step": 60
+              "step": 40
             }
           ],
           "thresholds": "20,40",
@@ -2038,7 +2038,7 @@
               "value": "null"
             }
           ],
-          "valueName": "avg"
+          "valueName": "current"
         },
         {
           "aliasColors": {},
@@ -2079,7 +2079,7 @@
               "intervalFactor": 2,
               "legendFormat": "{{region}} : {{host}}: {{state}} ",
               "refId": "A",
-              "step": 20
+              "step": 10
             }
           ],
           "thresholds": [],
@@ -2157,7 +2157,7 @@
               "intervalFactor": 2,
               "legendFormat": "{{region}} : {{host}}: {{state}} ",
               "refId": "A",
-              "step": 20
+              "step": 10
             }
           ],
           "thresholds": [],
@@ -2256,7 +2256,7 @@
               "format": "time_series",
               "intervalFactor": 2,
               "refId": "A",
-              "step": 60
+              "step": 40
             }
           ],
           "thresholds": "20,40",
@@ -2270,16 +2270,16 @@
               "value": "null"
             }
           ],
-          "valueName": "avg"
+          "valueName": "current"
         },
         {
           "cacheTimeout": null,
           "colorBackground": true,
           "colorValue": false,
           "colors": [
-            "rgba(245, 54, 54, 0.9)",
+            "rgba(50, 172, 45, 0.97)",
             "rgba(237, 129, 40, 0.89)",
-            "rgba(50, 172, 45, 0.97)"
+            "rgba(245, 54, 54, 0.9)"
           ],
           "datasource": "automated-ds",
           "format": "none",
@@ -2332,7 +2332,7 @@
               "format": "time_series",
               "intervalFactor": 2,
               "refId": "A",
-              "step": 60
+              "step": 40
             }
           ],
           "thresholds": "20,40",
@@ -2346,7 +2346,7 @@
               "value": "null"
             }
           ],
-          "valueName": "avg"
+          "valueName": "current"
         },
         {
           "aliasColors": {},
@@ -2387,7 +2387,7 @@
               "intervalFactor": 2,
               "legendFormat": "{{region}} : {{host}}: {{state}} ",
               "refId": "A",
-              "step": 20
+              "step": 10
             }
           ],
           "thresholds": [],
@@ -2465,7 +2465,7 @@
               "intervalFactor": 2,
               "legendFormat": "{{region}} : {{host}}: {{state}} ",
               "refId": "A",
-              "step": 20
+              "step": 10
             }
           ],
           "thresholds": [],
@@ -2509,9 +2509,9 @@
           "colorBackground": true,
           "colorValue": false,
           "colors": [
-            "rgba(245, 54, 54, 0.9)",
+            "rgba(50, 172, 45, 0.97)",
             "rgba(237, 129, 40, 0.89)",
-            "rgba(50, 172, 45, 0.97)"
+            "rgba(245, 54, 54, 0.9)"
           ],
           "datasource": "automated-ds",
           "format": "decmbytes",
@@ -2564,7 +2564,7 @@
               "format": "time_series",
               "intervalFactor": 2,
               "refId": "A",
-              "step": 60
+              "step": 40
             }
           ],
           "thresholds": "20000,40000",
@@ -2578,7 +2578,7 @@
               "value": "null"
             }
           ],
-          "valueName": "avg"
+          "valueName": "current"
         },
         {
           "cacheTimeout": null,
@@ -2640,7 +2640,7 @@
               "format": "time_series",
               "intervalFactor": 2,
               "refId": "A",
-              "step": 60
+              "step": 40
             }
           ],
           "thresholds": "20000,40000",
@@ -2654,7 +2654,7 @@
               "value": "null"
             }
           ],
-          "valueName": "avg"
+          "valueName": "current"
         },
         {
           "aliasColors": {},
@@ -2695,7 +2695,7 @@
               "intervalFactor": 2,
               "legendFormat": "{{region}} : {{host}}: {{state}} ",
               "refId": "A",
-              "step": 20
+              "step": 10
             }
           ],
           "thresholds": [],
@@ -2773,7 +2773,7 @@
               "intervalFactor": 2,
               "legendFormat": "{{region}} : {{host}}: {{state}} ",
               "refId": "A",
-              "step": 20
+              "step": 10
             }
           ],
           "thresholds": [],
@@ -2872,7 +2872,7 @@
               "format": "time_series",
               "intervalFactor": 2,
               "refId": "A",
-              "step": 60
+              "step": 40
             }
           ],
           "thresholds": "100,500",
@@ -2886,7 +2886,7 @@
               "value": "null"
             }
           ],
-          "valueName": "avg"
+          "valueName": "current"
         },
         {
           "cacheTimeout": null,
@@ -2948,7 +2948,7 @@
               "format": "time_series",
               "intervalFactor": 2,
               "refId": "A",
-              "step": 60
+              "step": 40
             }
           ],
           "thresholds": "100,500",
@@ -2962,7 +2962,7 @@
               "value": "null"
             }
           ],
-          "valueName": "avg"
+          "valueName": "current"
         },
         {
           "aliasColors": {},
@@ -3003,7 +3003,7 @@
               "intervalFactor": 2,
               "legendFormat": "{{region}} : {{host}}: {{state}} ",
               "refId": "A",
-              "step": 20
+              "step": 10
             }
           ],
           "thresholds": [],
@@ -3081,7 +3081,7 @@
               "intervalFactor": 2,
               "legendFormat": "{{region}} : {{host}}: {{state}} ",
               "refId": "A",
-              "step": 20
+              "step": 10
             }
           ],
           "thresholds": [],
@@ -3192,7 +3192,7 @@
               "format": "time_series",
               "intervalFactor": 2,
               "refId": "A",
-              "step": 60
+              "step": 40
             }
           ],
           "thresholds": "50,80",
@@ -3206,7 +3206,7 @@
               "value": "null"
             }
           ],
-          "valueName": "avg"
+          "valueName": "current"
         },
         {
           "cacheTimeout": null,
@@ -3268,7 +3268,7 @@
               "format": "time_series",
               "intervalFactor": 2,
               "refId": "A",
-              "step": 60
+              "step": 40
             }
           ],
           "thresholds": "50,80",
@@ -3282,7 +3282,7 @@
               "value": "null"
             }
           ],
-          "valueName": "avg"
+          "valueName": "current"
         },
         {
           "aliasColors": {},
@@ -3323,7 +3323,7 @@
               "intervalFactor": 2,
               "legendFormat": "{{region}} : {{host}}: {{state}} ",
               "refId": "A",
-              "step": 20
+              "step": 10
             }
           ],
           "thresholds": [],
@@ -3401,7 +3401,7 @@
               "intervalFactor": 2,
               "legendFormat": "{{region}} : {{host}}: {{state}} ",
               "refId": "A",
-              "step": 20
+              "step": 10
             }
           ],
           "thresholds": [],
@@ -3500,7 +3500,7 @@
               "format": "time_series",
               "intervalFactor": 2,
               "refId": "A",
-              "step": 60
+              "step": 40
             }
           ],
           "thresholds": "50,80",
@@ -3514,7 +3514,7 @@
               "value": "null"
             }
           ],
-          "valueName": "avg"
+          "valueName": "current"
         },
         {
           "cacheTimeout": null,
@@ -3576,7 +3576,7 @@
               "format": "time_series",
               "intervalFactor": 2,
               "refId": "A",
-              "step": 60
+              "step": 40
             }
           ],
           "thresholds": "50,80",
@@ -3590,7 +3590,7 @@
               "value": "null"
             }
           ],
-          "valueName": "avg"
+          "valueName": "current"
         },
         {
           "aliasColors": {},
@@ -3631,7 +3631,7 @@
               "intervalFactor": 2,
               "legendFormat": "{{region}} : {{host}}: {{state}} ",
               "refId": "A",
-              "step": 20
+              "step": 10
             }
           ],
           "thresholds": [],
@@ -3709,7 +3709,7 @@
               "intervalFactor": 2,
               "legendFormat": "{{region}} : {{host}}: {{state}} ",
               "refId": "A",
-              "step": 20
+              "step": 10
             }
           ],
           "thresholds": [],
@@ -3808,7 +3808,7 @@
               "format": "time_series",
               "intervalFactor": 2,
               "refId": "A",
-              "step": 60
+              "step": 40
             }
           ],
           "thresholds": "50,80",
@@ -3822,7 +3822,7 @@
               "value": "null"
             }
           ],
-          "valueName": "avg"
+          "valueName": "current"
         },
         {
           "aliasColors": {},
@@ -3974,7 +3974,7 @@
               "format": "time_series",
               "intervalFactor": 2,
               "refId": "A",
-              "step": 60
+              "step": 40
             }
           ],
           "thresholds": "50,80",
@@ -3988,7 +3988,7 @@
               "value": "null"
             }
           ],
-          "valueName": "avg"
+          "valueName": "current"
         },
         {
           "cacheTimeout": null,
@@ -4050,7 +4050,7 @@
               "format": "time_series",
               "intervalFactor": 2,
               "refId": "A",
-              "step": 60
+              "step": 40
             }
           ],
           "thresholds": "50,80",
@@ -4064,7 +4064,7 @@
               "value": "null"
             }
           ],
-          "valueName": "avg"
+          "valueName": "current"
         },
         {
           "aliasColors": {},
@@ -4105,7 +4105,7 @@
               "intervalFactor": 2,
               "legendFormat": "{{region}} : {{host}}: {{state}} ",
               "refId": "A",
-              "step": 30
+              "step": 20
             }
           ],
           "thresholds": [],
@@ -4183,7 +4183,7 @@
               "intervalFactor": 2,
               "legendFormat": "{{region}} : {{host}}: {{state}} ",
               "refId": "A",
-              "step": 10
+              "step": 4
             }
           ],
           "thresholds": [],
@@ -4282,7 +4282,7 @@
               "format": "time_series",
               "intervalFactor": 2,
               "refId": "A",
-              "step": 60
+              "step": 40
             }
           ],
           "thresholds": "50,80",
@@ -4296,7 +4296,7 @@
               "value": "null"
             }
           ],
-          "valueName": "avg"
+          "valueName": "current"
         },
         {
           "cacheTimeout": null,
@@ -4358,7 +4358,7 @@
               "format": "time_series",
               "intervalFactor": 2,
               "refId": "A",
-              "step": 60
+              "step": 40
             }
           ],
           "thresholds": "50,80",
@@ -4372,7 +4372,7 @@
               "value": "null"
             }
           ],
-          "valueName": "avg"
+          "valueName": "current"
         },
         {
           "aliasColors": {},
@@ -4413,7 +4413,7 @@
               "intervalFactor": 2,
               "legendFormat": "{{region}} : {{host}}: {{state}} ",
               "refId": "A",
-              "step": 20
+              "step": 10
             }
           ],
           "thresholds": [],
@@ -4491,7 +4491,7 @@
               "intervalFactor": 2,
               "legendFormat": "{{region}} : {{host}}: {{state}} ",
               "refId": "A",
-              "step": 20
+              "step": 10
             }
           ],
           "thresholds": [],
@@ -4602,7 +4602,7 @@
               "format": "time_series",
               "intervalFactor": 2,
               "refId": "A",
-              "step": 60
+              "step": 40
             }
           ],
           "thresholds": "50,80",
@@ -4616,7 +4616,7 @@
               "value": "null"
             }
           ],
-          "valueName": "avg"
+          "valueName": "current"
         },
         {
           "cacheTimeout": null,
@@ -4678,7 +4678,7 @@
               "format": "time_series",
               "intervalFactor": 2,
               "refId": "A",
-              "step": 60
+              "step": 40
             }
           ],
           "thresholds": "50,80",
@@ -4692,7 +4692,7 @@
               "value": "null"
             }
           ],
-          "valueName": "avg"
+          "valueName": "current"
         },
         {
           "aliasColors": {},
@@ -4733,7 +4733,7 @@
               "intervalFactor": 2,
               "legendFormat": "{{region}} : {{host}}: {{state}} ",
               "refId": "A",
-              "step": 20
+              "step": 10
             }
           ],
           "thresholds": [],
@@ -4811,7 +4811,7 @@
               "intervalFactor": 2,
               "legendFormat": "{{region}} : {{host}}: {{state}} ",
               "refId": "A",
-              "step": 20
+              "step": 10
             }
           ],
           "thresholds": [],
@@ -5893,5 +5893,5 @@
   },
   "timezone": "browser",
   "title": "OpenStack Stats",
-  "version": 3
+  "version": 4
 }
\ No newline at end of file