Try and make our nagios setup 32/64 bit happy. Add a bunch of things to arm-releng playbook.

This commit is contained in:
Kevin Fenzi 2013-08-23 21:50:25 +00:00
parent cf5aefa4fe
commit 1bbbd709bf
11 changed files with 26 additions and 16 deletions

View file

@ -6,15 +6,24 @@
tags:
- arm-releng
vars:
libdir: /usr/lib
vars_files:
- /srv/web/infra/ansible/vars/global.yml
- ${private}/vars.yml
roles:
- /srv/web/infra/ansible/roles/fas_client
- /srv/web/infra/ansible/roles/rkhunter
- /srv/web/infra/ansible/roles/denyhosts
- /srv/web/infra/ansible/roles/nagios_client
tasks:
# This task sets up /etc/hosts for us
# this is how you include other task lists
- include: $tasks/hosts.yml
# This task includes our common scripts
- include: $tasks/base.yml
- include: $tasks/2fa_client.yml
- include: $tasks/motd.yml
- include: $tasks/common_scripts.yml
- include: $tasks/koji/releng_config.yml

View file

@ -18,7 +18,7 @@
- packages
- name: install local nrpe check scripts that are not packaged
copy: src=scripts/$item dest=/usr/lib64/nagios/plugins/$item mode=0755 owner=nagios group=nagios
copy: src=scripts/$item dest={{ libdir }}/nagios/plugins/$item mode=0755 owner=nagios group=nagios
with_items:
- check_postfix_queue
- check_raid.py

View file

@ -1 +1 @@
command[check_cron]=/usr/lib64/nagios/plugins/check_procs -c 1:10 -C 'crond' -u root
command[check_cron]={{ libdir }}/nagios/plugins/check_procs -c 1:10 -C 'crond' -u root

View file

@ -1,2 +1,2 @@
command[check_disk_/]=/usr/lib64/nagios/plugins/check_disk -w 15% -c 10% -p /
command[check_disk_/boot]=/usr/lib64/nagios/plugins/check_disk -w 15% -c 10% -p /boot
command[check_disk_/]={{ libdir }}/nagios/plugins/check_disk -w 15% -c 10% -p /
command[check_disk_/boot]={{ libdir }}/nagios/plugins/check_disk -w 15% -c 10% -p /boot

View file

@ -1 +1 @@
command[check_lock]=/usr/lib64/nagios/plugins/check_lock
command[check_lock]={{ libdir }}/nagios/plugins/check_lock

View file

@ -1 +1 @@
command[check_mirrorlist_cache]=/usr/lib64/nagios/plugins/check_file_age -w 14400 -c 129600 -f /var/lib/mirrormanager/mirrorlist_cache.pkl
command[check_mirrorlist_cache]={{ libdir }}/nagios/plugins/check_file_age -w 14400 -c 129600 -f /var/lib/mirrormanager/mirrorlist_cache.pkl

View file

@ -1 +1 @@
command[check_postfix_queue]=/usr/lib64/nagios/plugins/check_postfix_queue -w 2 -c 5
command[check_postfix_queue]={{ libdir }}/nagios/plugins/check_postfix_queue -w 2 -c 5

View file

@ -1 +1 @@
command[check_raid]=/usr/lib64/nagios/plugins/check_raid.py
command[check_raid]={{ libdir }}/nagios/plugins/check_raid.py

View file

@ -1 +1 @@
command[check_swap]=/usr/lib64/nagios/plugins/check_swap -w 15% -c 10%
command[check_swap]={{ libdir }}/nagios/plugins/check_swap -w 15% -c 10%

View file

@ -198,11 +198,11 @@ include_dir=/etc/nrpe.d/
# The following examples use hardcoded command arguments...
command[check_users]=/usr/lib64/nagios/plugins/check_users -w 5 -c 10
command[check_load]=/usr/lib64/nagios/plugins/check_load -w 15,10,5 -c 30,25,20
command[check_hda1]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /dev/hda1
command[check_zombie_procs]=/usr/lib64/nagios/plugins/check_procs -w 5 -c 10 -s Z
command[check_total_procs]=/usr/lib64/nagios/plugins/check_procs -w {{ nrpe_procs_warn }} -c {{ nrpe_procs_crit }}
command[check_users]={{ libdir }}/nagios/plugins/check_users -w 5 -c 10
command[check_load]={{ libdir }}/nagios/plugins/check_load -w 15,10,5 -c 30,25,20
command[check_hda1]={{ libdir }}/nagios/plugins/check_disk -w 20% -c 10% -p /dev/hda1
command[check_zombie_procs]={{ libdir }}/nagios/plugins/check_procs -w 5 -c 10 -s Z
command[check_total_procs]={{ libdir }}/nagios/plugins/check_procs -w {{ nrpe_procs_warn }} -c {{ nrpe_procs_crit }}
# The following examples allow user-supplied arguments and can

View file

@ -10,6 +10,7 @@ tasks: /srv/web/infra/ansible/tasks
vars: /srv/web/infra/ansible/vars
is_fedora: "'$ansible_distribution' == 'Fedora'"
is_rhel: "'$ansible_distribution' == 'RedHat'"
libdir: /usr/lib64
dist_tag: unknown
auth_keys_from_fas: '/srv/web/infra/ansible/scripts/auth-keys-from-fas'
el6_qcow_id: ami-00000013