From 50bd9f65796244532c8e1f50e33203e2a0c98b5d Mon Sep 17 00:00:00 2001
From: Michael Grote <michael.grote@posteo.de>
Date: Mon, 12 Aug 2024 14:21:11 +0200
Subject: [PATCH] ff

---
 group_vars/munin.yml                        | 45 +++++++++++----------
 roles/mgrote_munin_server/defaults/main.yml | 18 ---------
 2 files changed, 24 insertions(+), 39 deletions(-)

diff --git a/group_vars/munin.yml b/group_vars/munin.yml
index c0ce1548..524bf98a 100644
--- a/group_vars/munin.yml
+++ b/group_vars/munin.yml
@@ -37,34 +37,37 @@ manage_lvm: true
 pvresize_to_max: true
 
 ### mgrote_munin_node
-munin_node_bind_host: "127.0.0.1" # testen
+munin_node_bind_host: "127.0.0.1"
 munin_node_bind_port: "4949"
-munin_node_allowed_cidrs: [127.0.0.1] # testen
-
-###  geerlingguy.munin-master
-munin_dbdir: /var/lib/munin
-munin_htmldir: /var/www/html
-munin_logdir: /var/log/munin
-munin_rundir: /var/run/munin
-munin_includedir: /etc/munin/conf.d
-
-munin_html_strategy: cron
-munin_graph_strategy: cron
-munin_max_processes: 12
-
-munin_cron_job: present
-
-munin_admin_user: munin
-munin_admin_password: "{{ lookup('viczem.keepass.keepass', 'munin_admin_pass', 'password') }}"
+munin_node_allowed_cidrs: [127.0.0.1]
 
+###  mgrote_munin_master
 munin_hosts:
-  - name: "munin.mgrote.net"
+  - name: "{{ ansible_fqdn }}"
     address: "127.0.0.1"
-    extra: ["use_node_name yes"]
+  - name: fileserver3.mgrote.net
+    address: fileserver3.mgrote.net
+  - name: ansible2.mgrote.net
+    address: ansible2.mgrote.net
+  - name: pve5.mgrote.net
+    address: pve5.mgrote.net
+  - name: forgejo.mgrote.net
+    address: forgejo.mgrote.net
+  - name: docker10.mgrote.net
+    address: docker10.mgrote.net
+  - name: pbs.mgrote.net
+    address: pbs.mgrote.net
+  - name: blocky.mgrote.net
+    address: blocky.mgrote.net
+  - name: ldap.mgrote.net
+    address: ldap.mgrote.net
+  - name: munin-container
+    address: localhost
+
 
 
 # notfications config
-
+# TODO
 # cgi?
 # rrdcache
 # rolle wieder aus image ausabuen
diff --git a/roles/mgrote_munin_server/defaults/main.yml b/roles/mgrote_munin_server/defaults/main.yml
index af72de30..100f6563 100644
--- a/roles/mgrote_munin_server/defaults/main.yml
+++ b/roles/mgrote_munin_server/defaults/main.yml
@@ -30,21 +30,3 @@ munin_dbdir: "/var/lib/munin"
 munin_hosts:
   - name: "{{ ansible_fqdn }}"
     address: "127.0.0.1"
-  - name: fileserver3.mgrote.net
-    address: fileserver3.mgrote.net
-  - name: ansible2.mgrote.net
-    address: ansible2.mgrote.net
-  - name: pve5.mgrote.net
-    address: pve5.mgrote.net
-  - name: forgejo.mgrote.net
-    address: forgejo.mgrote.net
-  - name: docker10.mgrote.net
-    address: docker10.mgrote.net
-  - name: pbs.mgrote.net
-    address: pbs.mgrote.net
-  - name: blocky.mgrote.net
-    address: blocky.mgrote.net
-  - name: ldap.mgrote.net
-    address: ldap.mgrote.net
-  - name: munin-container
-    address: localhost