diff --git a/changelog.d/13697.misc b/changelog.d/13697.misc
new file mode 100644
index 0000000000..b9d2a60961
--- /dev/null
+++ b/changelog.d/13697.misc
@@ -0,0 +1 @@
+Update the Grafana dashboard that is included with Synapse in the `contrib` directory.
\ No newline at end of file
diff --git a/contrib/grafana/synapse.json b/contrib/grafana/synapse.json
index 0f23fc17ea..248cd6d9ad 100644
--- a/contrib/grafana/synapse.json
+++ b/contrib/grafana/synapse.json
@@ -3244,6 +3244,104 @@
"yaxis": {
"align": false
}
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "${DS_PROMETHEUS}"
+ },
+ "description": "Average number of hosts being rate limited across each worker type.",
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "palette-classic"
+ },
+ "custom": {
+ "axisLabel": "",
+ "axisPlacement": "auto",
+ "barAlignment": 0,
+ "drawStyle": "line",
+ "fillOpacity": 0,
+ "gradientMode": "none",
+ "hideFrom": {
+ "legend": false,
+ "tooltip": false,
+ "viz": false
+ },
+ "lineInterpolation": "linear",
+ "lineWidth": 1,
+ "pointSize": 5,
+ "scaleDistribution": {
+ "type": "linear"
+ },
+ "showPoints": "auto",
+ "spanNulls": false,
+ "stacking": {
+ "group": "A",
+ "mode": "none"
+ },
+ "thresholdsStyle": {
+ "mode": "off"
+ }
+ },
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green"
+ }
+ ]
+ },
+ "unit": "none"
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 9,
+ "w": 12,
+ "x": 12,
+ "y": 53
+ },
+ "id": 225,
+ "options": {
+ "legend": {
+ "calcs": [],
+ "displayMode": "list",
+ "placement": "bottom"
+ },
+ "tooltip": {
+ "mode": "single",
+ "sort": "desc"
+ }
+ },
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "${DS_PROMETHEUS}"
+ },
+ "editorMode": "builder",
+ "expr": "avg by(job, rate_limiter_name) (synapse_rate_limit_sleep_affected_hosts{instance=\"$instance\", job=~\"$job\", index=~\"$index\"})",
+ "hide": false,
+ "legendFormat": "Slept by {{job}}:{{rate_limiter_name}}",
+ "range": true,
+ "refId": "B"
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "${DS_PROMETHEUS}"
+ },
+ "editorMode": "builder",
+ "expr": "avg by(job, rate_limiter_name) (synapse_rate_limit_reject_affected_hosts{instance=\"$instance\", job=~\"$job\", index=~\"$index\"})",
+ "legendFormat": "Rejected by {{job}}:{{rate_limiter_name}}",
+ "range": true,
+ "refId": "A"
+ }
+ ],
+ "title": "Hosts being rate limited",
+ "type": "timeseries"
}
],
"targets": [
@@ -6404,7 +6502,7 @@
"h": 13,
"w": 12,
"x": 0,
- "y": 10
+ "y": 35
},
"hiddenSeries": false,
"id": 12,
@@ -6502,7 +6600,7 @@
"h": 13,
"w": 12,
"x": 12,
- "y": 10
+ "y": 35
},
"hiddenSeries": false,
"id": 26,
@@ -6601,7 +6699,7 @@
"h": 13,
"w": 12,
"x": 0,
- "y": 23
+ "y": 48
},
"hiddenSeries": false,
"id": 13,
@@ -6705,7 +6803,7 @@
"h": 13,
"w": 12,
"x": 12,
- "y": 23
+ "y": 48
},
"hiddenSeries": false,
"id": 27,
@@ -6803,7 +6901,7 @@
"h": 13,
"w": 12,
"x": 0,
- "y": 36
+ "y": 61
},
"hiddenSeries": false,
"id": 28,
@@ -6900,7 +6998,7 @@
"h": 13,
"w": 12,
"x": 12,
- "y": 36
+ "y": 61
},
"hiddenSeries": false,
"id": 25,
@@ -6935,7 +7033,7 @@
"datasource": {
"uid": "$datasource"
},
- "expr": "rate(synapse_util_metrics_block_time_seconds{instance=\"$instance\",job=~\"$job\",index=~\"$index\"}[$bucket_size]) / rate(synapse_util_metrics_block_count[$bucket_size])",
+ "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])",
"format": "time_series",
"interval": "",
"intervalFactor": 2,
@@ -6960,11 +7058,13 @@
},
"yaxes": [
{
- "format": "ms",
+ "$$hashKey": "object:180",
+ "format": "s",
"logBase": 1,
"show": true
},
{
+ "$$hashKey": "object:181",
"format": "short",
"logBase": 1,
"show": true
@@ -6988,7 +7088,7 @@
"h": 15,
"w": 12,
"x": 0,
- "y": 49
+ "y": 74
},
"hiddenSeries": false,
"id": 154,
@@ -7009,7 +7109,7 @@
"alertThreshold": true
},
"percentage": false,
- "pluginVersion": "8.4.3",
+ "pluginVersion": "9.0.4",
"pointradius": 2,
"points": false,
"renderer": "flot",
@@ -7109,7 +7209,7 @@
"h": 10,
"w": 12,
"x": 0,
- "y": 36
+ "y": 69
},
"hiddenSeries": false,
"id": 1,
@@ -7211,7 +7311,7 @@
"h": 10,
"w": 12,
"x": 12,
- "y": 36
+ "y": 69
},
"hiddenSeries": false,
"id": 8,
@@ -7311,7 +7411,7 @@
"h": 10,
"w": 12,
"x": 0,
- "y": 46
+ "y": 79
},
"hiddenSeries": false,
"id": 38,
@@ -7407,7 +7507,7 @@
"h": 10,
"w": 12,
"x": 12,
- "y": 46
+ "y": 79
},
"hiddenSeries": false,
"id": 39,
@@ -7415,11 +7515,16 @@
"alignAsTable": true,
"avg": false,
"current": false,
- "max": false,
+ "hideEmpty": false,
+ "hideZero": false,
+ "max": true,
"min": false,
+ "rightSide": false,
"show": true,
+ "sort": "max",
+ "sortDesc": true,
"total": false,
- "values": false
+ "values": true
},
"lines": true,
"linewidth": 1,
@@ -7467,11 +7572,13 @@
},
"yaxes": [
{
+ "$$hashKey": "object:101",
"format": "rps",
"logBase": 1,
"show": true
},
{
+ "$$hashKey": "object:102",
"format": "short",
"logBase": 1,
"show": true
@@ -7501,7 +7608,7 @@
"h": 9,
"w": 12,
"x": 0,
- "y": 56
+ "y": 89
},
"hiddenSeries": false,
"id": 65,
@@ -11757,8 +11864,8 @@
]
},
"time": {
- "from": "2022-07-22T04:08:13.716Z",
- "to": "2022-07-22T18:44:27.863Z"
+ "from": "now-3h",
+ "to": "now"
},
"timepicker": {
"now": true,
@@ -11789,6 +11896,6 @@
"timezone": "",
"title": "Synapse",
"uid": "000000012",
- "version": 124,
+ "version": 132,
"weekStart": ""
}
\ No newline at end of file
|
