Skip to content

Commit 9e79789

Browse files
committed
and cpuidle is only good on hardware as well
1 parent ce7d995 commit 9e79789

File tree

2 files changed

+25
-1
lines changed

2 files changed

+25
-1
lines changed

roles/monitoring/tasks/main.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,15 @@
215215
when: not (host_is_zfs | default(false))
216216
notify: restart munin-node
217217

218+
- name: remove custom munin monitoring plugins from munin-contrib, that don't take arguments, for non-virtual nor containers
219+
file:
220+
path: "/etc/munin/plugins/{{ item }}"
221+
state: absent
222+
become: true
223+
with_items: "{{ non_virtual_non_container_custom_munin_plugins }}"
224+
when: host_is_container | default(false) or host_is_virtual | default(false)
225+
notify: restart munin-node
226+
218227
- name: remove custom munin monitoring plugins from munin-contrib, that don't take arguments, for non-containers
219228
file:
220229
path: "/etc/munin/plugins/{{ item }}"
@@ -316,6 +325,19 @@
316325
with_items: "{{ custom_munin_plugins }}"
317326
notify: restart munin-node
318327

328+
- name: install custom munin monitoring plugins from munin-contrib, that don't take arguments, for non-virtual nor containers
329+
copy:
330+
src: "monitoring/munin/{{ item }}"
331+
dest: "/etc/munin/plugins/"
332+
owner: root
333+
group: root
334+
mode: 0755
335+
local_follow: true
336+
become: true
337+
with_items: "{{ non_virtual_non_container_custom_munin_plugins }}"
338+
when: not (host_is_container | default(false) or host_is_virtual | default(false) )
339+
notify: restart munin-node
340+
319341
- name: install custom munin monitoring plugins from munin-contrib, that don't take arguments, for non-containers
320342
copy:
321343
src: "monitoring/munin/{{ item }}"

roles/monitoring/vars/main.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,10 @@
7979
- { src: 'zfsonlinux_stats_l2efficiency', dest: 'zfsonlinux_stats_' }
8080

8181
# From munin git repos and copied across to the machine:
82-
non_container_custom_munin_plugins:
82+
non_virtual_non_container_custom_munin_plugins:
8383
- cpuidle # actually the stats of the host (although of course you might care to correlate performance problems against host resources)
84+
85+
non_container_custom_munin_plugins:
8486
- chrony_sourcestats # clock is locked to host
8587
- chrony_status
8688
- chrony

0 commit comments

Comments
 (0)