From 57d9288654e6247c5b18e52e267809d3e4c4dbaf Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Thu, 10 Oct 2024 21:28:07 +0200 Subject: [PATCH 1/5] dd --- group_vars/munin.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/group_vars/munin.yml b/group_vars/munin.yml index b07b9156..55b0e365 100644 --- a/group_vars/munin.yml +++ b/group_vars/munin.yml @@ -100,7 +100,14 @@ munin_node_plugins: env.ssh_user munin env.ssh_password {{ lookup('viczem.keepass.keepass', 'routeros-munin-user-password', 'password') }} env.ssh_host 192.168.3.144 - + - name: http_response + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/http/http_response + config: | + [http_response] + env.sites http://dokuwiki2.grote.lan https://wiki.mgrote.net/ + env.max_time 20 + env.short_label true + env.follow_redirect true ### mgrote.apt_manage_packages apt_packages_extra: - sshpass # für munin: mikrotik_system -- 2.43.0 From 850e82aa1b378e9373dea75cc5459b176b8866a5 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Thu, 10 Oct 2024 21:31:31 +0200 Subject: [PATCH 2/5] ff --- group_vars/munin.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/group_vars/munin.yml b/group_vars/munin.yml index 55b0e365..aa738d32 100644 --- a/group_vars/munin.yml +++ b/group_vars/munin.yml @@ -104,10 +104,11 @@ munin_node_plugins: src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/http/http_response config: | [http_response] - env.sites http://dokuwiki2.grote.lan https://wiki.mgrote.net/ + env.sites https://git.mgrote.net https://pve5.mgrote.net:8006 https://pbs.mgrote.net:8007 http://docker10.mgrote.net:8081 http://ldap.mgrote.net:17170 https://docker10.mgrote.net:8443 https://registry.mgrote.net/ui/ http://docker10.mgrote.net:3344 http://munin.mgrote.net http://192.168.5.1 http://192.168.3.1 http://192.168.3.108:8080 http://192.168.3.204 http://docker10.mgrote.net:6483 https://miniflux.mgrote.net/ https://nextcloud.mgrote.net https://audio.mgrote.net/mg http://wiki.mgrote.net env.max_time 20 env.short_label true env.follow_redirect true + ### mgrote.apt_manage_packages apt_packages_extra: - sshpass # für munin: mikrotik_system -- 2.43.0 From 110247a5980ff1d54fcdbc475f7254f669b4cdd3 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Thu, 10 Oct 2024 21:33:15 +0200 Subject: [PATCH 3/5] ff --- group_vars/munin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/group_vars/munin.yml b/group_vars/munin.yml index aa738d32..f6116b8b 100644 --- a/group_vars/munin.yml +++ b/group_vars/munin.yml @@ -7,7 +7,7 @@ ufw_rules: comment: 'ssh' from_ip: 0.0.0.0/0 - rule: allow - to_port: 80 #TODO passt? + to_port: 80 protocol: tcp comment: 'munin' -- 2.43.0 From d823acc67e3996bbec6063b7c40ad7d5a8867513 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Thu, 10 Oct 2024 21:33:47 +0200 Subject: [PATCH 4/5] ff --- group_vars/munin.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/group_vars/munin.yml b/group_vars/munin.yml index f6116b8b..e9bf5a14 100644 --- a/group_vars/munin.yml +++ b/group_vars/munin.yml @@ -100,14 +100,14 @@ munin_node_plugins: env.ssh_user munin env.ssh_password {{ lookup('viczem.keepass.keepass', 'routeros-munin-user-password', 'password') }} env.ssh_host 192.168.3.144 - - name: http_response - src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/http/http_response - config: | - [http_response] - env.sites https://git.mgrote.net https://pve5.mgrote.net:8006 https://pbs.mgrote.net:8007 http://docker10.mgrote.net:8081 http://ldap.mgrote.net:17170 https://docker10.mgrote.net:8443 https://registry.mgrote.net/ui/ http://docker10.mgrote.net:3344 http://munin.mgrote.net http://192.168.5.1 http://192.168.3.1 http://192.168.3.108:8080 http://192.168.3.204 http://docker10.mgrote.net:6483 https://miniflux.mgrote.net/ https://nextcloud.mgrote.net https://audio.mgrote.net/mg http://wiki.mgrote.net - env.max_time 20 - env.short_label true - env.follow_redirect true + - name: http_response + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/http/http_response + config: | + [http_response] + env.sites https://git.mgrote.net https://pve5.mgrote.net:8006 https://pbs.mgrote.net:8007 http://docker10.mgrote.net:8081 http://ldap.mgrote.net:17170 https://docker10.mgrote.net:8443 https://registry.mgrote.net/ui/ http://docker10.mgrote.net:3344 http://munin.mgrote.net http://192.168.5.1 http://192.168.3.1 http://192.168.3.108:8080 http://192.168.3.204 http://docker10.mgrote.net:6483 https://miniflux.mgrote.net/ https://nextcloud.mgrote.net https://audio.mgrote.net/mg http://wiki.mgrote.net + env.max_time 20 + env.short_label true + env.follow_redirect true ### mgrote.apt_manage_packages apt_packages_extra: -- 2.43.0 From 1deb0087cb9a0067ec5fa01f30a100a869d3055d Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Thu, 10 Oct 2024 21:37:28 +0200 Subject: [PATCH 5/5] dd --- group_vars/munin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/group_vars/munin.yml b/group_vars/munin.yml index e9bf5a14..0648cc1d 100644 --- a/group_vars/munin.yml +++ b/group_vars/munin.yml @@ -104,7 +104,7 @@ munin_node_plugins: src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/http/http_response config: | [http_response] - env.sites https://git.mgrote.net https://pve5.mgrote.net:8006 https://pbs.mgrote.net:8007 http://docker10.mgrote.net:8081 http://ldap.mgrote.net:17170 https://docker10.mgrote.net:8443 https://registry.mgrote.net/ui/ http://docker10.mgrote.net:3344 http://munin.mgrote.net http://192.168.5.1 http://192.168.3.1 http://192.168.3.108:8080 http://192.168.3.204 http://docker10.mgrote.net:6483 https://miniflux.mgrote.net/ https://nextcloud.mgrote.net https://audio.mgrote.net/mg http://wiki.mgrote.net + env.sites https://git.mgrote.net http://ldap.mgrote.net:17170 https://docker10.mgrote.net:8443 https://registry.mgrote.net/ui/ http://docker10.mgrote.net:3344 http://munin.mgrote.net http://192.168.5.1 http://192.168.3.1 http://192.168.3.108:8080 http://192.168.3.204 http://docker10.mgrote.net:6483 https://miniflux.mgrote.net/ https://nextcloud.mgrote.net https://audio.mgrote.net/mg http://wiki.mgrote.net env.max_time 20 env.short_label true env.follow_redirect true -- 2.43.0