coren has uploaded a new change for review.
https://gerrit.wikimedia.org/r/258448
Change subject: Labs: monitor getent timing only on active fileserver
......................................................................
Labs: monitor getent timing only on active fileserver
The test only makes sense from actual fileservers, and is only
really meaningful on one at a time (since they would fail
together).
Change-Id: Ic2da87fce4ef8f6f6b81d68de1d1f317dfd88734
---
M modules/labstore/manifests/fileserver.pp
M modules/labstore/manifests/monitoring.pp
2 files changed, 16 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/48/258448/1
diff --git a/modules/labstore/manifests/fileserver.pp
b/modules/labstore/manifests/fileserver.pp
index 24eae6e..b224bd9 100644
--- a/modules/labstore/manifests/fileserver.pp
+++ b/modules/labstore/manifests/fileserver.pp
@@ -76,6 +76,22 @@
labstore::fileserver::cleanup_snapshots { 'labstore':
keep_free => '6',
}
+
+ # Monitor that getent passwd over LDAP resolves in reasonable time
+ # (this being the mechanism that NFS uses to fetch groups)
+ nrpe::monitor_service { 'getent_check':
+ nrpe_command => '/usr/local/bin/getent_check',
+ description => 'Getent speed check',
+ require => File['/usr/local/bin/getent_check'],
+ }
+
+ file { '/usr/local/bin/getent_check':
+ ensure => present,
+ source => 'puppet:///modules/labstore/getent_check',
+ mode => '0755',
+ owner => 'root',
+ group => 'root',
+ }
}
# There is no service {} stanza on purpose -- this service
diff --git a/modules/labstore/manifests/monitoring.pp
b/modules/labstore/manifests/monitoring.pp
index 0eb231a..fe34df9 100644
--- a/modules/labstore/manifests/monitoring.pp
+++ b/modules/labstore/manifests/monitoring.pp
@@ -47,20 +47,4 @@
critical => '24',
percentage => '50', # Don't freak out on spikes
}
-
- # Monitor that getent passwd over LDAP resolves in reasonable time
- # (this being the mechanism that NFS uses to fetch groups)
- nrpe::monitor_service { 'getent_check':
- nrpe_command => '/usr/local/bin/getent_check',
- description => 'Getent speed check',
- require => File['/usr/local/bin/getent_check'],
- }
-
- file { '/usr/local/bin/getent_check':
- ensure => present,
- source => 'puppet:///modules/labstore/getent_check',
- mode => '0755',
- owner => 'root',
- group => 'root',
- }
}
--
To view, visit https://gerrit.wikimedia.org/r/258448
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic2da87fce4ef8f6f6b81d68de1d1f317dfd88734
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren <mpellet...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
