From c5daa06dde0c2240cdbc33c958cd526fb1889980 Mon Sep 17 00:00:00 2001 From: Lars Kruse Date: Mon, 22 Feb 2021 02:09:25 +0100 Subject: [PATCH] Plugin prosody_: interprete input as utf-8 Previously only ascii was accepted. See: https://github.com/munin-monitoring/contrib/pull/1040#issuecomment-780824064 Thanks, msebald! --- plugins/prosody/prosody_ | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/prosody/prosody_ b/plugins/prosody/prosody_ index 4a3fab53..ed5ec19f 100755 --- a/plugins/prosody/prosody_ +++ b/plugins/prosody/prosody_ @@ -58,13 +58,13 @@ def main(): telnet = telnetlib.Telnet(host, port) telnet.write(b"c2s:show_secure()\n") telnet_response = telnet.read_until(b"secure client connections", 5) - parsed_info = connection_count_re.findall(telnet_response.decode('ascii')) + parsed_info = connection_count_re.findall(telnet_response.decode()) secure_client_connections = int(parsed_info[0]) print("secure_client_connections.value %s" % secure_client_connections) telnet.write(b"c2s:show_insecure()\n") telnet_response = telnet.read_until(b"insecure client connections", 5) - parsed_info = connection_count_re.findall(telnet_response.decode('ascii')) + parsed_info = connection_count_re.findall(telnet_response.decode()) insecure_client_connections = int(parsed_info[0]) print("insecure_client_connections.value %s" % insecure_client_connections) all_client_connections = secure_client_connections + insecure_client_connections @@ -86,7 +86,7 @@ def main(): telnet = telnetlib.Telnet(host, port) telnet.write(b"s2s:show()\n") telnet_response = telnet.read_until(b"connections", 5) - parsed_info = server_connections_re.findall(telnet_response.decode('ascii')) + parsed_info = server_connections_re.findall(telnet_response.decode()) print("outgoing_connections.value %s" % (parsed_info[0][0])) print("incoming_connections.value %s" % (parsed_info[0][1])) telnet.write(b"quit\n") @@ -109,7 +109,7 @@ def main(): telnet = telnetlib.Telnet(host, port) telnet.write(b"c2s:show()\n") telnet_response = telnet.read_until(b"clients", 5) - parsed_info = client_presence_re.findall(telnet_response.decode('ascii')) + parsed_info = client_presence_re.findall(telnet_response.decode()) print("available.value %s" % parsed_info.count("available")) print("chat.value %s" % (parsed_info.count("chat"))) print("away.value %s" % (parsed_info.count("away"))) @@ -137,7 +137,7 @@ def main(): telnet = telnetlib.Telnet(host, port) telnet.write(b"server:uptime()\n") telnet_response = telnet.read_until(b"minutes (", 5) - parsed_info = uptime_re.findall(telnet_response.decode('ascii')) + parsed_info = uptime_re.findall(telnet_response.decode()) uptime_value = (float(parsed_info[0]) + float(parsed_info[1]) / 24 + float(parsed_info[2]) / 60 / 24) print("uptime.value %s" % (uptime_value))