Dzahn has submitted this change and it was merged.

Change subject: icinga: fix IRC output of paging/critical services
......................................................................


icinga: fix IRC output of paging/critical services

We want to always add the special contact group called
"admins" besides just "sms". The "admins" group has one
member called "irc" and is what leads to icinga-wm output.

The special contact "irc" has special notification commands that
echo into the /var/log/icinga/irc.log file.

ircecho (icinga-wm) simply reads from that log file.
If we don't add "admins" we won't get IRC notifications as explained
in more detail on the ticket.

Bug:T118072
Change-Id: I05c2764ff7e7f1eb8fdbbf571e04ca213d6834fd
---
M modules/monitoring/manifests/host.pp
M modules/monitoring/manifests/service.pp
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/modules/monitoring/manifests/host.pp 
b/modules/monitoring/manifests/host.pp
index a4172b1..27b5f9c 100644
--- a/modules/monitoring/manifests/host.pp
+++ b/modules/monitoring/manifests/host.pp
@@ -25,7 +25,7 @@
     }
 
     $is_critical = $critical ? {
-        true    => "${contact_group},sms",
+        true    => "${contact_group},sms,admins",
         default => $contact_group,
     }
 
diff --git a/modules/monitoring/manifests/service.pp 
b/modules/monitoring/manifests/service.pp
index b63a075..5ecd80d 100644
--- a/modules/monitoring/manifests/service.pp
+++ b/modules/monitoring/manifests/service.pp
@@ -33,7 +33,7 @@
     }
 
     $contact_critical = $critical ? {
-        true    => "${contact_group},sms",
+        true    => "${contact_group},sms,admins",
         default => $contact_group,
     }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/254331
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I05c2764ff7e7f1eb8fdbbf571e04ca213d6834fd
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Yuvipanda <yuvipa...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to