s2s_in/out + muc

1 files changed, 5 insertions, 7 deletions

diff --git a/prometheus.py b/prometheus.py
index 8a053f1..2067f83 100755
--- a/prometheus.py
+++ b/prometheus.py
@@ -41,10 +41,14 @@ class Prometheus():
     def _get_metrics(self):
         output = ""
 
-        output += self._parse_metric("ejabberd_registered_total", self._metrics.get_registered())
+        output += self._parse_metric("ejabberd_node_s2s_in", self._metrics.get_s2s_in())
+        output += self._parse_metric("ejabberd_node_s2s_out", self._metrics.get_s2s_out())
 
         for host in self._metrics.get_vhosts():
             output += self._parse_metric("ejabberd_registered_vhosts", self._metrics.get_registered(host), {"vhost": host})
+            muc = self._metrics.get_muc(host)
+            if muc is not None:
+                output += self._parse_metric("ejabberd_muc", muc, {"vhost": host})
 
             for k, v in self._metrics.get_online_by_node(vhost=host).items():
                 output += self._parse_metric("ejabberd_online_vhost_node", v, {"vhost": host, "node": k})
@@ -59,12 +63,6 @@ class Prometheus():
                 for k, v in self._metrics.get_online_by_ipversion(node=node, vhost=host).items():
                     output += self._parse_metric("ejabberd_online_ipversion", v, {"vhost": host, "node": node, "ipversion": str(k)})
 
-        # next four lines should be dropped  - it should be calc by ejabberd_online_vhost_node
-        for k, v in self._metrics.get_online_by_node().items():
-                output += self._parse_metric("ejabberd_online_node_total", v, {"node": k})
-        for k, v in self._metrics.get_online_by_vhost().items():
-                output += self._parse_metric("ejabberd_online_vhost_total", v, {"vhost": k})
-
         return output