Merge "bugfix:fix all generic test cases in grafana"

1 files changed, 112 insertions, 320 deletions

diff --git a/dashboard/Yardstick-TC011-1456495954966 b/dashboard/Yardstick-TC011-1456495954966
index db8f48ce8..2bca4dece 100644
--- a/dashboard/Yardstick-TC011-1456495954966
+++ b/dashboard/Yardstick-TC011-1456495954966
@@ -154,7 +154,7 @@
               ]
             }
           ],
-          "timeFrom": "24h",
+          "timeFrom": "14d",
           "timeShift": null,
           "title": "jitter: packet delay variation (ms)",
           "tooltip": {
@@ -212,9 +212,9 @@
           "repeat": "POD",
           "scopedVars": {
             "POD": {
-              "selected": true,
               "text": "ericsson-pod2",
-              "value": "ericsson\\-pod2"
+              "value": "ericsson\\-pod2",
+              "selected": true
             }
           },
           "scroll": true,
@@ -298,7 +298,7 @@
               ]
             }
           ],
-          "timeFrom": "24h",
+          "timeFrom": "14d",
           "title": "$POD",
           "transform": "timeseries_to_rows",
           "type": "table"
@@ -317,9 +317,9 @@
           "repeat": null,
           "scopedVars": {
             "POD": {
-              "selected": true,
-              "text": "huawei-us-deploy-bare-1",
-              "value": "huawei\\-us\\-deploy\\-bare\\-1"
+              "text": "huawei-pod1",
+              "value": "huawei\\-pod1",
+              "selected": true
             }
           },
           "scroll": true,
@@ -403,11 +403,11 @@
               ]
             }
           ],
-          "timeFrom": "24h",
+          "timeFrom": "14d",
           "title": "$POD",
           "transform": "timeseries_to_rows",
           "type": "table",
-          "repeatIteration": 1456495947533,
+          "repeatIteration": 1468225357451,
           "repeatPanelId": 5
         },
         {
@@ -424,9 +424,9 @@
           "repeat": null,
           "scopedVars": {
             "POD": {
-              "selected": true,
-              "text": "intel-pod6",
-              "value": "intel\\-pod6"
+              "text": "huawei-pod2",
+              "value": "huawei\\-pod2",
+              "selected": true
             }
           },
           "scroll": true,
@@ -510,11 +510,11 @@
               ]
             }
           ],
-          "timeFrom": "24h",
+          "timeFrom": "14d",
           "title": "$POD",
           "transform": "timeseries_to_rows",
           "type": "table",
-          "repeatIteration": 1456495947533,
+          "repeatIteration": 1468225357451,
           "repeatPanelId": 5
         },
         {
@@ -531,9 +531,9 @@
           "repeat": null,
           "scopedVars": {
             "POD": {
-              "selected": true,
-              "text": "opnfv-jump-1",
-              "value": "opnfv\\-jump\\-1"
+              "text": "intel-pod6",
+              "value": "intel\\-pod6",
+              "selected": true
             }
           },
           "scroll": true,
@@ -617,11 +617,11 @@
               ]
             }
           ],
-          "timeFrom": "24h",
+          "timeFrom": "14d",
           "title": "$POD",
           "transform": "timeseries_to_rows",
           "type": "table",
-          "repeatIteration": 1456495947533,
+          "repeatIteration": 1468225357451,
           "repeatPanelId": 5
         },
         {
@@ -638,9 +638,9 @@
           "repeat": null,
           "scopedVars": {
             "POD": {
-              "selected": true,
-              "text": "opnfv-jump-2",
-              "value": "opnfv\\-jump\\-2"
+              "text": "lf-pod2",
+              "value": "lf\\-pod2",
+              "selected": true
             }
           },
           "scroll": true,
@@ -724,11 +724,11 @@
               ]
             }
           ],
-          "timeFrom": "24h",
+          "timeFrom": "14d",
           "title": "$POD",
           "transform": "timeseries_to_rows",
           "type": "table",
