From 3fc57e699b9c524d5683fcc39231f7b1f425bbb9 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Sat, 20 Oct 2018 15:36:00 +0200 Subject: [PATCH] Enable nagios checks for ticketkey, and stop emailing puiterwijk Signed-off-by: Patrick Uiterwijk --- roles/batcave/files/ticketkey.cron | 2 +- roles/nagios_client/templates/check_proxies.cfg.j2 | 1 + roles/nagios_server/files/nagios/services/file_age.cfg | 9 +++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 roles/nagios_client/templates/check_proxies.cfg.j2 diff --git a/roles/batcave/files/ticketkey.cron b/roles/batcave/files/ticketkey.cron index 9041e24100..d8ce11acc4 100755 --- a/roles/batcave/files/ticketkey.cron +++ b/roles/batcave/files/ticketkey.cron @@ -4,4 +4,4 @@ source /root/sshagent >>/dev/null export ANSIBLE_HOST_KEY_CHECKING=False export HOME=/root/ #export ANSIBLE_SSH_PIPELINING=False -/usr/bin/ansible-playbook /srv/web/infra/ansible/playbooks/update_ticketkey.yml | mailx -s "TickeyKey rollover" puiterwijk@fedoraproject.org +/usr/bin/ansible-playbook /srv/web/infra/ansible/playbooks/update_ticketkey.yml >/dev/null 2>&1 diff --git a/roles/nagios_client/templates/check_proxies.cfg.j2 b/roles/nagios_client/templates/check_proxies.cfg.j2 new file mode 100644 index 0000000000..055f4d0cae --- /dev/null +++ b/roles/nagios_client/templates/check_proxies.cfg.j2 @@ -0,0 +1 @@ +command[check_ticketkey_age]={{ libdir }}/nagios/plugins/check_file_age -w 3600 -c 7200 -f /etc/httpd/ticketkey_{{env}}.tkey diff --git a/roles/nagios_server/files/nagios/services/file_age.cfg b/roles/nagios_server/files/nagios/services/file_age.cfg index c04ffa69f2..3a1a9fc2af 100644 --- a/roles/nagios_server/files/nagios/services/file_age.cfg +++ b/roles/nagios_server/files/nagios/services/file_age.cfg @@ -16,6 +16,15 @@ define service { notification_interval 130 } +define service { + hostgroup_name proxies + service_description Check TicketKey age + check_command check_by_nrpe!check_ticketkey_age + use defaulttemplate + check_interval 120 + notification_interval 130 +} + define service { host_name log01.phx2.fedoraproject.org service_description Check Merged Log