John F. Lewis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/244732

Change subject: base: don't set contact_groups unless they override icinga 
defaults
......................................................................

base: don't set contact_groups unless they override icinga defaults

Change-Id: Ie722134c76b48ab63f7cd2e731d3b2bac4e095b1
---
M modules/base/manifests/monitoring/host.pp
1 file changed, 2 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/32/244732/1

diff --git a/modules/base/manifests/monitoring/host.pp 
b/modules/base/manifests/monitoring/host.pp
index 9381cdf..d42857c 100644
--- a/modules/base/manifests/monitoring/host.pp
+++ b/modules/base/manifests/monitoring/host.pp
@@ -27,13 +27,11 @@
 ) {
     include base::puppet::params # In order to be able to use some variables
 
-    monitoring::host { $::hostname:
-        contact_group => $contact_group
-    }
+    monitoring::host { $::hostname: }
+
     monitoring::service { 'ssh':
         description   => 'SSH',
         check_command => 'check_ssh',
-        contact_group => $contact_group
     }
 
     package { [ 'megacli', 'arcconf', 'mpt-status' ]:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie722134c76b48ab63f7cd2e731d3b2bac4e095b1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to