-          "repeatIteration": 1456495947533,
+          "repeatIteration": 1468225357451,
           "repeatPanelId": 5
         },
         {
@@ -745,116 +745,9 @@
           "repeat": null,
           "scopedVars": {
             "POD": {
-              "selected": true,
-              "text": "orange-fr-pod2",
-              "value": "orange\\-fr\\-pod2"
-            }
-          },
-          "scroll": true,
-          "showHeader": true,
-          "sort": {
-            "col": 0,
-            "desc": true
-          },
-          "span": 2,
-          "styles": [
-            {
-              "dateFormat": "YYYY-MM-DD HH:mm:ss",
-              "pattern": "Time",
-              "type": "date"
-            },
-            {
-              "colorMode": null,
-              "colors": [
-                "rgba(245, 54, 54, 0.9)",
-                "rgba(237, 129, 40, 0.89)",
-                "rgba(50, 172, 45, 0.97)"
-              ],
-              "decimals": 2,
-              "pattern": "deploy_scenario",
-              "thresholds": [],
-              "type": "string",
-              "unit": "short"
-            },
-            {
-              "colorMode": null,
-              "colors": [
-                "rgba(245, 54, 54, 0.9)",
-                "rgba(237, 129, 40, 0.89)",
-                "rgba(50, 172, 45, 0.97)"
-              ],
-              "dateFormat": "YYYY-MM-DD HH:mm:ss",
-              "decimals": 4,
-              "pattern": "/.*/",
-              "thresholds": [],
-              "type": "number",
-              "unit": "short"
-            }
-          ],
-          "targets": [
-            {
-              "dsType": "influxdb",
-              "groupBy": [
-                {
-                  "params": [
-                    "deploy_scenario"
-                  ],
-                  "type": "tag"
-                }
-              ],
-              "measurement": "opnfv_yardstick_tc011",
-              "query": "SELECT \"end.sum.jitter_ms\" FROM \"opnfv_yardstick_tc011\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"deploy_scenario\"",
-              "refId": "A",
-              "resultFormat": "time_series",
-              "select": [
-                [
-                  {
-                    "params": [
-                      "end.sum.jitter_ms"
-                    ],
-                    "type": "field"
-                  }
-                ]
-              ],
-              "tags": [
-                {
-                  "key": "pod_name",
-                  "operator": "=~",
-                  "value": "/$POD$/"
-                },
-                {
-                  "condition": "AND",
-                  "key": "deploy_scenario",
-                  "operator": "=~",
-                  "value": "/$SCENARIO$/"
-                }
-              ]
-            }
-          ],
-          "timeFrom": "24h",
-          "title": "$POD",
-          "transform": "timeseries_to_rows",
-          "type": "table",
-          "repeatIteration": 1456495947533,
-          "repeatPanelId": 5
-        },
-        {
-          "columns": [],
-          "datasource": "yardstick-vtc",
-          "editable": true,
-          "error": false,
-          "fontSize": "100%",
-          "id": 20,
-          "isNew": true,
-          "links": [],
-          "minSpan": 2,
-          "pageSize": null,
-          "repeat": null,
-          "scopedVars": {
-            "POD": {
-              "selected": true,
               "text": "zte-pod1",
-              "value": "zte\\-pod1"
+              "value": "zte\\-pod1",
+              "selected": true
             }
           },
           "scroll": true,
@@ -938,11 +831,11 @@
               ]
             }
           ],
-          "timeFrom": "24h",
+          "timeFrom": "14d",
           "title": "$POD",
           "transform": "timeseries_to_rows",
           "type": "table",
-          "repeatIteration": 1456495947533,
+          "repeatIteration": 1468225357451,
           "repeatPanelId": 5
         }
       ],
@@ -995,9 +888,9 @@
           "repeat": "POD",
           "scopedVars": {
             "POD": {
-              "selected": true,
               "text": "ericsson-pod2",
-              "value": "ericsson\\-pod2"
+              "value": "ericsson\\-pod2",
+              "selected": true
             }
           },
           "seriesOverrides": [],
