diff --git a/src/core_plugins/kibana/server/tutorials/netflow/common_instructions.js b/src/core_plugins/kibana/server/tutorials/netflow/common_instructions.js index a4ed13ebfb5e1..29fdcf7778218 100644 --- a/src/core_plugins/kibana/server/tutorials/netflow/common_instructions.js +++ b/src/core_plugins/kibana/server/tutorials/netflow/common_instructions.js @@ -1,19 +1,38 @@ export const COMMON_NETFLOW_INSTRUCTIONS = { CONFIG: { - OSX: [ - { - title: 'Edit the configuration', - textPre: 'While in the Logstash install directory, modify `config/logstash.yml` to set the' - + ' configuration parameters for the Netflow module:', - commands: [ - 'modules:', - ' - name: netflow', - ' var.input.udp.port: ', - ' var.elasticsearch.hosts: [ "" ]', - ' var.kibana.host: ":"' - ] - } - ] + ON_PREM: { + OSX: [ + { + title: 'Edit the configuration', + textPre: 'While in the Logstash install directory, modify `config/logstash.yml` to set the' + + ' configuration parameters for the Netflow module:', + commands: [ + 'modules:', + ' - name: netflow', + ' var.input.udp.port: ', + ' var.elasticsearch.hosts: [ "" ]', + ' var.kibana.host: ":"' + ] + } + ] + }, + ELASTIC_CLOUD: { + OSX: [ + { + title: 'Edit the configuration', + textPre: 'While in the Logstash install directory, modify `config/logstash.yml` to set the' + + ' configuration parameters for the Netflow module:', + commands: [ + 'modules:', + ' - name: netflow', + ' var.input.udp.port: ', + ' cloud.id: "{config.cloud.id}"', + ' cloud.auth: "elastic:"' + ], + textPost: 'Where `` is the password of the `elastic` user.' + } + ] + } }, SETUP: { OSX: [ diff --git a/src/core_plugins/kibana/server/tutorials/netflow/elastic_cloud.js b/src/core_plugins/kibana/server/tutorials/netflow/elastic_cloud.js index cd1923e8bfcae..5005ee6bc3e19 100644 --- a/src/core_plugins/kibana/server/tutorials/netflow/elastic_cloud.js +++ b/src/core_plugins/kibana/server/tutorials/netflow/elastic_cloud.js @@ -1,4 +1,6 @@ import { INSTRUCTION_VARIANT } from '../../../common/tutorials/instruction_variant'; +import { LOGSTASH_INSTRUCTIONS } from '../../../common/tutorials/logstash_instructions'; +import { COMMON_NETFLOW_INSTRUCTIONS } from './common_instructions'; // TODO: compare with onPremElasticCloud and onPrem scenarios and extract out common bits export const ELASTIC_CLOUD_INSTRUCTIONS = { @@ -9,9 +11,9 @@ export const ELASTIC_CLOUD_INSTRUCTIONS = { { id: INSTRUCTION_VARIANT.OSX, instructions: [ - { - title: 'elastiCloud instructions - TBD', - } + ...LOGSTASH_INSTRUCTIONS.INSTALL.OSX, + ...COMMON_NETFLOW_INSTRUCTIONS.CONFIG.ELASTIC_CLOUD.OSX, + ...COMMON_NETFLOW_INSTRUCTIONS.SETUP.OSX ] } ] 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 f5a9ae2a7466c..c85d6655ca445 100644 --- a/src/core_plugins/kibana/server/tutorials/netflow/on_prem.js +++ b/src/core_plugins/kibana/server/tutorials/netflow/on_prem.js @@ -12,7 +12,7 @@ export const ON_PREM_INSTRUCTIONS = { id: INSTRUCTION_VARIANT.OSX, instructions: [ ...LOGSTASH_INSTRUCTIONS.INSTALL.OSX, - ...COMMON_NETFLOW_INSTRUCTIONS.CONFIG.OSX, + ...COMMON_NETFLOW_INSTRUCTIONS.CONFIG.ON_PREM.OSX, ...COMMON_NETFLOW_INSTRUCTIONS.SETUP.OSX ] } diff --git a/src/core_plugins/kibana/server/tutorials/netflow/on_prem_elastic_cloud.js b/src/core_plugins/kibana/server/tutorials/netflow/on_prem_elastic_cloud.js index 167eac24a25e2..dfac2033c5c47 100644 --- a/src/core_plugins/kibana/server/tutorials/netflow/on_prem_elastic_cloud.js +++ b/src/core_plugins/kibana/server/tutorials/netflow/on_prem_elastic_cloud.js @@ -18,7 +18,7 @@ export const ON_PREM_ELASTIC_CLOUD_INSTRUCTIONS = { TRYCLOUD_OPTION1, TRYCLOUD_OPTION2, ...LOGSTASH_INSTRUCTIONS.INSTALL.OSX, - ...COMMON_NETFLOW_INSTRUCTIONS.CONFIG.OSX, + ...COMMON_NETFLOW_INSTRUCTIONS.CONFIG.ON_PREM.OSX, ...COMMON_NETFLOW_INSTRUCTIONS.SETUP.OSX ] }