diff --git a/src/core_plugins/kibana/common/tutorials/logstash_instructions.js b/src/core_plugins/kibana/common/tutorials/logstash_instructions.js index 729a9489cf35d..a61992b6810cc 100644 --- a/src/core_plugins/kibana/common/tutorials/logstash_instructions.js +++ b/src/core_plugins/kibana/common/tutorials/logstash_instructions.js @@ -18,6 +18,40 @@ export const LOGSTASH_INSTRUCTIONS = { 'tar xzvf logstash-{config.kibana.version}.tar.gz' ] } + ], + DEB: [ + { + title: 'Download and install the Java runtime environment', + textPre: `${SKIP_INSTALL_SENTENCE} ${FIRST_TIME_SENTENCE}`, + commands: [ + 'sudo apt-get install default-jre' + ] + }, + { + title: 'Download and install Logstash', + textPre: SKIP_INSTALL_SENTENCE, + commands: [ + 'curl -L -O https://artifacts.elastic.co/downloads/logstash/logstash-{config.kibana.version}.deb', + 'sudo apt install ./logstash-{config.kibana.version}.deb' + ] + } + ], + RPM: [ + { + title: 'Download and install the Java runtime environment', + textPre: `${SKIP_INSTALL_SENTENCE} ${FIRST_TIME_SENTENCE}`, + commands: [ + 'sudo yum install -y java-1.8.0-openjdk' + ] + }, + { + title: 'Download and install Logstash', + textPre: SKIP_INSTALL_SENTENCE, + commands: [ + 'curl -L -O https://artifacts.elastic.co/downloads/logstash/logstash-{config.kibana.version}.rpm', + 'sudo rpm -ivh ./logstash-{config.kibana.version}.rpm' + ] + } ] } }; diff --git a/src/core_plugins/kibana/server/tutorials/netflow/on_prem.js b/src/core_plugins/kibana/server/tutorials/netflow/on_prem.js index a3f7a417df699..b429b7579f868 100644 --- a/src/core_plugins/kibana/server/tutorials/netflow/on_prem.js +++ b/src/core_plugins/kibana/server/tutorials/netflow/on_prem.js @@ -23,10 +23,10 @@ export const ON_PREM_INSTRUCTIONS = { title: 'Set up the Netflow module', textPre: 'In the Logstash install directory, run the following command to set up the Netflow module.', commands: [ - './bin/logstash --modules netflow --setup', + './bin/logstash --modules netflow --setup-and-exit', ], - textPost: 'The `--setup` option creates a `netflow-*` index pattern in Elasticsearch and imports' + - ' Kibana dashboards and visualizations. Running `--setup` is a one-time setup step. Omit this step' + + textPost: 'The `--setup-and-exit` option creates a `netflow-*` index pattern in Elasticsearch and imports' + + ' Kibana dashboards and visualizations. Running `--setup-and-exit` is a one-time setup step. Omit this step' + ' for subsequent runs of the module to avoid overwriting existing Kibana dashboards.' }, { @@ -36,6 +36,68 @@ export const ON_PREM_INSTRUCTIONS = { ] } ] + }, + { + id: INSTRUCTION_VARIANT.DEB, + instructions: [ + ...LOGSTASH_INSTRUCTIONS.INSTALL.DEB, + { + title: 'Set up the Netflow module', + textPre: 'Run the following command to set up the Netflow module.', + commands: [ + '/usr/share/logstash/bin/logstash --modules netflow --setup-and-exit', + ], + textPost: 'The `--setup-and-exit` option creates a `netflow-*` index pattern in Elasticsearch and imports' + + ' Kibana dashboards and visualizations. Running `--setup-and-exit` is a one-time setup step. Omit this step' + + ' for subsequent runs of the module to avoid overwriting existing Kibana dashboards.' + }, + { + title: 'Configure the Netflow module', + textPre: 'Edit `/etc/logstash/logstash.yml` and add the following lines to it:', + commands: [ + 'modules:', + '- name: netflow', + ' var.input.udp.port: {params.netflow_var_input_udp_port}' + ] + }, + { + title: 'Restart the Logstash service', + commands: [ + 'sudo systemctl restart logstash.service' + ] + } + ] + }, + { + id: INSTRUCTION_VARIANT.RPM, + instructions: [ + ...LOGSTASH_INSTRUCTIONS.INSTALL.RPM, + { + title: 'Set up the Netflow module', + textPre: 'Run the following command to set up the Netflow module.', + commands: [ + '/usr/share/logstash/bin/logstash --modules netflow --setup-and-exit', + ], + textPost: 'The `--setup-and-exit` option creates a `netflow-*` index pattern in Elasticsearch and imports' + + ' Kibana dashboards and visualizations. Running `--setup-and-exit` is a one-time setup step. Omit this step' + + ' for subsequent runs of the module to avoid overwriting existing Kibana dashboards.' + }, + { + title: 'Configure the Netflow module', + textPre: 'Edit `/etc/logstash/logstash.yml` and add the following lines to it:', + commands: [ + 'modules:', + '- name: netflow', + ' var.input.udp.port: {params.netflow_var_input_udp_port}' + ] + }, + { + title: 'Restart the Logstash service', + commands: [ + 'sudo systemctl restart logstash.service' + ] + } + ] } ] }