From 835174180b498a2ae7f3d014b5b190cc24d12eb7 Mon Sep 17 00:00:00 2001
From: Will Lewis <1543626+wrjlewis@users.noreply.github.com>
Date: Thu, 20 Jul 2023 13:33:06 +0100
Subject: [PATCH] Fixed grafana deploy annotations in the dashboard config, so
 it shows for those not managing matrix.org (#15957)

Removed the 'matrix.org' hardcorded instance setting

Originally introduced in #15674

Co-authored-by: wrjlewis <will.lewis@askattest.com>
---
 changelog.d/15957.bugfix     | 1 +
 contrib/grafana/synapse.json | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/15957.bugfix

diff --git a/changelog.d/15957.bugfix b/changelog.d/15957.bugfix
new file mode 100644
index 000000000000..edbe2a956a97
--- /dev/null
+++ b/changelog.d/15957.bugfix
@@ -0,0 +1 @@
+Fixed deploy annotations in the provided Grafana dashboard config, so that it shows for any homeserver and not just matrix.org. Contributed by @wrjlewis.
\ No newline at end of file
diff --git a/contrib/grafana/synapse.json b/contrib/grafana/synapse.json
index f3253b32b929..90f449aa7678 100644
--- a/contrib/grafana/synapse.json
+++ b/contrib/grafana/synapse.json
@@ -63,7 +63,7 @@
           "uid": "${DS_PROMETHEUS}"
         },
         "enable": true,
-        "expr": "changes(process_start_time_seconds{instance=\"matrix.org\",job=~\"synapse\"}[$bucket_size]) * on (instance, job) group_left(version) synapse_build_info{instance=\"matrix.org\",job=\"synapse\"}",
+        "expr": "changes(process_start_time_seconds{instance=\"$instance\",job=~\"synapse\"}[$bucket_size]) * on (instance, job) group_left(version) synapse_build_info{instance=\"$instance\",job=\"synapse\"}",
         "iconColor": "purple",
         "name": "deploys",
         "titleFormat": "Deployed {{version}}"