From 0192cc9dac403c53cfc78f0ebe3791644c7bb459 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Sat, 29 Apr 2017 17:17:08 +0000 Subject: [PATCH] and we have to let nrpe go out a different ip for a while --- roles/nagios/client/templates/nrpe.cfg.j2 | 6 ++--- roles/nagios_client/templates/nrpe.cfg.j2 | 8 ++++--- .../files/nagios/configs/minimal.cfg | 10 ++++----- .../files/nagios/services/file_age.cfg | 4 ++-- .../files/nagios/services/nrpe.cfg | 2 +- .../files/nagios/services/templates.cfg | 22 +++++++++---------- 6 files changed, 27 insertions(+), 25 deletions(-) diff --git a/roles/nagios/client/templates/nrpe.cfg.j2 b/roles/nagios/client/templates/nrpe.cfg.j2 index 3d7effbf4f..c3e1a9e760 100644 --- a/roles/nagios/client/templates/nrpe.cfg.j2 +++ b/roles/nagios/client/templates/nrpe.cfg.j2 @@ -23,7 +23,7 @@ log_facility=daemon # number. The file is only written if the NRPE daemon is started by the root # user and is running in standalone mode. -pid_file=/var/run/nrpe/nrpe.pid +pid_file=/var/run/nrpe.pid @@ -80,9 +80,9 @@ nrpe_group=nrpe {% if env == "staging" %} -allowed_hosts=10.5.126.2,10.5.126.41,10.5.126.241,192.168.1.10,192.168.1.20,209.132.181.35,192.168.1.166 +allowed_hosts=10.5.126.2,10.5.126.41,10.5.126.241,192.168.1.10,192.168.1.20,209.132.181.35,192.168.1.166,209.132.181.102 {% else %} -allowed_hosts=10.5.126.41,192.168.1.10,192.168.1.20,209.132.181.35,10.5.126.241,192.168.1.166 +allowed_hosts=10.5.126.41,192.168.1.10,192.168.1.20,209.132.181.35,10.5.126.241,192.168.1.166,209.132.181.102 {% endif %} diff --git a/roles/nagios_client/templates/nrpe.cfg.j2 b/roles/nagios_client/templates/nrpe.cfg.j2 index 29b16af5c9..c3e1a9e760 100644 --- a/roles/nagios_client/templates/nrpe.cfg.j2 +++ b/roles/nagios_client/templates/nrpe.cfg.j2 @@ -23,7 +23,7 @@ log_facility=daemon # number. The file is only written if the NRPE daemon is started by the root # user and is running in standalone mode. -pid_file=/var/run/nrpe/nrpe.pid +pid_file=/var/run/nrpe.pid @@ -78,11 +78,13 @@ nrpe_group=nrpe # # NOTE: This option is ignored if NRPE is running under either inetd or xinetd + {% if env == "staging" %} -allowed_hosts=10.5.126.2,10.5.126.41,10.5.126.241,192.168.1.10,192.168.1.20,209.132.181.35,192.168.1.166 +allowed_hosts=10.5.126.2,10.5.126.41,10.5.126.241,192.168.1.10,192.168.1.20,209.132.181.35,192.168.1.166,209.132.181.102 {% else %} -allowed_hosts=10.5.126.41,10.5.126.241,192.168.1.10,192.168.1.20,209.132.181.35,192.168.1.166 +allowed_hosts=10.5.126.41,192.168.1.10,192.168.1.20,209.132.181.35,10.5.126.241,192.168.1.166,209.132.181.102 {% endif %} + # COMMAND ARGUMENT PROCESSING diff --git a/roles/nagios_server/files/nagios/configs/minimal.cfg b/roles/nagios_server/files/nagios/configs/minimal.cfg index c41bec4d91..9bbb1a1fb0 100644 --- a/roles/nagios_server/files/nagios/configs/minimal.cfg +++ b/roles/nagios_server/files/nagios/configs/minimal.cfg @@ -264,7 +264,7 @@ define service{ is_volatile 0 check_period 24x7 max_check_attempts 4 - normal_check_interval 5 + check_interval 5 retry_check_interval 1 contact_groups admins notification_options w,u,c,r @@ -285,7 +285,7 @@ define service{ is_volatile 0 check_period 24x7 max_check_attempts 4 - normal_check_interval 5 + check_interval 5 retry_check_interval 1 contact_groups admins notification_options w,u,c,r @@ -307,7 +307,7 @@ define service{ is_volatile 0 check_period 24x7 max_check_attempts 4 - normal_check_interval 5 + check_interval 5 retry_check_interval 1 contact_groups admins notification_options w,u,c,r @@ -328,7 +328,7 @@ define service{ is_volatile 0 check_period 24x7 max_check_attempts 4 - normal_check_interval 5 + check_interval 5 retry_check_interval 1 contact_groups admins notification_options w,u,c,r @@ -348,7 +348,7 @@ define service{ is_volatile 0 check_period 24x7 max_check_attempts 4 - normal_check_interval 5 + check_interval 5 retry_check_interval 1 contact_groups admins notification_options w,u,c,r diff --git a/roles/nagios_server/files/nagios/services/file_age.cfg b/roles/nagios_server/files/nagios/services/file_age.cfg index 35a6ec2004..5de18e7be7 100644 --- a/roles/nagios_server/files/nagios/services/file_age.cfg +++ b/roles/nagios_server/files/nagios/services/file_age.cfg @@ -3,7 +3,7 @@ define service { service_description Check MirrorList Cache check_command check_by_nrpe!check_mirrorlist_cache use defaulttemplate - normal_check_interval 120 + check_interval 120 notification_interval 130 } @@ -12,7 +12,7 @@ define service { service_description Check Merged Log check_command check_by_nrpe!check_merged_file_age use defaulttemplate - normal_check_interval 120 + check_interval 120 notification_interval 130 event_handler restart_rsyslog } diff --git a/roles/nagios_server/files/nagios/services/nrpe.cfg b/roles/nagios_server/files/nagios/services/nrpe.cfg index 7aead22b53..0f516f81ba 100644 --- a/roles/nagios_server/files/nagios/services/nrpe.cfg +++ b/roles/nagios_server/files/nagios/services/nrpe.cfg @@ -3,6 +3,6 @@ define service { service_description nrpe check_command test_nrpe max_check_attempts 2 - normal_check_interval 2 + check_interval 2 use defaulttemplate } diff --git a/roles/nagios_server/files/nagios/services/templates.cfg b/roles/nagios_server/files/nagios/services/templates.cfg index 5538eaff1d..d6922a59cc 100644 --- a/roles/nagios_server/files/nagios/services/templates.cfg +++ b/roles/nagios_server/files/nagios/services/templates.cfg @@ -24,7 +24,7 @@ define service{ is_volatile 0 ; The service is not volatile check_period 24x7 ; The service can be checked at any time of the day max_check_attempts 3 ; Re-check the service up to 3 times in order to determine its final (hard) state - normal_check_interval 10 ; Check the service every 10 minutes under normal conditions + check_interval 10 ; Check the service every 10 minutes under normal conditions retry_check_interval 2 ; Re-check the service every two minutes until a hard state can be determined contact_groups admins ; Notifications get sent out to everyone in the 'admins' group notification_options w,u,c,r ; Send notifications about warning, unknown, critical, and recovery events @@ -40,7 +40,7 @@ define service{ name local-service ; The name of this service template use generic-service ; Inherit default values from the generic-service definition max_check_attempts 4 ; Re-check the service up to 4 times in order to determine its final (hard) state - normal_check_interval 5 ; Check the service every 5 minutes under normal conditions + check_interval 5 ; Check the service every 5 minutes under normal conditions retry_check_interval 1 ; Re-check the service every minute until a hard state can be determined register 0 ; DONT REGISTER THIS DEFINITION - ITS NOT A REAL SERVICE, JUST A TEMPLATE! } @@ -50,7 +50,7 @@ define service{ define service { name criticaltemplate max_check_attempts 4 - normal_check_interval 5 + check_interval 5 retry_check_interval 1 check_period 24x7 notification_interval 15 @@ -65,7 +65,7 @@ define service { define service { name defaulttemplate max_check_attempts 3 - normal_check_interval 10 + check_interval 10 retry_check_interval 1 check_period 24x7 notification_interval 15 @@ -79,7 +79,7 @@ define service { define service { name disktemplate max_check_attempts 3 - normal_check_interval 30 + check_interval 30 retry_check_interval 1 check_period 24x7 notification_interval 40 @@ -93,7 +93,7 @@ define service { define service { name builderdisktemplate max_check_attempts 12 - normal_check_interval 30 + check_interval 30 retry_check_interval 1 check_period 24x7 notification_interval 40 @@ -107,7 +107,7 @@ define service { define service { name lighttemplate max_check_attempts 3 - normal_check_interval 480 + check_interval 480 retry_check_interval 5 check_period 16x7 notification_interval 490 @@ -121,7 +121,7 @@ define service { define service { name websitetemplate max_check_attempts 3 - normal_check_interval 5 + check_interval 5 retry_check_interval 1 check_period 24x7 notification_interval 15 @@ -135,7 +135,7 @@ define service { define service { name internalwebsitetemplate max_check_attempts 3 - normal_check_interval 5 + check_interval 5 retry_check_interval 1 check_period 24x7 notification_interval 15 @@ -161,7 +161,7 @@ define service { define service { name ppc-secondarytemplate max_check_attempts 3 - normal_check_interval 10 + check_interval 10 retry_check_interval 1 check_period 24x7 notification_interval 15 @@ -175,7 +175,7 @@ define service { define service { name retracetemplate max_check_attempts 3 - normal_check_interval 10 + check_interval 10 retry_check_interval 1 check_period 24x7 notification_interval 15