Do a more complete job of removing stale plugins

After testing prior commit, found a few more things that are common
between container and host, etc, plus fixed a few bugs

Author: spacelama

roles/monitoring/tasks/main.yml

@@ -125,22 +125,23 @@
 - name: find possibly extraneous munin checks (hwmon wildcard)
   find:
     paths: /etc/munin/plugins
+    file_type: any
     patterns:
       - sensors_*
-    file_type: link
   register: munin_plugins_to_possibly_delete_hwmon
 
 - name: find disk devices
   find:
     paths: /dev
+    file_type: any
     patterns: [ sda, sdb, sdc, sdd, sde, sdf, sdg, sdh, sdi, sdj, sdk, sdl, sdm, sdn, sdo, sdp, nvme0n1, nvme0n2 ]
   register: disk_devices
 
 - name: find extraneous munin checks (ntp wildcards and list)
   find:
     paths: /etc/munin/plugins
+    file_type: any
     patterns: "{{ remove_munin_plugins }}"
-    file_type: link
   register: munin_plugins_to_delete
 
 - name: remove extraneous munin checks (ntp wildcards and list)
@@ -160,22 +161,22 @@
   notify: restart munin-node
   when: not hwmon0.stat.exists
 
-- name: remove extraneous munin plugins (virtual machines, containers)
+- name: remove extraneous munin plugins without params (pi or non virtual nor container; ie, physical machines including pi)
   file:
     path: "/etc/munin/plugins/{{ item }}"
     state: absent
   become: true
-  with_items: "{{ physical_machine_munin_plugins }}"
-  when: host_is_container | default(false) or host_is_virtual | default(false) or host_is_pi | default(false)
+  with_items: "{{ pi_or_non_virtual_nor_container_munin_plugins }}"
+  when: not (host_is_pi | default(false) or not ( host_is_container | default(false) or host_is_virtual | default(false) ) )
   notify: restart munin-node
 
-- name: remove monitoring plugins not used in containers
+- name: remove extraneous munin plugins without params (non virtual nor container nor pi; ie, physical machines but not including pi)
   file:
     path: "/etc/munin/plugins/{{ item }}"
     state: absent
   become: true
-  with_items: "{{ non_container_custom_munin_plugins_with_args }}"
-  when: host_is_container | default(false)
+  with_items: "{{ non_virtual_nor_container_nor_pi_munin_plugins }}"
+  when: host_is_container | default(false) or host_is_virtual | default(false) or host_is_pi | default(false)
   notify: restart munin-node
 
 - name: remove monitoring plugins not used in containers with params
@@ -223,9 +224,9 @@
   when: host_is_container | default(false)
   notify: restart munin-node
 
-- name: remove existing munin plugins without params
+- name: remove existing munin plugins without params (non containers)
   file:
-    path: "/etc/munin/plugins/{{ item.src }}"
+    path: "/etc/munin/plugins/{{ item }}"
     state: absent
   become: true
   with_items: "{{ non_container_munin_plugins }}"
@@ -337,7 +338,7 @@
   with_items: "{{ munin_plugins }}"
   notify: restart munin-node
 
-- name: existing munin plugins without params (non containers)
+- name: install existing munin plugins without params (non containers)
   file:
     src: "/usr/share/munin/plugins/{{ item }}"
     dest: "/etc/munin/plugins/{{ item }}"
@@ -347,13 +348,23 @@
   when: not (host_is_container | default(false))
   notify: restart munin-node
 
-- name: existing munin plugins without params (physical machines)
+- name: enable existing munin plugins without params (pi or non virtual nor container; ie, physical machines including pi)
+  file:
+    src: "/usr/share/munin/plugins/{{ item }}"
+    dest: "/etc/munin/plugins/{{ item }}"
+    state: link
+  become: true
+  with_items: "{{ pi_or_non_virtual_nor_container_munin_plugins }}"
+  when: host_is_pi | default(false) or not ( host_is_container | default(false) or host_is_virtual | default(false) )
+  notify: restart munin-node
+
+- name: enable existing munin plugins without params (non virtual nor container nor pi; ie, physical machines but not including pi)
   file:
     src: "/usr/share/munin/plugins/{{ item }}"
     dest: "/etc/munin/plugins/{{ item }}"
     state: link
   become: true
-  with_items: "{{ physical_machine_munin_plugins }}"
+  with_items: "{{ non_virtual_nor_container_nor_pi_munin_plugins }}"
   when: not ( host_is_container | default(false) or host_is_virtual | default(false) or host_is_pi | default(false) )
   notify: restart munin-node
 

roles/monitoring/vars/main.yml

@@ -11,14 +11,20 @@
     - squid_objectsize
     - squid_cache
     - squid_traffic
