From 5c11472e9aefe49a604e3aee31353214f00065f8 Mon Sep 17 00:00:00 2001 From: Jeremy Dubois Date: Thu, 9 Jul 2020 15:44:25 +0200 Subject: [PATCH 1/3] Force replacement of some NRPE checks We cannot simply put "force: true" because some checks are customizable, some are not. We do not force to replace customizable ones for the customizations not to be lost. --- roles/nagios-nrpe/tasks/main.yml | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/roles/nagios-nrpe/tasks/main.yml b/roles/nagios-nrpe/tasks/main.yml index 2b4abd0..eb19793 100644 --- a/roles/nagios-nrpe/tasks/main.yml +++ b/roles/nagios-nrpe/tasks/main.yml @@ -32,23 +32,33 @@ - name: Nagios plugins are installed copy: - src: plugins_bsd/ - dest: /usr/local/libexec/nagios/plugins/ + src: plugins_bsd/{{ item.name }} + dest: /usr/local/libexec/nagios/plugins/{{ item.name }} owner: root group: wheel mode: "0755" + force: "{{ item.force }}" + with_items: + - { name: 'check_carp_if', force: true } + - { name: 'check_connections_state.sh', force: false } + - { name: 'check_ipsecctl.sh', force: false } + - { name: 'check_openbgpd', force: true } + - { name: 'check_openvpn', force: false } + - { name: 'check_openvpn.pl', force: true } + - { name: 'check_ospfd_simple', force: true } notify: restart nrpe - name: Nagios plugins are installed - template template: - src: plugins_bsd/{{ item }}.j2 - dest: /usr/local/libexec/nagios/plugins/{{ item }} + src: plugins_bsd/{{ item.name }}.j2 + dest: /usr/local/libexec/nagios/plugins/{{ item.name }} owner: root group: wheel mode: "0755" + force: "{{ item.force }}" with_items: - - 'check_pf_states' - - 'check_free_mem.sh' + - { name: 'check_pf_states', force: false } + - { name: 'check_free_mem.sh', force: true } notify: restart nrpe - name: Starting and enabling nrpe From c6e55ea4c05dabe5acea0782db7286099717a820 Mon Sep 17 00:00:00 2001 From: Jeremy Dubois Date: Thu, 9 Jul 2020 16:09:19 +0200 Subject: [PATCH 2/3] Correct yamllint : spaces inside braces --- roles/nagios-nrpe/tasks/main.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/roles/nagios-nrpe/tasks/main.yml b/roles/nagios-nrpe/tasks/main.yml index eb19793..355dc9f 100644 --- a/roles/nagios-nrpe/tasks/main.yml +++ b/roles/nagios-nrpe/tasks/main.yml @@ -39,13 +39,13 @@ mode: "0755" force: "{{ item.force }}" with_items: - - { name: 'check_carp_if', force: true } - - { name: 'check_connections_state.sh', force: false } - - { name: 'check_ipsecctl.sh', force: false } - - { name: 'check_openbgpd', force: true } - - { name: 'check_openvpn', force: false } - - { name: 'check_openvpn.pl', force: true } - - { name: 'check_ospfd_simple', force: true } + - {name: 'check_carp_if', force: true} + - {name: 'check_connections_state.sh', force: false} + - {name: 'check_ipsecctl.sh', force: false} + - {name: 'check_openbgpd', force: true} + - {name: 'check_openvpn', force: false} + - {name: 'check_openvpn.pl', force: true} + - {name: 'check_ospfd_simple', force: true} notify: restart nrpe - name: Nagios plugins are installed - template @@ -57,8 +57,8 @@ mode: "0755" force: "{{ item.force }}" with_items: - - { name: 'check_pf_states', force: false } - - { name: 'check_free_mem.sh', force: true } + - {name: 'check_pf_states', force: false} + - {name: 'check_free_mem.sh', force: true} notify: restart nrpe - name: Starting and enabling nrpe From cdc811b3deef401082b390e7c9cb02990ab5358d Mon Sep 17 00:00:00 2001 From: Jeremy Dubois Date: Tue, 28 Jul 2020 17:43:24 +0200 Subject: [PATCH 3/3] New NRPE check : check_packetfilter --- roles/nagios-nrpe/tasks/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/nagios-nrpe/tasks/main.yml b/roles/nagios-nrpe/tasks/main.yml index 355dc9f..72215d3 100644 --- a/roles/nagios-nrpe/tasks/main.yml +++ b/roles/nagios-nrpe/tasks/main.yml @@ -46,6 +46,7 @@ - {name: 'check_openvpn', force: false} - {name: 'check_openvpn.pl', force: true} - {name: 'check_ospfd_simple', force: true} + - {name: 'check_packetfilter', force: true} notify: restart nrpe - name: Nagios plugins are installed - template