Ersetze "lokale" munin-plugins durch upstream varianten (#239)

upstream ist gespiegelt

Co-authored-by: Michael Grote <michael.grote@posteo.de>
Reviewed-on: mg/ansible#239
Co-authored-by: mg <michael.grote@posteo.de>
Co-committed-by: mg <michael.grote@posteo.de>

group_vars/acng.yml

@@ -23,16 +23,16 @@
   ### geerlingguy.munin-node
   munin_node_plugins:
     - name: chrony
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/chrony
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/chrony/chrony
     - name: systemd_status
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/systemd_status
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_status
     - name: lvm_
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/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/munin-plugins/raw/branch/master/extern/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

group_vars/all.yml

@@ -21,11 +21,11 @@
     - name: mt_system_hex
   munin_node_plugins:
     - name: chrony
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/chrony
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/chrony/chrony
     - name: systemd_status
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/systemd_status
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_status
     - name: lvm_
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/lvm_
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/disk/lvm_
       config: |
         [lvm_*]
         user root

group_vars/docker.yml

@@ -22,28 +22,28 @@
   ### geerlingguy.munin-node
   munin_node_plugins:
     - name: chrony
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/chrony
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/chrony/chrony
     - name: systemd_status
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/systemd_status
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_status
     - name: lvm_
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/lvm_
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/disk/lvm_
       config: |
         [lvm_*]
         user root
     - name: docker_containers
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/docker_
+      src: https://git.mgrote.net/mg/mirror-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/mg/munin-plugins/raw/branch/master/extern/docker_
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/docker/docker_
     - name: docker_memory
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/docker_
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/docker/docker_
     - name: docker_network
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/docker_
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/docker/docker_
     - name: docker_volumes
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/docker_
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/docker/docker_
     - name: fail2ban
       src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/fail2ban
       config: |

group_vars/fileserver.yml

@@ -1,4 +1,47 @@
 ---
+  ### oefenweb.ufw
+  ufw_rules:
+    - rule: allow
+      to_port: 22
+      protocol: tcp
+      comment: 'ssh'
+      from_ip: 0.0.0.0/0
+    - rule: allow
+      to_port: 445
+      comment: 'smb'
+      from_ip: 0.0.0.0/0
+    - rule: allow
+      to_port: 139
+      comment: 'smb'
+      from_ip: 0.0.0.0/0
+    - rule: allow
+      to_port: 4949
+      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
+  munin_node_plugins:
+    - name: chrony
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/chrony/chrony
+    - name: systemd_status
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_status
+    - name: samba
+      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/samba
+      config: |
+        [samba]
+        user root
+        group root
+        env.smbstatus /usr/bin/smbstatus
+        env.ignoreipcshare 1
   ### mgrote.smb_fileserver
   smb_users:
     - name: 'annemariedroessler2'
@@ -89,48 +132,3 @@
   smb_min_protocol: "SMB2"
   smb_client_min_protocol: "SMB2"
   smb_client_max_protocol: "SMB3_11"
-
-  ### oefenweb.ufw
-  ufw_rules:
-    - rule: allow
-      to_port: 22
-      protocol: tcp
-      comment: 'ssh'
-      from_ip: 0.0.0.0/0
-    - rule: allow
-      to_port: 445
-      comment: 'smb'
-      from_ip: 0.0.0.0/0
-    - rule: allow
-      to_port: 139
-      comment: 'smb'
-      from_ip: 0.0.0.0/0
-    - rule: allow
-      to_port: 4949
-      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
-  munin_node_plugins:
-    - name: chrony
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/chrony
-    - name: systemd_status
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/systemd_status
-    - name: samba
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/samba
-      config: |
-        [samba]
-        user root
-        group root
-        env.smbstatus /usr/bin/smbstatus
-        env.ignoreipcshare 1

group_vars/pihole.yml

@@ -33,11 +33,11 @@
   ### geerlingguy.munin-node
   munin_node_plugins:
     - name: chrony
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/chrony
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/chrony/chrony
     - name: systemd_status
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/systemd_status
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_status
     - name: lvm_
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/lvm_
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/disk/lvm_
       config: |
         [lvm_*]
         user root

group_vars/proxmox.yml

@@ -27,30 +27,30 @@
     - name: zfs_usage_hdd_data_raidz # liest falsch ein
   munin_node_plugins:
     - name: chrony
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/chrony
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/chrony/chrony
     - name: systemd_status
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/systemd_status
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_status
     - name: lvm_
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/lvm_
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/disk/lvm_
       config: |
         [lvm_*]
         user root
     - name: zfs_arcstats
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/zfs_arcstats
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/zfs/zfs_arcstats
     - name: zfsonlinux_stats_
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/zfsonlinux_stats_
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/zfs/zfsonlinux_stats_
     - name: zpool_iostat
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/zpool_iostat
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/zfs/zpool_iostat
     - name: zfs_list
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/zfs_list
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/zfs/zfs_list
     - name: zpool_capacity
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/zpool_capacity
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/zfs/zpool_capacity
     - name: kvm_mem
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/kvm_mem
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/libvirt/kvm_mem
     - name: kvm_net
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/kvm_net
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/libvirt/kvm_net
     - name: kvm_cpu
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/kvm_cpu
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/libvirt/kvm_cpu
     - name: zpool_fragmentation
       src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/zpool_fragmentation
     - name: proxmox_count
@@ -61,6 +61,8 @@
         group root
     - name: zfs_count
       src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/zfs_count
+    - name: ksm_
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/other/ksm_
     - name: fail2ban
       src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/fail2ban
       config: |

group_vars/tor.yml

@@ -32,7 +32,7 @@
   munin_node_allowed_cidrs: [0.0.0.0/0]
   munin_node_plugins:
     - name: chrony
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/chrony
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/chrony/chrony
     - name: fail2ban
       src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/fail2ban
       config: |
@@ -41,14 +41,14 @@
         env.config_dir /etc/fail2ban
         user root
     - name: systemd_status
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/systemd_status
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_status
     - name: lvm_
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/lvm_
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/disk/lvm_
       config: |
         [lvm_*]
         user root
     - name: tor_traffic
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/tor_
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/tor/tor_
       config: |
         [tor_*]
         user root
@@ -60,15 +60,15 @@
         env.torport {{ tor_control_port }}
         env.torsocket /var/run/tor/control
     - name: tor_bandwidth
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/tor_
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/tor/tor_
     - name: tor_connections
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/tor_
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/tor/tor_
     - name: tor_countries
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/tor_
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/tor/tor_
     - name: tor_dormant
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/tor_
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/tor/tor_
     - name: tor_routers
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/tor_
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/tor/tor_
   ### mgrote.ntp_chrony_server
   ntp_chrony_timezone: "Europe/Berlin"
   ntp_chrony_servers:

host_vars/docker2.grote.lan.yml

@@ -48,22 +48,22 @@
   ### mgrote.munin-node
   munin_node_plugins:
     - name: chrony
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/chrony
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/chrony/chrony
     - name: systemd_status
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/systemd_status
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_status
     - name: lvm_
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/lvm_
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/disk/lvm_
       config: |
         [lvm_*]
         user root
     - name: docker_containers
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/docker_
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/docker/docker_
       config: |
         [docker_*]
         user root
         env.DOCKER_HOST unix://run/docker.sock
     - name: nextcloud_mgrote.next-cloud.org
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/nextcloud_
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/nextcloud/nextcloud_
       config: |
         [nextcloud_mgrote.next-cloud.org]
         env.username munin
@@ -71,13 +71,13 @@
         env.api_path /ocs/v2.php/apps/serverinfo/api/v1/info
         env.scheme https
     - name: docker_cpu
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/docker_
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/docker/docker_
     - name: docker_memory
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/docker_
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/docker/docker_
     - name: docker_network
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/docker_
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/docker/docker_
     - name: docker_volumes
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/docker_
+      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/docker/docker_
     - name: mt_system_crs309
       src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/mikrotik/mt_system
       config: |

host_vars/fileserver2-test.grote.lan.yml

@@ -1,129 +0,0 @@
----
-  # Bind Mounts - fileserver
-  # wird ohne bind-mounts betrieben
-
-  ### mgrote.smb_fileserver
-  smb_users:
-    - name: 'annemariedroessler2'
-      password: "{{ lookup('keepass', 'fileserver_smb_user_amd', 'password') }}"
-    - name: 'restic'
-      password: "{{ lookup('keepass', 'fileserver_smb_user_restic', 'password') }}"
-    - name: 'win10'
-      password: "{{ lookup('keepass', 'fileserver_smb_user_win10', 'password') }}"
-    - name: 'kodi'
-      password: "{{ lookup('keepass', 'fileserver_smb_user_kodi', 'password') }}"
-    - name: 'michaelgrote'
-      password: "{{ lookup('keepass', 'fileserver_smb_user_mg', 'password') }}"
-    - name: 'navidrome'
-      password: "{{ lookup('keepass', 'fileserver_smb_user_navidrome', 'password') }}"
-    - name: 'docker'
-      password: "{{ lookup('keepass', 'fileserver_smb_user_docker', 'password') }}"
-    - name: 'pve'
-      password: "{{ lookup('keepass', 'fileserver_smb_user_pve', 'password') }}"
-    - name: 'brother_ads2700w'
-      password: "{{ lookup('keepass', 'fileserver_smb_user_brother_ads2700w', 'password') }}"
-    - name: 'photoprism'
-      password: "{{ lookup('keepass', 'fileserver_smb_user_photoprism', 'password') }}"
-
-  smb_shares:
-    - name: 'videos'
-      path: '/shares_videos'
-      users_ro: 'kodi'
-      users_rw: 'annemariedroessler2 michaelgrote win10'
-    - name: 'scans'
-      path: '/shares_scans'
-      users_ro: 'annemariedroessler2 michaelgrote'
-      users_rw: 'brother_ads2700w'
-    - name: 'papa_backup'
-      path: '/shares_papa_backup'
-      users_ro: 'michaelgrote'
-      users_rw: 'win10'
-    - name: 'amd'
-      path: '/shares_amd'
-      users_ro: 'michaelgrote win10'
-      users_rw: 'annemariedroessler2'
-    - name: 'backup'
-      path: '/shares_backup'
-      users_ro: 'annemariedroessler2'
-      users_rw: 'win10 michaelgrote'
-    - name: 'archiv'
-      path: '/shares_archiv'
-      users_ro: ''
-      users_rw: 'michaelgrote win10'
-    - name: 'hm'
-      path: '/shares_hm'
-      users_ro: 'win10'
-      users_rw: 'michaelgrote'
-    - name: 'mg'
-      path: '/shares_data_crypt'
-      users_ro: ''
-      users_rw: 'win10 michaelgrote'
-    - name: 'musik'
-      path: '/shares_music'
-      users_ro: 'navidrome kodi annemariedroessler2 '
-      users_rw: 'win10 michaelgrote'
-    - name: 'tmp'
-      path: '/shares_tmp'
-      users_ro: 'win10'
-      users_rw: 'kodi annemariedroessler2 win10 michaelgrote'
-    - name: 'bilder'
-      path: '/shares_bilder'
-      users_ro: 'photoprism'
-      users_rw: 'annemariedroessler2 michaelgrote win10'
-    - name: 'proxmox'
-      path: '/shares_pve_backup'
-      users_ro: 'michaelgrote'
-      users_rw: 'pve win10'
-    - name: 'restic'
-      path: '/shares_restic'
-      users_ro: ''
-      users_rw: 'annemariedroessler2 restic win10 michaelgrote'
-  smb_workgroup: WORKGROUP
-  smb_min_protocol: "SMB2"
-  smb_client_min_protocol: "SMB2"
-  smb_client_max_protocol: "SMB3_11"
-
-  ### oefenweb.ufw
-  ufw_rules:
-    - rule: allow
-      to_port: 22
-      protocol: tcp
-      comment: 'ssh'
-      from_ip: 0.0.0.0/0
-    - rule: allow
-      to_port: 445
-      comment: 'smb'
-      from_ip: 0.0.0.0/0
-    - rule: allow
-      to_port: 139
-      comment: 'smb'
-      from_ip: 0.0.0.0/0
-    - rule: allow
-      to_port: 4949
-      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
-  munin_node_plugins:
-    - name: chrony
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/chrony
-    - name: systemd_status
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/systemd_status
-    - name: samba
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/samba
-      config: |
-        [samba]
-        user root
-        group root
-        env.smbstatus /usr/bin/smbstatus
-        env.ignoreipcshare 1

roles/mgrote.munin-node/defaults/main.yml

@@ -21,7 +21,7 @@
   munin_plugin_conf_dest_path: /etc/munin/plugin-conf.d/
 #  munin_node_plugins: #plugins to install
 #    - name: docker_volumes # name
-#      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/docker_ #src
+#      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/docker/docker_ #src
 #      config_file_name: /etc/munin/plugin-conf.d/docker # where to put plugin config
       # content of config
 #      config: |