Alexandros Kosiaris has submitted this change and it was merged.
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, 17 insertions(+), 3 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/modules/service/manifests/node.pp
b/modules/service/manifests/node.pp
index 0fa5104..98b4988 100644
--- a/modules/service/manifests/node.pp
+++ b/modules/service/manifests/node.pp
@@ -244,11 +244,16 @@
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',
mode => '0755'
+ }
+ # we first placed tail-${title} in /usr/bin, so make sure
+ # it's not there any more
+ file { "/usr/bin/tail-${title}":
+ ensure => absent,
}
}
@@ -284,11 +289,20 @@
include service::monitoring
$monitor_url = "http://${::ipaddress}:${port}${healthcheck_url}";
+ $check_command = "/usr/local/lib/nagios/plugins/service_checker -t 5
${::ipaddress} ${monitor_url}"
+ file { "/usr/local/bin/check-${title}":
+ content => inline_template(
+ '<%= ["!/bin/sh", @check_command].join("\n") %>'
+ ),
+ owner => 'root',
+ group => 'root',
+ mode => '0755',
+ }
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}",
- subscribe =>
File['/usr/local/lib/nagios/plugins/service_checker'],
+ nrpe_command => "/usr/local/bin/check-${title}",
+ subscribe => File["/usr/local/bin/check-${title}"],
}
# we also support smart-releases
service::deployment_script { $name:
--
To view, visit https://gerrit.wikimedia.org/r/289358
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I16b4cf9df06d7cc92a174be74d9e5c15c79787c8
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Mobrovac <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
