diff options
| author | Neil Johnson <neil@matrix.org> | 2018-08-15 09:53:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-15 09:53:59 +0000 |
| commit | 1c5e690a6b8128c71d578485f6b0abb8bc0d10e0 (patch) | |
| tree | 2ca8cbb96ff473f36a58bdecfecbe20b1d5a0ef7 | |
| parent | Merge pull request #3667 from matrix-org/erikj/fixup_unbind (diff) | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/change_pro... (diff) | |
| download | synapse-1c5e690a6b8128c71d578485f6b0abb8bc0d10e0.tar.xz | |
Merge pull request #3690 from matrix-org/neilj/change_prometheus_mau_metric_name
combine mau metrics into one group
| -rw-r--r-- | changelog.d/3690.misc | 1 | ||||
| -rwxr-xr-x | synapse/app/homeserver.py | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/changelog.d/3690.misc b/changelog.d/3690.misc new file mode 100644 index 0000000000..710add0243 --- /dev/null +++ b/changelog.d/3690.misc @@ -0,0 +1 @@ +Rename MAU prometheus metrics diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 37a9b126a5..a98bb506e5 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -303,8 +303,8 @@ class SynapseHomeServer(HomeServer): # Gauges to expose monthly active user control metrics -current_mau_gauge = Gauge("synapse_admin_current_mau", "Current MAU") -max_mau_value_gauge = Gauge("synapse_admin_max_mau_value", "MAU Limit") +current_mau_gauge = Gauge("synapse_admin_mau:current", "Current MAU") +max_mau_gauge = Gauge("synapse_admin_mau:max", "MAU Limit") def setup(config_options): @@ -532,7 +532,7 @@ def run(hs): if hs.config.limit_usage_by_mau: count = yield hs.get_datastore().get_monthly_active_count() current_mau_gauge.set(float(count)) - max_mau_value_gauge.set(float(hs.config.max_mau_value)) + max_mau_gauge.set(float(hs.config.max_mau_value)) hs.get_datastore().initialise_reserved_users( hs.config.mau_limits_reserved_threepids |