Skip to content

Commit 029e20f

Browse files
mgirgisfmgirgisf
committed
update template
1 parent 27b3ff1 commit 029e20f

File tree

1 file changed

+20
-47
lines changed

1 file changed

+20
-47
lines changed

‎pkg/dashboards/openstack-network-traffic.go‎

Lines changed: 20 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -993,14 +993,14 @@ func OpenstackNetworkTraffic(dsName string) *corev1.ConfigMap {
993993
"name": "` + dsName + `",
994994
"type": "prometheus"
995995
},
996-
"definition": "label_values(vm:ceilometer_network_incoming_bytes:rate1m,vm_instance)",
996+
"definition": "label_values(ceilometer_cpu, vm_instance)",
997997
"hide": 0,
998998
"includeAll": true,
999999
"label": null,
10001000
"multi": true,
1001-
"name": "compute_node",
1001+
"name": "Compute_node",
10021002
"options": [],
1003-
"query": "label_values(vm:ceilometer_network_incoming_bytes:rate1m,vm_instance)",
1003+
"query": "label_values(vm:ceilometer_cpu:ratio1m, vm_instance)",
10041004
"refresh": 0,
10051005
"regex": "",
10061006
"skipUrlSync": false,
@@ -1014,25 +1014,26 @@ func OpenstackNetworkTraffic(dsName string) *corev1.ConfigMap {
10141014
{
10151015
"allValue": ".*",
10161016
"current": {
1017-
"text": "",
1018-
"value": ""
1019-
},
1020-
"datasource": {
1021-
"name": "` + dsName + `",
1022-
"type": "prometheus"
1017+
"tags": [],
1018+
"text": "539c3dc2361f4fd191aaa21c14360e35",
1019+
"value": [
1020+
"539c3dc2361f4fd191aaa21c14360e35"
1021+
]
10231022
},
1024-
"definition": "label_values(ceilometer_cpu{vm_instance=~\"$compute_node\"},project)",
1023+
"datasource": { "name": "` + dsName + `", "type": "prometheus" },
1024+
"definition": "label_values(ceilometer_cpu, project)",
10251025
"hide": 0,
10261026
"includeAll": true,
1027+
"index": -1,
10271028
"label": null,
10281029
"multi": true,
10291030
"name": "project",
10301031
"options": [],
1031-
"query": "label_values(ceilometer_cpu{vm_instance=~\"$compute_node\"},project)",
1032+
"query": "label_values(ceilometer_cpu, project)",
10321033
"refresh": 0,
10331034
"regex": "",
10341035
"skipUrlSync": false,
1035-
"sort": 0,
1036+
"sort": 1,
10361037
"tagValuesQuery": "",
10371038
"tags": [],
10381039
"tagsQuery": "",
@@ -1077,42 +1078,14 @@ func OpenstackNetworkTraffic(dsName string) *corev1.ConfigMap {
10771078
"name": "` + dsName + `",
10781079
"type": "prometheus"
10791080
},
1080-
"definition": "label_values(vm:ceilometer_network_incoming_bytes:rate1m{vm_name=~\"$VM\"},device)",
1081+
"definition": "label_values(ceilometer_network_incoming_bytes{vm_name=~\"$VM\"}, device)",
10811082
"hide": 0,
10821083
"includeAll": true,
10831084
"label": null,
10841085
"multi": true,
10851086
"name": "In_adapter",
10861087
"options": [],
1087-
"query": "label_values(vm:ceilometer_network_incoming_bytes:rate1m{vm_name=~\"$VM\"},device)",
1088-
"refresh": 0,
1089-
"regex": "",
1090-
"skipUrlSync": false,
1091-
"sort": 0,
1092-
"tagValuesQuery": "",
1093-
"tags": [],
1094-
"tagsQuery": "",
1095-
"type": "query",
1096-
"useTags": false
1097-
},
1098-
{
1099-
"allValue": ".*",
1100-
"current": {
1101-
"text": "",
1102-
"value": ""
1103-
},
1104-
"datasource": {
1105-
"name": "` + dsName + `",
1106-
"type": "prometheus"
1107-
},
1108-
"definition": "label_values(ceilometer_cpu{project =~ \"$project\"}, vm_instance)",
1109-
"hide": 0,
1110-
"includeAll": true,
1111-
"label": null,
1112-
"multi": true,
1113-
"name": "VM",
1114-
"options": [],
1115-
"query": "label_values(vm:ceilometer_cpu:ratio1m{project =~ \"$project\"}, vm_name)",
1088+
"query": "label_values(ceilometer_network_incoming_bytes{vm_name=~\"$VM\"}, device)",
11161089
"refresh": 0,
11171090
"regex": "",
11181091
"skipUrlSync": false,
@@ -1133,18 +1106,18 @@ func OpenstackNetworkTraffic(dsName string) *corev1.ConfigMap {
11331106
"name": "` + dsName + `",
11341107
"type": "prometheus"
11351108
},
1136-
"definition": "label_values(vm:ceilometer_network_outgoing_bytes:rate1m{vm_name=~\"$VM\"},device)",
1109+
"definition": "label_values(ceilometer_network_outgoing_bytes{vm_name=~\"$VM\"}, device)",
11371110
"hide": 0,
11381111
"includeAll": true,
11391112
"label": null,
11401113
"multi": true,
1141-
"name": "out_adapter",
1114+
"name": "Out_adapter",
11421115
"options": [],
1143-
"query": "label_values(vm:ceilometer_network_outgoing_bytes:rate1m{vm_name=~\"$VM\"},device)",
1144-
"refresh": 0,
1116+
"query": "label_values(ceilometer_network_outgoing_bytes{vm_name=~\"$VM\"}, device)",
1117+
"refresh": 1,
11451118
"regex": "",
11461119
"skipUrlSync": false,
1147-
"sort": 0,
1120+
"sort": 1,
11481121
"tagValuesQuery": "",
11491122
"tags": [],
11501123
"tagsQuery": "",

0 commit comments

Comments
 (0)