Merge "Change nagios mail To: Header to contain the actual platform environment's contact email (Bug #6466)" into develop

6 files changed, 39 insertions, 10 deletions

diff --git a/puppet/modules/site_nagios/manifests/add_host_services.pp b/puppet/modules/site_nagios/manifests/add_host_services.pp
index 279809d1..236702e2 100644
--- a/puppet/modules/site_nagios/manifests/add_host_services.pp
+++ b/puppet/modules/site_nagios/manifests/add_host_services.pp
@@ -4,7 +4,9 @@ define site_nagios::add_host_services (
   $ip_address,
   $services,
   $ssh_port,
-  $openvpn_gateway_address='' ) {
+  $environment,
+  $openvpn_gateway_address='',
+  ) {
 
     $nagios_hostname = $domain_internal
 
@@ -16,6 +18,7 @@ define site_nagios::add_host_services (
       'hostname'    => $nagios_hostname,
       'ip_address'  => $ip_address,
       'openvpn_gw'  => $openvpn_gateway_address,
+      'environment' => $environment
     }
     $dynamic_parameters = {
       'service' => '%s'
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:  {}
diff --git a/puppet/modules/site_nagios/manifests/server.pp b/puppet/modules/site_nagios/manifests/server.pp
index 37bd77fb..068ee419 100644
--- a/puppet/modules/site_nagios/manifests/server.pp
+++ b/puppet/modules/site_nagios/manifests/server.pp
@@ -6,12 +6,11 @@ class site_nagios::server inherits nagios::base {
   $nagios_hiera     = hiera('nagios')
   $nagiosadmin_pw   = htpasswd_sha1($nagios_hiera['nagiosadmin_pw'])
   $nagios_hosts     = $nagios_hiera['hosts']
-  $domains_internal = $nagios_hiera['domains_internal']
+  $nagios_contacts  = hiera('contacts')
+  $environment      = $nagios_hiera['environments']
 
   include nagios::base
   include nagios::defaults::commands
-  include nagios::defaults::contactgroups
-  include nagios::defaults::contacts
   include nagios::defaults::templates
   include nagios::defaults::timeperiods
   include nagios::defaults::plugins
@@ -63,5 +62,7 @@ class site_nagios::server inherits nagios::base {
         'set copytruncate copytruncate' ]
   }
 
-  ::site_nagios::server::hostgroup { $domains_internal: }
+  create_resources ( site_nagios::server::hostgroup, $environment )
+  create_resources ( site_nagios::server::contactgroup, $environment )
+  create_resources ( site_nagios::server::add_contacts, $environment )
 }
diff --git a/puppet/modules/site_nagios/manifests/server/add_contacts.pp b/puppet/modules/site_nagios/manifests/server/add_contacts.pp
new file mode 100644
index 00000000..db507abf
--- /dev/null
+++ b/puppet/modules/site_nagios/manifests/server/add_contacts.pp
@@ -0,0 +1,16 @@
+define site_nagios::server::add_contacts ($contact_emails) {
+
+  $environment = $name
+
+  nagios_contact {
+    $environment:
+      alias                         => $environment,
+      service_notification_period   => '24x7',
+      host_notification_period      => '24x7',
+      service_notification_options  => 'w,u,c,r',
+      host_notification_options     => 'd,r',
+      service_notification_commands => 'notify-service-by-email',
+      host_notification_commands    => 'notify-host-by-email',
+      email                         => join($contact_emails, ', ')
+  }
+}
diff --git a/puppet/modules/site_nagios/manifests/server/contactgroup.pp b/puppet/modules/site_nagios/manifests/server/contactgroup.pp
new file mode 100644
index 00000000..188c54f1
--- /dev/null
+++ b/puppet/modules/site_nagios/manifests/server/contactgroup.pp
@@ -0,0 +1,6 @@
+define site_nagios::server::contactgroup ($contact_emails) {
+
+  nagios_contactgroup { $name:
+    members => $name
+  }
+}
diff --git a/puppet/modules/site_nagios/manifests/server/hostgroup.pp b/puppet/modules/site_nagios/manifests/server/hostgroup.pp
index 035ba7d1..6f85ca6d 100644
--- a/puppet/modules/site_nagios/manifests/server/hostgroup.pp
+++ b/puppet/modules/site_nagios/manifests/server/hostgroup.pp
@@ -1,3 +1,3 @@
-define site_nagios::server::hostgroup {
+define site_nagios::server::hostgroup ($contact_emails) {
   nagios_hostgroup { $name: }
 }