diff options
| author | Erik Johnston <erik@matrix.org> | 2020-03-02 16:55:55 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2020-03-02 16:55:55 +0000 |
| commit | 65a941d1f8e4a27c56ad015369219a2e7c577a01 (patch) | |
| tree | 442d9e11867521f021b3cb05531af9c446d7c4ef /contrib | |
| parent | Fix worker handling (diff) | |
| parent | Always return a deferred from `get_current_state_deltas`. (#7019) (diff) | |
| download | synapse-65a941d1f8e4a27c56ad015369219a2e7c577a01.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fixup_devices_stream
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/docker/docker-compose.yml | 3 | ||||
| -rw-r--r-- | contrib/grafana/README.md | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/contrib/docker/docker-compose.yml b/contrib/docker/docker-compose.yml index 453b305053..17354b6610 100644 --- a/contrib/docker/docker-compose.yml +++ b/contrib/docker/docker-compose.yml @@ -15,10 +15,9 @@ services: restart: unless-stopped # See the readme for a full documentation of the environment settings environment: - - SYNAPSE_CONFIG_PATH=/etc/homeserver.yaml + - SYNAPSE_CONFIG_PATH=/data/homeserver.yaml volumes: # You may either store all the files in a local folder - - ./matrix-config/homeserver.yaml:/etc/homeserver.yaml - ./files:/data # .. or you may split this between different storage points # - ./files:/data diff --git a/contrib/grafana/README.md b/contrib/grafana/README.md index 6a6cc0bed4..ca780d412e 100644 --- a/contrib/grafana/README.md +++ b/contrib/grafana/README.md @@ -1,6 +1,6 @@ # Using the Synapse Grafana dashboard 0. Set up Prometheus and Grafana. Out of scope for this readme. Useful documentation about using Grafana with Prometheus: http://docs.grafana.org/features/datasources/prometheus/ -1. Have your Prometheus scrape your Synapse. https://github.com/matrix-org/synapse/blob/master/docs/metrics-howto.rst +1. Have your Prometheus scrape your Synapse. https://github.com/matrix-org/synapse/blob/master/docs/metrics-howto.md 2. Import dashboard into Grafana. Download `synapse.json`. Import it to Grafana and select the correct Prometheus datasource. http://docs.grafana.org/reference/export_import/ 3. Set up additional recording rules |