1.12.0rc1

* commit 'e43e78b98': 1.12.0rc1 update grafana dashboard
2020-03-24 14:42:52 +00:00
parent a2f183346c e43e78b985
commit a1be668df3
61 changed files with 291 additions and 91 deletions
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,80 @@
+Synapse 1.12.0rc1 (2020-03-19)
+==============================
+
+Features
+--------
+
+- Changes related to room alias management ([MSC2432](https://github.com/matrix-org/matrix-doc/pull/2432):
+  - Publishing/removing a room from the room directory now requires the user to have a power level capable of modifying the canonical alias, instead of the room aliases. ([\#6965](https://github.com/matrix-org/synapse/issues/6965))
+  - Validate the alt_aliases property of canonical alias events. ([\#6971](https://github.com/matrix-org/synapse/issues/6971))
+  - Users with a power level sufficient to modify the canonical alias of a room can now delete room aliases. ([\#6986](https://github.com/matrix-org/synapse/issues/6986))
+  - Implement updated authorization rules and redaction rules for aliases events, from [MSC2261](https://github.com/matrix-org/matrix-doc/pull/2261) and [MSC2432](https://github.com/matrix-org/matrix-doc/pull/2432). ([\#7037](https://github.com/matrix-org/synapse/issues/7037))
+  - Stop sending m.room.aliases events during room creation and upgrade. ([\#6941](https://github.com/matrix-org/synapse/issues/6941))
+  - Synapse no longer uses room alias events to calculate room names for email notifications. ([\#6966](https://github.com/matrix-org/synapse/issues/6966))
+  - The room list endpoint no longer returns a list of aliases. ([\#6970](https://github.com/matrix-org/synapse/issues/6970))
+  - Remove special handling of aliases events from [MSC2260](https://github.com/matrix-org/matrix-doc/pull/2260) added in v1.10.0rc1. ([\#7034](https://github.com/matrix-org/synapse/issues/7034))
+- Expose the `synctl`, `hash_password` and `generate_config` commands in the snapcraft package. Contributed by @devec0. ([\#6315](https://github.com/matrix-org/synapse/issues/6315))
+- Check that server_name is correctly set before running database updates. ([\#6982](https://github.com/matrix-org/synapse/issues/6982))
+- Break down monthly active users by `appservice_id` and emit via Prometheus. ([\#7030](https://github.com/matrix-org/synapse/issues/7030))
+- Render a configurable and comprehensible error page if something goes wrong during the SAML2 authentication process. ([\#7058](https://github.com/matrix-org/synapse/issues/7058), [\#7067](https://github.com/matrix-org/synapse/issues/7067))
+- Add an optional parameter to control whether other sessions are logged out when a user's password is modified. ([\#7085](https://github.com/matrix-org/synapse/issues/7085))
+- Add prometheus metrics for the number of active pushers. ([\#7103](https://github.com/matrix-org/synapse/issues/7103), [\#7106](https://github.com/matrix-org/synapse/issues/7106))
+- Improve performance when making HTTPS requests to sygnal, sydent, etc, by sharing the SSL context object between connections. ([\#7094](https://github.com/matrix-org/synapse/issues/7094))
+
+
+Bugfixes
+--------
+
+- When a user's profile is updated via the admin API, also generate a displayname/avatar update for that user in each room. ([\#6572](https://github.com/matrix-org/synapse/issues/6572))
+- Fix a couple of bugs in email configuration handling. ([\#6962](https://github.com/matrix-org/synapse/issues/6962))
+- Fix an issue affecting worker-based deployments where replication would stop working, necessitating a full restart, after joining a large room. ([\#6967](https://github.com/matrix-org/synapse/issues/6967))
+- Fix `duplicate key` error which was logged when rejoining a room over federation. ([\#6968](https://github.com/matrix-org/synapse/issues/6968))
+- Prevent user from setting 'deactivated' to anything other than a bool on the v2 PUT /users Admin API. ([\#6990](https://github.com/matrix-org/synapse/issues/6990))
+- Fix py35-old CI by using native tox package. ([\#7018](https://github.com/matrix-org/synapse/issues/7018))
+- Fix a bug causing `org.matrix.dummy_event` to be included in responses from `/sync`. ([\#7035](https://github.com/matrix-org/synapse/issues/7035))
+- Fix a bug that renders UTF-8 text files incorrectly when loaded from media. Contributed by @TheStranjer. ([\#7044](https://github.com/matrix-org/synapse/issues/7044))
+- Fix a bug that would cause Synapse to respond with an error about event visibility if a client tried to request the state of a room at a given token. ([\#7066](https://github.com/matrix-org/synapse/issues/7066))
+- Repair a data-corruption issue which was introduced in Synapse 1.10, and fixed in Synapse 1.11, and which could cause `/sync` to return with 404 errors about missing events and unknown rooms. ([\#7070](https://github.com/matrix-org/synapse/issues/7070))
+- Fix a bug causing account validity renewal emails to be sent even if the feature is turned off in some cases. ([\#7074](https://github.com/matrix-org/synapse/issues/7074))
+
+
+Improved Documentation
+----------------------
+
+- Updated CentOS8 install instructions. Contributed by Richard Kellner. ([\#6925](https://github.com/matrix-org/synapse/issues/6925))
+- Fix `POSTGRES_INITDB_ARGS` in the `contrib/docker/docker-compose.yml` example docker-compose configuration. ([\#6984](https://github.com/matrix-org/synapse/issues/6984))
+- Document that the fallback auth endpoints must be routed to the same worker node as the register endpoints. ([\#7048](https://github.com/matrix-org/synapse/issues/7048))
+
+
+Deprecations and Removals
+-------------------------
+
+- Remove the unused query_auth federation endpoint per MSC2451. ([\#7026](https://github.com/matrix-org/synapse/issues/7026))
+
+
+Internal Changes
+----------------
+
+- Add type hints to `logging/context.py`. ([\#6309](https://github.com/matrix-org/synapse/issues/6309))
+- Add some clarifications to `README.md` in the database schema directory. ([\#6615](https://github.com/matrix-org/synapse/issues/6615))
+- Refactoring work in preparation for changing the event redaction algorithm. ([\#6874](https://github.com/matrix-org/synapse/issues/6874), [\#6875](https://github.com/matrix-org/synapse/issues/6875), [\#6983](https://github.com/matrix-org/synapse/issues/6983), [\#7003](https://github.com/matrix-org/synapse/issues/7003))
+- Improve performance of v2 state resolution for large rooms. ([\#6952](https://github.com/matrix-org/synapse/issues/6952), [\#7095](https://github.com/matrix-org/synapse/issues/7095))
+- Reduce time spent doing GC, by freezing objects on startup. ([\#6953](https://github.com/matrix-org/synapse/issues/6953))
+- Minor perfermance fixes to `get_auth_chain_ids`. ([\#6954](https://github.com/matrix-org/synapse/issues/6954))
+- Don't record remote cross-signing keys in the `devices` table. ([\#6956](https://github.com/matrix-org/synapse/issues/6956))
+- Use flake8-comprehensions to enforce good hygiene of list/set/dict comprehensions. ([\#6957](https://github.com/matrix-org/synapse/issues/6957))
+- Merge worker apps together. ([\#6964](https://github.com/matrix-org/synapse/issues/6964), [\#7002](https://github.com/matrix-org/synapse/issues/7002), [\#7055](https://github.com/matrix-org/synapse/issues/7055), [\#7104](https://github.com/matrix-org/synapse/issues/7104))
+- Remove redundant `store_room` call from `FederationHandler._process_received_pdu`. ([\#6979](https://github.com/matrix-org/synapse/issues/6979))
+- Update warning for incorrect database collation/ctype to include link to documentation. ([\#6985](https://github.com/matrix-org/synapse/issues/6985))
+- Add some type annotations to the database storage classes. ([\#6987](https://github.com/matrix-org/synapse/issues/6987))
+- Port `synapse.handlers.presence` to async/await. ([\#6991](https://github.com/matrix-org/synapse/issues/6991), [\#7019](https://github.com/matrix-org/synapse/issues/7019))
+- Add some type annotations to the federation base & client classes. ([\#6995](https://github.com/matrix-org/synapse/issues/6995))
+- Change date in [INSTALL.md#tls-certificates] for last date of getting TLS certificates to November 2019. ([\#7015](https://github.com/matrix-org/synapse/issues/7015))
+- Port `synapse.rest.keys` to async/await. ([\#7020](https://github.com/matrix-org/synapse/issues/7020))
+- Add a type check to `is_verified` when processing room keys. ([\#7045](https://github.com/matrix-org/synapse/issues/7045))
+- Add type annotations and comments to the auth handler. ([\#7063](https://github.com/matrix-org/synapse/issues/7063))
+
+
 Synapse 1.11.1 (2020-03-03)
 ===========================

--- a/changelog.d/6309.misc
+++ b/changelog.d/6309.misc
@@ -1 +0,0 @@
-Add type hints to `logging/context.py`.
--- a/changelog.d/6315.feature
+++ b/changelog.d/6315.feature
@@ -1 +0,0 @@
-Expose the `synctl`, `hash_password` and `generate_config` commands in the snapcraft package. Contributed by @devec0.
--- a/changelog.d/6572.bugfix
+++ b/changelog.d/6572.bugfix
@@ -1 +0,0 @@
-When a user's profile is updated via the admin API, also generate a displayname/avatar update for that user in each room.
--- a/changelog.d/6615.misc
+++ b/changelog.d/6615.misc
@@ -1 +0,0 @@
-Add some clarifications to `README.md` in the database schema directory.
--- a/changelog.d/6874.misc
+++ b/changelog.d/6874.misc
@@ -1 +0,0 @@
-Refactoring work in preparation for changing the event redaction algorithm.
--- a/changelog.d/6875.misc
+++ b/changelog.d/6875.misc
@@ -1 +0,0 @@
-Refactoring work in preparation for changing the event redaction algorithm.
--- a/changelog.d/6925.doc
+++ b/changelog.d/6925.doc
@@ -1 +0,0 @@
-Updated CentOS8 install instructions. Contributed by Richard Kellner.
--- a/changelog.d/6941.removal
+++ b/changelog.d/6941.removal
@@ -1 +0,0 @@
-Stop sending m.room.aliases events during room creation and upgrade.
--- a/changelog.d/6952.misc
+++ b/changelog.d/6952.misc
@@ -1 +0,0 @@
-Improve perf of v2 state res for large rooms.
--- a/changelog.d/6953.misc
+++ b/changelog.d/6953.misc
@@ -1 +0,0 @@
-Reduce time spent doing GC by freezing objects on startup.
--- a/changelog.d/6954.misc
+++ b/changelog.d/6954.misc
@@ -1 +0,0 @@
-Minor perf fixes to `get_auth_chain_ids`.
--- a/changelog.d/6956.misc
+++ b/changelog.d/6956.misc
@@ -1 +0,0 @@
-Don't record remote cross-signing keys in the `devices` table.
--- a/changelog.d/6957.misc
+++ b/changelog.d/6957.misc
@@ -1 +0,0 @@
-Use flake8-comprehensions to enforce good hygiene of list/set/dict comprehensions.
--- a/changelog.d/6962.bugfix
+++ b/changelog.d/6962.bugfix
@@ -1 +0,0 @@
-Fix a couple of bugs in email configuration handling.
--- a/changelog.d/6964.misc
+++ b/changelog.d/6964.misc
@@ -1 +0,0 @@
-Merge worker apps together.
--- a/changelog.d/6965.feature
+++ b/changelog.d/6965.feature
@@ -1 +0,0 @@
-Publishing/removing a room from the room directory now requires the user to have a power level capable of modifying the canonical alias, instead of the room aliases.
--- a/changelog.d/6966.removal
+++ b/changelog.d/6966.removal
@@ -1 +0,0 @@
-Synapse no longer uses room alias events to calculate room names for email notifications.
--- a/changelog.d/6967.bugfix
+++ b/changelog.d/6967.bugfix
@@ -1 +0,0 @@
-Fix an issue affecting worker-based deployments where replication would stop working, necessitating a full restart, after joining a large room.
--- a/changelog.d/6968.bugfix
+++ b/changelog.d/6968.bugfix
@@ -1 +0,0 @@
-Fix `duplicate key` error which was logged when rejoining a room over federation.
--- a/changelog.d/6970.removal
+++ b/changelog.d/6970.removal
@@ -1 +0,0 @@
-The room list endpoint no longer returns a list of aliases.
--- a/changelog.d/6971.feature
+++ b/changelog.d/6971.feature
@@ -1 +0,0 @@
-Validate the alt_aliases property of canonical alias events.
--- a/changelog.d/6979.misc
+++ b/changelog.d/6979.misc
@@ -1 +0,0 @@
-Remove redundant `store_room` call from `FederationHandler._process_received_pdu`.
--- a/changelog.d/6982.feature
+++ b/changelog.d/6982.feature
@@ -1 +0,0 @@
-Check that server_name is correctly set before running database updates.
--- a/changelog.d/6983.misc
+++ b/changelog.d/6983.misc
@@ -1 +0,0 @@
-Refactoring work in preparation for changing the event redaction algorithm.
--- a/changelog.d/6984.docker
+++ b/changelog.d/6984.docker
@@ -1 +0,0 @@
-Fix `POSTGRES_INITDB_ARGS` in the `contrib/docker/docker-compose.yml` example docker-compose configuration.
--- a/changelog.d/6985.misc
+++ b/changelog.d/6985.misc
@@ -1 +0,0 @@
-Update warning for incorrect database collation/ctype to include link to documentation.
--- a/changelog.d/6986.feature
+++ b/changelog.d/6986.feature
@@ -1 +0,0 @@
-Users with a power level sufficient to modify the canonical alias of a room can now delete room aliases.
--- a/changelog.d/6987.misc
+++ b/changelog.d/6987.misc
@@ -1 +0,0 @@
-Add some type annotations to the database storage classes.
--- a/changelog.d/6990.bugfix
+++ b/changelog.d/6990.bugfix
@@ -1 +0,0 @@
-Prevent user from setting 'deactivated' to anything other than a bool on the v2 PUT /users Admin API.
--- a/changelog.d/6991.misc
+++ b/changelog.d/6991.misc
@@ -1 +0,0 @@
-Port `synapse.handlers.presence` to async/await.
--- a/changelog.d/6995.misc
+++ b/changelog.d/6995.misc
@@ -1 +0,0 @@
-Add some type annotations to the federation base & client classes.
--- a/changelog.d/7002.misc
+++ b/changelog.d/7002.misc
@@ -1 +0,0 @@
-Merge worker apps together.
--- a/changelog.d/7003.misc
+++ b/changelog.d/7003.misc
@@ -1 +0,0 @@
-Refactoring work in preparation for changing the event redaction algorithm.
--- a/changelog.d/7015.misc
+++ b/changelog.d/7015.misc
@@ -1 +0,0 @@
-Change date in INSTALL.md#tls-certificates for last date of getting TLS certificates to November 2019.
--- a/changelog.d/7018.bugfix
+++ b/changelog.d/7018.bugfix
@@ -1 +0,0 @@
-Fix py35-old CI by using native tox package.
--- a/changelog.d/7019.misc
+++ b/changelog.d/7019.misc
@@ -1 +0,0 @@
-Port `synapse.handlers.presence` to async/await.
--- a/changelog.d/7020.misc
+++ b/changelog.d/7020.misc
@@ -1 +0,0 @@
-Port `synapse.rest.keys` to async/await.
--- a/changelog.d/7026.removal
+++ b/changelog.d/7026.removal
@@ -1 +0,0 @@
-Remove the unused query_auth federation endpoint per MSC2451.
--- a/changelog.d/7030.feature
+++ b/changelog.d/7030.feature
@@ -1 +0,0 @@
-Break down monthly active users by `appservice_id` and emit via Prometheus.
--- a/changelog.d/7034.removal
+++ b/changelog.d/7034.removal
@@ -1 +0,0 @@
-Remove special handling of aliases events from [MSC2260](https://github.com/matrix-org/matrix-doc/pull/2260) added in v1.10.0rc1.
--- a/changelog.d/7035.bugfix
+++ b/changelog.d/7035.bugfix
@@ -1 +0,0 @@
-Fix a bug causing `org.matrix.dummy_event` to be included in responses from `/sync`.
--- a/changelog.d/7037.feature
+++ b/changelog.d/7037.feature
@@ -1 +0,0 @@
-Implement updated authorization rules and redaction rules for aliases events, from [MSC2261](https://github.com/matrix-org/matrix-doc/pull/2261) and [MSC2432](https://github.com/matrix-org/matrix-doc/pull/2432).
--- a/changelog.d/7044.bugfix
+++ b/changelog.d/7044.bugfix
@@ -1 +0,0 @@
-Fix a bug that renders UTF-8 text files incorrectly when loaded from media. Contributed by @TheStranjer.
--- a/changelog.d/7045.misc
+++ b/changelog.d/7045.misc
@@ -1 +0,0 @@
-Add a type check to `is_verified` when processing room keys.
--- a/changelog.d/7048.doc
+++ b/changelog.d/7048.doc
@@ -1 +0,0 @@
-Document that the fallback auth endpoints must be routed to the same worker node as the register endpoints.
--- a/changelog.d/7055.misc
+++ b/changelog.d/7055.misc
@@ -1 +0,0 @@
-Merge worker apps together.
--- a/changelog.d/7058.feature
+++ b/changelog.d/7058.feature
@@ -1 +0,0 @@
-Render a configurable and comprehensible error page if something goes wrong during the SAML2 authentication process.
--- a/changelog.d/7063.misc
+++ b/changelog.d/7063.misc
@@ -1 +0,0 @@
-Add type annotations and comments to the auth handler.
--- a/changelog.d/7066.bugfix
+++ b/changelog.d/7066.bugfix
@@ -1 +0,0 @@
-Fix a bug that would cause Synapse to respond with an error about event visibility if a client tried to request the state of a room at a given token.
--- a/changelog.d/7067.feature
+++ b/changelog.d/7067.feature
@@ -1 +0,0 @@
-Render a configurable and comprehensible error page if something goes wrong during the SAML2 authentication process.
--- a/changelog.d/7070.bugfix
+++ b/changelog.d/7070.bugfix
@@ -1 +0,0 @@
-Repair a data-corruption issue which was introduced in Synapse 1.10, and fixed in Synapse 1.11, and which could cause `/sync` to return with 404 errors about missing events and unknown rooms.
--- a/changelog.d/7074.bugfix
+++ b/changelog.d/7074.bugfix
@@ -1 +0,0 @@
-Fix a bug causing account validity renewal emails to be sent even if the feature is turned off in some cases.
--- a/changelog.d/7085.feature
+++ b/changelog.d/7085.feature
@@ -1 +0,0 @@
-Add an optional parameter to control whether other sessions are logged out when a user's password is modified.
--- a/changelog.d/7094.misc
+++ b/changelog.d/7094.misc
@@ -1 +0,0 @@
-Improve performance when making HTTPS requests to sygnal, sydent, etc, by sharing the SSL context object between connections.
--- a/changelog.d/7095.misc
+++ b/changelog.d/7095.misc
@@ -1 +0,0 @@
-Attempt to improve performance of state res v2 algorithm.
--- a/changelog.d/7103.feature
+++ b/changelog.d/7103.feature
@@ -1 +0,0 @@
-Add prometheus metrics for the number of active pushers.
--- a/changelog.d/7104.misc
+++ b/changelog.d/7104.misc
@@ -1 +0,0 @@
-Merge worker apps together.
--- a/changelog.d/7106.feature
+++ b/changelog.d/7106.feature
@@ -1 +0,0 @@
-Add prometheus metrics for the number of active pushers.
--- a/contrib/grafana/synapse.json
+++ b/contrib/grafana/synapse.json
@@ -18,7 +18,7 @@
  "gnetId": null,
  "graphTooltip": 0,
  "id": 1,
-  "iteration": 1561447718159,
+  "iteration": 1584612489167,
  "links": [
    {
      "asDropdown": true,
@@ -34,6 +34,7 @@
  "panels": [
    {
      "collapsed": false,
+      "datasource": null,
      "gridPos": {
        "h": 1,
        "w": 24,
@@ -52,12 +53,14 @@
      "dashes": false,
      "datasource": "$datasource",
      "fill": 1,
+      "fillGradient": 0,
      "gridPos": {
        "h": 9,
        "w": 12,
        "x": 0,
        "y": 1
      },
+      "hiddenSeries": false,
      "id": 75,
      "legend": {
        "avg": false,
@@ -72,7 +75,9 @@
      "linewidth": 1,
      "links": [],
      "nullPointMode": "null",
-      "options": {},
+      "options": {
+        "dataLinks": []
+      },
      "paceLength": 10,
      "percentage": false,
      "pointradius": 5,
@@ -151,6 +156,7 @@
      "editable": true,
      "error": false,
      "fill": 1,
+      "fillGradient": 0,
      "grid": {},
      "gridPos": {
        "h": 9,
@@ -158,6 +164,7 @@
        "x": 12,
        "y": 1
      },
+      "hiddenSeries": false,
      "id": 33,
      "legend": {
        "avg": false,
@@ -172,7 +179,9 @@
      "linewidth": 2,
      "links": [],
      "nullPointMode": "null",
-      "options": {},
+      "options": {
+        "dataLinks": []
+      },
      "paceLength": 10,
      "percentage": false,
      "pointradius": 5,
@@ -302,12 +311,14 @@
      "dashes": false,
      "datasource": "$datasource",
      "fill": 0,
+      "fillGradient": 0,
      "gridPos": {
        "h": 9,
        "w": 12,
        "x": 12,
        "y": 10
      },
+      "hiddenSeries": false,
      "id": 107,
      "legend": {
        "avg": false,
@@ -322,7 +333,9 @@
      "linewidth": 1,
      "links": [],
      "nullPointMode": "null",
-      "options": {},
+      "options": {
+        "dataLinks": []
+      },
      "paceLength": 10,
      "percentage": false,
      "pointradius": 5,
@@ -425,12 +438,14 @@
      "dashes": false,
      "datasource": "$datasource",
      "fill": 0,
+      "fillGradient": 0,
      "gridPos": {
        "h": 9,
        "w": 12,
        "x": 0,
        "y": 19
      },
+      "hiddenSeries": false,
      "id": 118,
      "legend": {
        "avg": false,
@@ -445,7 +460,9 @@
      "linewidth": 1,
      "links": [],
      "nullPointMode": "null",
-      "options": {},
+      "options": {
+        "dataLinks": []
+      },
      "paceLength": 10,
      "percentage": false,
      "pointradius": 5,
@@ -542,6 +559,7 @@
    },
    {
      "collapsed": true,
+      "datasource": null,
      "gridPos": {
        "h": 1,
        "w": 24,
@@ -1361,6 +1379,7 @@
    },
    {
      "collapsed": true,
+      "datasource": null,
      "gridPos": {
        "h": 1,
        "w": 24,
@@ -1732,6 +1751,7 @@
    },
    {
      "collapsed": true,
+      "datasource": null,
      "gridPos": {
        "h": 1,
        "w": 24,
@@ -2439,6 +2459,7 @@
    },
    {
      "collapsed": true,
+      "datasource": null,
      "gridPos": {
        "h": 1,
        "w": 24,
@@ -2635,6 +2656,7 @@
    },
    {
      "collapsed": true,
+      "datasource": null,
      "gridPos": {
        "h": 1,
        "w": 24,
@@ -2650,11 +2672,12 @@
          "dashes": false,
          "datasource": "$datasource",
          "fill": 1,
+          "fillGradient": 0,
          "gridPos": {
            "h": 9,
            "w": 12,
            "x": 0,
-            "y": 61
+            "y": 33
          },
          "id": 79,
          "legend": {
@@ -2670,6 +2693,9 @@
          "linewidth": 1,
          "links": [],
          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
          "paceLength": 10,
          "percentage": false,
          "pointradius": 5,
@@ -2684,8 +2710,13 @@
              "expr": "sum(rate(synapse_federation_client_sent_transactions{instance=\"$instance\"}[$bucket_size]))",
              "format": "time_series",
              "intervalFactor": 1,
-              "legendFormat": "txn rate",
+              "legendFormat": "successful txn rate",
              "refId": "A"
+            },
+            {
+              "expr": "sum(rate(synapse_util_metrics_block_count{block_name=\"_send_new_transaction\",instance=\"$instance\"}[$bucket_size]) - ignoring (block_name) rate(synapse_federation_client_sent_transactions{instance=\"$instance\"}[$bucket_size]))",
+              "legendFormat": "failed txn rate",
+              "refId": "B"
            }
          ],
          "thresholds": [],
@@ -2736,11 +2767,12 @@
          "dashes": false,
          "datasource": "$datasource",
          "fill": 1,
+          "fillGradient": 0,
          "gridPos": {
            "h": 9,
            "w": 12,
            "x": 12,
-            "y": 61
+            "y": 33
          },
          "id": 83,
          "legend": {
@@ -2756,6 +2788,9 @@
          "linewidth": 1,
          "links": [],
          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
          "paceLength": 10,
          "percentage": false,
          "pointradius": 5,
@@ -2829,11 +2864,12 @@
          "dashes": false,
          "datasource": "$datasource",
          "fill": 1,
+          "fillGradient": 0,
          "gridPos": {
            "h": 9,
            "w": 12,
            "x": 0,
-            "y": 70
+            "y": 42
          },
          "id": 109,
          "legend": {
@@ -2849,6 +2885,9 @@
          "linewidth": 1,
          "links": [],
          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
          "paceLength": 10,
          "percentage": false,
          "pointradius": 5,
@@ -2923,11 +2962,12 @@
          "dashes": false,
          "datasource": "$datasource",
          "fill": 1,
+          "fillGradient": 0,
          "gridPos": {
            "h": 9,
            "w": 12,
            "x": 12,
-            "y": 70
+            "y": 42
          },
          "id": 111,
          "legend": {
@@ -2943,6 +2983,9 @@
          "linewidth": 1,
          "links": [],
          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
          "paceLength": 10,
          "percentage": false,
          "pointradius": 5,
@@ -3009,6 +3052,7 @@
    },
    {
      "collapsed": true,
+      "datasource": null,
      "gridPos": {
        "h": 1,
        "w": 24,
@@ -3024,12 +3068,14 @@
          "dashes": false,
          "datasource": "$datasource",
          "fill": 1,
+          "fillGradient": 0,
          "gridPos": {
-            "h": 7,
+            "h": 8,
            "w": 12,
            "x": 0,
-            "y": 62
+            "y": 34
          },
+          "hiddenSeries": false,
          "id": 51,
          "legend": {
            "avg": false,
@@ -3044,6 +3090,9 @@
          "linewidth": 1,
          "links": [],
          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
          "paceLength": 10,
          "percentage": false,
          "pointradius": 5,
@@ -3112,6 +3161,95 @@
            "align": false,
            "alignLevel": null
          }
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "$datasource",
+          "description": "",
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 12,
+            "y": 34
+          },
+          "hiddenSeries": false,
+          "id": 134,
+          "legend": {
+            "avg": false,
+            "current": false,
+            "hideZero": false,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": false,
+            "values": false
+          },
+          "lines": true,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "topk(10,synapse_pushers{job=~\"$job\",index=~\"$index\", instance=\"$instance\"})",
+              "legendFormat": "{{kind}} {{app_id}}",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "Active pusher instances by app",
+          "tooltip": {
+            "shared": false,
+            "sort": 2,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
        }
      ],
      "repeat": null,
@@ -3120,6 +3258,7 @@
    },
    {
      "collapsed": true,
+      "datasource": null,
      "gridPos": {
        "h": 1,
        "w": 24,
@@ -3523,6 +3662,7 @@
    },
    {
      "collapsed": true,
+      "datasource": null,
      "gridPos": {
        "h": 1,
        "w": 24,
@@ -3540,6 +3680,7 @@
          "editable": true,
          "error": false,
          "fill": 1,
+          "fillGradient": 0,
          "grid": {},
          "gridPos": {
            "h": 13,
@@ -3562,6 +3703,9 @@
          "linewidth": 2,
          "links": [],
          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
          "paceLength": 10,
          "percentage": false,
          "pointradius": 5,
@@ -3630,6 +3774,7 @@
          "editable": true,
          "error": false,
          "fill": 1,
+          "fillGradient": 0,
          "grid": {},
          "gridPos": {
            "h": 13,
@@ -3652,6 +3797,9 @@
          "linewidth": 2,
          "links": [],
          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
          "paceLength": 10,
          "percentage": false,
          "pointradius": 5,
@@ -3720,6 +3868,7 @@
          "editable": true,
          "error": false,
          "fill": 1,
+          "fillGradient": 0,
          "grid": {},
          "gridPos": {
            "h": 13,
@@ -3742,6 +3891,9 @@
          "linewidth": 2,
          "links": [],
          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
          "paceLength": 10,
          "percentage": false,
          "pointradius": 5,
@@ -3810,6 +3962,7 @@
          "editable": true,
          "error": false,
          "fill": 1,
+          "fillGradient": 0,
          "grid": {},
          "gridPos": {
            "h": 13,
@@ -3832,6 +3985,9 @@
          "linewidth": 2,
          "links": [],
          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
          "paceLength": 10,
          "percentage": false,
          "pointradius": 5,
@@ -3921,6 +4077,7 @@
          "linewidth": 2,
          "links": [],
          "nullPointMode": "null",
+          "options": {},
          "paceLength": 10,
          "percentage": false,
          "pointradius": 5,
@@ -4010,6 +4167,7 @@
          "linewidth": 2,
          "links": [],
          "nullPointMode": "null",
+          "options": {},
          "paceLength": 10,
          "percentage": false,
          "pointradius": 5,
@@ -4076,6 +4234,7 @@
    },
    {
      "collapsed": true,
+      "datasource": null,
      "gridPos": {
        "h": 1,
        "w": 24,
@@ -4540,6 +4699,7 @@
    },
    {
      "collapsed": true,
+      "datasource": null,
      "gridPos": {
        "h": 1,
        "w": 24,
@@ -5060,6 +5220,7 @@
    },
    {
      "collapsed": true,
+      "datasource": null,
      "gridPos": {
        "h": 1,
        "w": 24,
@@ -5079,7 +5240,7 @@
            "h": 7,
            "w": 12,
            "x": 0,
-            "y": 67
+            "y": 39
          },
          "id": 2,
          "legend": {
@@ -5095,6 +5256,7 @@
          "linewidth": 1,
          "links": [],
          "nullPointMode": "null",
+          "options": {},
          "paceLength": 10,
          "percentage": false,
          "pointradius": 5,
@@ -5198,7 +5360,7 @@
            "h": 7,
            "w": 12,
            "x": 12,
-            "y": 67
+            "y": 39
          },
          "id": 41,
          "legend": {
@@ -5214,6 +5376,7 @@
          "linewidth": 1,
          "links": [],
          "nullPointMode": "null",
+          "options": {},
          "paceLength": 10,
          "percentage": false,
          "pointradius": 5,
@@ -5286,7 +5449,7 @@
            "h": 7,
            "w": 12,
            "x": 0,
-            "y": 74
+            "y": 46
          },
          "id": 42,
          "legend": {
@@ -5302,6 +5465,7 @@
          "linewidth": 1,
          "links": [],
          "nullPointMode": "null",
+          "options": {},
          "paceLength": 10,
          "percentage": false,
          "pointradius": 5,
@@ -5373,7 +5537,7 @@
            "h": 7,
            "w": 12,
            "x": 12,
-            "y": 74
+            "y": 46
          },
          "id": 43,
          "legend": {
@@ -5389,6 +5553,7 @@
          "linewidth": 1,
          "links": [],
          "nullPointMode": "null",
+          "options": {},
          "paceLength": 10,
          "percentage": false,
          "pointradius": 5,
@@ -5460,7 +5625,7 @@
            "h": 7,
            "w": 12,
            "x": 0,
-            "y": 81
+            "y": 53
          },
          "id": 113,
          "legend": {
@@ -5476,6 +5641,7 @@
          "linewidth": 1,
          "links": [],
          "nullPointMode": "null",
+          "options": {},
          "paceLength": 10,
          "percentage": false,
          "pointradius": 5,
@@ -5546,7 +5712,7 @@
            "h": 7,
            "w": 12,
            "x": 12,
-            "y": 81
+            "y": 53
          },
          "id": 115,
          "legend": {
@@ -5562,6 +5728,7 @@
          "linewidth": 1,
          "links": [],
          "nullPointMode": "null",
+          "options": {},
          "paceLength": 10,
          "percentage": false,
          "pointradius": 5,
@@ -5573,7 +5740,7 @@
          "steppedLine": false,
          "targets": [
            {
-              "expr": "rate(synapse_replication_tcp_protocol_close_reason{job=\"$job\",index=~\"$index\",instance=\"$instance\"}[$bucket_size])",
+              "expr": "rate(synapse_replication_tcp_protocol_close_reason{job=~\"$job\",index=~\"$index\",instance=\"$instance\"}[$bucket_size])",
              "format": "time_series",
              "intervalFactor": 1,
              "legendFormat": "{{job}}-{{index}} {{reason_type}}",
@@ -5628,6 +5795,7 @@
    },
    {
      "collapsed": true,
+      "datasource": null,
      "gridPos": {
        "h": 1,
        "w": 24,
@@ -5643,11 +5811,12 @@
          "dashes": false,
          "datasource": "$datasource",
          "fill": 1,
+          "fillGradient": 0,
          "gridPos": {
            "h": 9,
            "w": 12,
            "x": 0,
-            "y": 13
+            "y": 40
          },
          "id": 67,
          "legend": {
@@ -5663,7 +5832,9 @@
          "linewidth": 1,
          "links": [],
          "nullPointMode": "connected",
-          "options": {},
+          "options": {
+            "dataLinks": []
+          },
          "paceLength": 10,
          "percentage": false,
          "pointradius": 5,
@@ -5679,7 +5850,7 @@
              "format": "time_series",
              "interval": "",
              "intervalFactor": 1,
-              "legendFormat": "{{job}}-{{index}} ",
+              "legendFormat": "{{job}}-{{index}} {{name}}",
              "refId": "A"
            }
          ],
@@ -5731,11 +5902,12 @@
          "dashes": false,
          "datasource": "$datasource",
          "fill": 1,
+          "fillGradient": 0,
          "gridPos": {
            "h": 9,
            "w": 12,
            "x": 12,
-            "y": 13
+            "y": 40
          },
          "id": 71,
          "legend": {
@@ -5751,7 +5923,9 @@
          "linewidth": 1,
          "links": [],
          "nullPointMode": "connected",
-          "options": {},
+          "options": {
+            "dataLinks": []
+          },
          "paceLength": 10,
          "percentage": false,
          "pointradius": 5,
@@ -5819,11 +5993,12 @@
          "dashes": false,
          "datasource": "$datasource",
          "fill": 1,
+          "fillGradient": 0,
          "gridPos": {
            "h": 9,
            "w": 12,
            "x": 0,
-            "y": 22
+            "y": 49
          },
          "id": 121,
          "interval": "",
@@ -5840,7 +6015,9 @@
          "linewidth": 1,
          "links": [],
          "nullPointMode": "connected",
-          "options": {},
+          "options": {
+            "dataLinks": []
+          },
          "paceLength": 10,
          "percentage": false,
          "pointradius": 5,
@@ -5909,6 +6086,7 @@
    },
    {
      "collapsed": true,
+      "datasource": null,
      "gridPos": {
        "h": 1,
        "w": 24,
@@ -6607,7 +6785,7 @@
    }
  ],
  "refresh": "5m",
-  "schemaVersion": 18,
+  "schemaVersion": 22,
  "style": "dark",
  "tags": [
    "matrix"
@@ -6616,7 +6794,7 @@
    "list": [
      {
        "current": {
-          "tags": [],
+          "selected": true,
          "text": "Prometheus",
          "value": "Prometheus"
        },
@@ -6638,6 +6816,7 @@
        "auto_count": 100,
        "auto_min": "30s",
        "current": {
+          "selected": false,
          "text": "auto",
          "value": "$__auto_interval_bucket_size"
        },
@@ -6719,9 +6898,9 @@
        "allFormat": "regex wildcard",
        "allValue": "",
        "current": {
-          "text": "All",
+          "text": "synapse",
          "value": [
-            "$__all"
+            "synapse"
          ]
        },
        "datasource": "$datasource",
@@ -6751,7 +6930,9 @@
        "allValue": ".*",
        "current": {
          "text": "All",
-          "value": "$__all"
+          "value": [
+            "$__all"
+          ]
        },
        "datasource": "$datasource",
        "definition": "",
@@ -6810,5 +6991,5 @@
  "timezone": "",
  "title": "Synapse",
  "uid": "000000012",
-  "version": 10
+  "version": 19
 }
--- a/synapse/init.py
+++ b/synapse/init.py
@@ -36,7 +36,7 @@ try:
 except ImportError:
    pass

-__version__ = "1.11.1"
+__version__ = "1.12.0rc1"

 if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
    # We import here so that we don't have to install a bunch of deps when
				`@@ -1 +0,0 @@`
				Expose the `synctl`, `hash_password` and `generate_config` commands in the snapcraft package. Contributed by @devec0.
				`@@ -1 +0,0 @@`
				`When a user's profile is updated via the admin API, also generate a displayname/avatar update for that user in each room.`
				`@@ -1 +0,0 @@`
				Add some clarifications to `README.md` in the database schema directory.
				`@@ -1 +0,0 @@`
				`Refactoring work in preparation for changing the event redaction algorithm.`
				`@@ -1 +0,0 @@`
				`Updated CentOS8 install instructions. Contributed by Richard Kellner.`
				`@@ -1 +0,0 @@`
				`Stop sending m.room.aliases events during room creation and upgrade.`
				`@@ -1 +0,0 @@`
				`Improve perf of v2 state res for large rooms.`
				`@@ -1 +0,0 @@`
				`Reduce time spent doing GC by freezing objects on startup.`
				`@@ -1 +0,0 @@`
				Don't record remote cross-signing keys in the `devices` table.
				`@@ -1 +0,0 @@`
				`Use flake8-comprehensions to enforce good hygiene of list/set/dict comprehensions.`