Some minor improvements to default config files.

skaschimer · Mar 26, 2018 · d688e47 · d688e47
1 parent 2c3b38e
commit d688e47
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 13 deletions.
diff --git a/sample-config/template-object/commands.cfg.in b/sample-config/template-object/commands.cfg.in
@@ -82,7 +82,7 @@ define command{
 # 'check_local_load' command definition
 define command{
         command_name    check_local_load
-        command_line    $USER1$/check_load -w $ARG1$ -c $ARG2$
+        command_line    $USER1$/check_load -r -w $ARG1$ -c $ARG2$
         }
 
 

diff --git a/sample-config/template-object/contacts.cfg.in b/sample-config/template-object/contacts.cfg.in
@@ -30,7 +30,6 @@ define contact{
         contact_name                    nagiosadmin		; Short name of user
 	use				generic-contact		; Inherit default values from generic-contact template (defined above)
         alias                           Nagios Admin		; Full name of user
-
         email                           @nagios_user@@localhost	; <<***** CHANGE THIS TO YOUR EMAIL ADDRESS ******
         }
 

diff --git a/sample-config/template-object/localhost.cfg.in b/sample-config/template-object/localhost.cfg.in
@@ -125,7 +125,7 @@ define service{
         use                             local-service         ; Name of service template to use
         host_name                       localhost
         service_description             Swap Usage
-	check_command			check_local_swap!20!10
+	check_command			check_local_swap!20%!10%
         }
 
 

diff --git a/sample-config/template-object/printer.cfg.in b/sample-config/template-object/printer.cfg.in
@@ -67,8 +67,8 @@ define service{
 	host_name		hplj2605dn		; The name of the host the service is associated with
 	service_description	Printer Status		; The service description
 	check_command		check_hpjd!-C public	; The command used to monitor the service
-	check_interval	10	; Check the service every 10 minutes under normal conditions
-	retry_interval	1	; Re-check the service every minute until its final/hard state is determined
+	check_interval		10			; Check the service every 10 minutes under normal conditions
+	retry_interval		1			; Re-check the service every minute until its final/hard state is determined
 	}
 
 
@@ -79,6 +79,6 @@ define service{
 	host_name		hplj2605dn
 	service_description	PING
 	check_command		check_ping!3000.0,80%!5000.0,100%
-	check_interval	10
-	retry_interval	1
+	check_interval		10
+	retry_interval		1
         }
diff --git a/sample-config/template-object/switch.cfg.in b/sample-config/template-object/switch.cfg.in
@@ -64,8 +64,8 @@ define service{
 	host_name		linksys-srw224p	; The name of the host the service is associated with
 	service_description	PING		; The service description
 	check_command		check_ping!200.0,20%!600.0,60%	; The command used to monitor the service
-	check_interval	5		; Check the service every 5 minutes under normal conditions
-	retry_interval	1		; Re-check the service every minute until its final/hard state is determined
+	check_interval		5		; Check the service every 5 minutes under normal conditions
+	retry_interval		1		; Re-check the service every minute until its final/hard state is determined
 	}
 
 

diff --git a/sample-config/template-object/templates.cfg.in b/sample-config/template-object/templates.cfg.in
@@ -164,8 +164,8 @@ 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
-        check_interval           10			; Check the service every 10 minutes under normal conditions
-        retry_interval            2			; Re-check the service every two minutes until a hard state can be determined
+        check_interval           	10			; Check the service every 10 minutes under normal conditions
+        retry_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
         notification_interval           60			; Re-notify about service problems every hour
@@ -180,8 +180,8 @@ 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
-        check_interval           5			; Check the service every 5 minutes under normal conditions
-        retry_interval            1			; Re-check the service every minute until a hard state can be determined
+        check_interval           	5			; Check the service every 5 minutes under normal conditions
+        retry_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!
 	}