From 869468642c56f7a890ab7b10a72762273d5a01f1 Mon Sep 17 00:00:00 2001 From: Philippe MILINK Date: Sun, 25 Feb 2024 15:15:43 +0100 Subject: [PATCH] Installe le plugin Munin django.py depuis zds-site Possible depuis que le module django_munin est inclus dans zds-site, commit 7a83d90fb34f14746c6604d9be1c42385bb2291a. --- roles/munin/files/plugins/django.py | 37 ----------------------------- roles/munin/tasks/main.yml | 12 +++------- 2 files changed, 3 insertions(+), 46 deletions(-) delete mode 100755 roles/munin/files/plugins/django.py diff --git a/roles/munin/files/plugins/django.py b/roles/munin/files/plugins/django.py deleted file mode 100755 index de05c59..0000000 --- a/roles/munin/files/plugins/django.py +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env python3 -import sys -import urllib.request -import os -import base64 - - -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.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().decode()) - # they can set the category in the config - if category != "": - print("graph_category " + category) -else: - request = urllib.request.Request(url) - if login != "" and password != "": - request.add_header("Authorization", "Basic %s" % base64string) - data = urllib.request.urlopen(request).readlines() - for line in data: - parts = line.decode().split(" ") - label = parts[0] - value = " ".join(parts[1:]) - print(label + ".value " + value) diff --git a/roles/munin/tasks/main.yml b/roles/munin/tasks/main.yml index 1176648..03a97be 100644 --- a/roles/munin/tasks/main.yml +++ b/roles/munin/tasks/main.yml @@ -75,9 +75,10 @@ dest: "{{ munin_available_plugins_dir }}/wget_page" mode: u=rwx,g=rx,o=rx -- name: copy django.py munin plugin # to be copied from zds-site tree when merged in it +- name: copy django.py munin plugin ansible.builtin.copy: - src: plugins/django.py + remote_src: true + src: "{{ appdir }}/django_munin/plugins/django.py" dest: "{{ munin_available_plugins_dir }}/django.py" mode: u=rwx,g=rx,o=rx @@ -131,10 +132,3 @@ regexp: '^env.mysqluser root' line: 'env.mysqluser root' when: env == "beta" - -- name: create table for django-munin # should be created with a Django migration, but it is missing... - community.mysql.mysql_query: - login_user: "{{ mysql.user }}" - login_password: "{{ mysql.password }}" - login_db: "{{ mysql.name }}" - query: "CREATE TABLE IF NOT EXISTS munin_test (id integer NOT NULL PRIMARY KEY AUTO_INCREMENT, name varchar(256) NOT NULL);"