Skip to content

Commit bff1ec0

Browse files
mgirgisfmgirgisf
committed
update template
1 parent 029e20f commit bff1ec0

File tree

1 file changed

+48
-25
lines changed

1 file changed

+48
-25
lines changed

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

Lines changed: 48 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -219,12 +219,11 @@ func OpenstackNetworkTraffic(dsName string) *corev1.ConfigMap {
219219
"renderer": "flot",
220220
"seriesOverrides": [],
221221
"spaceLength": 10,
222-
"span": 6,
223222
"stack": false,
224223
"steppedLine": false,
225224
"targets": [
226225
{
227-
"expr": "vm:ceilometer_network_incoming_bytes:rate1m{resource_name=~\"$VM:$In_adapter\", project=~\"$project\" } / 1000000",
226+
"expr": "vm:ceilometer_network_incoming_bytes:rate1m{resource_name=~\"$VM:.*\", project=~\"$project\" } / 1000000",
228227
"legendFormat": "__auto",
229228
"editorMode": "code",
230229
"range": true,
@@ -243,21 +242,20 @@ func OpenstackNetworkTraffic(dsName string) *corev1.ConfigMap {
243242
},
244243
"type": "graph",
245244
"xaxis": {
246-
"buckets": null,
247245
"mode": "time",
248246
"name": null,
249247
"show": true,
250248
"values": []
251249
},
252250
"yaxes": [
253251
{
254-
"$$hashKey": "object:892",
252+
"$$hashKey": "object:946",
255253
"format": "p",
256254
"logBase": 1,
257255
"show": true
258256
},
259257
{
260-
"$$hashKey": "object:893",
258+
"$$hashKey": "object:947",
261259
"format": "short",
262260
"logBase": 1,
263261
"show": true
@@ -280,7 +278,7 @@ func OpenstackNetworkTraffic(dsName string) *corev1.ConfigMap {
280278
"fieldConfig": {
281279
"defaults": {
282280
"links": [],
283-
"unit": "p"
281+
"unit": "percentunit"
284282
},
285283
"overrides": []
286284
},
@@ -327,7 +325,17 @@ func OpenstackNetworkTraffic(dsName string) *corev1.ConfigMap {
327325
"refId": "A"
328326
}
329327
],
330-
"thresholds": [],
328+
"thresholds": [
329+
{
330+
"$$hashKey": "object:151",
331+
"colorMode": "critical",
332+
"fill": true,
333+
"line": true,
334+
"op": "gt",
335+
"value": 30,
336+
"yaxis": "left"
337+
}
338+
],
331339
"timeFrom": null,
332340
"timeRegions": [],
333341
"timeShift": null,
@@ -347,13 +355,13 @@ func OpenstackNetworkTraffic(dsName string) *corev1.ConfigMap {
347355
},
348356
"yaxes": [
349357
{
350-
"$$hashKey": "object:892",
351-
"format": "p",
358+
"$$hashKey": "object:946",
359+
"format": "percentunit",
352360
"logBase": 1,
353361
"show": true
354362
},
355363
{
356-
"$$hashKey": "object:893",
364+
"$$hashKey": "object:947",
357365
"format": "short",
358366
"logBase": 1,
359367
"show": true
@@ -492,7 +500,7 @@ func OpenstackNetworkTraffic(dsName string) *corev1.ConfigMap {
492500
"h": 8,
493501
"w": 12,
494502
"x": 0,
495-
"y": 0
503+
"y": 10
496504
},
497505
"hiddenSeries": false,
498506
"id": 6,
@@ -525,6 +533,8 @@ func OpenstackNetworkTraffic(dsName string) *corev1.ConfigMap {
525533
"expr": "vm:ceilometer_network_incoming_packets_error:rate1m{project =~ \"$project\",vm_name =~ \"$VM\", device =~\"$In_adapter\"}",
526534
"legendFormat": "__auto",
527535
"editorMode": "code",
536+
"hide": false,
537+
"interval": "",
528538
"range": true,
529539
"refId": "A"
530540
}
@@ -550,7 +560,7 @@ func OpenstackNetworkTraffic(dsName string) *corev1.ConfigMap {
550560
"yaxes": [
551561
{
552562
"$$hashKey": "object:946",
553-
"format": "percentunit",
563+
"format": "p",
554564
"logBase": 1,
555565
"show": true
556566
},
@@ -998,7 +1008,7 @@ func OpenstackNetworkTraffic(dsName string) *corev1.ConfigMap {
9981008
"includeAll": true,
9991009
"label": null,
10001010
"multi": true,
1001-
"name": "Compute_node",
1011+
"name": "compute_node",
10021012
"options": [],
10031013
"query": "label_values(vm:ceilometer_cpu:ratio1m, vm_instance)",
10041014
"refresh": 0,
@@ -1021,15 +1031,15 @@ func OpenstackNetworkTraffic(dsName string) *corev1.ConfigMap {
10211031
]
10221032
},
10231033
"datasource": { "name": "` + dsName + `", "type": "prometheus" },
1024-
"definition": "label_values(ceilometer_cpu, project)",
1034+
"definition": "label_values(ceilometer_cpu{vm_instance=~\"$compute_node\"}, project)",
10251035
"hide": 0,
10261036
"includeAll": true,
10271037
"index": -1,
10281038
"label": null,
10291039
"multi": true,
10301040
"name": "project",
10311041
"options": [],
1032-
"query": "label_values(ceilometer_cpu, project)",
1042+
"query": "label_values(ceilometer_cpu{vm_instance=~\"$compute_node\"}, project)",
10331043
"refresh": 0,
10341044
"regex": "",
10351045
"skipUrlSync": false,
@@ -1071,21 +1081,27 @@ func OpenstackNetworkTraffic(dsName string) *corev1.ConfigMap {
10711081
{
10721082
"allValue": ".*",
10731083
"current": {
1074-
"text": "",
1075-
"value": ""
1076-
},
1084+
"selected": true,
1085+
"text": [
1086+
"tap0cb7726a-da"
1087+
],
1088+
"value": [
1089+
"tap0cb7726a-da"
1090+
]
1091+
},
10771092
"datasource": {
10781093
"name": "` + dsName + `",
10791094
"type": "prometheus"
10801095
},
1081-
"definition": "label_values(ceilometer_network_incoming_bytes{vm_name=~\"$VM\"}, device)",
1096+
"definition": "label_values(vm:ceilometer_network_incoming_bytes:rate1m{vm_name=~\"$VM\"}, device)",
10821097
"hide": 0,
10831098
"includeAll": true,
1099+
"index": -1,
10841100
"label": null,
10851101
"multi": true,
10861102
"name": "In_adapter",
10871103
"options": [],
1088-
"query": "label_values(ceilometer_network_incoming_bytes{vm_name=~\"$VM\"}, device)",
1104+
"query": "label_values(vm:ceilometer_network_incoming_bytes:rate1m{vm_name=~\"$VM\"}, device)",
10891105
"refresh": 0,
10901106
"regex": "",
10911107
"skipUrlSync": false,
@@ -1099,21 +1115,28 @@ func OpenstackNetworkTraffic(dsName string) *corev1.ConfigMap {
10991115
{
11001116
"allValue": ".*",
11011117
"current": {
1102-
"text": "",
1103-
"value": ""
1104-
},
1118+
"selected": true,
1119+
"text": [
1120+
"tap0cb7726a-da",
1121+
"tapfb47a4c6-9f"
1122+
],
1123+
"value": [
1124+
"tap0cb7726a-da",
1125+
"tapfb47a4c6-9f"
1126+
]
1127+
},
11051128
"datasource": {
11061129
"name": "` + dsName + `",
11071130
"type": "prometheus"
11081131
},
1109-
"definition": "label_values(ceilometer_network_outgoing_bytes{vm_name=~\"$VM\"}, device)",
1132+
"definition": "label_values(vm:ceilometer_network_outgoing_bytes:rate1m, device)",
11101133
"hide": 0,
11111134
"includeAll": true,
11121135
"label": null,
11131136
"multi": true,
11141137
"name": "Out_adapter",
11151138
"options": [],
1116-
"query": "label_values(ceilometer_network_outgoing_bytes{vm_name=~\"$VM\"}, device)",
1139+
"query": "label_values(vm:ceilometer_network_outgoing_bytes:rate1m, device)",
11171140
"refresh": 1,
11181141
"regex": "",
11191142
"skipUrlSync": false,

0 commit comments

Comments
 (0)