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:
parent
990d3abdc6
commit
d36dbe03c8
10
control.py
10
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"})
|
||||
|
|
|
@ -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
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue