From 51369107eefffca0c50784b2ad2b51bf56c53512 Mon Sep 17 00:00:00 2001 From: varac Date: Sun, 27 Jan 2013 14:42:04 +0100 Subject: site_nagios: add hosts + services --- .../modules/site_nagios/manifests/add_service.pp | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 puppet/modules/site_nagios/manifests/add_service.pp (limited to 'puppet/modules/site_nagios/manifests/add_service.pp') diff --git a/puppet/modules/site_nagios/manifests/add_service.pp b/puppet/modules/site_nagios/manifests/add_service.pp new file mode 100644 index 00000000..5a5b344f --- /dev/null +++ b/puppet/modules/site_nagios/manifests/add_service.pp @@ -0,0 +1,22 @@ +define site_nagios::add_service ($host, $ip, $service) { + + notice ('$name $host $ip $service') + + case $service { + 'openvpn': { + $check_command = 'check_openvpn!...' + $service_description = 'Openvpn' + } + 'webapp': { + $check_command = 'check_http!...' + $service_description = 'Website' + } + default: { fail ('unknown service') } + } + + nagios_service { $name: + use => 'generic-service', + check_command => $check_command, + service_description => $service_description, + host_name => $host } +} -- cgit v1.2.3 From ab0792667b57bb034fe23ae24064fad56f3c8163 Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 28 Jan 2013 15:03:10 +0100 Subject: adapted new hiera config, see #1546 --- .../modules/site_nagios/manifests/add_service.pp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'puppet/modules/site_nagios/manifests/add_service.pp') diff --git a/puppet/modules/site_nagios/manifests/add_service.pp b/puppet/modules/site_nagios/manifests/add_service.pp index 5a5b344f..1a69e068 100644 --- a/puppet/modules/site_nagios/manifests/add_service.pp +++ b/puppet/modules/site_nagios/manifests/add_service.pp @@ -1,22 +1,22 @@ -define site_nagios::add_service ($host, $ip, $service) { - - notice ('$name $host $ip $service') +define site_nagios::add_service ($hostname, $ip_address, $service) { case $service { 'openvpn': { - $check_command = 'check_openvpn!...' + $check_command = 'check_openvpn' $service_description = 'Openvpn' } 'webapp': { - $check_command = 'check_http!...' + $check_command = 'check_http' $service_description = 'Website' } - default: { fail ('unknown service') } + default: { notice ("No Nagios service check for service \"$service\"") } } - nagios_service { $name: - use => 'generic-service', - check_command => $check_command, - service_description => $service_description, - host_name => $host } + if ( $check_command != '' ) { + nagios_service { $name: + use => 'generic-service', + check_command => $check_command, + service_description => $service_description, + host_name => $hostname } + } } -- cgit v1.2.3 From f8e3cf9aa8362c5ec36d3b0d33477898a2fd5c0c Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 28 Jan 2013 16:14:26 +0100 Subject: deploy openvpn check --- puppet/modules/site_nagios/manifests/add_service.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'puppet/modules/site_nagios/manifests/add_service.pp') diff --git a/puppet/modules/site_nagios/manifests/add_service.pp b/puppet/modules/site_nagios/manifests/add_service.pp index 1a69e068..a1f99cc9 100644 --- a/puppet/modules/site_nagios/manifests/add_service.pp +++ b/puppet/modules/site_nagios/manifests/add_service.pp @@ -2,7 +2,7 @@ define site_nagios::add_service ($hostname, $ip_address, $service) { case $service { 'openvpn': { - $check_command = 'check_openvpn' + $check_command = "check_openvpn_server_ip_port!$ip_address!1194" $service_description = 'Openvpn' } 'webapp': { -- cgit v1.2.3 From 8164205e06ecd9e1c68b788425cb4f71129b1061 Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 28 Jan 2013 16:15:33 +0100 Subject: don't deploy openvpn check until we fix #1546 --- puppet/modules/site_nagios/manifests/add_service.pp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'puppet/modules/site_nagios/manifests/add_service.pp') diff --git a/puppet/modules/site_nagios/manifests/add_service.pp b/puppet/modules/site_nagios/manifests/add_service.pp index a1f99cc9..d8293b42 100644 --- a/puppet/modules/site_nagios/manifests/add_service.pp +++ b/puppet/modules/site_nagios/manifests/add_service.pp @@ -1,10 +1,10 @@ define site_nagios::add_service ($hostname, $ip_address, $service) { case $service { - 'openvpn': { - $check_command = "check_openvpn_server_ip_port!$ip_address!1194" - $service_description = 'Openvpn' - } + #'openvpn': { + # $check_command = "check_openvpn_server_ip_port!$ip_address!1194" + # $service_description = 'Openvpn' + #} 'webapp': { $check_command = 'check_http' $service_description = 'Website' -- cgit v1.2.3 From f34cecba90941f3e4acbe88cab6ce0b5a76b8ce2 Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 28 Jan 2013 16:21:11 +0100 Subject: use check_https for website --- puppet/modules/site_nagios/manifests/add_service.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'puppet/modules/site_nagios/manifests/add_service.pp') diff --git a/puppet/modules/site_nagios/manifests/add_service.pp b/puppet/modules/site_nagios/manifests/add_service.pp index d8293b42..5b282ac4 100644 --- a/puppet/modules/site_nagios/manifests/add_service.pp +++ b/puppet/modules/site_nagios/manifests/add_service.pp @@ -6,7 +6,7 @@ define site_nagios::add_service ($hostname, $ip_address, $service) { # $service_description = 'Openvpn' #} 'webapp': { - $check_command = 'check_http' + $check_command = 'check_https' $service_description = 'Website' } default: { notice ("No Nagios service check for service \"$service\"") } -- cgit v1.2.3 From 76375b224bd621ab2238fa49207ca928892cd6f5 Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 28 Jan 2013 16:59:18 +0100 Subject: disabled notice about nagios services not deployed --- puppet/modules/site_nagios/manifests/add_service.pp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'puppet/modules/site_nagios/manifests/add_service.pp') diff --git a/puppet/modules/site_nagios/manifests/add_service.pp b/puppet/modules/site_nagios/manifests/add_service.pp index 5b282ac4..25babd18 100644 --- a/puppet/modules/site_nagios/manifests/add_service.pp +++ b/puppet/modules/site_nagios/manifests/add_service.pp @@ -1,6 +1,7 @@ define site_nagios::add_service ($hostname, $ip_address, $service) { case $service { + # don't deploy until we fix 1546 #'openvpn': { # $check_command = "check_openvpn_server_ip_port!$ip_address!1194" # $service_description = 'Openvpn' @@ -9,7 +10,9 @@ define site_nagios::add_service ($hostname, $ip_address, $service) { $check_command = 'check_https' $service_description = 'Website' } - default: { notice ("No Nagios service check for service \"$service\"") } + default: { + #notice ("No Nagios service check for service \"$service\"") + } } if ( $check_command != '' ) { -- cgit v1.2.3 From 5380b3add3c1cd9c016905d0c339744fc9f2be98 Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 28 Jan 2013 22:03:23 +0100 Subject: re-add nagios service check openvpn --- puppet/modules/site_nagios/manifests/add_service.pp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'puppet/modules/site_nagios/manifests/add_service.pp') diff --git a/puppet/modules/site_nagios/manifests/add_service.pp b/puppet/modules/site_nagios/manifests/add_service.pp index 25babd18..280cb010 100644 --- a/puppet/modules/site_nagios/manifests/add_service.pp +++ b/puppet/modules/site_nagios/manifests/add_service.pp @@ -1,11 +1,12 @@ -define site_nagios::add_service ($hostname, $ip_address, $service) { +define site_nagios::add_service ( + $hostname, $ip_address, $openvpn_gw = '', $service) { case $service { # don't deploy until we fix 1546 - #'openvpn': { - # $check_command = "check_openvpn_server_ip_port!$ip_address!1194" - # $service_description = 'Openvpn' - #} + 'openvpn': { + $check_command = "check_openvpn_server_ip_port!$openvpn_gw!1194" + $service_description = 'Openvpn' + } 'webapp': { $check_command = 'check_https' $service_description = 'Website' -- cgit v1.2.3 From 0f47539146baa793a17739ede0137312d333bb9e Mon Sep 17 00:00:00 2001 From: varac Date: Wed, 6 Feb 2013 23:37:32 +0100 Subject: nagios: don't check openvpn, check cmd doesn't work --- puppet/modules/site_nagios/manifests/add_service.pp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'puppet/modules/site_nagios/manifests/add_service.pp') diff --git a/puppet/modules/site_nagios/manifests/add_service.pp b/puppet/modules/site_nagios/manifests/add_service.pp index 280cb010..6ef3cbf5 100644 --- a/puppet/modules/site_nagios/manifests/add_service.pp +++ b/puppet/modules/site_nagios/manifests/add_service.pp @@ -2,14 +2,9 @@ define site_nagios::add_service ( $hostname, $ip_address, $openvpn_gw = '', $service) { case $service { - # don't deploy until we fix 1546 - 'openvpn': { - $check_command = "check_openvpn_server_ip_port!$openvpn_gw!1194" - $service_description = 'Openvpn' - } 'webapp': { - $check_command = 'check_https' - $service_description = 'Website' + $check_command = 'check_https_cert' + $service_description = 'Website Certificate' } default: { #notice ("No Nagios service check for service \"$service\"") -- cgit v1.2.3