From a8ff9d89ff00ad9e89a51e1ffd5b35bfbfe6790d Mon Sep 17 00:00:00 2001 From: Joe Reuter Date: Mon, 8 Jul 2024 16:31:42 +0200 Subject: [PATCH] [OTel Onboarding] Adjust linux snippet and warning (#187691) Address https://github.com/elastic/observability-dev/issues/3217#issuecomment-2210741356 Screenshot 2024-07-05 at 17 30 47 (cherry picked from commit ae802a5776e8f64e43ef7c6d26024d7cd8117745) --- .../quickstart_flows/otel_logs/index.tsx | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/x-pack/plugins/observability_solution/observability_onboarding/public/application/quickstart_flows/otel_logs/index.tsx b/x-pack/plugins/observability_solution/observability_onboarding/public/application/quickstart_flows/otel_logs/index.tsx index 1bac512fb0f60..d07e15525c08c 100644 --- a/x-pack/plugins/observability_solution/observability_onboarding/public/application/quickstart_flows/otel_logs/index.tsx +++ b/x-pack/plugins/observability_solution/observability_onboarding/public/application/quickstart_flows/otel_logs/index.tsx @@ -69,7 +69,7 @@ export const OtelLogsPanel: React.FC = () => { } = useKibana(); const AGENT_CDN_BASE_URL = isServerless - ? 'snapshots.elastic.co/8.15.0-474afc1d/downloads/beats/elastic-agent' + ? 'snapshots.elastic.co/8.15.0-dd63864e/downloads/beats/elastic-agent' : 'artifacts.elastic.co/downloads/beats/elastic-agent'; // TODO change once otel flow should be shown on serverless // const agentVersion = isServerless ? setup?.elasticAgentVersion : stackVersion; @@ -545,6 +545,8 @@ spec: content: `arch=$(if ([[ $(arch) == "arm" || $(arch) == "aarch64" ]]); then echo "arm64"; else echo $(arch); fi) curl --output elastic-distro-${agentVersion}-linux-$arch.tar.gz --url https://${AGENT_CDN_BASE_URL}/elastic-agent-${agentVersion}-linux-$arch.tar.gz --proto '=https' --tlsv1.2 -fOL && mkdir elastic-distro-${agentVersion}-linux-$arch && tar -xvf elastic-distro-${agentVersion}-linux-$arch.tar.gz -C "elastic-distro-${agentVersion}-linux-$arch" --strip-components=1 && cd elastic-distro-${agentVersion}-linux-$arch + +sudo setcap 'cap_dac_read_search=ep' ./data/elastic-agent-*/elastic-agent rm ./otel.yml && cp ./otel_samples/platformlogs_hostmetrics.yml ./otel.yml && mkdir -p ./data/otelcol && sed -i 's#\\\${env:STORAGE_DIR}#'"$PWD"/data/otelcol'#g' ./otel.yml && sed -i 's#\\\${env:ELASTIC_ENDPOINT}#${setup?.elasticsearchUrl}#g' ./otel.yml && sed -i 's/\\\${env:ELASTIC_API_KEY}/${apiKeyData?.apiKeyEncoded}/g' ./otel.yml`, start: './otelcol --config otel.yml', @@ -721,8 +723,8 @@ rm ./otel.yml && cp ./otel_samples/platformlogs_hostmetrics.yml ./otel.yml && mk + {selectedTab !== 'kubernetes' && ( +

+ {i18n.translate( + 'xpack.observability_onboarding.otelLogsPanel.historicalDataDescription2', + { + defaultMessage: + 'The default log path is /var/log/*. You can change this path in the otel.yml file if needed.', + } + )} +

+ )}
{selectedContent.prompt}