diff --git a/src/core_plugins/kibana/common/tutorials/heartbeat_instructions.js b/src/core_plugins/kibana/common/tutorials/heartbeat_instructions.js index 25cbca6dedecb..9107dd509067d 100644 --- a/src/core_plugins/kibana/common/tutorials/heartbeat_instructions.js +++ b/src/core_plugins/kibana/common/tutorials/heartbeat_instructions.js @@ -119,7 +119,7 @@ export const createHeartbeatInstructions = context => ({ }), commands: [ 'sudo heartbeat setup', - 'sudo service heartbeat start', + 'sudo service heartbeat-elastic start', ] }, RPM: { @@ -131,7 +131,7 @@ export const createHeartbeatInstructions = context => ({ }), commands: [ 'sudo heartbeat setup', - 'sudo service heartbeat start', + 'sudo service heartbeat-elastic start', ], }, WINDOWS: { @@ -169,13 +169,11 @@ export const createHeartbeatInstructions = context => ({ ], textPost: i18n.translate('kbn.common.tutorials.heartbeatInstructions.config.osxTextPost', { defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user, {esUrlTemplate} is the URL of Elasticsearch, \ -and {kibanaUrlTemplate} is the URL of Kibana. \ - To configure your own monitors check [configure Hearbeat docs]({configureLink}).', +and {kibanaUrlTemplate} is the URL of Kibana.', values: { passwordTemplate: '``', esUrlTemplate: '``', kibanaUrlTemplate: '``', - configureLink: '{config.docs.beats.heartbeat}/heartbeat-configuration.html', }, }), }, @@ -200,13 +198,11 @@ and {kibanaUrlTemplate} is the URL of Kibana. \ ], textPost: i18n.translate('kbn.common.tutorials.heartbeatInstructions.config.debTextPost', { defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user, {esUrlTemplate} is the URL of Elasticsearch, \ -and {kibanaUrlTemplate} is the URL of Kibana. \ - To configure your own monitors check [configure Hearbeat docs]({configureLink}).', +and {kibanaUrlTemplate} is the URL of Kibana.', values: { passwordTemplate: '``', esUrlTemplate: '``', kibanaUrlTemplate: '``', - configureLink: '{config.docs.beats.heartbeat}/heartbeat-configuration.html', }, }), }, @@ -231,13 +227,11 @@ and {kibanaUrlTemplate} is the URL of Kibana. \ ], textPost: i18n.translate('kbn.common.tutorials.heartbeatInstructions.config.rpmTextPost', { defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user, {esUrlTemplate} is the URL of Elasticsearch, \ -and {kibanaUrlTemplate} is the URL of Kibana. \ - To configure your own monitors check [configure Hearbeat docs]({configureLink}).', +and {kibanaUrlTemplate} is the URL of Kibana.', values: { passwordTemplate: '``', esUrlTemplate: '``', kibanaUrlTemplate: '``', - configureLink: '{config.docs.beats.heartbeat}/heartbeat-configuration.html', }, }), }, @@ -262,13 +256,11 @@ and {kibanaUrlTemplate} is the URL of Kibana. \ ], textPost: i18n.translate('kbn.common.tutorials.heartbeatInstructions.config.windowsTextPost', { defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user, {esUrlTemplate} is the URL of Elasticsearch, \ -and {kibanaUrlTemplate} is the URL of Kibana. \ - To configure your own monitors check [configure Hearbeat docs]({configureLink}).', +and {kibanaUrlTemplate} is the URL of Kibana.', values: { passwordTemplate: '``', esUrlTemplate: '``', kibanaUrlTemplate: '``', - configureLink: '{config.docs.beats.heartbeat}/heartbeat-configuration.html', }, }), } @@ -361,6 +353,7 @@ export function heartbeatEnableInstructionsOnPrem() { defaultMessage: 'Edit the configuration - Add monitors', }); const defaultCommands = [ + 'heartbeat.monitors:', '- type: http', ' urls: [""]', ' schedule: "@every 10s"' @@ -377,7 +370,7 @@ export function heartbeatEnableInstructionsOnPrem() { OSX: { title: defaultTitle, textPre: i18n.translate('kbn.common.tutorials.heartbeatEnableOnPremInstructions.osxTextPre', { - defaultMessage: 'Modify the settings in the `heartbeat.yml` file.', + defaultMessage: 'Edit the `heartbeat.monitors` setting in the `heartbeat.yml` file.', }), commands: defaultCommands, textPost: defaultTextPost @@ -385,7 +378,7 @@ export function heartbeatEnableInstructionsOnPrem() { DEB: { title: defaultTitle, textPre: i18n.translate('kbn.common.tutorials.heartbeatEnableOnPremInstructions.debTextPre', { - defaultMessage: 'Modify the monitors in the `/etc/heartbeat/heartbeat.yml` file.', + defaultMessage: 'Edit the `heartbeat.monitors` setting in the `heartbeat.yml` file.', }), commands: defaultCommands, textPost: defaultTextPost @@ -393,7 +386,7 @@ export function heartbeatEnableInstructionsOnPrem() { RPM: { title: defaultTitle, textPre: i18n.translate('kbn.common.tutorials.heartbeatEnableOnPremInstructions.rpmTextPre', { - defaultMessage: 'Modify the monitors in the `/etc/heartbeat/heartbeat.yml` file.', + defaultMessage: 'Edit the `heartbeat.monitors` setting in the `heartbeat.yml` file.', }), commands: defaultCommands, textPost: defaultTextPost @@ -401,7 +394,7 @@ export function heartbeatEnableInstructionsOnPrem() { WINDOWS: { title: defaultTitle, textPre: i18n.translate('kbn.common.tutorials.heartbeatEnableOnPremInstructions.windowsTextPre', { - defaultMessage: 'Modify the monitors in the `/etc/heartbeat/heartbeat.yml` file.', + defaultMessage: 'Edit the `heartbeat.monitors` setting in the `heartbeat.yml` file.', }), commands: defaultCommands, textPost: defaultTextPost @@ -414,6 +407,7 @@ export function heartbeatEnableInstructionsCloud() { defaultMessage: 'Edit the configuration - Add monitors', }); const defaultCommands = [ + 'heartbeat.monitors:', '- type: http', ' urls: ["http://elastic.co"]', ' schedule: "@every 10s"' @@ -426,7 +420,7 @@ export function heartbeatEnableInstructionsCloud() { OSX: { title: defaultTitle, textPre: i18n.translate('kbn.common.tutorials.heartbeatEnableCloudInstructions.osxTextPre', { - defaultMessage: 'Modify the settings in the `heartbeat.yml` file.', + defaultMessage: 'Edit the `heartbeat.monitors` setting in the `heartbeat.yml` file.', }), commands: defaultCommands, textPost: defaultTextPost @@ -434,7 +428,7 @@ export function heartbeatEnableInstructionsCloud() { DEB: { title: defaultTitle, textPre: i18n.translate('kbn.common.tutorials.heartbeatEnableCloudInstructions.debTextPre', { - defaultMessage: 'Modify the monitors in the `/etc/heartbeat/heartbeat.yml` file.', + defaultMessage: 'Edit the `heartbeat.monitors` setting in the `heartbeat.yml` file.', }), commands: defaultCommands, textPost: defaultTextPost @@ -442,7 +436,7 @@ export function heartbeatEnableInstructionsCloud() { RPM: { title: defaultTitle, textPre: i18n.translate('kbn.common.tutorials.heartbeatEnableCloudInstructions.rpmTextPre', { - defaultMessage: 'Modify the monitors in the `/etc/heartbeat/heartbeat.yml` file.', + defaultMessage: 'Edit the `heartbeat.monitors` setting in the `heartbeat.yml` file.', }), commands: defaultCommands, textPost: defaultTextPost @@ -450,8 +444,7 @@ export function heartbeatEnableInstructionsCloud() { WINDOWS: { title: defaultTitle, textPre: i18n.translate('kbn.common.tutorials.heartbeatEnableCloudInstructions.windowsTextPre', { - defaultMessage: 'From the {path} folder, run:', - values: { path: `C:\\Program Files\\Heartbeat` }, + defaultMessage: 'Edit the `heartbeat.monitors` setting in the `heartbeat.yml` file.', }), commands: defaultCommands, textPost: defaultTextPost