@@ -1066,7 +959,7 @@
               ]
             }
           ],
-          "timeFrom": "10d",
+          "timeFrom": "14d",
           "timeShift": null,
           "title": "$POD",
           "tooltip": {
@@ -1123,9 +1016,9 @@
           "repeat": null,
           "scopedVars": {
             "POD": {
-              "selected": true,
-              "text": "huawei-us-deploy-bare-1",
-              "value": "huawei\\-us\\-deploy\\-bare\\-1"
+              "text": "huawei-pod1",
+              "value": "huawei\\-pod1",
+              "selected": true
             }
           },
           "seriesOverrides": [],
@@ -1194,7 +1087,7 @@
               ]
             }
           ],
-          "timeFrom": "10d",
+          "timeFrom": "14d",
           "timeShift": null,
           "title": "$POD",
           "tooltip": {
@@ -1208,7 +1101,7 @@
             "short",
             "short"
           ],
-          "repeatIteration": 1456495947533,
+          "repeatIteration": 1468225357451,
           "repeatPanelId": 7
         },
         {
@@ -1253,9 +1146,9 @@
           "repeat": null,
           "scopedVars": {
             "POD": {
-              "selected": true,
-              "text": "intel-pod6",
-              "value": "intel\\-pod6"
+              "text": "huawei-pod2",
+              "value": "huawei\\-pod2",
+              "selected": true
             }
           },
           "seriesOverrides": [],
@@ -1324,7 +1217,7 @@
               ]
             }
           ],
-          "timeFrom": "10d",
+          "timeFrom": "14d",
           "timeShift": null,
           "title": "$POD",
           "tooltip": {
@@ -1338,7 +1231,7 @@
             "short",
             "short"
           ],
-          "repeatIteration": 1456495947533,
+          "repeatIteration": 1468225357451,
           "repeatPanelId": 7
         },
         {
@@ -1383,9 +1276,9 @@
           "repeat": null,
           "scopedVars": {
             "POD": {
-              "selected": true,
-              "text": "opnfv-jump-1",
-              "value": "opnfv\\-jump\\-1"
+              "text": "intel-pod6",
+              "value": "intel\\-pod6",
+              "selected": true
             }
           },
           "seriesOverrides": [],
@@ -1454,7 +1347,7 @@
               ]
             }
           ],
-          "timeFrom": "10d",
+          "timeFrom": "14d",
           "timeShift": null,
           "title": "$POD",
           "tooltip": {
@@ -1468,7 +1361,7 @@
             "short",
             "short"
           ],
-          "repeatIteration": 1456495947533,
+          "repeatIteration": 1468225357451,
           "repeatPanelId": 7
         },
         {
@@ -1513,9 +1406,9 @@
           "repeat": null,
           "scopedVars": {
             "POD": {
-              "selected": true,
-              "text": "opnfv-jump-2",
-              "value": "opnfv\\-jump\\-2"
+              "text": "lf-pod2",
+              "value": "lf\\-pod2",
+              "selected": true
             }
           },
           "seriesOverrides": [],
@@ -1584,7 +1477,7 @@
               ]
             }
           ],
-          "timeFrom": "10d",
+          "timeFrom": "14d",
           "timeShift": null,
           "title": "$POD",
           "tooltip": {
@@ -1598,7 +1491,7 @@
             "short",
             "short"
           ],
