From c5a00afc2af4ccc3651ec8f06a3315b49d6e3884 Mon Sep 17 00:00:00 2001 From: kubi Date: Tue, 12 Jul 2016 17:04:09 +0800 Subject: bugfix:fix all generic test cases in grafana update the pod name and scenario name, and extend the duration of graph JIRA:- Change-Id: Ic611dc8d49e666433c2191c4098d56d95d40f1af Signed-off-by: kubi --- dashboard/Yardstick-TC027-1456496061153 | 209 +++++++++++++++++++++----------- 1 file changed, 138 insertions(+), 71 deletions(-) (limited to 'dashboard/Yardstick-TC027-1456496061153') diff --git a/dashboard/Yardstick-TC027-1456496061153 b/dashboard/Yardstick-TC027-1456496061153 index e52d08ab7..4531c1552 100644 --- a/dashboard/Yardstick-TC027-1456496061153 +++ b/dashboard/Yardstick-TC027-1456496061153 @@ -103,30 +103,24 @@ "steppedLine": false, "targets": [ { - "alias": "$tag_pod_name - $tag_deploy_scenario", + "alias": "", "dsType": "influxdb", "groupBy": [ { + "type": "tag", "params": [ - "pod_name" - ], - "type": "tag" - }, - { - "params": [ - "task_id" - ], - "type": "tag" + "deploy_scenario" + ] }, { + "type": "tag", "params": [ - "deploy_scenario" - ], - "type": "tag" + "installer" + ] } ], "measurement": "opnfv_yardstick_tc027", - "query": "SELECT \"rtt\" FROM \"opnfv_yardstick_tc027\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"pod_name\", \"task_id\", \"deploy_scenario\"", + "query": "SELECT \"rtt\" FROM \"opnfv_yardstick_tc027\" WHERE \"pod_name\" = 'huawei-pod1' AND \"deploy_scenario\" = 'os-nosdn-nofeature-ha' AND $timeFilter GROUP BY \"deploy_scenario\", \"installer\"", "refId": "A", "resultFormat": "time_series", "select": [ @@ -142,19 +136,19 @@ "tags": [ { "key": "pod_name", - "operator": "=~", - "value": "/$POD$/" + "operator": "=", + "value": "huawei-pod1" }, { "condition": "AND", "key": "deploy_scenario", - "operator": "=~", - "value": "/$SCENARIO$/" + "operator": "=", + "value": "os-nosdn-nofeature-ha" } ] } ], - "timeFrom": "24h", + "timeFrom": "14d", "timeShift": null, "title": "RTT", "tooltip": { @@ -282,8 +276,8 @@ ] } ], - "timeFrom": "24h", - "title": "Panel Title", + "timeFrom": "14d", + "title": "$POD", "transform": "timeseries_to_rows", "type": "table" } @@ -384,9 +378,9 @@ ] } ], - "timeFrom": "10d", + "timeFrom": "14d", "timeShift": null, - "title": "Panel Title", + "title": "$POD", "tooltip": { "shared": true, "value_type": "cumulative" @@ -397,7 +391,8 @@ "y_formats": [ "short", "short" - ] + ], + "links": [] } ], "title": "New row" @@ -439,14 +434,8 @@ "allFormat": "regex values", "current": { "tags": [], - "text": "ericsson-pod2 + huawei-us-deploy-bare-1 + opnfv-jump-1 + opnfv-jump-2 + orange-fr-pod2", - "value": [ - "ericsson\\-pod2", - "huawei\\-us\\-deploy\\-bare\\-1", - "opnfv\\-jump\\-1", - "opnfv\\-jump\\-2", - "orange\\-fr\\-pod2" - ] + "text": "huawei-pod1", + "value": "huawei\\-pod1" }, "datasource": "yardstick-vtc", "includeAll": true, @@ -455,44 +444,84 @@ "name": "POD", "options": [ { - "selected": false, "text": "All", - "value": "(elxg482ls42|ericsson\\-pod2|huawei\\-us\\-deploy\\-bare\\-1|opnfv\\-jump\\-1|opnfv\\-jump\\-2|orange\\-fr\\-pod2|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": false + }, + { + "text": "huawei-pod1", + "value": "huawei\\-pod1", + "selected": true + }, + { + "text": "huawei-pod2", + "value": "huawei\\-pod2", + "selected": false }, { - "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 + }, + { + "text": "intel-pod6", + "value": "intel\\-pod6", + "selected": false + }, + { + "text": "lf-pod1", + "value": "lf\\-pod1", + "selected": false + }, + { + "text": "lf-pod2", + "value": "lf\\-pod2", + "selected": false }, { - "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": false, "text": "unknown", - "value": "unknown" + "value": "unknown", + "selected": false + }, + { + "text": "zte-pod1", + "value": "zte\\-pod1", + "selected": false } ], "query": "SHOW TAG VALUES WITH KEY = \"pod_name\"", @@ -502,9 +531,12 @@ { "allFormat": "regex values", "current": { - "tags": [], - "text": "All", - "value": "(os\\-nosdn\\-nofeature\\-ha|os\\-nosdn\\-ovs\\-ha|os\\-odl_l2\\-bgpvpn\\-ha|os\\-odl_l2\\-nofeature\\-ha|os\\-odl_l2\\-nofeature\\-noha|os\\-odl_l2\\-sfc\\-ha|os\\-odl_l3\\-nofeature\\-ha|os\\-onos\\-nofeature\\-ha)" + "text": "os-nosdn-nofeature-ha + os-nosdn-nofeature-noha", + "value": [ + "os\\-nosdn\\-nofeature\\-ha", + "os\\-nosdn\\-nofeature\\-noha" + ], + "tags": [] }, "datasource": "yardstick-vtc", "includeAll": true, @@ -513,49 +545,84 @@ "name": "SCENARIO", "options": [ { - "selected": true, "text": "All", - "value": "(os\\-nosdn\\-nofeature\\-ha|os\\-nosdn\\-ovs\\-ha|os\\-odl_l2\\-bgpvpn\\-ha|os\\-odl_l2\\-nofeature\\-ha|os\\-odl_l2\\-nofeature\\-noha|os\\-odl_l2\\-sfc\\-ha|os\\-odl_l3\\-nofeature\\-ha|os\\-onos\\-nofeature\\-ha)" + "value": "(os\\-no_sdn\\-ovs\\-ha|os\\-nosdn\\-kvm\\-ha|os\\-nosdn\\-nofeature\\-ha|os\\-nosdn\\-nofeature\\-noha|os\\-nosdn\\-ovs\\-ha|os\\-ocl\\-nofeature\\-ha|os\\-odl_l2\\-bgpvpn\\-ha|os\\-odl_l2\\-nofeature\\-ha|os\\-odl_l2\\-nofeature\\-noha|os\\-odl_l2\\-sfc\\-ha|os\\-odl_l3\\-nofeature\\-ha|os\\-onos\\-nofeature\\-ha|os\\-onos\\-sfc\\-ha|os\\-ovs\\-nofeature\\-ha|unknown)", + "selected": false + }, + { + "text": "os-no_sdn-ovs-ha", + "value": "os\\-no_sdn\\-ovs\\-ha", + "selected": false + }, + { + "text": "os-nosdn-kvm-ha", + "value": "os\\-nosdn\\-kvm\\-ha", + "selected": false }, { - "selected": false, "text": "os-nosdn-nofeature-ha", - "value": "os\\-nosdn\\-nofeature\\-ha" + "value": "os\\-nosdn\\-nofeature\\-ha", + "selected": true + }, + { + "text": "os-nosdn-nofeature-noha", + "value": "os\\-nosdn\\-nofeature\\-noha", + "selected": true }, { - "selected": false, "text": "os-nosdn-ovs-ha", - "value": "os\\-nosdn\\-ovs\\-ha" + "value": "os\\-nosdn\\-ovs\\-ha", + "selected": false + }, + { + "text": "os-ocl-nofeature-ha", + "value": "os\\-ocl\\-nofeature\\-ha", + "selected": false }, { - "selected": false, "text": "os-odl_l2-bgpvpn-ha", - "value": "os\\-odl_l2\\-bgpvpn\\-ha" + "value": "os\\-odl_l2\\-bgpvpn\\-ha", + "selected": false }, { - "selected": false, "text": "os-odl_l2-nofeature-ha", - "value": "os\\-odl_l2\\-nofeature\\-ha" + "value": "os\\-odl_l2\\-nofeature\\-ha", + "selected": false }, { - "selected": false, "text": "os-odl_l2-nofeature-noha", - "value": "os\\-odl_l2\\-nofeature\\-noha" + "value": "os\\-odl_l2\\-nofeature\\-noha", + "selected": false }, { - "selected": false, "text": "os-odl_l2-sfc-ha", - "value": "os\\-odl_l2\\-sfc\\-ha" + "value": "os\\-odl_l2\\-sfc\\-ha", + "selected": false }, { - "selected": false, "text": "os-odl_l3-nofeature-ha", - "value": "os\\-odl_l3\\-nofeature\\-ha" + "value": "os\\-odl_l3\\-nofeature\\-ha", + "selected": false }, { - "selected": false, "text": "os-onos-nofeature-ha", - "value": "os\\-onos\\-nofeature\\-ha" + "value": "os\\-onos\\-nofeature\\-ha", + "selected": false + }, + { + "text": "os-onos-sfc-ha", + "value": "os\\-onos\\-sfc\\-ha", + "selected": false + }, + { + "text": "os-ovs-nofeature-ha", + "value": "os\\-ovs\\-nofeature\\-ha", + "selected": false + }, + { + "text": "unknown", + "value": "unknown", + "selected": false } ], "query": "SHOW TAG VALUES WITH KEY = \"deploy_scenario\"", @@ -568,6 +635,6 @@ "list": [] }, "schemaVersion": 8, - "version": 7, + "version": 8, "links": [] -} \ No newline at end of file +} -- cgit 1.2.3-korg