diff --git a/puppet/zulip_ops/manifests/nagios.pp b/puppet/zulip_ops/manifests/nagios.pp index ec10e991f8..611f2f42a5 100644 --- a/puppet/zulip_ops/manifests/nagios.pp +++ b/puppet/zulip_ops/manifests/nagios.pp @@ -7,6 +7,10 @@ class zulip_ops::nagios { "nagios3", ] package { $nagios_packages: ensure => "installed" } + $nagios_format_users = join($zulip_ops::base::users, ",") + $nagios_alert_email = zulipconf("nagios", "alert_email", undef) + $nagios_test_email = zulipconf("nagios", "test_email", undef) + $nagios_pager_email = zulipconf("nagios", "pager_email", undef) apache2site { 'nagios': require => [File['/etc/apache2/sites-available/'], @@ -43,7 +47,6 @@ class zulip_ops::nagios { notify => Service["nagios3"], } - $nagios_format_users = join($zulip_ops::base::users, ",") file { "/etc/nagios3/cgi.cfg": require => Package[nagios3], owner => "root", diff --git a/puppet/zulip_ops/templates/nagios3/contacts.cfg.template.erb b/puppet/zulip_ops/templates/nagios3/contacts.cfg.template.erb index e1faf2dcda..23b2596a2a 100644 --- a/puppet/zulip_ops/templates/nagios3/contacts.cfg.template.erb +++ b/puppet/zulip_ops/templates/nagios3/contacts.cfg.template.erb @@ -21,7 +21,7 @@ define contact{ host_notification_options d,r service_notification_commands notify-service-by-email host_notification_commands notify-host-by-email - email monitoring@zulip.com + email <%= @nagios_alert_email %> } define contact{ @@ -33,7 +33,7 @@ define contact{ host_notification_options d,r service_notification_commands notify-service-by-email host_notification_commands notify-host-by-email - email monitoring@zulip.com + email <%= @nagios_test_email %> } ###############################################################################