From d36dbe03c8c4c11730a8da3c07844ef57fc21ff5 Mon Sep 17 00:00:00 2001 From: nico Date: Wed, 17 Jun 2020 13:29:34 +0200 Subject: Revert "add more global values" This reverts commit 990d3abdc60bea8a525d4fbdc56cdff2e44947ce. my mistake, I hadn't checked if I am on the correct branch --- control.py | 10 ---------- metrics.py | 8 +++----- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/control.py b/control.py index ecf3994..f865444 100644 --- a/control.py +++ b/control.py @@ -73,16 +73,6 @@ class EjabberdCtl(EjabberdApi): return result return result["s2s_outgoing"] - def fetch_uptime(self): - result = self.cmd("stats", {"name": "uptimeseconds"}) - if "stat" in result: - return result["stat"] - - def fetch_processes(self): - result = self.cmd("stats", {"name": "processes"}) - if "stat" in result: - return result["stat"] - def fetch_registered_count(self, vhost=None): if vhost is None: result = self.cmd("stats", {"name":"registeredusers"}) diff --git a/metrics.py b/metrics.py index 761825e..90d3fc5 100755 --- a/metrics.py +++ b/metrics.py @@ -210,10 +210,6 @@ class EjabberdMetrics(EjabberdCtl): data = { "registered": self.get_registered(), "muc": self.get_muc(), - "s2s_in": self.get_s2s_in(), - "s2s_out": self.get_s2s_out(), - "uptime": self.fetch_uptime(), - "processes": self.fetch_processes(), "online_by_status": self.get_online_by_status(), "online_by_client": self.get_online_by_client(), "online_by_ipversion": self.get_online_by_ipversion(), @@ -233,7 +229,9 @@ class EjabberdMetrics(EjabberdCtl): data["online_client_by_ipversion"] = self.get_online_client_by_ipversion() data["nodes"] = nodes - + + data["s2s_in"] = self.get_s2s_in() + data["s2s_out"] = self.get_s2s_out() return data -- cgit v1.2.3-18-g5258