Skip to content

Commit

Permalink
[8.x] [Fleet] removed extraneous '/downloads' in path for c…
Browse files Browse the repository at this point in the history
…url commands (#204660) (#204779)

# Backport

This will backport the following commits from `main` to `8.x`:
- [[Fleet] removed extraneous '/downloads' in path for curl
commands (#204660)](#204660)

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

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

<!--BACKPORT [{"author":{"name":"Mason
Herron","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-12-18T15:37:32Z","message":"[Fleet]
removed extraneous '/downloads' in path for curl commands
(#204660)\n\n## Summary\r\n\r\nRemoved the extra `/downloads` portion of
the curl command, as it is\r\nalready returned in the base
url.\r\nCloses #204462 \r\n\r\nBefore:
\r\n\r\n![image](https://github.com/user-attachments/assets/5a156aca-ea2b-4703-97b3-f7a5e4ae6ab1)\r\n\r\nAfter:
\r\n\r\n![image](https://github.com/user-attachments/assets/d5c9f0d4-1452-40c1-b8df-4473584ac288)","sha":"e29a14d623d1034f6ea12bce679a8fceb95b4cdc","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["bug","release_note:skip","Team:Fleet","v9.0.0","backport:prev-minor"],"title":"[Fleet]
removed extraneous '/downloads' in path for curl
commands","number":204660,"url":"https://github.com/elastic/kibana/pull/204660","mergeCommit":{"message":"[Fleet]
removed extraneous '/downloads' in path for curl commands
(#204660)\n\n## Summary\r\n\r\nRemoved the extra `/downloads` portion of
the curl command, as it is\r\nalready returned in the base
url.\r\nCloses #204462 \r\n\r\nBefore:
\r\n\r\n![image](https://github.com/user-attachments/assets/5a156aca-ea2b-4703-97b3-f7a5e4ae6ab1)\r\n\r\nAfter:
\r\n\r\n![image](https://github.com/user-attachments/assets/d5c9f0d4-1452-40c1-b8df-4473584ac288)","sha":"e29a14d623d1034f6ea12bce679a8fceb95b4cdc"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/204660","number":204660,"mergeCommit":{"message":"[Fleet]
removed extraneous '/downloads' in path for curl commands
(#204660)\n\n## Summary\r\n\r\nRemoved the extra `/downloads` portion of
the curl command, as it is\r\nalready returned in the base
url.\r\nCloses #204462 \r\n\r\nBefore:
\r\n\r\n![image](https://github.com/user-attachments/assets/5a156aca-ea2b-4703-97b3-f7a5e4ae6ab1)\r\n\r\nAfter:
\r\n\r\n![image](https://github.com/user-attachments/assets/d5c9f0d4-1452-40c1-b8df-4473584ac288)","sha":"e29a14d623d1034f6ea12bce679a8fceb95b4cdc"}}]}]
BACKPORT-->

Co-authored-by: Mason Herron <[email protected]>
  • Loading branch information
kibanamachine and Supplementing authored Dec 18, 2024
1 parent 5f127c9 commit b10bef3
Showing 1 changed file with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,24 +22,24 @@ export const StandaloneInstructions = ({
const { windows: windowsDownloadSourceProxyArgs, curl: curlDownloadSourceProxyArgs } =
getDownloadSourceProxyArgs(downloadSourceProxy);

const linuxDebCommand = `curl -L -O ${downloadBaseUrl}/downloads/beats/elastic-agent/elastic-agent-${agentVersion}-amd64.deb ${curlDownloadSourceProxyArgs}
const linuxDebCommand = `curl -L -O ${downloadBaseUrl}/beats/elastic-agent/elastic-agent-${agentVersion}-amd64.deb ${curlDownloadSourceProxyArgs}
sudo dpkg -i elastic-agent-${agentVersion}-amd64.deb \nsudo systemctl enable elastic-agent \nsudo systemctl start elastic-agent`;

const linuxRpmCommand = `curl -L -O ${downloadBaseUrl}/downloads/beats/elastic-agent/elastic-agent-${agentVersion}-x86_64.rpm ${curlDownloadSourceProxyArgs}
const linuxRpmCommand = `curl -L -O ${downloadBaseUrl}/beats/elastic-agent/elastic-agent-${agentVersion}-x86_64.rpm ${curlDownloadSourceProxyArgs}
sudo rpm -vi elastic-agent-${agentVersion}-x86_64.rpm \nsudo systemctl enable elastic-agent \nsudo systemctl start elastic-agent`;

const linuxCommand = `curl -L -O ${downloadBaseUrl}/downloads/beats/elastic-agent/elastic-agent-${agentVersion}-linux-x86_64.tar.gz ${curlDownloadSourceProxyArgs}
const linuxCommand = `curl -L -O ${downloadBaseUrl}/beats/elastic-agent/elastic-agent-${agentVersion}-linux-x86_64.tar.gz ${curlDownloadSourceProxyArgs}
tar xzvf elastic-agent-${agentVersion}-linux-x86_64.tar.gz
cd elastic-agent-${agentVersion}-linux-x86_64
sudo ./elastic-agent install`;

const macCommand = `curl -L -O ${downloadBaseUrl}/downloads/beats/elastic-agent/elastic-agent-${agentVersion}-darwin-aarch64.tar.gz ${curlDownloadSourceProxyArgs}
const macCommand = `curl -L -O ${downloadBaseUrl}/beats/elastic-agent/elastic-agent-${agentVersion}-darwin-aarch64.tar.gz ${curlDownloadSourceProxyArgs}
tar xzvf elastic-agent-${agentVersion}-darwin-aarch64.tar.gz
cd elastic-agent-${agentVersion}-darwin-aarch64
sudo ./elastic-agent install`;

const windowsCommand = `$ProgressPreference = 'SilentlyContinue'
Invoke-WebRequest -Uri ${downloadBaseUrl}/downloads/beats/elastic-agent/elastic-agent-${agentVersion}-windows-x86_64.zip -OutFile elastic-agent-${agentVersion}-windows-x86_64.zip ${windowsDownloadSourceProxyArgs}
Invoke-WebRequest -Uri ${downloadBaseUrl}/beats/elastic-agent/elastic-agent-${agentVersion}-windows-x86_64.zip -OutFile elastic-agent-${agentVersion}-windows-x86_64.zip ${windowsDownloadSourceProxyArgs}
Expand-Archive .\elastic-agent-${agentVersion}-windows-x86_64.zip -DestinationPath .
cd elastic-agent-${agentVersion}-windows-x86_64
.\\elastic-agent.exe install`;
Expand Down

0 comments on commit b10bef3

Please sign in to comment.