-          "repeatIteration": 1456495947533,
+          "repeatIteration": 1468225357451,
           "repeatPanelId": 7
         },
         {
@@ -1643,139 +1536,9 @@
           "repeat": null,
           "scopedVars": {
             "POD": {
-              "selected": true,
-              "text": "orange-fr-pod2",
-              "value": "orange\\-fr\\-pod2"
-            }
-          },
-          "seriesOverrides": [],
-          "span": 2,
-          "stack": false,
-          "steppedLine": false,
-          "targets": [
-            {
-              "dsType": "influxdb",
-              "groupBy": [
-                {
-                  "params": [
-                    "24h"
-                  ],
-                  "type": "time"
-                },
-                {
-                  "params": [
-                    "deploy_scenario"
-                  ],
-                  "type": "tag"
-                },
-                {
-                  "params": [
-                    "pod_name"
-                  ],
-                  "type": "tag"
-                },
-                {
-                  "params": [
-                    "null"
-                  ],
-                  "type": "fill"
-                }
-              ],
-              "measurement": "opnfv_yardstick_tc011",
-              "query": "SELECT mean(\"end.sum.jitter_ms\") FROM \"opnfv_yardstick_tc011\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY time(24h), \"deploy_scenario\", \"pod_name\" fill(null)",
-              "refId": "A",
-              "resultFormat": "time_series",
-              "select": [
-                [
-                  {
-                    "params": [
-                      "end.sum.jitter_ms"
-                    ],
-                    "type": "field"
-                  },
-                  {
-                    "params": [],
-                    "type": "mean"
-                  }
-                ]
-              ],
-              "tags": [
-                {
-                  "key": "pod_name",
-                  "operator": "=~",
-                  "value": "/$POD$/"
-                },
-                {
-                  "condition": "AND",
-                  "key": "deploy_scenario",
-                  "operator": "=~",
-                  "value": "/$SCENARIO$/"
-                }
-              ]
-            }
-          ],
-          "timeFrom": "10d",
-          "timeShift": null,
-          "title": "$POD",
-          "tooltip": {
-            "shared": true,
-            "value_type": "cumulative"
-          },
-          "type": "graph",
-          "x-axis": true,
-          "y-axis": true,
-          "y_formats": [
-            "short",
-            "short"
-          ],
-          "repeatIteration": 1456495947533,
-          "repeatPanelId": 7
-        },
-        {
-          "aliasColors": {},
-          "bars": false,
-          "datasource": "yardstick-vtc",
-          "editable": true,
-          "error": false,
-          "fill": 1,
-          "grid": {
-            "leftLogBase": 1,
-            "leftMax": null,
-            "leftMin": null,
-            "rightLogBase": 1,
-            "rightMax": null,
-            "rightMin": null,
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
-          "id": 21,
-          "isNew": true,
-          "legend": {
-            "avg": false,
-            "current": false,
-            "max": false,
-            "min": false,
-            "show": true,
-            "total": false,
-            "values": false
-          },
-          "lines": true,
-          "linewidth": 2,
-          "links": [],
-          "minSpan": 2,
-          "nullPointMode": "connected",
-          "percentage": false,
-          "pointradius": 3,
-          "points": true,
-          "renderer": "flot",
-          "repeat": null,
-          "scopedVars": {
-            "POD": {
-              "selected": true,
               "text": "zte-pod1",
-              "value": "zte\\-pod1"
+              "value": "zte\\-pod1",
+              "selected": true
             }
           },
           "seriesOverrides": [],
@@ -1844,7 +1607,7 @@
               ]
             }
           ],
-          "timeFrom": "10d",
+          "timeFrom": "14d",
           "timeShift": null,
           "title": "$POD",
           "tooltip": {
@@ -1858,7 +1621,7 @@
             "short",
             "short"
           ],
-          "repeatIteration": 1456495947533,
+          "repeatIteration": 1468225357451,
           "repeatPanelId": 7
         }
       ],
@@ -1900,14 +1663,13 @@
         "allFormat": "regex values",
         "current": {
           "tags": [],
-          "text": "ericsson-pod2 + huawei-us-deploy-bare-1 + intel-pod6 + opnfv-jump-1 + opnfv-jump-2 + orange-fr-pod2 + zte-pod1",
+          "text": "ericsson-pod2 + huawei-pod1 + huawei-pod2 + intel-pod6 + lf-pod2 + zte-pod1",
           "value": [
             "ericsson\\-pod2",
-            "huawei\\-us\\-deploy\\-bare\\-1",
+            "huawei\\-pod1",
+            "huawei\\-pod2",
             "intel\\-pod6",
-            "opnfv\\-jump\\-1",
-            "opnfv\\-jump\\-2",
-            "orange\\-fr\\-pod2",
+            "lf\\-pod2",
             "zte\\-pod1"
           ]
         },