-    - "{{ (host_is_zfs | default(false) ) | ternary( omit, 'zfs*_*') }}"
-    - "{{ (host_is_container | default(false) ) | ternary( 'numa_*', omit ) }}"
-    - "{{ (host_is_container | default(false) ) | ternary( 'smart_*', omit ) }}"
-    - "{{ (host_is_container | default(false) ) | ternary( 'sensors_*', omit ) }}"
-    - "{{ (host_is_container | default(false) ) | ternary( 'nutups_*', omit ) }}"
-    - "{{ (host_is_dell | default(false) ) | ternary( omit, 'ipmi_' ) }}"
+    - ping_gamow
+    - ping_maxwell
+    - "{{ (host_is_zfs        | default(false) ) | ternary( omit, 'zfs*_*') }}"
+    - "{{ (host_is_container  | default(false) ) | ternary( 'numa_*', omit ) }}"
+    - "{{ (host_is_container  | default(false) ) | ternary( 'chrony_*', omit ) }}"
+    - "{{ (host_is_container  | default(false) ) | ternary( 'nvme_*', omit ) }}"
+    - "{{ (host_is_container  | default(false) ) | ternary( 'smart_*', omit ) }}"
+    - "{{ (host_is_container  | default(false) ) | ternary( 'sensors_*', omit ) }}"
+    - "{{ (host_is_container  | default(false) ) | ternary( 'nutups_*', omit ) }}"
+    - "{{ (host_is_dell       | default(false) ) | ternary( omit, 'ipmi_' ) }}"
+    - "{{ (host_is_pve_server | default(false) ) | ternary( omit, 'raid' ) }}"
 
-  # would love to just put our modified plugins that
+  # From munin git repos and copied across to the machine.
+  # Would love to just put our modified plugins that
   # are already in upstream, directly into
   # /etc/munin/plugins, but these are the ones that
   # take arguments, so they need to go somewhere!
@@ -30,7 +36,11 @@
     - nvme_
     - tasmota_
 
-  physical_machine_munin_plugins:
+  pi_or_non_virtual_nor_container_munin_plugins:
+    - cpuspeed
+
+  non_virtual_nor_container_nor_pi_munin_plugins:
+    - acpi
     - hddtemp_smartctl
 
   dell_ipmi_munin_plugins:
@@ -39,6 +49,7 @@
     - ipmi_fans
     - ipmi_volts
 
+  # From munin git repos and copied across to the machine:
   zfs_custom_munin_plugins:
     - zfs-demand
     - zfs-general
@@ -57,7 +68,7 @@
     - zpool_capacity
     - zpool_iostat
 
-  # we don't run suggests on zfsonlinux every time
+  # We don't run suggests on zfsonlinux every time
   zfs_munin_plugins_with_args:
     - { src: 'zfsonlinux_stats_efficiency', dest: 'zfsonlinux_stats_' }
     - { src: 'zfsonlinux_stats_cachehitlist', dest: 'zfsonlinux_stats_' }
@@ -67,18 +78,24 @@
     - { src: 'zfsonlinux_stats_l2utilization', dest: 'zfsonlinux_stats_' }
     - { src: 'zfsonlinux_stats_l2efficiency', dest: 'zfsonlinux_stats_' }
 
+  # From munin git repos and copied across to the machine:
   non_container_custom_munin_plugins:
-    - chrony_sourcestats
+    - cpuidle            # actually the stats of the host (although of course you might care to correlate performance problems against host resources)
+    - chrony_sourcestats # clock is locked to host
     - chrony_status
     - chrony
     - chrony_drift
     - ntp_thirdparty
-    - raid
 
-  non_container_munin_plugins: []
-    #FIXME: dunno here or all hosts: - iostat
-    #FIXME: dunno here or all hosts: - iostat_ios
-    #FIXME: dunno here or all hosts: - netstat
+  non_container_munin_plugins:
+    - diskstats
+    - interrupts
+    - irqstats
+    - load      # host
+    - processes # host
+    - swap # seems to be measuring host values
+    - iostat
+    - iostat_ios
 
   non_container_munin_plugins_with_args:
     - { src: 'ping_dirac', dest: 'ping_' }
@@ -96,15 +113,15 @@
     - nutups_
 #    - ipmi_  # wants to set all 4 on all hosts, so define them via a check on host_is_dell_server instead
 
+  # From munin git repos and copied across to the machine:
   custom_munin_plugins:
-    - cpuidle
     - fail2ban
     - fail2ban_all_jails
 
   munin_plugins:
     - df_abs
-    - iostat
-    - iostat_ios
+    - df
+    - df_inode
     - netstat
 
   munin_suggests:

roles/pve_server/files/munin/raid

@@ -0,0 +1 @@
+../../../../repos/munin-contrib/plugins/disk/raid

roles/pve_server/tasks/after_bootstrap.yml

@@ -219,6 +219,7 @@
    - ceph_capacity
 #   - ceph-osd-info  # lot of graphs and questionable value, even when overriding ceph-osd-info internally by specifying subgraphs=False
    - proxmox_vm_count
+   - raid
   notify: restart munin-node
 
 - name: install some extra ceph monitoring plugins