diff --git a/roles/base/tasks/packages.yml b/roles/base/tasks/packages.yml index d205e19..695ffe1 100644 --- a/roles/base/tasks/packages.yml +++ b/roles/base/tasks/packages.yml @@ -9,9 +9,7 @@ - name: Install packages (vim rsync mtr etc) openbsd_pkg: - name: "{{ item }}" - state: present - with_items: + name: - wget - vim--no_x11 - rsync-- diff --git a/roles/nagios-nrpe/tasks/main.yml b/roles/nagios-nrpe/tasks/main.yml index ec97d0a..270de2f 100644 --- a/roles/nagios-nrpe/tasks/main.yml +++ b/roles/nagios-nrpe/tasks/main.yml @@ -1,17 +1,15 @@ --- - name: Install nrpe openbsd_pkg: - name: "{{ item }}" + name: + - nrpe-- state: present - with_items: - - nrpe-- - name: Install monitoring-plugins openbsd_pkg: - name: "{{ item }}" + name: + - monitoring-plugins state: present - with_items: - - monitoring-plugins - name: Create nrpe.d dir file: diff --git a/roles/nagios-nrpe/templates/plugins_bsd/check_free_mem.sh.j2 b/roles/nagios-nrpe/templates/plugins_bsd/check_free_mem.sh.j2 index ab5f7e2..ee47ad5 100755 --- a/roles/nagios-nrpe/templates/plugins_bsd/check_free_mem.sh.j2 +++ b/roles/nagios-nrpe/templates/plugins_bsd/check_free_mem.sh.j2 @@ -64,7 +64,7 @@ __EOT # Total memory size (in MB) tot_mem=$(( `/sbin/sysctl -n hw.physmem` / BYTES_IN_MB)) # Free memory size (in MB) -{% if ansible_distribution_version | version_compare("6.2",'<') %} +{% if ansible_distribution_version is version_compare("6.2",'<') %} free_mem=$(( `/usr/bin/vmstat | /usr/bin/tail -1 | /usr/bin/awk '{ print $5 }'` / KB_IN_MB )) {% else %} free_mem=$(/usr/bin/vmstat | /usr/bin/tail -1 | /usr/bin/awk '{ print $4 }' | tr -d 'M')