From 4ceca3f87e0d60773fdb9395d4077c7310ca0423 Mon Sep 17 00:00:00 2001 From: Martin/Geno Date: Thu, 17 Oct 2019 09:13:00 +0200 Subject: s2s_in/out + muc --- prometheus.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'prometheus.py') 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 -- cgit v1.2.3-18-g5258