@@ -1918,54 +1680,84 @@
         "name": "POD",
         "options": [
           {
-            "selected": false,
             "text": "All",
-            "value": "(elxg482ls42|ericsson\\-pod2|huawei\\-us\\-deploy\\-bare\\-1|intel\\-pod6|opnfv\\-jump\\-1|opnfv\\-jump\\-2|orange\\-fr\\-pod2|zte\\-pod1|unknown)"
+            "value": "(elxg482ls42|ericsson\\-pod1|ericsson\\-pod2|huawei\\-pod1|huawei\\-pod2|huawei\\-us\\-deploy\\-bare\\-1|intel\\-pod5|intel\\-pod6|lf\\-pod1|lf\\-pod2|opnfv\\-jump\\-1|opnfv\\-jump\\-2|orange\\-fr\\-pod2|unknown|zte\\-pod1)",
+            "selected": false
           },
           {
-            "selected": false,
             "text": "elxg482ls42",
-            "value": "elxg482ls42"
+            "value": "elxg482ls42",
+            "selected": false
+          },
+          {
+            "text": "ericsson-pod1",
+            "value": "ericsson\\-pod1",
+            "selected": false
           },
           {
-            "selected": true,
             "text": "ericsson-pod2",
-            "value": "ericsson\\-pod2"
+            "value": "ericsson\\-pod2",
+            "selected": true
+          },
+          {
+            "text": "huawei-pod1",
+            "value": "huawei\\-pod1",
+            "selected": true
+          },
+          {
+            "text": "huawei-pod2",
+            "value": "huawei\\-pod2",
+            "selected": true
           },
           {
-            "selected": true,
             "text": "huawei-us-deploy-bare-1",
-            "value": "huawei\\-us\\-deploy\\-bare\\-1"
+            "value": "huawei\\-us\\-deploy\\-bare\\-1",
+            "selected": false
+          },
+          {
+            "text": "intel-pod5",
+            "value": "intel\\-pod5",
+            "selected": false
           },
           {
-            "selected": true,
             "text": "intel-pod6",
-            "value": "intel\\-pod6"
+            "value": "intel\\-pod6",
+            "selected": true
+          },
+          {
+            "text": "lf-pod1",
+            "value": "lf\\-pod1",
+            "selected": false
+          },
+          {
+            "text": "lf-pod2",
+            "value": "lf\\-pod2",
+            "selected": true
           },
           {
-            "selected": true,
             "text": "opnfv-jump-1",
-            "value": "opnfv\\-jump\\-1"
+            "value": "opnfv\\-jump\\-1",
+            "selected": false
           },
           {
-            "selected": true,
             "text": "opnfv-jump-2",
-            "value": "opnfv\\-jump\\-2"
+            "value": "opnfv\\-jump\\-2",
+            "selected": false
           },
           {
-            "selected": true,
             "text": "orange-fr-pod2",
-            "value": "orange\\-fr\\-pod2"
+            "value": "orange\\-fr\\-pod2",
+            "selected": false
           },
           {
-            "selected": true,
-            "text": "zte-pod1",
-            "value": "zte\\-pod1"
+            "text": "unknown",
+            "value": "unknown",
+            "selected": false
           },
           {
-            "selected": false,
-            "text": "unknown",
-            "value": "unknown"
+            "text": "zte-pod1",
+            "value": "zte\\-pod1",
+            "selected": true
           }
         ],
         "query": "SHOW TAG VALUES WITH KEY = \"pod_name\"",
@@ -2044,6 +1836,6 @@
   },
   "refresh": "15m",
   "schemaVersion": 8,
-  "version": 11,
+  "version": 2,
   "links": []
 }