Skip to content
This repository was archived by the owner on Oct 10, 2025. It is now read-only.

Commit 6358671

Browse files
josecelanojosecelano
committed
Merge torrust#81: Fix metrics dashboard
69733c0 feat: [torrust#67] fix metrics dashboard titles and add label inet (Jose Celano) Pull request description: Graphs titles didn't match the filters. - Some graphs didn't specify it's for UDP4. - They didn't have a label to filter the IP family (inet), so inet6 was also included. That is not a problem yet becuase we haven't enabled inet6, but it would be when we [enabled it](torrust#52). - It also contains a fix I applied some days ago. For the average processing times, the aggregate function should also be "average" instead of "sum". To calculate the average processing times for all UDP4 connection requests, we have to calculate the average for all the time series: ``` # HELP udp_tracker_server_performance_avg_processed_requests_total Total number of UDP requests processed for the average performance metrics # TYPE udp_tracker_server_performance_avg_processed_requests_total counter udp_tracker_server_performance_avg_processed_requests_total{request_kind="connect",server_binding_address_ip_family="inet",server_binding_address_ip_type="plain",server_binding_ip="0.0.0.0",server_binding_port="6868",server_binding_protocol="udp"} 2710 udp_tracker_server_performance_avg_processed_requests_total{request_kind="scrape",server_binding_address_ip_family="inet",server_binding_address_ip_type="plain",server_binding_ip="0.0.0.0",server_binding_port="6969",server_binding_protocol="udp"} 749970 udp_tracker_server_performance_avg_processed_requests_total{request_kind="connect",server_binding_address_ip_family="inet",server_binding_address_ip_type="plain",server_binding_ip="0.0.0.0",server_binding_port="6969",server_binding_protocol="udp"} 27088948 udp_tracker_server_performance_avg_processed_requests_total{request_kind="announce",server_binding_address_ip_family="inet",server_binding_address_ip_type="plain",server_binding_ip="0.0.0.0",server_binding_port="6969",server_binding_protocol="udp"} 40968541 ``` ACKs for top commit: josecelano: ACK 69733c0 Tree-SHA512: df9d36555b8d4fd3ce1a28becdb97b1de3ffa370ad427dd220e0cc43dbe3eb832cd8b35f0e7386751e469c770f1933269405e308a015cee0d241b7de00205be9
2 parents 1cab514 + 69733c0 commit 6358671

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

‎share/grafana/dashboards/metrics.json‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@
383383
{
384384
"disableTextWrap": false,
385385
"editorMode": "builder",
386-
"expr": "sum(rate(udp_tracker_server_requests_accepted_total{job=\"tracker_metrics\", request_kind=\"connect\"}[15m]))",
386+
"expr": "sum(rate(udp_tracker_server_requests_accepted_total{job=\"tracker_metrics\", request_kind=\"connect\", server_binding_address_ip_family=\"inet\"}[15m]))",
387387
"fullMetaSearch": false,
388388
"includeNullMetadata": true,
389389
"legendFormat": "__auto",
@@ -480,7 +480,7 @@
480480
{
481481
"disableTextWrap": false,
482482
"editorMode": "builder",
483-
"expr": "sum(rate(udp_tracker_server_requests_accepted_total{job=\"tracker_metrics\", request_kind=\"announce\"}[15m]))",
483+
"expr": "sum(rate(udp_tracker_server_requests_accepted_total{job=\"tracker_metrics\", request_kind=\"announce\", server_binding_address_ip_family=\"inet\"}[15m]))",
484484
"fullMetaSearch": false,
485485
"includeNullMetadata": true,
486486
"legendFormat": "__auto",
@@ -577,7 +577,7 @@
577577
{
578578
"disableTextWrap": false,
579579
"editorMode": "builder",
580-
"expr": "sum(rate(udp_tracker_server_requests_accepted_total{job=\"tracker_metrics\", request_kind=\"scrape\"}[15m]))",
580+
"expr": "sum(rate(udp_tracker_server_requests_accepted_total{job=\"tracker_metrics\", request_kind=\"scrape\", server_binding_address_ip_family=\"inet\"}[15m]))",
581581
"fullMetaSearch": false,
582582
"includeNullMetadata": true,
583583
"legendFormat": "__auto",
@@ -674,7 +674,7 @@
674674
{
675675
"disableTextWrap": false,
676676
"editorMode": "builder",
677-
"expr": "sum(rate(udp_tracker_server_errors_total{job=\"tracker_metrics\"}[15m]))",
677+
"expr": "sum(rate(udp_tracker_server_errors_total{job=\"tracker_metrics\", server_binding_address_ip_family=\"inet\"}[15m]))",
678678
"fullMetaSearch": false,
679679
"includeNullMetadata": true,
680680
"legendFormat": "__auto",
@@ -691,7 +691,7 @@
691691
"type": "prometheus",
692692
"uid": "ce6lwx047kutca"
693693
},
694-
"description": "UDP Average Connect Processing Time",
694+
"description": "UDP4 Average Connect Processing Time",
695695
"fieldConfig": {
696696
"defaults": {
697697
"color": {
@@ -772,7 +772,7 @@
772772
{
773773
"disableTextWrap": false,
774774
"editorMode": "builder",
775-
"expr": "sum(udp_tracker_server_performance_avg_processing_time_ns{job=\"tracker_metrics\", request_kind=\"connect\"})",
775+
"expr": "avg(udp_tracker_server_performance_avg_processing_time_ns{job=\"tracker_metrics\", request_kind=\"connect\", server_binding_address_ip_family=\"inet\"})",
776776
"fullMetaSearch": false,
777777
"includeNullMetadata": true,
778778
"legendFormat": "__auto",
@@ -781,15 +781,15 @@
781781
"useBackend": false
782782
}
783783
],
784-
"title": "UDP Average Connect Time",
784+
"title": "UDP4 Average Connect Time",
785785
"type": "timeseries"
786786
},
787787
{
788788
"datasource": {
789789
"type": "prometheus",
790790
"uid": "ce6lwx047kutca"
791791
},
792-
"description": "UDP Average Announce Processing Time",
792+
"description": "UDP4 Average Announce Processing Time",
793793
"fieldConfig": {
794794
"defaults": {
795795
"color": {
@@ -870,7 +870,7 @@
870870
{
871871
"disableTextWrap": false,
872872
"editorMode": "builder",
873-
"expr": "sum(udp_tracker_server_performance_avg_processing_time_ns{job=\"tracker_metrics\", request_kind=\"announce\"})",
873+
"expr": "avg(udp_tracker_server_performance_avg_processing_time_ns{job=\"tracker_metrics\", request_kind=\"announce\", server_binding_address_ip_family=\"inet\"})",
874874
"fullMetaSearch": false,
875875
"includeNullMetadata": true,
876876
"legendFormat": "__auto",
@@ -879,15 +879,15 @@
879879
"useBackend": false
880880
}
881881
],
882-
"title": "UDP Average Announce Time",
882+
"title": "UDP4 Average Announce Time",
883883
"type": "timeseries"
884884
},
885885
{
886886
"datasource": {
887887
"type": "prometheus",
888888
"uid": "ce6lwx047kutca"
889889
},
890-
"description": "UDP Average Scrape Processing Time",
890+
"description": "UDP4 Average Scrape Processing Time",
891891
"fieldConfig": {
892892
"defaults": {
893893
"color": {
@@ -968,7 +968,7 @@
968968
{
969969
"disableTextWrap": false,
970970
"editorMode": "builder",
971-
"expr": "sum(udp_tracker_server_performance_avg_processing_time_ns{job=\"tracker_metrics\", request_kind=\"scrape\"})",
971+
"expr": "avg(udp_tracker_server_performance_avg_processing_time_ns{job=\"tracker_metrics\", request_kind=\"scrape\", server_binding_address_ip_family=\"inet\"})",
972972
"fullMetaSearch": false,
973973
"includeNullMetadata": true,
974974
"legendFormat": "__auto",
@@ -977,15 +977,15 @@
977977
"useBackend": false
978978
}
979979
],
980-
"title": "UDP Average Scrape Time",
980+
"title": "UDP4 Average Scrape Time",
981981
"type": "timeseries"
982982
},
983983
{
984984
"datasource": {
985985
"type": "prometheus",
986986
"uid": "ce6lwx047kutca"
987987
},
988-
"description": "UDP Banned Requests (per sec)",
988+
"description": "UDP4 Banned Requests (per sec)",
989989
"fieldConfig": {
990990
"defaults": {
991991
"color": {
@@ -1069,7 +1069,7 @@
10691069
},
10701070
"disableTextWrap": false,
10711071
"editorMode": "builder",
1072-
"expr": "sum(rate(udp_tracker_server_requests_banned_total{job=\"tracker_metrics\"}[15m]))",
1072+
"expr": "sum(rate(udp_tracker_server_requests_banned_total{job=\"tracker_metrics\", server_binding_address_ip_family=\"inet\"}[15m]))",
10731073
"fullMetaSearch": false,
10741074
"hide": false,
10751075
"includeNullMetadata": true,
@@ -1080,7 +1080,7 @@
10801080
"useBackend": false
10811081
}
10821082
],
1083-
"title": "UDP Banned Requests (per sec)",
1083+
"title": "UDP4 Banned Requests (per sec)",
10841084
"type": "timeseries"
10851085
},
10861086
{
@@ -1167,8 +1167,8 @@
11671167
"targets": [
11681168
{
11691169
"disableTextWrap": false,
1170-
"editorMode": "code",
1171-
"expr": "sum(rate(udp_tracker_server_requests_received_total{job=\"tracker_metrics\"}[15m]))",
1170+
"editorMode": "builder",
1171+
"expr": "sum(rate(udp_tracker_server_requests_received_total{job=\"tracker_metrics\", server_binding_address_ip_family=\"inet\"}[15m]))",
11721172
"fullMetaSearch": false,
11731173
"hide": false,
11741174
"includeNullMetadata": true,
@@ -1184,7 +1184,7 @@
11841184
},
11851185
"disableTextWrap": false,
11861186
"editorMode": "builder",
1187-
"expr": "sum(rate(udp_tracker_server_responses_sent_total{job=\"tracker_metrics\"}[15m]))",
1187+
"expr": "sum(rate(udp_tracker_server_responses_sent_total{job=\"tracker_metrics\", server_binding_address_ip_family=\"inet\"}[15m]))",
11881188
"fullMetaSearch": false,
11891189
"hide": false,
11901190
"includeNullMetadata": true,
@@ -1390,7 +1390,7 @@
13901390
},
13911391
"disableTextWrap": false,
13921392
"editorMode": "builder",
1393-
"expr": "sum(rate(udp_tracker_server_requests_aborted_total{job=\"tracker_metrics\"}[15m]))",
1393+
"expr": "sum(rate(udp_tracker_server_requests_aborted_total{job=\"tracker_metrics\", server_binding_address_ip_family=\"inet\"}[15m]))",
13941394
"fullMetaSearch": false,
13951395
"hide": false,
13961396
"includeNullMetadata": true,
@@ -1401,7 +1401,7 @@
14011401
"useBackend": false
14021402
}
14031403
],
1404-
"title": "UDP aborted requests (per second)",
1404+
"title": "UDP4 aborted requests (per second)",
14051405
"type": "timeseries"
14061406
}
14071407
],
@@ -1412,13 +1412,13 @@
14121412
"list": []
14131413
},
14141414
"time": {
1415-
"from": "now-6h",
1415+
"from": "now-3h",
14161416
"to": "now"
14171417
},
14181418
"timepicker": {},
14191419
"timezone": "browser",
14201420
"title": "Torrust Live Demo Tracker (metrics)",
14211421
"uid": "deogmiudufm68d",
1422-
"version": 32,
1422+
"version": 50,
14231423
"weekStart": ""
14241424
}

0 commit comments

Comments
 (0)