Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/374050 )
Change subject: icinga/base: screen monitoring by default. whitelist copper,
terbium
......................................................................
icinga/base: screen monitoring by default. whitelist copper, terbium
Enable screen/tmux monitoring for all hosts by default, except whitelist
copper and terbium per the original ticket.
Any others to remove?
Bug: T165348
Change-Id: Ib34a53205235eb9310a32731f1383e6a77985ee7
---
A hieradata/hosts/copper.yaml
M hieradata/hosts/netmon2001.yaml
A hieradata/hosts/terbium.yaml
M modules/base/manifests/monitoring/host.pp
4 files changed, 3 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/hieradata/hosts/copper.yaml b/hieradata/hosts/copper.yaml
new file mode 100644
index 0000000..4bfa7b0
--- /dev/null
+++ b/hieradata/hosts/copper.yaml
@@ -0,0 +1 @@
+monitor_screens: false
diff --git a/hieradata/hosts/netmon2001.yaml b/hieradata/hosts/netmon2001.yaml
index f9409f6..370806d 100644
--- a/hieradata/hosts/netmon2001.yaml
+++ b/hieradata/hosts/netmon2001.yaml
@@ -1,2 +1 @@
do_acme: false
-monitor_screens: true
diff --git a/hieradata/hosts/terbium.yaml b/hieradata/hosts/terbium.yaml
new file mode 100644
index 0000000..4bfa7b0
--- /dev/null
+++ b/hieradata/hosts/terbium.yaml
@@ -0,0 +1 @@
+monitor_screens: false
diff --git a/modules/base/manifests/monitoring/host.pp
b/modules/base/manifests/monitoring/host.pp
index a7bd6c5..1aa33e9 100644
--- a/modules/base/manifests/monitoring/host.pp
+++ b/modules/base/manifests/monitoring/host.pp
@@ -148,7 +148,7 @@
}
}
- if hiera('monitor_screens', false) {
+ if hiera('monitor_screens', true) {
file { '/usr/local/lib/nagios/plugins/check_long_procs':
ensure => present,
--
To view, visit https://gerrit.wikimedia.org/r/374050
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib34a53205235eb9310a32731f1383e6a77985ee7
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
