diff --git a/group_vars/acng.yml b/group_vars/acng.yml index 72c87214..8d321fa6 100644 --- a/group_vars/acng.yml +++ b/group_vars/acng.yml @@ -35,21 +35,22 @@ acng_server_exthreshold: "60" #hebt Pakete 60 Tage auf acng_server_auth_user: acngadmin acng_server_auth_pass: "{{ lookup('keepass', 'acng_webinterface', 'password') }}" - ### geerlingguy.munin-node + ### mgrote.munin-node munin_node_plugins: - name: timesync src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/timesync_status - name: systemd_status src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_status + - name: systemd_mem + src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_mem + config: | + [systemd_mem] + env.all_services true - name: lvm_ src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/disk/lvm_ config: | [lvm_*] user root - - name: acng - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/apt/acng - config: | - env.logfile /var/log/apt-cacher-ng/apt-cacher.log - name: fail2ban src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/fail2ban config: | @@ -57,6 +58,10 @@ env.client /usr/bin/fail2ban-client env.config_dir /etc/fail2ban user root + - name: acng + src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/apt/acng + config: | + env.logfile /var/log/apt-cacher-ng/apt-cacher.log - name: http_response src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/http/http_response config: | diff --git a/group_vars/all.yml b/group_vars/all.yml index 853af775..18419a96 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -46,7 +46,7 @@ public_ssh_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCyqs0OE5RVqs6tIzyuGQWvq/OVDa/tfdSEqMIwcthFt+pwCCjpqtNc8L8FSXgphSwuNosFakqhMLDFD3pmII+t61NRExsoR3nGTDuCAQnTvTKXTEfhnunN3pwgXWVTI68j9pRzmSy+hMkSFbgN9EGMSXxGcNunY7ewS3ZkVe08SWFpiX9giYq6uiOiMHsZKdcP6s2QRXUhZlTx2cOc/9gJ5lD82EUXQRZzT6ww2xVrceIW9c3CZFmSmYWxvrR7dPcHrke90FPPd5WhU+Anz++6GsT6+OhZTk+uQnBHllFXn9NoFQIEUDO4zV+gFXITaAbTkLAcCwuKB2QcDZ6C2mhf ansible-generated on ansible-v2 allow_sudo: true allow_passwordless_sudo: true - ### geerlingguy.munin-node + ### mgrote.munin-node munin_node_bind_host: "0.0.0.0" munin_node_bind_port: "4949" munin_node_allowed_cidrs: [192.168.2.0/24] @@ -55,15 +55,16 @@ - name: hddtemp2 # ersetzt durch hddtemp_smartctl - name: ntp # verursacht zu viele dns ptr request - name: hddtempd # ersetzt durch hddtemp_smartctl - - name: ipmi_power # für pve2, leeres diagramm - - name: docker_images - - name: docker_status - - name: chrony munin_node_plugins: - name: timesync src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/timesync_status - name: systemd_status src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_status + - name: systemd_mem + src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_mem + config: | + [systemd_mem] + env.all_services true - name: lvm_ src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/disk/lvm_ config: | diff --git a/group_vars/dnsmasq.yml b/group_vars/dnsmasq.yml index 8fcaf644..e6ff869f 100644 --- a/group_vars/dnsmasq.yml +++ b/group_vars/dnsmasq.yml @@ -20,12 +20,17 @@ ### mgrote.apt_manage_sources # wird leer gesetzt da dnsmasq NICHT den Router befragt und daher keine Lokalen Hostnamen abfragen kann manage_sources_apt_proxy: "" - ### geerlingguy.munin-node + ### mgrote.munin-node munin_node_plugins: - name: timesync src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/timesync_status - name: systemd_status src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_status + - name: systemd_mem + src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_mem + config: | + [systemd_mem] + env.all_services true - name: lvm_ src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/disk/lvm_ config: | diff --git a/group_vars/docker.yml b/group_vars/docker.yml index 480c19e5..d4341108 100644 --- a/group_vars/docker.yml +++ b/group_vars/docker.yml @@ -52,24 +52,20 @@ - name: docker # für munin-plugin docker_ ### mgrote.docker-compose-deploy docker_compose_base_dir: /home/docker-user - ### geerlingguy.munin-node + ### mgrote.munin-node 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: ipmi_power # für pve2, leeres diagramm - - name: docker_images - - name: docker_status - - name: chrony munin_node_plugins: - name: timesync src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/timesync_status - name: systemd_status src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_status + - name: systemd_mem + src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_mem + config: | + [systemd_mem] + env.all_services true - name: lvm_ src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/disk/lvm_ config: | diff --git a/group_vars/dokuwiki.yml b/group_vars/dokuwiki.yml index 36b0f459..3c7f928c 100644 --- a/group_vars/dokuwiki.yml +++ b/group_vars/dokuwiki.yml @@ -16,12 +16,17 @@ protocol: tcp comment: 'munin' from_ip: 192.168.2.144/24 - ### geerlingguy.munin-node + ### mgrote.munin-node munin_node_plugins: - name: timesync src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/timesync_status - name: systemd_status src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_status + - name: systemd_mem + src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_mem + config: | + [systemd_mem] + env.all_services true - name: lvm_ src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/disk/lvm_ config: | diff --git a/group_vars/fileserver.yml b/group_vars/fileserver.yml index 1429943e..39c143d2 100644 --- a/group_vars/fileserver.yml +++ b/group_vars/fileserver.yml @@ -19,21 +19,24 @@ protocol: tcp comment: 'munin' from_ip: 192.168.2.144/24 - ### geerlingguy.munin-node - 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: ipmi_power # für pve2, leeres diagramm - - name: lvm_ - - name: samba_locked - - name: samba_users + ### mgrote.munin-node munin_node_plugins: - name: timesync src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/timesync_status - name: systemd_status src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_status + - name: systemd_mem + src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_mem + config: | + [systemd_mem] + env.all_services true + - name: fail2ban + src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/fail2ban + config: | + [fail2ban] + env.client /usr/bin/fail2ban-client + env.config_dir /etc/fail2ban + user root - name: samba src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/samba config: | diff --git a/group_vars/gitea.yml b/group_vars/gitea.yml index 70772f34..37cb8ba1 100644 --- a/group_vars/gitea.yml +++ b/group_vars/gitea.yml @@ -93,12 +93,17 @@ gitea_fail2ban_jail_maxretry: 3 gitea_fail2ban_jail_findtime: 300 gitea_fail2ban_jail_bantime: 600 - ### geerlingguy.munin-node + ### mgrote.munin-node munin_node_plugins: - name: timesync src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/timesync_status - name: systemd_status src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_status + - name: systemd_mem + src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_mem + config: | + [systemd_mem] + env.all_services true - name: lvm_ src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/disk/lvm_ config: | diff --git a/group_vars/proxmox.yml b/group_vars/proxmox.yml index e5e6948f..93fc6c44 100644 --- a/group_vars/proxmox.yml +++ b/group_vars/proxmox.yml @@ -30,35 +30,29 @@ apt_packages_extra: - ifupdown2 - bmon - ### geerlingguy.munin-node - 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: ipmi_power # für pve2, leeres diagramm - - name: squid_cache - - name: squid_objectsize - - name: squid_requests - - name: squid_traffic - - name: nfsd4 - - name: nfsd - - name: kvm_vm_count - - name: proxmox_lxc_count - - name: proxmox_vm_count - - name: zfs_usage_rpool # liest falsch ein - - name: zfs_usage_hdd_data_raidz # liest falsch ein - - name: zpool_fragmentation # ist in zfs* vorhanden + ### mgrote.munin-node munin_node_plugins: - name: timesync src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/timesync_status - name: systemd_status src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_status + - name: systemd_mem + src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_mem + config: | + [systemd_mem] + env.all_services true - name: lvm_ src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/disk/lvm_ config: | [lvm_*] user root + - name: fail2ban + src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/fail2ban + config: | + [fail2ban] + env.client /usr/bin/fail2ban-client + env.config_dir /etc/fail2ban + user root - name: zfs_arcstats src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/zfs/zfs_arcstats - name: zfsonlinux_stats_ @@ -93,13 +87,6 @@ src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/zfs/zfs_pool_dataset_count - name: ksm_ src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/system/kernel_same_page_merging - - name: fail2ban - src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/fail2ban - config: | - [fail2ban] - env.client /usr/bin/fail2ban-client - env.config_dir /etc/fail2ban - user root - name: apcupsd_ww src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/power/apcupsd_ww - name: apcupsd_pwr diff --git a/host_vars/docker7-test.grote.lan.yml b/host_vars/docker7-test.grote.lan.yml index 74659c04..19ad68f5 100644 --- a/host_vars/docker7-test.grote.lan.yml +++ b/host_vars/docker7-test.grote.lan.yml @@ -43,22 +43,18 @@ pip_package: python3-pip pip_install_packages: - name: docker # für munin-plugin docker_ - ### geerlingguy.munin-node + ### mgrote.munin-node munin_node_allowed_cidrs: [0.0.0.0/0] # weil der munin-server aus einem anderen subnet zugreift - 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: ipmi_power # für pve2, leeres diagramm - - name: docker_images - - name: docker_status - - name: chrony munin_node_plugins: - name: timesync src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/timesync_status - name: systemd_status src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_status + - name: systemd_mem + src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_mem + config: | + [systemd_mem] + env.all_services true - name: lvm_ src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/disk/lvm_ config: | diff --git a/host_vars/docker7.grote.lan.yml b/host_vars/docker7.grote.lan.yml index 3d9abd11..1b5777ce 100644 --- a/host_vars/docker7.grote.lan.yml +++ b/host_vars/docker7.grote.lan.yml @@ -108,23 +108,18 @@ - name: fritzconnection # für munin fritzbox* - name: lxml # für munin fritzbox* - name: requests # für munin fritzbox* - ### geerlingguy.munin-node + ### mgrote.munin-node munin_node_allowed_cidrs: [0.0.0.0/0] # weil der munin-server aus einem anderen subnet zugreift - 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: ipmi_power # für pve2, leeres diagramm - - name: docker_images - - name: docker_status - - name: chrony - - name: nextcloud_mgrote.next-cloud.org munin_node_plugins: - name: timesync src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/timesync_status - name: systemd_status src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_status + - name: systemd_mem + src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_mem + config: | + [systemd_mem] + env.all_services true - name: lvm_ src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/disk/lvm_ config: | diff --git a/host_vars/docker8.grote.lan.yml b/host_vars/docker8.grote.lan.yml index 631de95d..755ccf27 100644 --- a/host_vars/docker8.grote.lan.yml +++ b/host_vars/docker8.grote.lan.yml @@ -33,12 +33,17 @@ .Trash-* # https://github.com/restic/restic/issues/1005 # https://forum.restic.net/t/exclude-syntax-confusion/1531/12 - ### geerlingguy.munin-node + ### mgrote.munin-node munin_node_plugins: - name: timesync src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/timesync_status - name: systemd_status src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_status + - name: systemd_mem + src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_mem + config: | + [systemd_mem] + env.all_services true - name: lvm_ src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/disk/lvm_ config: |