Merge pull request #90 from opinkerfi/config_update_http

http template: Update

Author: gardart

usr/share/okconfig/templates/http/commands.cfg

@@ -1,18 +1,15 @@
 
 define command {
 	command_name     okc-check_http
-        command_line     $USER1$/check_http -I "$HOSTADDRESS$" -H "$_SERVICE_VIRTUAL_HOST$" -p "$_SERVICE_PORT$" -u "$_SERVICE_URI$" -s "$_SERVICE_SEARCH_STRING$" -w "$_SERVICE_RESPONSE_WARNING$" -c "$_SERVICE_RESPONSE_CRITICAL$" -f "$_SERVICE_ON_REDIRECT$"
+        command_line     $USER1$/check_http -I "$HOSTADDRESS$" -H "$_SERVICE_VIRTUAL_HOST$" -p "$_SERVICE_PORT$" -u "$_SERVICE_URI$" -s "$_SERVICE_SEARCH_STRING$" -w "$_SERVICE_RESPONSE_WARNING$" -c "$_SERVICE_RESPONSE_CRITICAL$" -f "$_SERVICE_ON_REDIRECT$" $_SERVICE_EXTRAOPTIONS$
 }
 
 define command {
 	command_name     okc-check_https
-        command_line     $USER1$/check_http -I "$HOSTADDRESS$" -H "$_SERVICE_VIRTUAL_HOST$" -p "$_SERVICE_PORT$" --ssl -u "$_SERVICE_URI$" -s "$_SERVICE_SEARCH_STRING$" -w "$_SERVICE_RESPONSE_WARNING$" -c "$_SERVICE_RESPONSE_CRITICAL$" -f "$_SERVICE_ON_REDIRECT$"
+        command_line     $USER1$/check_http -I "$HOSTADDRESS$" -H "$_SERVICE_VIRTUAL_HOST$" -p "$_SERVICE_PORT$" --ssl -u "$_SERVICE_URI$" -s "$_SERVICE_SEARCH_STRING$" -w "$_SERVICE_RESPONSE_WARNING$" -c "$_SERVICE_RESPONSE_CRITICAL$" -f "$_SERVICE_ON_REDIRECT$" $_SERVICE_EXTRAOPTIONS$
 }
 
 define command {
 	command_name     okc-check_https_certificate
-        command_line     $USER1$/check_http -I "$HOSTADDRESS$"  -p "$_SERVICE_PORT$" --ssl -C "$_SERVICE_CERTIFICATE_AGE_WARNING$" 
+        command_line     $USER1$/check_http -I "$HOSTADDRESS$"  -p "$_SERVICE_PORT$" --ssl -C "$_SERVICE_CERTIFICATE_AGE_WARNING$,$_SERVICE_CERTIFICATE_AGE_CRITICAL$" $_SERVICE_EXTRAOPTIONS$
 }
-
-
-

usr/share/okconfig/templates/http/services.cfg

@@ -1,3 +1,6 @@
+#
+# Okconfig template for http service checks
+#
 
 define service {
 	service_description	http check
@@ -11,14 +14,13 @@ define service {
 	__RESPONSE_CRITICAL	10
 	__VIRTUAL_HOST          localhost
 	__PORT                  80
-        __ON_REDIRECT           follow
+  __ON_REDIRECT           follow
+  __EXTRAOPTIONS
 
 	register		0
 
 }
 
-
-
 define service {
 	service_description	HTTPS HOSTNAME
 	check_command		okc-check_https
@@ -31,13 +33,12 @@ define service {
 	__RESPONSE_CRITICAL	10
 	__VIRTUAL_HOST		localhost
 	__PORT			443
-        __ON_REDIRECT           follow
+  __ON_REDIRECT           follow
+  __EXTRAOPTIONS
 
 	register		0
 }
 
-
-# Edited by PyNag on Fri Jun 28 14:11:33 2013
 define service {
 	service_description	HTTPS SSL Certificate
 	check_command		okc-check_https_certificate
@@ -47,11 +48,10 @@ define service {
 	__CERTIFICATE_AGE_WARNING	21
 	__CERTIFICATE_AGE_CRITICAL	2
 	__PORT				443
+  __EXTRAOPTIONS
 
 	register		0
 
 	notes			Check a remote https server and alert if https certificate is not valid or about to expire.
 	notes_url		http://github.com/opinkerfi/okconfig/wiki
 }
-
-