From 30b0406e9ab149a16748357ee9afa99cfb9c1ec8 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Tue, 30 Jul 2024 23:22:10 +0200 Subject: [PATCH 01/10] dd --- group_vars/docker.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/group_vars/docker.yml b/group_vars/docker.yml index a871490f..22cb9f6d 100644 --- a/group_vars/docker.yml +++ b/group_vars/docker.yml @@ -121,6 +121,10 @@ munin_node_plugins: src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/docker/docker_volumesize - name: chrony src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/chrony/chrony + # test + - name: docker_multi + src: https://raw.githubusercontent.com/munin-monitoring/contrib/master/plugins/docker/docker_ + ### oefenweb.ufw ufw_rules: -- 2.43.0 From 4e1d53eba349a2ee30b22152f5f6b9e521f3e4dd Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Tue, 30 Jul 2024 23:23:41 +0200 Subject: [PATCH 02/10] ff --- group_vars/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/group_vars/docker.yml b/group_vars/docker.yml index 22cb9f6d..7081aace 100644 --- a/group_vars/docker.yml +++ b/group_vars/docker.yml @@ -117,7 +117,7 @@ munin_node_plugins: src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/docker/docker_ - name: docker_volumes src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/docker/docker_ - - name: docker_volumesize + - name: docker_volumesize2 src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/docker/docker_volumesize - name: chrony src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/chrony/chrony -- 2.43.0 From d449753cad74cff087b42191380b5b5b85ee96c5 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Tue, 30 Jul 2024 23:28:20 +0200 Subject: [PATCH 03/10] dd --- group_vars/docker.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/group_vars/docker.yml b/group_vars/docker.yml index 7081aace..29d76ddc 100644 --- a/group_vars/docker.yml +++ b/group_vars/docker.yml @@ -123,8 +123,7 @@ munin_node_plugins: src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/chrony/chrony # test - name: docker_multi - src: https://raw.githubusercontent.com/munin-monitoring/contrib/master/plugins/docker/docker_ - + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/docker/docker_ ### oefenweb.ufw ufw_rules: -- 2.43.0 From 61e8de457543c2e0e61e374a6aff5f2d0830e261 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Tue, 30 Jul 2024 23:32:41 +0200 Subject: [PATCH 04/10] ff --- group_vars/docker.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/group_vars/docker.yml b/group_vars/docker.yml index 29d76ddc..bc6a90f3 100644 --- a/group_vars/docker.yml +++ b/group_vars/docker.yml @@ -103,12 +103,6 @@ munin_node_plugins: env.client /usr/bin/fail2ban-client env.config_dir /etc/fail2ban user root - - name: docker_containers - src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/docker/docker_ - config: | - [docker_*] - user root - env.DOCKER_HOST unix://run/docker.sock - name: docker_cpu src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/docker/docker_ - name: docker_memory @@ -117,13 +111,17 @@ munin_node_plugins: src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/docker/docker_ - name: docker_volumes src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/docker/docker_ - - name: docker_volumesize2 + - name: docker_volumesize src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/docker/docker_volumesize - name: chrony src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/chrony/chrony - # test - name: docker_multi src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/docker/docker_ + config: | + [docker_*] + group docker + env.DOCKER_HOST unix://run/docker.sock + env.EXCLUDE_CONTAINER_NAME wp_ ### oefenweb.ufw ufw_rules: -- 2.43.0 From 77370b74dc6b43f83fe7603379b0e9cfe3fcc2c1 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Tue, 30 Jul 2024 23:39:57 +0200 Subject: [PATCH 05/10] ff --- group_vars/all.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/group_vars/all.yml b/group_vars/all.yml index ada59d7d..3cac30fd 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -212,6 +212,8 @@ munin_node_disabled_plugins: - name: squid_requests # proxmox - name: squid_traffic # proxmox - name: timesync + - name: docker_volumesize2 + - name: docker_containers munin_node_plugins: - name: chrony src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/chrony/chrony -- 2.43.0 From 02ec7802fa41b5a9fd3e12f0befb9e0bcd692ed3 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Tue, 30 Jul 2024 23:43:02 +0200 Subject: [PATCH 06/10] ff --- group_vars/all.yml | 4 ++++ group_vars/docker.yml | 12 ++---------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/group_vars/all.yml b/group_vars/all.yml index 3cac30fd..cb89ce90 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -214,6 +214,10 @@ munin_node_disabled_plugins: - name: timesync - name: docker_volumesize2 - name: docker_containers + - name: docker_cpu + - name: docker_volumes + - name: docker_memory + - name: docker_network munin_node_plugins: - name: chrony src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/chrony/chrony diff --git a/group_vars/docker.yml b/group_vars/docker.yml index bc6a90f3..176bbea0 100644 --- a/group_vars/docker.yml +++ b/group_vars/docker.yml @@ -103,16 +103,6 @@ munin_node_plugins: env.client /usr/bin/fail2ban-client env.config_dir /etc/fail2ban user root - - name: docker_cpu - src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/docker/docker_ - - name: docker_memory - src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/docker/docker_ - - name: docker_network - src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/docker/docker_ - - name: docker_volumes - src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/docker/docker_ - - name: docker_volumesize - src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/docker/docker_volumesize - name: chrony src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/chrony/chrony - name: docker_multi @@ -122,6 +112,8 @@ munin_node_plugins: group docker env.DOCKER_HOST unix://run/docker.sock env.EXCLUDE_CONTAINER_NAME wp_ + - name: docker_volumesize + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/docker/docker_volumesize ### oefenweb.ufw ufw_rules: -- 2.43.0 From e8f9525c6af7079c85e0f4d867a7c724da2f1013 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Tue, 30 Jul 2024 23:44:04 +0200 Subject: [PATCH 07/10] ff --- group_vars/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/group_vars/docker.yml b/group_vars/docker.yml index 176bbea0..fa6d7a81 100644 --- a/group_vars/docker.yml +++ b/group_vars/docker.yml @@ -111,7 +111,7 @@ munin_node_plugins: [docker_*] group docker env.DOCKER_HOST unix://run/docker.sock - env.EXCLUDE_CONTAINER_NAME wp_ + env.EXCLUDE_CONTAINER_NAME wp - name: docker_volumesize src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/docker/docker_volumesize -- 2.43.0 From 48e5cc5b75c1df85e4f0360f092a4b2b35958b85 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Tue, 30 Jul 2024 23:47:07 +0200 Subject: [PATCH 08/10] ff --- group_vars/all.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/group_vars/all.yml b/group_vars/all.yml index cb89ce90..0b25b2a8 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -203,21 +203,21 @@ munin_node_bind_host: "0.0.0.0" munin_node_bind_port: "4949" munin_node_allowed_cidrs: [192.168.2.0/24] munin_node_disabled_plugins: - - name: meminfo # zu hohe last - - name: hddtemp2 # ersetzt durch hddtemp_smartctl - - name: ntp # verursacht zu viele dns ptr request - - name: hddtempd # ersetzt durch hddtemp_smartctl - - name: squid_cache # proxmox - - name: squid_objectsize # proxmox - - name: squid_requests # proxmox - - name: squid_traffic # proxmox - - name: timesync - - name: docker_volumesize2 - - name: docker_containers - - name: docker_cpu - - name: docker_volumes - - name: docker_memory - - name: docker_network + - meminfo # zu hohe last + - hddtemp2 # ersetzt durch hddtemp_smartctl + - ntp # verursacht zu viele dns ptr request + - hddtempd # ersetzt durch hddtemp_smartctl + - squid_cache # proxmox + - squid_objectsize # proxmox + - squid_requests # proxmox + - squid_traffic # proxmox + - timesync + - docker_volumesize2 + - docker_containers + - docker_cpu + - docker_volumes + - docker_memory + - docker_network munin_node_plugins: - name: chrony src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/chrony/chrony -- 2.43.0 From ff9890d78953835dcd5684bcc7def1b32e9264df Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Wed, 31 Jul 2024 00:03:18 +0200 Subject: [PATCH 09/10] dd --- docker-compose/munin/docker-compose.yml.j2 | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose/munin/docker-compose.yml.j2 b/docker-compose/munin/docker-compose.yml.j2 index a0899ccb..ea701c72 100644 --- a/docker-compose/munin/docker-compose.yml.j2 +++ b/docker-compose/munin/docker-compose.yml.j2 @@ -24,6 +24,7 @@ services: pbs.mgrote.net:pbs.mgrote.net blocky.mgrote.net:blocky.mgrote.net ldap.mgrote.net:ldap.mgrote.net + munin-container:127.0.0.1 # z.B. # computer-test.mgrote.net.test:192.68.2.4 # computer.mgrote.net:computer.mgrote.net -- 2.43.0 From c20221f1be6eb10443ed82c8420d4a3db7082af7 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Wed, 31 Jul 2024 00:09:52 +0200 Subject: [PATCH 10/10] ff --- docker-compose/munin/docker-compose.yml.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose/munin/docker-compose.yml.j2 b/docker-compose/munin/docker-compose.yml.j2 index ea701c72..2f2b5d90 100644 --- a/docker-compose/munin/docker-compose.yml.j2 +++ b/docker-compose/munin/docker-compose.yml.j2 @@ -24,9 +24,9 @@ services: pbs.mgrote.net:pbs.mgrote.net blocky.mgrote.net:blocky.mgrote.net ldap.mgrote.net:ldap.mgrote.net - munin-container:127.0.0.1 + munin-container:localhost # z.B. - # computer-test.mgrote.net.test:192.68.2.4 + # computer-test.mgrote.net:192.68.2.4 # computer.mgrote.net:computer.mgrote.net volumes: - db:/var/lib/munin -- 2.43.0