From 558ca4b7c3b68fd1badc9c4188791ebf6c6159b7 Mon Sep 17 00:00:00 2001
From: Jonathan Budzenski <jon@budzenski.me>
Date: Wed, 11 Nov 2020 12:50:16 -0600
Subject: [PATCH] [7.x] [deb/rpm] On upgrade, support restarting kibana service
 (#82049) (#82971)

* [deb/rpm] On upgrade, restart kibana service (#82049)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>

* default restart behavior to off in 7.x

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../os_packages/package_scripts/post_install.sh     | 13 +++++++++++++
 src/dev/build/tasks/os_packages/run_fpm.ts          |  3 ++-
 .../service_templates/sysv/etc/default/kibana       | 10 +---------
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/dev/build/tasks/os_packages/package_scripts/post_install.sh b/src/dev/build/tasks/os_packages/package_scripts/post_install.sh
index 939226b565f79..728278dae746b 100644
--- a/src/dev/build/tasks/os_packages/package_scripts/post_install.sh
+++ b/src/dev/build/tasks/os_packages/package_scripts/post_install.sh
@@ -1,6 +1,11 @@
 #!/bin/sh
 set -e
 
+# source the default env file
+if [ -f "<%= envFile %>" ]; then
+    . "<%= envFile %>"
+fi
+
 export KBN_PATH_CONF=${KBN_PATH_CONF:-<%= configDir %>}
 
 set_chmod() {
@@ -71,4 +76,12 @@ if [ "$IS_UPGRADE" = "true" ]; then
   if command -v systemctl >/dev/null; then
       systemctl daemon-reload
   fi
+
+  if [ "$RESTART_ON_UPGRADE" = "true" ]; then
+    echo -n "Restarting kibana service..."
+    if command -v systemctl >/dev/null; then
+        systemctl restart kibana.service || true
+    fi
+    echo " OK"
+  fi
 fi
diff --git a/src/dev/build/tasks/os_packages/run_fpm.ts b/src/dev/build/tasks/os_packages/run_fpm.ts
index 306b5a9407870..316101d96f338 100644
--- a/src/dev/build/tasks/os_packages/run_fpm.ts
+++ b/src/dev/build/tasks/os_packages/run_fpm.ts
@@ -113,7 +113,8 @@ export async function runFpm(
     `dataDir=/var/lib/kibana`,
     '--template-value',
     `logDir=/var/log/kibana`,
-
+    '--template-value',
+    `envFile=/etc/default/kibana`,
     // config and data directories are copied to /usr/share and /var/lib
     // below, so exclude them from the main package source located in
     // /usr/share/kibana/config. PATHS MUST BE RELATIVE, so drop the leading slash
diff --git a/src/dev/build/tasks/os_packages/service_templates/sysv/etc/default/kibana b/src/dev/build/tasks/os_packages/service_templates/sysv/etc/default/kibana
index 9c9f58ded350b..047952f7ca2cc 100644
--- a/src/dev/build/tasks/os_packages/service_templates/sysv/etc/default/kibana
+++ b/src/dev/build/tasks/os_packages/service_templates/sysv/etc/default/kibana
@@ -1,13 +1,5 @@
 user="kibana"
 group="kibana"
-chroot="/"
-chdir="/"
-nice=""
-
-
-# If this is set to 1, then when `stop` is called, if the process has
-# not exited within a reasonable time, SIGKILL will be sent next.
-# The default behavior is to simply log a message "program stop failed; still running"
-KILL_ON_STOP_TIMEOUT=0
 
 KBN_PATH_CONF="/etc/kibana"
+RESTART_ON_UPGRADE="false"