Yuvipanda has submitted this change and it was merged.
Change subject: shinken: Fix email commands to work properly
......................................................................
shinken: Fix email commands to work properly
Also use templates for contacts
Change-Id: I517ada22351305f43352a632c628ec529cb566c7
---
M modules/shinken/files/contacts.cfg
M modules/shinken/files/templates.cfg
2 files changed, 16 insertions(+), 56 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/shinken/files/contacts.cfg
b/modules/shinken/files/contacts.cfg
index f39b287..ab63ff6 100644
--- a/modules/shinken/files/contacts.cfg
+++ b/modules/shinken/files/contacts.cfg
@@ -12,7 +12,7 @@
host_notification_period none
service_notification_period none
service_notification_commands notify-by-email
- host_notification_commands notify-by-email
+ host_notification_commands host-notify-by-email
host_notification_options d,u,r
service_notification_options w,u,r,c
password guest
@@ -22,82 +22,40 @@
contact_name yuvipanda
alias Yuvi Panda
email yuvipa...@wikimedia.org
- host_notifications_enabled 1
- service_notifications_enabled 1
- host_notification_period 24x7
- service_notification_period 24x7
- service_notification_commands notify-by-email
- host_notification_commands notify-by-email
- host_notification_options d,u,r
- service_notification_options w,u,r,c
+ use generic-contact
}
define contact {
contact_name legoktm
alias Lego KTM
email lego...@wikimedia.org
- host_notifications_enabled 1
- service_notifications_enabled 1
- host_notification_period 24x7
- service_notification_period 24x7
- service_notification_commands notify-by-email
- host_notification_commands notify-by-email
- host_notification_options d,u,r
- service_notification_options w,u,r,c
+ use generic-contact
}
define contact {
contact_name milimetric
alias Dan Andreescu
email dandree...@wikimedia.org
- host_notifications_enabled 1
- service_notifications_enabled 1
- host_notification_period 24x7
- service_notification_period 24x7
- service_notification_commands notify-by-email
- host_notification_commands notify-by-email
- host_notification_options d,u,r
- service_notification_options w,u,r,c
+ use generic-contact
}
define contact {
contact_name greg_g
alias Greg G
email g...@wikimedia.org
- host_notifications_enabled 1
- service_notifications_enabled 1
- host_notification_period 24x7
- service_notification_period 24x7
- service_notification_commands notify-by-email
- host_notification_commands notify-by-email
- host_notification_options d,u,r
- service_notification_options w,u,r,c
+ use generic-contact
}
define contact {
contact_name cmcmahon
alias Chris McMahon
email cmcma...@wikimedia.org
- host_notifications_enabled 1
- service_notifications_enabled 1
- host_notification_period 24x7
- service_notification_period 24x7
- service_notification_commands notify-by-email
- host_notification_commands notify-by-email
- host_notification_options d,u,r
- service_notification_options w,u,r,c
+ use generic-contact
}
define contact {
contact_name amusso
alias Antoine Musso
email has...@free.fr
- host_notifications_enabled 1
- service_notifications_enabled 1
- host_notification_period 24x7
- service_notification_period 24x7
- service_notification_commands notify-by-email
- host_notification_commands notify-by-email
- host_notification_options d,u,r
- service_notification_options w,u,r,c
+ use generic-contact
}
diff --git a/modules/shinken/files/templates.cfg
b/modules/shinken/files/templates.cfg
index 422e94e..4f944c6 100644
--- a/modules/shinken/files/templates.cfg
+++ b/modules/shinken/files/templates.cfg
@@ -114,11 +114,13 @@
# This is how emails are sent, 24x7 way.
define notificationway{
- notificationway_name email
- service_notification_period 24x7
- host_notification_period 24x7
- service_notification_options c,w,r
- host_notification_options d,u,r,f,s
- service_notification_commands notify-by-email ; send service
notifications via email
- host_notification_commands notify-by-email ; send host
notifications via email
+ notificationway_name email
+ service_notification_period 24x7
+ host_notification_period 24x7
+ service_notification_options c,w,r
+ host_notification_options d,u,r,f,s
+ host_notifications_enabled 1
+ service_notifications_enabled 1
+ service_notification_commands notify-by-email ; send service
notifications via email
+ host_notification_commands host-notify-by-email ; send host
notifications via email
}
--
To view, visit https://gerrit.wikimedia.org/r/174946
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I517ada22351305f43352a632c628ec529cb566c7
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@gmail.com>
Gerrit-Reviewer: Yuvipanda <yuvipa...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
