Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223153
Change subject: uwsgi: Do not setup nrpe monitor in labs
......................................................................
uwsgi: Do not setup nrpe monitor in labs
Change-Id: Ia257354914892516dbf184c58a48a9c66ffe7dd2
---
M hieradata/labs.yaml
M modules/uwsgi/manifests/init.pp
2 files changed, 7 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/53/223153/1
diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index 3f77fa6..9736342 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -8,6 +8,7 @@
elasticsearch::recover_after_nodes: 1
ganglia_class: old
has_ganglia: false
+has_nrpe: false
archiva::proxy::ssl_enabled: false
archiva::proxy::certificate_name: ssl-cert-snakeoil
statsite::instance::graphite_host: 'labmon1001.eqiad.wmnet'
diff --git a/modules/uwsgi/manifests/init.pp b/modules/uwsgi/manifests/init.pp
index 658c620..4b6ae57 100644
--- a/modules/uwsgi/manifests/init.pp
+++ b/modules/uwsgi/manifests/init.pp
@@ -54,9 +54,11 @@
require => File['/sbin/uwsgictl'],
}
- nrpe::monitor_service { 'uwsgi':
- description => 'uWSGI web apps',
- nrpe_command => '/sbin/uwsgictl check',
- require => Service['uwsgi'],
+ if hiera('has_nrpe', true) {
+ nrpe::monitor_service { 'uwsgi':
+ description => 'uWSGI web apps',
+ nrpe_command => '/sbin/uwsgictl check',
+ require => Service['uwsgi'],
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/223153
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia257354914892516dbf184c58a48a9c66ffe7dd2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
