Filippo Giunchedi has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/368177 )
Change subject: diamond: ship systemd override file
......................................................................
diamond: ship systemd override file
* Fix logging configuration by honouring diamond.conf
* Workaround "slow shutdown" issue by forcing TimeoutStopSec to 3s
Bug: T171580
Change-Id: I493a96b9ac8d7b72ef06def922b7d845b227f6b8
---
M modules/diamond/manifests/init.pp
A modules/diamond/templates/initscripts/diamond.systemd_override.erb
2 files changed, 20 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Filippo Giunchedi: Looks good to me, approved
diff --git a/modules/diamond/manifests/init.pp
b/modules/diamond/manifests/init.pp
index dd53594..7b730c6 100644
--- a/modules/diamond/manifests/init.pp
+++ b/modules/diamond/manifests/init.pp
@@ -104,6 +104,14 @@
],
}
+ if os_version('debian >= jessie') {
+ systemd::unit { 'diamond':
+ ensure => present,
+ restart => true,
+ override => true,
+ content =>
template('diamond/initscripts/diamond.systemd_override.erb'),
+ }
+ }
diamond::collector { 'CPU':
settings => {
diff --git a/modules/diamond/templates/initscripts/diamond.systemd_override.erb
b/modules/diamond/templates/initscripts/diamond.systemd_override.erb
new file mode 100644
index 0000000..e230acd
--- /dev/null
+++ b/modules/diamond/templates/initscripts/diamond.systemd_override.erb
@@ -0,0 +1,12 @@
+[Service]
+SyslogIdentifier=diamond
+
+# See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=854842 and
+# https://github.com/python-diamond/Diamond/issues/595
+# Fixed upstream in fd4146dc3
+TimeoutStopSec=3
+
+# Omit --log-stdout to honour logging config
+# Fixed upstream in a8e474dc44
+ExecStart=
+ExecStart=/usr/bin/python /usr/bin/diamond --foreground
--
To view, visit https://gerrit.wikimedia.org/r/368177
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I493a96b9ac8d7b72ef06def922b7d845b227f6b8
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@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
