From 584bccc05093cec9f5fc0d3641b88fabb5bda0e5 Mon Sep 17 00:00:00 2001 From: Anan Zhuang Date: Fri, 19 Mar 2021 12:48:47 -0700 Subject: [PATCH] Fix comments Signed-off-by: Anan Zhuang --- src/plugins/home/server/tutorials/cef_logs/index.ts | 2 +- .../home/server/tutorials/crowdstrike_logs/index.ts | 2 +- .../tutorials/instructions/functionbeat_instructions.ts | 4 ---- .../tutorials/instructions/heartbeat_instructions.ts | 7 ------- .../server/tutorials/instructions/logstash_instructions.ts | 5 ----- .../tutorials/instructions/metricbeat_instructions.ts | 4 ---- 6 files changed, 2 insertions(+), 22 deletions(-) diff --git a/src/plugins/home/server/tutorials/cef_logs/index.ts b/src/plugins/home/server/tutorials/cef_logs/index.ts index e199bb98afe..a56e9849283 100644 --- a/src/plugins/home/server/tutorials/cef_logs/index.ts +++ b/src/plugins/home/server/tutorials/cef_logs/index.ts @@ -47,7 +47,7 @@ export function cefLogsSpecProvider(context: TutorialContext): TutorialSchema { input will parse the header and set the timestamp value. Then the \ processor is applied to parse the CEF encoded data. The decoded data \ is written into a `cef` object field. Lastly any OpenSearch Common Schema \ - (ECS) fields that can be populated with the CEF data are populated. \ + (OCS) fields that can be populated with the CEF data are populated. \ [Learn more]({learnMoreLink}).', values: { learnMoreLink: '{config.docs.beats.filebeat}/filebeat-module-cef.html', diff --git a/src/plugins/home/server/tutorials/crowdstrike_logs/index.ts b/src/plugins/home/server/tutorials/crowdstrike_logs/index.ts index 129a89acb16..c57dfef9a88 100644 --- a/src/plugins/home/server/tutorials/crowdstrike_logs/index.ts +++ b/src/plugins/home/server/tutorials/crowdstrike_logs/index.ts @@ -44,7 +44,7 @@ export function crowdstrikeLogsSpecProvider(context: TutorialContext): TutorialS defaultMessage: 'This is the Filebeat module for CrowdStrike Falcon using the Falcon \ [SIEM Connector](https://www.crowdstrike.com/blog/tech-center/integrate-with-your-siem). \ - This module collects this data, converts it to ECS, and ingests it to view in the SIEM. \ + This module collects this data, converts it to OCS, and ingests it to view in the SIEM. \ By default, the Falcon SIEM connector outputs JSON formatted Falcon Streaming API event data. \ [Learn more]({learnMoreLink}).', values: { diff --git a/src/plugins/home/server/tutorials/instructions/functionbeat_instructions.ts b/src/plugins/home/server/tutorials/instructions/functionbeat_instructions.ts index f6c5acc8eb5..2365bed6801 100644 --- a/src/plugins/home/server/tutorials/instructions/functionbeat_instructions.ts +++ b/src/plugins/home/server/tutorials/instructions/functionbeat_instructions.ts @@ -79,11 +79,7 @@ export const createFunctionbeatInstructions = (context?: TutorialContext) => ({ folderPath: '`C:\\Program Files`', functionbeatLink: '{config.docs.beats.functionbeat}/functionbeat-installation-configuration.html', -<<<<<<< HEAD elasticLink: 'https://www.opensearch.co/downloads/beats/functionbeat', -======= - opensearchLink: 'https://www.elastic.co/downloads/beats/functionbeat', ->>>>>>> 6b9f77d6fa (clean escloud -1) }, } ), diff --git a/src/plugins/home/server/tutorials/instructions/heartbeat_instructions.ts b/src/plugins/home/server/tutorials/instructions/heartbeat_instructions.ts index 9d62861746e..5b1ccba4009 100644 --- a/src/plugins/home/server/tutorials/instructions/heartbeat_instructions.ts +++ b/src/plugins/home/server/tutorials/instructions/heartbeat_instructions.ts @@ -92,11 +92,7 @@ export const createHeartbeatInstructions = (context?: TutorialContext) => ({ folderPath: '`C:\\Program Files`', heartbeatLink: '{config.docs.beats.heartbeat}/heartbeat-installation-configuration.html', -<<<<<<< HEAD elasticLink: 'https://www.opensearch.co/downloads/beats/heartbeat', -======= - opensearchLink: 'https://www.elastic.co/downloads/beats/heartbeat', ->>>>>>> 6b9f77d6fa (clean escloud -1) }, } ), @@ -341,7 +337,6 @@ export function heartbeatEnableInstructionsOnPrem() { }; } -<<<<<<< HEAD export function heartbeatEnableInstructionsCloud() { const defaultTitle = i18n.translate( 'home.tutorials.common.heartbeatEnableCloudInstructions.defaultTitle', @@ -402,8 +397,6 @@ export function heartbeatEnableInstructionsCloud() { }; } -======= ->>>>>>> 6b9f77d6fa (clean escloud -1) export function heartbeatStatusCheck() { return { title: i18n.translate('home.tutorials.common.heartbeatStatusCheck.title', { diff --git a/src/plugins/home/server/tutorials/instructions/logstash_instructions.ts b/src/plugins/home/server/tutorials/instructions/logstash_instructions.ts index aa19cf7476c..c8674d6e1dd 100644 --- a/src/plugins/home/server/tutorials/instructions/logstash_instructions.ts +++ b/src/plugins/home/server/tutorials/instructions/logstash_instructions.ts @@ -95,13 +95,8 @@ export const createLogstashInstructions = () => ({ values: { logstashLink: '{config.docs.base_url}guide/en/logstash/current/getting-started-with-logstash.html', -<<<<<<< HEAD elasticLink: 'https://artifacts.opensearch.co/downloads/logstash/logstash-{config.opensearchDashboards.version}.zip', -======= - opensearchLink: - 'https://artifacts.elastic.co/downloads/logstash/logstash-{config.opensearchDashboards.version}.zip', ->>>>>>> 6b9f77d6fa (clean escloud -1) }, } ), diff --git a/src/plugins/home/server/tutorials/instructions/metricbeat_instructions.ts b/src/plugins/home/server/tutorials/instructions/metricbeat_instructions.ts index 7a14921d644..d72d4b9e286 100644 --- a/src/plugins/home/server/tutorials/instructions/metricbeat_instructions.ts +++ b/src/plugins/home/server/tutorials/instructions/metricbeat_instructions.ts @@ -98,11 +98,7 @@ export const createMetricbeatInstructions = (context?: TutorialContext) => ({ folderPath: '`C:\\Program Files`', metricbeatLink: '{config.docs.beats.metricbeat}/metricbeat-installation-configuration.html', -<<<<<<< HEAD elasticLink: 'https://www.opensearch.co/downloads/beats/metricbeat', -======= - opensearchLink: 'https://www.elastic.co/downloads/beats/metricbeat', ->>>>>>> 6b9f77d6fa (clean escloud -1) }, } ),