summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2013-11-19 15:51:39 -0500
committerMicah Anderson <micah@leap.se>2013-11-19 15:51:39 -0500
commit41c5506ef0adc0381bcae99ae1139d2de3a2a858 (patch)
tree48c1dd9964168ee3b5c7910f132f34dc1aa1779a
parent58dbe442b37408f7cd1270cd5e1abb69e8ceeafa (diff)
added website nagios check (#1629)
Change-Id: Icebf9d8849b4440f4f6dbc00a1a8ac0873b62f6a
-rw-r--r--puppet/modules/site_nagios/manifests/add_service.pp26
1 files changed, 13 insertions, 13 deletions
diff --git a/puppet/modules/site_nagios/manifests/add_service.pp b/puppet/modules/site_nagios/manifests/add_service.pp
index 6ef3cbf5..8d2a310b 100644
--- a/puppet/modules/site_nagios/manifests/add_service.pp
+++ b/puppet/modules/site_nagios/manifests/add_service.pp
@@ -3,19 +3,19 @@ define site_nagios::add_service (
case $service {
'webapp': {
- $check_command = 'check_https_cert'
- $service_description = 'Website Certificate'
+ nagios_service {
+ "${name}_cert":
+ use => 'generic-service',
+ check_command => 'check_https_cert',
+ service_description => 'Website Certificate',
+ host_name => $hostname;
+ "${name}_website":
+ use => 'generic-service',
+ check_command => 'check_https',
+ service_description => 'Website',
+ host_name => $hostname
+ }
}
- default: {
- #notice ("No Nagios service check for service \"$service\"")
- }
- }
-
- if ( $check_command != '' ) {
- nagios_service { $name:
- use => 'generic-service',
- check_command => $check_command,
- service_description => $service_description,
- host_name => $hostname }
+ default: {}
}
}