diff options
author | Richard van der Hoff <richard@matrix.org> | 2019-01-31 18:43:20 +0000 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2019-01-31 18:43:20 +0000 |
commit | 625385d6841b5d2e62d83f073fd7f1af5a5aeda6 (patch) | |
tree | f1fe4bbd1f524985a9e61db6b15ff2c0b21b72a4 /contrib | |
parent | Reject large transactions on federation (#4513) (diff) | |
parent | v0.99.0rc3 (diff) | |
download | synapse-625385d6841b5d2e62d83f073fd7f1af5a5aeda6.tar.xz |
Merge branch 'release-v0.99.0' into develop
Diffstat (limited to '')
-rw-r--r-- | contrib/prometheus/README.md (renamed from contrib/prometheus/README) | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/contrib/prometheus/README b/contrib/prometheus/README.md index 7b733172e6..e646cb7ea7 100644 --- a/contrib/prometheus/README +++ b/contrib/prometheus/README.md @@ -6,8 +6,10 @@ To use it, first install prometheus by following the instructions at http://prometheus.io/ ### for Prometheus v1 + Add a new job to the main prometheus.conf file: +```yaml job: { name: "synapse" @@ -15,10 +17,12 @@ Add a new job to the main prometheus.conf file: target: "http://SERVER.LOCATION.HERE:PORT/_synapse/metrics" } } +``` ### for Prometheus v2 Add a new job to the main prometheus.yml file: +```yaml - job_name: "synapse" metrics_path: "/_synapse/metrics" # when endpoint uses https: @@ -26,11 +30,14 @@ Add a new job to the main prometheus.yml file: static_configs: - targets: ['SERVER.LOCATION:PORT'] +``` To use `synapse.rules` add +```yaml rule_files: - "/PATH/TO/synapse-v2.rules" +``` Metrics are disabled by default when running synapse; they must be enabled with the 'enable-metrics' option, either in the synapse config file or as a |