Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/160802
Change subject: Add nickel to $MONITORING_HOSTS network, rename ferm::rule
icinga-all to monitoring-all
......................................................................
Add nickel to $MONITORING_HOSTS network, rename ferm::rule icinga-all to
monitoring-all
Change-Id: I75225d476ba1478a6f02bc41a6dc487b4c47eb3c
---
M manifests/network.pp
M modules/base/manifests/init.pp
2 files changed, 9 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/02/160802/1
diff --git a/manifests/network.pp b/manifests/network.pp
index f53b4b6..bf8a76a 100644
--- a/manifests/network.pp
+++ b/manifests/network.pp
@@ -67,6 +67,7 @@
'208.80.153.249',
'10.4.1.120',
'10.4.1.137',
+ '208.80.154.150' # nickel.wikimedia.org (ganglia)
],
}
}
diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index a103283..84895f6 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -166,7 +166,15 @@
rule => 'proto tcp dport ssh saddr $BASTION_HOSTS ACCEPT;',
}
+ # NOTE: Renaming icinga-all to monitoring-all,
+ # since $MONITORING_HOSTS now includes nickel for ganglia.
+ # icinga-all will be removed after puppet runs everywhere
+ # and replaces icinga-all with monitoring-all.
ferm::rule { 'icinga-all':
+ ensure => 'absent',
+ rule => 'saddr $MONITORING_HOSTS ACCEPT;',
+ }
+ ferm::rule { 'monitoring-all':
ensure => $ensure,
rule => 'saddr $MONITORING_HOSTS ACCEPT;',
}
--
To view, visit https://gerrit.wikimedia.org/r/160802
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I75225d476ba1478a6f02bc41a6dc487b4c47eb3c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
