Skip to content

Commit a02e041

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #608 from mgirgisf/mgirgis-dashboard
[Dashboard] Update Legend for network traffic
2 parents 5d76e7c + b3b57e3 commit a02e041

File tree

1 file changed

+47
-44
lines changed

1 file changed

+47
-44
lines changed

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

Lines changed: 47 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -138,15 +138,15 @@ func OpenstackNetworkTraffic(dsName string) *corev1.ConfigMap {
138138
},
139139
"yaxes": [
140140
{
141-
"format": "watt",
141+
"format": "bytes",
142142
"label": null,
143143
"logBase": 1,
144144
"max": null,
145145
"min": null,
146146
"show": true
147147
},
148148
{
149-
"format": "watt",
149+
"format": "bytes",
150150
"label": null,
151151
"logBase": 1,
152152
"max": null,
@@ -224,9 +224,9 @@ func OpenstackNetworkTraffic(dsName string) *corev1.ConfigMap {
224224
"targets": [
225225
{
226226
"expr": "vm:ceilometer_network_incoming_bytes:rate1m{resource_name=~\"$VM:.*\", project=~\"$project\" } / 1000000",
227-
"legendFormat": "__auto",
228227
"editorMode": "code",
229228
"range": true,
229+
"legendFormat": "{{vm_name}} in ({{device}})",
230230
"refId": "A"
231231
}
232232
],
@@ -250,7 +250,7 @@ func OpenstackNetworkTraffic(dsName string) *corev1.ConfigMap {
250250
"yaxes": [
251251
{
252252
"$$hashKey": "object:946",
253-
"format": "p",
253+
"format": "Bps",
254254
"logBase": 1,
255255
"show": true
256256
},
@@ -319,9 +319,9 @@ func OpenstackNetworkTraffic(dsName string) *corev1.ConfigMap {
319319
"targets": [
320320
{
321321
"expr": "vm:ceilometer_network_incoming_packets_drop:rate1m{project =~ \"$project\",vm_name =~ \"$VM\", device =~\"$In_adapter\" }",
322-
"legendFormat": "__auto",
323322
"editorMode": "code",
324323
"range": true,
324+
"legendFormat": "{{vm_name}} in ({{device}})",
325325
"refId": "A"
326326
}
327327
],
@@ -334,7 +334,7 @@ func OpenstackNetworkTraffic(dsName string) *corev1.ConfigMap {
334334
"op": "gt",
335335
"value": 30,
336336
"yaxis": "left"
337-
}
337+
}
338338
],
339339
"timeFrom": null,
340340
"timeRegions": [],
@@ -356,13 +356,13 @@ func OpenstackNetworkTraffic(dsName string) *corev1.ConfigMap {
356356
"yaxes": [
357357
{
358358
"$$hashKey": "object:946",
359-
"format": "percentunit",
359+
"format": "packets",
360360
"logBase": 1,
361361
"show": true
362362
},
363363
{
364364
"$$hashKey": "object:947",
365-
"format": "short",
365+
"format": "packets",
366366
"logBase": 1,
367367
"show": true
368368
}
@@ -424,10 +424,10 @@ func OpenstackNetworkTraffic(dsName string) *corev1.ConfigMap {
424424
"steppedLine": false,
425425
"targets": [
426426
{
427-
"expr": "(rate(ceilometer_network_incoming_packets_drop{project=~\"$project\", resource_name=~\"$VM:$In_adapter\"}[1m]) / rate(ceilometer_network_incoming_packets{project=~\"$project\", resource_name=~\"$VM:In_adapter\"}[1m])) * 100\n",
428-
"legendFormat": "__auto",
427+
"expr": "(vm:ceilometer_network_incoming_packets_drop:rate1m{project =~ \"$project\",vm_name =~ \"$VM\", device =~\"$In_adapter\" } / vm:ceilometer_network_incoming_packets:rate1m{project =~ \"$project\",vm_name =~ \"$VM\", device =~\"$In_adapter\"}) * 100\n",
429428
"editorMode": "code",
430429
"range": true,
430+
"legendFormat": "{{vm_name}} in ({{device}})",
431431
"refId": "A"
432432
}
433433
],
@@ -462,13 +462,13 @@ func OpenstackNetworkTraffic(dsName string) *corev1.ConfigMap {
462462
"yaxes": [
463463
{
464464
"$$hashKey": "object:946",
465-
"format": "percentunit",
465+
"format": "packets",
466466
"logBase": 1,
467467
"show": true
468468
},
469469
{
470470
"$$hashKey": "object:947",
471-
"format": "short",
471+
"format": "packets",
472472
"logBase": 1,
473473
"show": true
474474
}
@@ -531,11 +531,11 @@ func OpenstackNetworkTraffic(dsName string) *corev1.ConfigMap {
531531
"targets": [
532532
{
533533
"expr": "vm:ceilometer_network_incoming_packets_error:rate1m{project =~ \"$project\",vm_name =~ \"$VM\", device =~\"$In_adapter\"}",
534-
"legendFormat": "__auto",
535534
"editorMode": "code",
536535
"hide": false,
537536
"interval": "",
538537
"range": true,
538+
"legendFormat": "{{vm_name}} in ({{device}})",
539539
"refId": "A"
540540
}
541541
],
@@ -560,13 +560,13 @@ func OpenstackNetworkTraffic(dsName string) *corev1.ConfigMap {
560560
"yaxes": [
561561
{
562562
"$$hashKey": "object:946",
563-
"format": "p",
563+
"format": "packets",
564564
"logBase": 1,
565565
"show": true
566566
},
567567
{
568568
"$$hashKey": "object:947",
569-
"format": "short",
569+
"format": "packets",
570570
"logBase": 1,
571571
"show": true
572572
}
@@ -641,10 +641,10 @@ func OpenstackNetworkTraffic(dsName string) *corev1.ConfigMap {
641641
"steppedLine": false,
642642
"targets": [
643643
{
644-
"expr": "vm:ceilometer_network_outgoing_bytes:rate1m{resource_name=~\"$VM:$In_adapter\", project=~\"$project\" } / 1000000",
645-
"legendFormat": "__auto",
644+
"expr": "vm:ceilometer_network_outgoing_bytes:rate1m{resource_name=~\"$VM:.+\", project=~\"$project\" } / 1000000",
646645
"editorMode": "code",
647646
"range": true,
647+
"legendFormat": "{{vm_name}} out ({{device}})",
648648
"refId": "A"
649649
}
650650
],
@@ -669,7 +669,7 @@ func OpenstackNetworkTraffic(dsName string) *corev1.ConfigMap {
669669
"yaxes": [
670670
{
671671
"$$hashKey": "object:892",
672-
"format": "p",
672+
"format": "Bps",
673673
"logBase": 1,
674674
"show": true
675675
},
@@ -737,10 +737,10 @@ func OpenstackNetworkTraffic(dsName string) *corev1.ConfigMap {
737737
"steppedLine": false,
738738
"targets": [
739739
{
740-
"expr": "vm:ceilometer_network_outgoing_packets_drop:rate1m{project =~ \"$project\",vm_name =~ \"$VM\", device =~\"$In_adapter\" }",
741-
"legendFormat": "__auto",
740+
"expr": "vm:ceilometer_network_outgoing_packets_drop:rate1m{project =~ \"$project\",vm_name =~ \"$VM\", device =~\"$Out_adapter\" }",
742741
"editorMode": "code",
743742
"range": true,
743+
"legendFormat": "{{vm_name}} out ({{device}})",
744744
"refId": "A"
745745
}
746746
],
@@ -765,13 +765,13 @@ func OpenstackNetworkTraffic(dsName string) *corev1.ConfigMap {
765765
"yaxes": [
766766
{
767767
"$$hashKey": "object:892",
768-
"format": "p",
768+
"format": "packets",
769769
"logBase": 1,
770770
"show": true
771771
},
772772
{
773773
"$$hashKey": "object:893",
774-
"format": "short",
774+
"format": "packets",
775775
"logBase": 1,
776776
"show": true
777777
}
@@ -833,10 +833,10 @@ func OpenstackNetworkTraffic(dsName string) *corev1.ConfigMap {
833833
"steppedLine": false,
834834
"targets": [
835835
{
836-
"expr": "(rate(ceilometer_network_outgoing_packets_drop{project=~\"$project\", resource_name=~\"$VM:$In_adapter\"}[1m]) / rate(ceilometer_network_incoming_packets{project=~\"$project\", resource_name=~\"$VM:In_adapter\"}[1m])) * 100\n",
837-
"legendFormat": "__auto",
836+
"expr": "(vm:ceilometer_network_outgoing_packets_drop:rate1m{project =~ \"$project\",vm_name =~ \"$VM\", device =~\"$Out_adapter\" } / vm:ceilometer_network_outgoing_packets:rate1m{project =~ \"$project\",vm_name =~ \"$VM\", device =~\"$Out_adapter\" }) * 100\n",
838837
"editorMode": "code",
839838
"range": true,
839+
"legendFormat": "{{vm_name}} out ({{device}})",
840840
"refId": "A"
841841
}
842842
],
@@ -871,13 +871,13 @@ func OpenstackNetworkTraffic(dsName string) *corev1.ConfigMap {
871871
"yaxes": [
872872
{
873873
"$$hashKey": "object:946",
874-
"format": "percentunit",
874+
"format": "packets",
875875
"logBase": 1,
876876
"show": true
877877
},
878878
{
879879
"$$hashKey": "object:947",
880-
"format": "short",
880+
"format": "packets",
881881
"logBase": 1,
882882
"show": true
883883
}
@@ -939,10 +939,10 @@ func OpenstackNetworkTraffic(dsName string) *corev1.ConfigMap {
939939
"steppedLine": false,
940940
"targets": [
941941
{
942-
"expr": "vm:ceilometer_network_outgoing_packets_error:rate1m{project =~ \"$project\",vm_name =~ \"$VM\", device =~\"$In_adapter\"}",
943-
"legendFormat": "__auto",
942+
"expr": "vm:ceilometer_network_outgoing_packets_error:rate1m{project =~ \"$project\",vm_name =~ \"$VM\", device =~\"$Out_adapter\"}",
944943
"editorMode": "code",
945944
"range": true,
945+
"legendFormat": "{{vm_name}} out ({{device}})",
946946
"refId": "A"
947947
}
948948
],
@@ -967,13 +967,13 @@ func OpenstackNetworkTraffic(dsName string) *corev1.ConfigMap {
967967
"yaxes": [
968968
{
969969
"$$hashKey": "object:946",
970-
"format": "percentunit",
970+
"format": "packets",
971971
"logBase": 1,
972972
"show": true
973973
},
974974
{
975975
"$$hashKey": "object:947",
976-
"format": "short",
976+
"format": "packets",
977977
"logBase": 1,
978978
"show": true
979979
}
@@ -1024,13 +1024,16 @@ func OpenstackNetworkTraffic(dsName string) *corev1.ConfigMap {
10241024
{
10251025
"allValue": ".*",
10261026
"current": {
1027-
"tags": [],
1028-
"text": "539c3dc2361f4fd191aaa21c14360e35",
1029-
"value": [
1030-
"539c3dc2361f4fd191aaa21c14360e35"
1031-
]
1027+
"tags": [],
1028+
"text": "539c3dc2361f4fd191aaa21c14360e35",
1029+
"value": [
1030+
"539c3dc2361f4fd191aaa21c14360e35"
1031+
]
1032+
},
1033+
"datasource": {
1034+
"name": "` + dsName + `",
1035+
"type": "prometheus"
10321036
},
1033-
"datasource": { "name": "` + dsName + `", "type": "prometheus" },
10341037
"definition": "label_values(ceilometer_cpu{vm_instance=~\"$compute_node\"}, project)",
10351038
"hide": 0,
10361039
"includeAll": true,
@@ -1083,12 +1086,12 @@ func OpenstackNetworkTraffic(dsName string) *corev1.ConfigMap {
10831086
"current": {
10841087
"selected": true,
10851088
"text": [
1086-
"tap0cb7726a-da"
1089+
"tap0cb7726a-da"
10871090
],
10881091
"value": [
1089-
"tap0cb7726a-da"
1092+
"tap0cb7726a-da"
10901093
]
1091-
},
1094+
},
10921095
"datasource": {
10931096
"name": "` + dsName + `",
10941097
"type": "prometheus"
@@ -1117,14 +1120,14 @@ func OpenstackNetworkTraffic(dsName string) *corev1.ConfigMap {
11171120
"current": {
11181121
"selected": true,
11191122
"text": [
1120-
"tap0cb7726a-da",
1121-
"tapfb47a4c6-9f"
1123+
"tap0cb7726a-da",
1124+
"tapfb47a4c6-9f"
11221125
],
11231126
"value": [
1124-
"tap0cb7726a-da",
1125-
"tapfb47a4c6-9f"
1127+
"tap0cb7726a-da",
1128+
"tapfb47a4c6-9f"
11261129
]
1127-
},
1130+
},
11281131
"datasource": {
11291132
"name": "` + dsName + `",
11301133
"type": "prometheus"

0 commit comments

Comments
 (0)