diff options
| author | Varac <varac@leap.se> | 2014-12-04 17:30:07 +0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@review.leap.se> | 2014-12-04 17:30:07 +0800 |
| commit | 60bd76583d46fe1c9f39804c7fd892fa9c1745d0 (patch) | |
| tree | e938e8bc993104715c79595af313f9d8485f5125 /puppet/modules/site_nagios/manifests/add_service.pp | |
| parent | acd6dd2848f38ba1b728f263f297bc6d2ad9e4bb (diff) | |
| parent | a84272aa77715a4029ebd06b38b7a5ad05e6acd0 (diff) | |
Merge "Change nagios mail To: Header to contain the actual platform environment's contact email (Bug #6466)" into develop
Diffstat (limited to 'puppet/modules/site_nagios/manifests/add_service.pp')
| -rw-r--r-- | puppet/modules/site_nagios/manifests/add_service.pp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/puppet/modules/site_nagios/manifests/add_service.pp b/puppet/modules/site_nagios/manifests/add_service.pp index 97c0b30d..72cd038a 100644 --- a/puppet/modules/site_nagios/manifests/add_service.pp +++ b/puppet/modules/site_nagios/manifests/add_service.pp @@ -1,5 +1,5 @@ define site_nagios::add_service ( - $hostname, $ip_address, $openvpn_gw = '', $service) { + $hostname, $ip_address, $service, $environment, $openvpn_gw = '') { $ssh = hiera_hash('ssh') $ssh_port = $ssh['port'] @@ -11,17 +11,20 @@ define site_nagios::add_service ( use => 'generic-service', check_command => "check_ssh_port!${ssh_port}", service_description => 'SSH', - host_name => $hostname; + host_name => $hostname, + contact_groups => $environment; "${name}_cert": use => 'generic-service', check_command => 'check_https_cert', service_description => 'Website Certificate', - host_name => $hostname; + host_name => $hostname, + contact_groups => $environment; "${name}_website": use => 'generic-service', check_command => 'check_https', service_description => 'Website', - host_name => $hostname + host_name => $hostname, + contact_groups => $environment; } } default: {} |