Skip to content

Commit

Permalink
[8.15] [Observability Onboarding] Fix Otel for x86_64 macs (#194915) (#…
Browse files Browse the repository at this point in the history
…195104)

# Backport

This will backport the following commits from `main` to `8.15`:
- [[Observability Onboarding] Fix Otel for x86_64 macs
(#194915)](#194915)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Joe
Reuter","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-10-04T15:16:54Z","message":"[Observability
Onboarding] Fix Otel for x86_64 macs (#194915)\n\n##
Summary\r\n\r\nFixes #194872 by
adjusting the\r\nway the arch is
determined","sha":"7c51f3bb79512c4455f85240e5801520cd0e3c57","branchLabelMapping":{"^v9.0.0$":"main","^v8.16.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","v9.0.0","backport:prev-minor","ci:project-deploy-observability","Team:obs-ux-logs","v8.16.0","v8.15.3"],"title":"[Observability
Onboarding] Fix Otel for x86_64
macs","number":194915,"url":"https://github.com/elastic/kibana/pull/194915","mergeCommit":{"message":"[Observability
Onboarding] Fix Otel for x86_64 macs (#194915)\n\n##
Summary\r\n\r\nFixes #194872 by
adjusting the\r\nway the arch is
determined","sha":"7c51f3bb79512c4455f85240e5801520cd0e3c57"}},"sourceBranch":"main","suggestedTargetBranches":["8.x","8.15"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/194915","number":194915,"mergeCommit":{"message":"[Observability
Onboarding] Fix Otel for x86_64 macs (#194915)\n\n##
Summary\r\n\r\nFixes #194872 by
adjusting the\r\nway the arch is
determined","sha":"7c51f3bb79512c4455f85240e5801520cd0e3c57"}},{"branch":"8.x","label":"v8.16.0","branchLabelMappingKey":"^v8.16.0$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.15","label":"v8.15.3","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Joe Reuter <[email protected]>
  • Loading branch information
kibanamachine and flash1293 authored Oct 4, 2024
1 parent 6c8ed0a commit 808a96c
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,7 @@ rm ./otel.yml && cp ./otel_samples/platformlogs_hostmetrics.yml ./otel.yml && mk
id: 'mac',
name: 'Mac',
firstStepTitle: HOST_COMMAND,
content: `arch=$(if [[ $(arch) == "arm64" ]]; then echo "aarch64"; else echo $(arch); fi)
content: `arch=$(if [[ $(uname -m) == "arm64" ]]; then echo "aarch64"; else echo $(uname -m); fi)
curl --output elastic-distro-${agentVersion}-darwin-$arch.tar.gz --url https://${AGENT_CDN_BASE_URL}/elastic-agent-${agentVersion}-darwin-$arch.tar.gz --proto '=https' --tlsv1.2 -fOL && mkdir -p "elastic-distro-${agentVersion}-darwin-$arch" && tar -xvf elastic-distro-${agentVersion}-darwin-$arch.tar.gz -C "elastic-distro-${agentVersion}-darwin-$arch" --strip-components=1 && cd elastic-distro-${agentVersion}-darwin-$arch
Expand Down

0 comments on commit 808a96c

Please sign in to comment.