Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[beats/heartbeat] Improve add data copy #24795

Merged
merged 1 commit into from
Oct 30, 2018
Merged

[beats/heartbeat] Improve add data copy #24795

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 16 additions & 23 deletions src/core_plugins/kibana/common/tutorials/heartbeat_instructions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ export const createHeartbeatInstructions = context => ({
}),
commands: [
'sudo heartbeat setup',
'sudo service heartbeat start',
'sudo service heartbeat-elastic start',
]
},
RPM: {
Expand All @@ -131,7 +131,7 @@ export const createHeartbeatInstructions = context => ({
}),
commands: [
'sudo heartbeat setup',
'sudo service heartbeat start',
'sudo service heartbeat-elastic start',
],
},
WINDOWS: {
Expand Down Expand Up @@ -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: '`<password>`',
esUrlTemplate: '`<es_url>`',
kibanaUrlTemplate: '`<kibana_url>`',
configureLink: '{config.docs.beats.heartbeat}/heartbeat-configuration.html',
},
}),
},
Expand All @@ -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: '`<password>`',
esUrlTemplate: '`<es_url>`',
kibanaUrlTemplate: '`<kibana_url>`',
configureLink: '{config.docs.beats.heartbeat}/heartbeat-configuration.html',
},
}),
},
Expand All @@ -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: '`<password>`',
esUrlTemplate: '`<es_url>`',
kibanaUrlTemplate: '`<kibana_url>`',
configureLink: '{config.docs.beats.heartbeat}/heartbeat-configuration.html',
},
}),
},
Expand All @@ -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: '`<password>`',
esUrlTemplate: '`<es_url>`',
kibanaUrlTemplate: '`<kibana_url>`',
configureLink: '{config.docs.beats.heartbeat}/heartbeat-configuration.html',
},
}),
}
Expand Down Expand Up @@ -361,6 +353,7 @@ export function heartbeatEnableInstructionsOnPrem() {
defaultMessage: 'Edit the configuration - Add monitors',
});
const defaultCommands = [
'heartbeat.monitors:',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 on making this more obvious. The only thing I worry is that people will have heartbeat.monitors: multiple times in their config afterwards. Let's see what happens.

'- type: http',
' urls: ["<http://localhost:9200>"]',
' schedule: "@every 10s"'
Expand All @@ -377,31 +370,31 @@ 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
},
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
},
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
},
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
Expand All @@ -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"'
Expand All @@ -426,32 +420,31 @@ 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
},
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
},
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
},
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
Expand Down