Mobrovac has uploaded a new change for review.
https://gerrit.wikimedia.org/r/289358
Change subject: service::node: Add a wrapper script for service_checker
......................................................................
service::node: Add a wrapper script for service_checker
Also move tail-log from /usr/bin to /usr/local/bin.
Change-Id: I16b4cf9df06d7cc92a174be74d9e5c15c79787c8
---
M modules/service/manifests/node.pp
1 file changed, 11 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/58/289358/1
diff --git a/modules/service/manifests/node.pp
b/modules/service/manifests/node.pp
index 0fa5104..c5a1d74 100644
--- a/modules/service/manifests/node.pp
+++ b/modules/service/manifests/node.pp
@@ -244,7 +244,7 @@
mode => '0444',
}
# convenience script to pretty-print logs
- file { "/usr/bin/tail-${title}":
+ file { "/usr/local/bin/tail-${title}":
content => template('service/node/tail-log.erb'),
owner => 'root',
group => 'root',
@@ -284,12 +284,21 @@
include service::monitoring
$monitor_url = "http://${::ipaddress}:${port}${healthcheck_url}";
+ $check_command = "/usr/local/lib/nagios/plugins/service_checker -t 5
${::ipaddress} ${monitor_url}"
nrpe::monitor_service{ "endpoints_${title}":
ensure => $ensure_monitoring,
description => "${title} endpoints health",
- nrpe_command => "/usr/local/lib/nagios/plugins/service_checker -t
5 ${::ipaddress} ${monitor_url}",
+ nrpe_command => $check_command,
subscribe =>
File['/usr/local/lib/nagios/plugins/service_checker'],
}
+ file { "/usr/local/bin/check-${title}":
+ content => inline_template(
+ '<%= ["!/bin/sh", @check_command].join("\n") %>'
+ ),
+ owner => 'root',
+ group => 'root',
+ mode => '0755',
+ }
# we also support smart-releases
service::deployment_script { $name:
monitor_url => $monitor_url,
--
To view, visit https://gerrit.wikimedia.org/r/289358
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I16b4cf9df06d7cc92a174be74d9e5c15c79787c8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
