summary refs log tree commit diff
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-14 16:26:55 +0100
committerNeil Johnson <neil@matrix.org>2018-08-14 16:26:55 +0100
commite7d091fb867ade42889af7b8f9ce6a94a3d5e85e (patch)
tree396c34f0190afc715f3d35a99086498c470a3f91
parentDockerised sytest (#3660) (diff)
downloadsynapse-e7d091fb867ade42889af7b8f9ce6a94a3d5e85e.tar.xz
combine mau metrics into one group
-rwxr-xr-xsynapse/app/homeserver.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 37a9b126a5..f13584e190 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -303,9 +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 +531,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