Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit f48f4dd

Browse files
reivilibrereivilibre
authored
Update the Grafana dashboard that is included with Synapse in the contrib directory. (#13697)
* Add missing graph to contrib * Update with minor but plausible changes, including positioning changes * Newsfile Signed-off-by: Olivier Wilkinson (reivilibre) <[email protected]> Signed-off-by: Olivier Wilkinson (reivilibre) <[email protected]>
1 parent 9d2823a commit f48f4dd

File tree

2 files changed

+128
-20
lines changed

2 files changed

+128
-20
lines changed

‎changelog.d/13697.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update the Grafana dashboard that is included with Synapse in the `contrib` directory.

‎contrib/grafana/synapse.json

Lines changed: 127 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3244,6 +3244,104 @@
32443244
"yaxis": {
32453245
"align": false
32463246
}
3247+
},
3248+
{
3249+
"datasource": {
3250+
"type": "prometheus",
3251+
"uid": "${DS_PROMETHEUS}"
3252+
},
3253+
"description": "Average number of hosts being rate limited across each worker type.",
3254+
"fieldConfig": {
3255+
"defaults": {
3256+
"color": {
3257+
"mode": "palette-classic"
3258+
},
3259+
"custom": {
3260+
"axisLabel": "",
3261+
"axisPlacement": "auto",
3262+
"barAlignment": 0,
3263+
"drawStyle": "line",
3264+
"fillOpacity": 0,
3265+
"gradientMode": "none",
3266+
"hideFrom": {
3267+
"legend": false,
3268+
"tooltip": false,
3269+
"viz": false
3270+
},
3271+
"lineInterpolation": "linear",
3272+
"lineWidth": 1,
3273+
"pointSize": 5,
3274+
"scaleDistribution": {
3275+
"type": "linear"
3276+
},
3277+
"showPoints": "auto",
3278+
"spanNulls": false,
3279+
"stacking": {
3280+
"group": "A",
3281+
"mode": "none"
3282+
},
3283+
"thresholdsStyle": {
3284+
"mode": "off"
3285+
}
3286+
},
3287+
"mappings": [],
3288+
"thresholds": {
3289+
"mode": "absolute",
3290+
"steps": [
3291+
{
3292+
"color": "green"
3293+
}
3294+
]
3295+
},
3296+
"unit": "none"
3297+
},
3298+
"overrides": []
3299+
},
3300+
"gridPos": {
3301+
"h": 9,
3302+
"w": 12,
3303+
"x": 12,
3304+
"y": 53
3305+
},
3306+
"id": 225,
3307+
"options": {
3308+
"legend": {
3309+
"calcs": [],
3310+
"displayMode": "list",
3311+
"placement": "bottom"
3312+
},
3313+
"tooltip": {
3314+
"mode": "single",
3315+
"sort": "desc"
3316+
}
3317+
},
3318+
"targets": [
3319+
{
3320+
"datasource": {
3321+
"type": "prometheus",
3322+
"uid": "${DS_PROMETHEUS}"
3323+
},
3324+
"editorMode": "builder",
3325+
"expr": "avg by(job, rate_limiter_name) (synapse_rate_limit_sleep_affected_hosts{instance=\"$instance\", job=~\"$job\", index=~\"$index\"})",
3326+
"hide": false,
3327+
"legendFormat": "Slept by {{job}}:{{rate_limiter_name}}",
3328+
"range": true,
3329+
"refId": "B"
3330+
},
3331+
{
3332+
"datasource": {
3333+
"type": "prometheus",
3334+
"uid": "${DS_PROMETHEUS}"
3335+
},
3336+
"editorMode": "builder",
3337+
"expr": "avg by(job, rate_limiter_name) (synapse_rate_limit_reject_affected_hosts{instance=\"$instance\", job=~\"$job\", index=~\"$index\"})",
3338+
"legendFormat": "Rejected by {{job}}:{{rate_limiter_name}}",
3339+
"range": true,
3340+
"refId": "A"
3341+
}
3342+
],
3343+
"title": "Hosts being rate limited",
3344+
"type": "timeseries"
32473345
}
32483346
],
32493347
"targets": [
@@ -6404,7 +6502,7 @@
64046502
"h": 13,
64056503
"w": 12,
64066504
"x": 0,
6407-
"y": 10
6505+
"y": 35
64086506
},
64096507
"hiddenSeries": false,
64106508
"id": 12,
@@ -6502,7 +6600,7 @@
65026600
"h": 13,
65036601
"w": 12,
65046602
"x": 12,
6505-
"y": 10
6603+
"y": 35
65066604
},
65076605
"hiddenSeries": false,
65086606
"id": 26,
@@ -6601,7 +6699,7 @@
66016699
"h": 13,
66026700
"w": 12,
66036701
"x": 0,
6604-
"y": 23
6702+
"y": 48
66056703
},
66066704
"hiddenSeries": false,
66076705
"id": 13,
@@ -6705,7 +6803,7 @@
67056803
"h": 13,
67066804
"w": 12,
67076805
"x": 12,
6708-
"y": 23
6806+
"y": 48
67096807
},
67106808
"hiddenSeries": false,
67116809
"id": 27,
@@ -6803,7 +6901,7 @@
68036901
"h": 13,
68046902
"w": 12,
68056903
"x": 0,
6806-
"y": 36
6904+
"y": 61
68076905
},
68086906
"hiddenSeries": false,
68096907
"id": 28,
@@ -6900,7 +6998,7 @@
69006998
"h": 13,
69016999
"w": 12,
69027000
"x": 12,
6903-
"y": 36
7001+
"y": 61
69047002
},
69057003
"hiddenSeries": false,
69067004
"id": 25,
@@ -6935,7 +7033,7 @@
69357033
"datasource": {
69367034
"uid": "$datasource"
69377035
},
6938-
"expr": "rate(synapse_util_metrics_block_time_seconds{instance=\"$instance\",job=~\"$job\",index=~\"$index\"}[$bucket_size]) / rate(synapse_util_metrics_block_count[$bucket_size])",
7036+
"expr": "rate(synapse_util_metrics_block_time_seconds{instance=\"$instance\",job=~\"$job\",index=~\"$index\"}[$bucket_size]) / rate(synapse_util_metrics_block_count{instance=\"$instance\",job=~\"$job\",index=~\"$index\"}[$bucket_size])",
69397037
"format": "time_series",
69407038
"interval": "",
69417039
"intervalFactor": 2,
@@ -6960,11 +7058,13 @@
69607058
},
69617059
"yaxes": [
69627060
{
6963-
"format": "ms",
7061+
"$$hashKey": "object:180",
7062+
"format": "s",
69647063
"logBase": 1,
69657064
"show": true
69667065
},
69677066
{
7067+
"$$hashKey": "object:181",
69687068
"format": "short",
69697069
"logBase": 1,
69707070
"show": true
@@ -6988,7 +7088,7 @@
69887088
"h": 15,
69897089
"w": 12,
69907090
"x": 0,
6991-
"y": 49
7091+
"y": 74
69927092
},
69937093
"hiddenSeries": false,
69947094
"id": 154,
@@ -7009,7 +7109,7 @@
70097109
"alertThreshold": true
70107110
},
70117111
"percentage": false,
7012-
"pluginVersion": "8.4.3",
7112+
"pluginVersion": "9.0.4",
70137113
"pointradius": 2,
70147114
"points": false,
70157115
"renderer": "flot",
@@ -7109,7 +7209,7 @@
71097209
"h": 10,
71107210
"w": 12,
71117211
"x": 0,
7112-
"y": 36
7212+
"y": 69
71137213
},
71147214
"hiddenSeries": false,
71157215
"id": 1,
@@ -7211,7 +7311,7 @@
72117311
"h": 10,
72127312
"w": 12,
72137313
"x": 12,
7214-
"y": 36
7314+
"y": 69
72157315
},
72167316
"hiddenSeries": false,
72177317
"id": 8,
@@ -7311,7 +7411,7 @@
73117411
"h": 10,
73127412
"w": 12,
73137413
"x": 0,
7314-
"y": 46
7414+
"y": 79
73157415
},
73167416
"hiddenSeries": false,
73177417
"id": 38,
@@ -7407,19 +7507,24 @@
74077507
"h": 10,
74087508
"w": 12,
74097509
"x": 12,
7410-
"y": 46
7510+
"y": 79
74117511
},
74127512
"hiddenSeries": false,
74137513
"id": 39,
74147514
"legend": {
74157515
"alignAsTable": true,
74167516
"avg": false,
74177517
"current": false,
7418-
"max": false,
7518+
"hideEmpty": false,
7519+
"hideZero": false,
7520+
"max": true,
74197521
"min": false,
7522+
"rightSide": false,
74207523
"show": true,
7524+
"sort": "max",
7525+
"sortDesc": true,
74217526
"total": false,
7422-
"values": false
7527+
"values": true
74237528
},
74247529
"lines": true,
74257530
"linewidth": 1,
@@ -7467,11 +7572,13 @@
74677572
},
74687573
"yaxes": [
74697574
{
7575+
"$$hashKey": "object:101",
74707576
"format": "rps",
74717577
"logBase": 1,
74727578
"show": true
74737579
},
74747580
{
7581+
"$$hashKey": "object:102",
74757582
"format": "short",
74767583
"logBase": 1,
74777584
"show": true
@@ -7501,7 +7608,7 @@
75017608
"h": 9,
75027609
"w": 12,
75037610
"x": 0,
7504-
"y": 56
7611+
"y": 89
75057612
},
75067613
"hiddenSeries": false,
75077614
"id": 65,
@@ -11757,8 +11864,8 @@
1175711864
]
1175811865
},
1175911866
"time": {
11760-
"from": "2022-07-22T04:08:13.716Z",
11761-
"to": "2022-07-22T18:44:27.863Z"
11867+
"from": "now-3h",
11868+
"to": "now"
1176211869
},
1176311870
"timepicker": {
1176411871
"now": true,
@@ -11789,6 +11896,6 @@
1178911896
"timezone": "",
1179011897
"title": "Synapse",
1179111898
"uid": "000000012",
11792-
"version": 124,
11899+
"version": 132,
1179311900
"weekStart": ""
1179411901
}

0 commit comments

Comments
 (0)