From 7d0eaedd4c94b4247ce5218e06f2e3230c7b52dd Mon Sep 17 00:00:00 2001
From: Gil Raphaelli <g@raphaelli.com>
Date: Thu, 18 Oct 2018 11:47:51 -0400
Subject: [PATCH] update apm-server start instructions for deb/rpm/windows
 (#24104)

* update apm-server start instructions for deb/rpm

* update apm-server start instructions for windows
---
 .../server/tutorials/apm/apm_server_instructions.js  | 12 +++++++++++-
 .../kibana/server/tutorials/apm/on_prem.js           |  6 ++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/core_plugins/kibana/server/tutorials/apm/apm_server_instructions.js b/src/core_plugins/kibana/server/tutorials/apm/apm_server_instructions.js
index 2826aca5194db9..5d037da91c4f01 100644
--- a/src/core_plugins/kibana/server/tutorials/apm/apm_server_instructions.js
+++ b/src/core_plugins/kibana/server/tutorials/apm/apm_server_instructions.js
@@ -44,6 +44,16 @@ const createStartServer = () => ({
   }),
 });
 
+export function createStartServerUnixSysv() {
+  const START_SERVER = createStartServer();
+
+  return {
+    title: START_SERVER.title,
+    textPre: START_SERVER.textPre,
+    commands: ['service apm-server start'],
+  };
+}
+
 export function createStartServerUnix() {
   const START_SERVER = createStartServer();
 
@@ -128,7 +138,7 @@ to allow the script to run. For example: {command}.',
     {
       title: START_SERVER.title,
       textPre: START_SERVER.textPre,
-      commands: ['apm-server.exe -e'],
+      commands: ['Start-Service apm-server'],
     },
   ];
 }
diff --git a/src/core_plugins/kibana/server/tutorials/apm/on_prem.js b/src/core_plugins/kibana/server/tutorials/apm/on_prem.js
index 281c41d563eb6b..39c198be412e4f 100644
--- a/src/core_plugins/kibana/server/tutorials/apm/on_prem.js
+++ b/src/core_plugins/kibana/server/tutorials/apm/on_prem.js
@@ -22,6 +22,7 @@ import { INSTRUCTION_VARIANT } from '../../../common/tutorials/instruction_varia
 import {
   createWindowsServerInstructions,
   createEditConfig,
+  createStartServerUnixSysv,
   createStartServerUnix,
   createDownloadServerRpm,
   createDownloadServerDeb,
@@ -41,6 +42,7 @@ import {
 export function onPremInstructions(apmIndexPattern) {
   const EDIT_CONFIG = createEditConfig();
   const START_SERVER_UNIX = createStartServerUnix();
+  const START_SERVER_UNIX_SYSV = createStartServerUnixSysv();
 
   return {
     instructionSets: [
@@ -55,11 +57,11 @@ export function onPremInstructions(apmIndexPattern) {
           },
           {
             id: INSTRUCTION_VARIANT.DEB,
-            instructions: [createDownloadServerDeb(), EDIT_CONFIG, START_SERVER_UNIX],
+            instructions: [createDownloadServerDeb(), EDIT_CONFIG, START_SERVER_UNIX_SYSV],
           },
           {
             id: INSTRUCTION_VARIANT.RPM,
-            instructions: [createDownloadServerRpm(), EDIT_CONFIG, START_SERVER_UNIX],
+            instructions: [createDownloadServerRpm(), EDIT_CONFIG, START_SERVER_UNIX_SYSV],
           },
           {
             id: INSTRUCTION_VARIANT.WINDOWS,