Awight has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/361939 )
Change subject: Fix intervals for notifications
......................................................................
Fix intervals for notifications
Change-Id: I6460d0ad9146d0f31088794c15543bd9a6840863
---
M files/templates.conf
M templates/notifications.conf.erb
2 files changed, 8 insertions(+), 8 deletions(-)
Approvals:
Awight: Verified; Looks good to me, approved
diff --git a/files/templates.conf b/files/templates.conf
index b05c47e..934739c 100644
--- a/files/templates.conf
+++ b/files/templates.conf
@@ -46,6 +46,8 @@
template Notification "mail-host-notification" {
command = "mail-host-notification"
+ interval = 40m
+
states = [ Up, Down ]
types = [ Problem, Acknowledgement, Recovery, Custom,
FlappingStart, FlappingEnd,
@@ -61,6 +63,8 @@
*/
template Notification "mail-service-notification" {
command = "mail-service-notification"
+
+ interval = 40m
states = [ OK, Warning, Critical, Unknown ]
types = [ Problem, Acknowledgement, Recovery, Custom,
@@ -81,6 +85,8 @@
template Notification "ores-mail-host-notification" {
command = "ores-mail-host-notification"
+ interval = 40m
+
states = [ Up, Down ]
types = [ Problem, Acknowledgement, Recovery, Custom,
FlappingStart, FlappingEnd,
@@ -97,6 +103,8 @@
template Notification "ores-mail-service-notification" {
command = "ores-mail-service-notification"
+ interval = 40m
+
states = [ OK, Warning, Critical, Unknown ]
types = [ Problem, Acknowledgement, Recovery, Custom,
FlappingStart, FlappingEnd,
diff --git a/templates/notifications.conf.erb b/templates/notifications.conf.erb
index 671600e..76f35fe 100644
--- a/templates/notifications.conf.erb
+++ b/templates/notifications.conf.erb
@@ -11,8 +11,6 @@
apply Notification "mail-icingaadmin" to Host {
import "mail-host-notification"
- interval = 40m
-
user_groups = ["icingaadmins"] /*host.vars.notification.mail.groups*/
//users = host.vars.notification.mail.users
@@ -31,8 +29,6 @@
apply Notification "mail-icingaadmin" to Service {
import "mail-service-notification"
-
- interval = 40m
user_groups = ["icingaadmins"] /*host.vars.notification.mail.groups*/
//users = host.vars.notification.mail.users
@@ -56,8 +52,6 @@
apply Notification "ores-mail-icingaadmin" to Host {
import "ores-mail-host-notification"
- interval = 40m
-
user_groups = ["icingaadmins"] /*host.vars.notification.mail.groups*/
//users = host.vars.notification.mail.users
@@ -75,8 +69,6 @@
apply Notification "ores-mail-icingaadmin" to Service {
import "ores-mail-service-notification"
-
- interval = 40m
user_groups = ["icingaadmins"] /*host.vars.notification.mail.groups*/
//users = host.vars.notification.mail.users
--
To view, visit https://gerrit.wikimedia.org/r/361939
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6460d0ad9146d0f31088794c15543bd9a6840863
Gerrit-PatchSet: 2
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
Gerrit-Reviewer: Awight <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
