From 6aa3762049b485f2a7bdcabadd60fb8e3a2fd3d5 Mon Sep 17 00:00:00 2001
From: Sylvain Boily <sylvain.boily@gmail.com>
Date: Mon, 8 May 2017 14:48:29 -0400
Subject: [PATCH] Systemd does not see all shutdowns as failures (#2716)

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index abfd968b9..42658c5a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Bugfixes
 
 - [#2749](https://github.com/influxdata/telegraf/pull/2749): Fixed sqlserver input to work with case sensitive server collation.
+- [#2716](https://github.com/influxdata/telegraf/pull/2716): Systemd does not see all shutdowns as failures
 
 ## v1.3 [unreleased]
 
diff --git a/scripts/telegraf.service b/scripts/telegraf.service
index 72a4a338e..cbbdc872d 100644
--- a/scripts/telegraf.service
+++ b/scripts/telegraf.service
@@ -9,6 +9,7 @@ User=telegraf
 ExecStart=/usr/bin/telegraf -config /etc/telegraf/telegraf.conf -config-directory /etc/telegraf/telegraf.d ${TELEGRAF_OPTS}
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-failure
+RestartForceExitStatus=SIGPIPE
 KillMode=control-group
 
 [Install]