From 475252d87304716efcca90ac0687a9cee2cc1374 Mon Sep 17 00:00:00 2001
From: Rene Zbinden <rene.zbinden@gmail.com>
Date: Tue, 24 May 2016 16:14:58 +0200
Subject: [PATCH] fix telegraf service (#1252)

---
 CHANGELOG.md             | 8 ++++++++
 scripts/telegraf.service | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab82bc4f1..da53d893d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 ## v1.0 [unreleased]
 
+### Release Notes
+
+### Features
+
+### Bugfixes
+
+- [#1252](https://github.com/influxdata/telegraf/pull/1252): Fix systemd service. Thanks @zbindenren!
+
 ## v0.13.1 [2016-05-24]
 
 ### Release Notes
diff --git a/scripts/telegraf.service b/scripts/telegraf.service
index 06345e779..5e42c8c17 100644
--- a/scripts/telegraf.service
+++ b/scripts/telegraf.service
@@ -11,7 +11,7 @@ Environment='STDERR=/var/log/telegraf/telegraf.log'
 ExecStart=/bin/sh -c "/usr/bin/telegraf -config /etc/telegraf/telegraf.conf -config-directory /etc/telegraf/telegraf.d ${TELEGRAF_OPTS} >>${STDOUT} 2>>${STDERR}"
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-failure
-KillMode=process
+KillMode=control-group
 
 [Install]
 WantedBy=multi-user.target