From 0bffb12f3fc874f8bd294007a12ac4a9efbba046 Mon Sep 17 00:00:00 2001 From: Arnaud-D <35631001+Arnaud-D@users.noreply.github.com> Date: Sat, 24 Feb 2024 18:48:41 +0100 Subject: [PATCH] =?UTF-8?q?Modifie=20le=20plugin=20pour=20correspondre=20?= =?UTF-8?q?=C3=A0=20la=20version=20en=20prod?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- django_munin/plugins/django.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/django_munin/plugins/django.py b/django_munin/plugins/django.py index 50f8d3efae..3d73602c5f 100755 --- a/django_munin/plugins/django.py +++ b/django_munin/plugins/django.py @@ -1,20 +1,27 @@ +#!/usr/bin/env python3 import sys import urllib.request import os import base64 -url = os.environ["url"] -category = os.environ.get("graph_category", "") + +plugin_name = os.path.basename(__file__) +route = plugin_name[plugin_name.find("_") + 1 :] + +url_base = os.environ.get("url_base", "http://127.0.0.1") +category = os.environ.get("graph_category", plugin_name[: plugin_name.find("_")]) login = os.environ.get("login", "") password = os.environ.get("password", "") -base64string = base64.encodestring(f"{login}:{password}").replace("\n", "") +base64string = base64.b64encode(f"{login}:{password}".encode()) + +url = url_base + "/munin/" + route + "/" if len(sys.argv) == 2: url = url + "?" + sys.argv[1] + "=1" request = urllib.request.Request(url) if login != "" and password != "": request.add_header("Authorization", "Basic %s" % base64string) - print(urllib.request.urlopen(request).read()) + print(urllib.request.urlopen(request).read().decode()) # they can set the category in the config if category != "": print("graph_category " + category) @@ -24,7 +31,7 @@ request.add_header("Authorization", "Basic %s" % base64string) data = urllib.request.urlopen(request).readlines() for line in data: - parts = line.split(" ") + parts = line.decode().split(" ") label = parts[0] value = " ".join(parts[1:]) print(label + ".value " + value)