Skip to content

Commit

Permalink
update apm-server start instructions for deb/rpm/windows (elastic#24104)
Browse files Browse the repository at this point in the history
* update apm-server start instructions for deb/rpm

* update apm-server start instructions for windows
  • Loading branch information
graphaelli authored Oct 18, 2018
1 parent 2be837e commit 7d0eaed
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -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'],
},
];
}
6 changes: 4 additions & 2 deletions src/core_plugins/kibana/server/tutorials/apm/on_prem.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import { INSTRUCTION_VARIANT } from '../../../common/tutorials/instruction_varia
import {
createWindowsServerInstructions,
createEditConfig,
createStartServerUnixSysv,
createStartServerUnix,
createDownloadServerRpm,
createDownloadServerDeb,
Expand All @@ -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: [
Expand All @@ -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,
Expand Down

0 comments on commit 7d0eaed

Please sign in to comment.