Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/259540
Change subject: icinga: disable paging for test hosts
......................................................................
icinga: disable paging for test hosts
This depends on I63b5a42c4d1ddd7, but after
that is merged this is to disable all paging
for services on test machines with one simple
hiera change, without having to add special cases
to each monitor::service that might appear somewhere
in roles that are used on prod and test machines.
Change-Id: Idbc4a54ac9199299fe3865dfcf5332fd70f6ba20
---
M hieradata/codfw/labtest.yaml
M hieradata/hosts/maps-test2001.yaml
M hieradata/hosts/maps-test2002.yaml
M hieradata/hosts/maps-test2003.yaml
M hieradata/hosts/maps-test2004.yaml
M hieradata/hosts/restbase-test2001.yaml
M hieradata/hosts/restbase-test2002.yaml
M hieradata/hosts/restbase-test2003.yaml
8 files changed, 13 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/40/259540/1
diff --git a/hieradata/codfw/labtest.yaml b/hieradata/codfw/labtest.yaml
index 0958744..d3edeb5 100644
--- a/hieradata/codfw/labtest.yaml
+++ b/hieradata/codfw/labtest.yaml
@@ -5,6 +5,9 @@
# with no actual advertisement or needed external services for now
# 208.80.155.0/22
+# no Icinga SMS for test machines
+do_paging: false
+
# Should handle all being the same
labs_nova_controller: &labsnovacontroller "labtestcontrol2001.wikimedia.org"
labs_nova_controller_spare: &labsnovacontrollerspare
"labtestcontrol2001.wikimedia.org"
diff --git a/hieradata/hosts/maps-test2001.yaml
b/hieradata/hosts/maps-test2001.yaml
index c37596d..c5dc28a 100644
--- a/hieradata/hosts/maps-test2001.yaml
+++ b/hieradata/hosts/maps-test2001.yaml
@@ -1 +1,2 @@
cassandra::rack: a5
+do_paging: false
diff --git a/hieradata/hosts/maps-test2002.yaml
b/hieradata/hosts/maps-test2002.yaml
index c37596d..c5dc28a 100644
--- a/hieradata/hosts/maps-test2002.yaml
+++ b/hieradata/hosts/maps-test2002.yaml
@@ -1 +1,2 @@
cassandra::rack: a5
+do_paging: false
diff --git a/hieradata/hosts/maps-test2003.yaml
b/hieradata/hosts/maps-test2003.yaml
index 4002439..419fb6d 100644
--- a/hieradata/hosts/maps-test2003.yaml
+++ b/hieradata/hosts/maps-test2003.yaml
@@ -1 +1,2 @@
cassandra::rack: b5
+do_paging: false
diff --git a/hieradata/hosts/maps-test2004.yaml
b/hieradata/hosts/maps-test2004.yaml
index 4002439..419fb6d 100644
--- a/hieradata/hosts/maps-test2004.yaml
+++ b/hieradata/hosts/maps-test2004.yaml
@@ -1 +1,2 @@
cassandra::rack: b5
+do_paging: false
diff --git a/hieradata/hosts/restbase-test2001.yaml
b/hieradata/hosts/restbase-test2001.yaml
index f7918db..62730de 100644
--- a/hieradata/hosts/restbase-test2001.yaml
+++ b/hieradata/hosts/restbase-test2001.yaml
@@ -9,3 +9,5 @@
listen_address: 10.192.16.155
rpc_address: 10.192.16.155
rpc_interface: eth0
+
+do_paging: false
diff --git a/hieradata/hosts/restbase-test2002.yaml
b/hieradata/hosts/restbase-test2002.yaml
index 1e545b0..392e1e0 100644
--- a/hieradata/hosts/restbase-test2002.yaml
+++ b/hieradata/hosts/restbase-test2002.yaml
@@ -9,3 +9,5 @@
listen_address: 10.192.16.157
rpc_address: 10.192.16.157
rpc_interface: eth0
+
+do_paging: false
diff --git a/hieradata/hosts/restbase-test2003.yaml
b/hieradata/hosts/restbase-test2003.yaml
index aaefd89..bf8cf61 100644
--- a/hieradata/hosts/restbase-test2003.yaml
+++ b/hieradata/hosts/restbase-test2003.yaml
@@ -9,3 +9,5 @@
listen_address: 10.192.16.159
rpc_address: 10.192.16.159
rpc_interface: eth0
+
+do_paging: false
--
To view, visit https://gerrit.wikimedia.org/r/259540
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idbc4a54ac9199299fe3865dfcf5332fd70f6ba20
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
