sum7
/
ejabberd-tools
2
1
Fork 0
Code Issues 1 Pull Requests 1 Projects 1 Releases Wiki Activity

Revert "add more global values" 

This reverts commit 990d3abdc6.

my mistake, I hadn't checked if I am on the correct branch
This commit is contained in:
nico 2020-06-17 13:29:34 +02:00
parent 990d3abdc6
commit d36dbe03c8
Signed by: mightyBroccoli
GPG Key ID: EA7C31AAB1BDC1A2
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
control.py
View File

@ -73,16 +73,6 @@ class EjabberdCtl(EjabberdApi):
return result return result
return result["s2s_outgoing"] 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): def fetch_registered_count(self, vhost=None):
if vhost is None: if vhost is None:
result = self.cmd("stats", {"name":"registeredusers"}) result = self.cmd("stats", {"name":"registeredusers"})

6
metrics.py
View File

@ -210,10 +210,6 @@ class EjabberdMetrics(EjabberdCtl):
data = { data = {
"registered": self.get_registered(), "registered": self.get_registered(),
"muc": self.get_muc(), "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_status": self.get_online_by_status(),
"online_by_client": self.get_online_by_client(), "online_by_client": self.get_online_by_client(),
"online_by_ipversion": self.get_online_by_ipversion(), "online_by_ipversion": self.get_online_by_ipversion(),
@ -234,6 +230,8 @@ class EjabberdMetrics(EjabberdCtl):
data["online_client_by_ipversion"] = self.get_online_client_by_ipversion() data["online_client_by_ipversion"] = self.get_online_client_by_ipversion()
data["nodes"] = nodes data["nodes"] = nodes
data["s2s_in"] = self.get_s2s_in()
data["s2s_out"] = self.get_s2s_out()
return data return data