Skip to content

Commit 07b18f9

Browse files
alstanchevalstanchev
authored
Merge pull request #2079 from bosch-io/bugfix/grafana-connectivity-dashboards
fix connectivity grafana dashboards
2 parents 9011f5b + 16059b6 commit 07b18f9

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

‎deployment/operations/grafana-dashboards/Cluster_traffic.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@
487487
"pluginVersion": "8.5.6",
488488
"targets": [
489489
{
490-
"expr": "count(count by (ditto_connection_id) (increase(connectivity_message_mapping_seconds_count[5m]) > 0))",
490+
"expr": "count(count by (ditto_connection_id) (increase(message_mapping_seconds_count[5m]) > 0))",
491491
"format": "time_series",
492492
"hide": true,
493493
"interval": "",
@@ -496,7 +496,7 @@
496496
"refId": "A"
497497
},
498498
{
499-
"expr": "count by (ditto_connection_type) (count by (instance, ditto_connection_type, ditto_connection_id) (increase (connectivity_message_mapping_seconds_count[5m]) > 0))",
499+
"expr": "count by (ditto_connection_type) (count by (instance, ditto_connection_type, ditto_connection_id) (increase (message_mapping_seconds_count[5m]) > 0))",
500500
"format": "time_series",
501501
"hide": false,
502502
"instant": false,
@@ -583,7 +583,7 @@
583583
"pluginVersion": "8.5.6",
584584
"targets": [
585585
{
586-
"expr": "sum(irate(connectivity_message_mapping_seconds_count{segment=\"overall\"}[5m]) > 0) by (direction, ditto_connection_type) > 0",
586+
"expr": "sum(irate(message_mapping_seconds_count{segment=\"overall\"}[5m]) > 0) by (direction, ditto_connection_type) > 0",
587587
"format": "time_series",
588588
"intervalFactor": 1,
589589
"legendFormat": "[{{ditto_connection_type}}] {{direction}}",
@@ -668,7 +668,7 @@
668668
"pluginVersion": "8.5.6",
669669
"targets": [
670670
{
671-
"expr": "avg((idelta(connectivity_message_mapping_seconds_sum{segment=\"overall\"}[1m]) / idelta(connectivity_message_mapping_seconds_count{segment=\"overall\"}[1m])) > 0) by (direction)",
671+
"expr": "avg((idelta(connectivity_message_mapping_seconds_sum{segment=\"overall\"}[1m]) / idelta(message_mapping_seconds_count{segment=\"overall\"}[1m])) > 0) by (direction)",
672672
"format": "time_series",
673673
"intervalFactor": 1,
674674
"legendFormat": "{{direction}}",

‎deployment/operations/grafana-dashboards/Connectivity_Metrics.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@
281281
"targets": [
282282
{
283283
"datasource": "prometheus",
284-
"expr": "count by (ditto_connection_type) (count by (instance, ditto_connection_id, ditto_connection_type) (increase(connectivity_message_mapping_seconds_count{instance=~\"$Host\", ditto_connection_type=~\"$ConnectionType\", ditto_connection_id=~\"$Connection\"}[5m]) > 0))",
284+
"expr": "count by (ditto_connection_type) (count by (instance, ditto_connection_id, ditto_connection_type) (increase(message_mapping_seconds_count{instance=~\"$Host\", ditto_connection_type=~\"$ConnectionType\", ditto_connection_id=~\"$Connection\"}[5m]) > 0))",
285285
"format": "time_series",
286286
"hide": false,
287287
"interval": "",
@@ -376,7 +376,7 @@
376376
"targets": [
377377
{
378378
"datasource": "prometheus",
379-
"expr": "count by (instance, ditto_connection_type) (count by (instance, ditto_connection_id, ditto_connection_type) (increase (connectivity_message_mapping_seconds_count{instance=~\"$Host\", ditto_connection_type=~\"$ConnectionType\", ditto_connection_id=~\"$Connection\"}[5m]) > 0))",
379+
"expr": "count by (instance, ditto_connection_type) (count by (instance, ditto_connection_id, ditto_connection_type) (increase (message_mapping_seconds_count{instance=~\"$Host\", ditto_connection_type=~\"$ConnectionType\", ditto_connection_id=~\"$Connection\"}[5m]) > 0))",
380380
"format": "time_series",
381381
"hide": false,
382382
"instant": false,
@@ -1808,23 +1808,23 @@
18081808
"steppedLine": false,
18091809
"targets": [
18101810
{
1811-
"expr": "avg((idelta(connectivity_message_mapping_seconds_sum{segment=\"overall\", instance=~\"$Host\", ditto_connection_id=~\"$Connection\", ditto_connection_type=~\"$ConnectionType\"}[5m]) / idelta(connectivity_message_mapping_seconds_count{segment=\"overall\", ditto_connection_id=~\"$Connection\", ditto_connection_type=~\"$ConnectionType\"}[5m])) > 0) by (ditto_mapping_success, direction, ditto_connection_type)",
1811+
"expr": "avg((idelta(connectivity_message_mapping_seconds_sum{segment=\"overall\", instance=~\"$Host\", ditto_connection_id=~\"$Connection\", ditto_connection_type=~\"$ConnectionType\"}[5m]) / idelta(message_mapping_seconds_count{segment=\"overall\", ditto_connection_id=~\"$Connection\", ditto_connection_type=~\"$ConnectionType\"}[5m])) > 0) by (ditto_mapping_success, direction, ditto_connection_type)",
18121812
"format": "time_series",
18131813
"hide": false,
18141814
"intervalFactor": 1,
18151815
"legendFormat": "[{{ditto_connection_type}}] {{direction}} successful: {{ditto_mapping_success}}",
18161816
"refId": "C"
18171817
},
18181818
{
1819-
"expr": "avg((idelta(connectivity_message_mapping_seconds_sum{segment=\"overall\", instance=~\"$Host\", ditto_connection_id=~\"$Connection\", ditto_connection_type=~\"$ConnectionType\"}[5m]) / idelta(connectivity_message_mapping_seconds_count{segment=\"overall\", ditto_connection_id=~\"$Connection\", ditto_connection_type=~\"$ConnectionType\"}[5m])) > 0) by (ditto_mapping_success, ditto_connection_type)",
1819+
"expr": "avg((idelta(connectivity_message_mapping_seconds_sum{segment=\"overall\", instance=~\"$Host\", ditto_connection_id=~\"$Connection\", ditto_connection_type=~\"$ConnectionType\"}[5m]) / idelta(message_mapping_seconds_count{segment=\"overall\", ditto_connection_id=~\"$Connection\", ditto_connection_type=~\"$ConnectionType\"}[5m])) > 0) by (ditto_mapping_success, ditto_connection_type)",
18201820
"format": "time_series",
18211821
"hide": false,
18221822
"intervalFactor": 1,
18231823
"legendFormat": "[{{ditto_connection_type}}] successful: {{ditto_mapping_success}}",
18241824
"refId": "D"
18251825
},
18261826
{
1827-
"expr": "avg((idelta(connectivity_message_mapping_seconds_sum{segment=\"overall\", instance=~\"$Host\", ditto_connection_id=~\"$Connection\", ditto_connection_type=~\"$ConnectionType\"}[5m]) / idelta(connectivity_message_mapping_seconds_count{segment=\"overall\", ditto_connection_id=~\"$Connection\", ditto_connection_type=~\"$ConnectionType\"}[5m])) > 0) by (direction, ditto_connection_type)",
1827+
"expr": "avg((idelta(connectivity_message_mapping_seconds_sum{segment=\"overall\", instance=~\"$Host\", ditto_connection_id=~\"$Connection\", ditto_connection_type=~\"$ConnectionType\"}[5m]) / idelta(message_mapping_seconds_count{segment=\"overall\", ditto_connection_id=~\"$Connection\", ditto_connection_type=~\"$ConnectionType\"}[5m])) > 0) by (direction, ditto_connection_type)",
18281828
"format": "time_series",
18291829
"hide": false,
18301830
"intervalFactor": 1,
@@ -1835,7 +1835,7 @@
18351835
"textEditor": false
18361836
},
18371837
{
1838-
"expr": "avg((idelta(connectivity_message_mapping_seconds_sum{segment=\"overall\", instance=~\"$Host\", ditto_connection_id=~\"$Connection\", ditto_connection_type=~\"$ConnectionType\"}[5m]) / idelta(connectivity_message_mapping_seconds_count{segment=\"overall\", ditto_connection_id=~\"$Connection\", ditto_connection_type=~\"$ConnectionType\"}[5m])) > 0)",
1838+
"expr": "avg((idelta(connectivity_message_mapping_seconds_sum{segment=\"overall\", instance=~\"$Host\", ditto_connection_id=~\"$Connection\", ditto_connection_type=~\"$ConnectionType\"}[5m]) / idelta(message_mapping_seconds_count{segment=\"overall\", ditto_connection_id=~\"$Connection\", ditto_connection_type=~\"$ConnectionType\"}[5m])) > 0)",
18391839
"format": "time_series",
18401840
"hide": false,
18411841
"intervalFactor": 1,
@@ -1995,7 +1995,7 @@
19951995
"name": "Host",
19961996
"options": [],
19971997
"query": {
1998-
"query": "label_values(connectivity_message_mapping_seconds_count, instance)",
1998+
"query": "label_values(message_mapping_seconds_count, instance)",
19991999
"refId": "prometheus-Host-Variable-Query"
20002000
},
20012001
"refresh": 1,
@@ -2019,14 +2019,14 @@
20192019
]
20202020
},
20212021
"datasource": "prometheus",
2022-
"definition": "label_values(connectivity_message_mapping_seconds_count,ditto_connection_id)",
2022+
"definition": "label_values(message_mapping_seconds_count,ditto_connection_id)",
20232023
"hide": 0,
20242024
"includeAll": true,
20252025
"multi": true,
20262026
"name": "Connection",
20272027
"options": [],
20282028
"query": {
2029-
"query": "label_values(connectivity_message_mapping_seconds_count,ditto_connection_id)",
2029+
"query": "label_values(message_mapping_seconds_count,ditto_connection_id)",
20302030
"refId": "prometheus-Connection-Variable-Query"
20312031
},
20322032
"refresh": 1,
@@ -2046,14 +2046,14 @@
20462046
"value": "$__all"
20472047
},
20482048
"datasource": "prometheus",
2049-
"definition": "label_values(connectivity_message_mapping_seconds_count,ditto_connection_type)",
2049+
"definition": "label_values(message_mapping_seconds_count,ditto_connection_type)",
20502050
"hide": 0,
20512051
"includeAll": true,
20522052
"multi": false,
20532053
"name": "ConnectionType",
20542054
"options": [],
20552055
"query": {
2056-
"query": "label_values(connectivity_message_mapping_seconds_count,ditto_connection_type)",
2056+
"query": "label_values(message_mapping_seconds_count,ditto_connection_type)",
20572057
"refId": "prometheus-ConnectionType-Variable-Query"
20582058
},
20592059
"refresh": 1,

‎deployment/operations/grafana-dashboards/Load_Test.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
"pluginVersion": "8.5.6",
113113
"targets": [
114114
{
115-
"expr": "sum(irate(connectivity_message_mapping_seconds_count{segment=\"overall\"}[5m]) > 0) by (direction) > 0",
115+
"expr": "sum(irate(message_mapping_seconds_count{segment=\"overall\"}[5m]) > 0) by (direction) > 0",
116116
"format": "time_series",
117117
"intervalFactor": 1,
118118
"legendFormat": "{{direction}}",

0 commit comments

Comments
 (0)