Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/376577 )
Change subject: Revert "icinga/base: screen monitoring by default. whitelist
copper, terbium"
......................................................................
Revert "icinga/base: screen monitoring by default. whitelist copper, terbium"
This reverts commit dce429bfe4b12ca22937449c3d851e381e315451.
Change-Id: I959702d4c12bc24d727922e33de6a330a4e28355
---
D hieradata/hosts/copper.yaml
M hieradata/hosts/netmon2001.yaml
D hieradata/hosts/terbium.yaml
M modules/base/manifests/monitoring/host.pp
4 files changed, 2 insertions(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/hieradata/hosts/copper.yaml b/hieradata/hosts/copper.yaml
deleted file mode 100644
index 4bfa7b0..0000000
--- a/hieradata/hosts/copper.yaml
+++ /dev/null
@@ -1 +0,0 @@
-monitor_screens: false
diff --git a/hieradata/hosts/netmon2001.yaml b/hieradata/hosts/netmon2001.yaml
index 370806d..f9409f6 100644
--- a/hieradata/hosts/netmon2001.yaml
+++ b/hieradata/hosts/netmon2001.yaml
@@ -1 +1,2 @@
do_acme: false
+monitor_screens: true
diff --git a/hieradata/hosts/terbium.yaml b/hieradata/hosts/terbium.yaml
deleted file mode 100644
index 4bfa7b0..0000000
--- a/hieradata/hosts/terbium.yaml
+++ /dev/null
@@ -1 +0,0 @@
-monitor_screens: false
diff --git a/modules/base/manifests/monitoring/host.pp
b/modules/base/manifests/monitoring/host.pp
index 1aa33e9..a7bd6c5 100644
--- a/modules/base/manifests/monitoring/host.pp
+++ b/modules/base/manifests/monitoring/host.pp
@@ -148,7 +148,7 @@
}
}
- if hiera('monitor_screens', true) {
+ if hiera('monitor_screens', false) {
file { '/usr/local/lib/nagios/plugins/check_long_procs':
ensure => present,
--
To view, visit https://gerrit.wikimedia.org/r/376577
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I959702d4c12bc24d727922e33de6a330a4e28355
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: Gehel <guillaume.leder...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
