From 6c961b85088ce824da7435317a10b757cd160889 Mon Sep 17 00:00:00 2001 From: "chantal.kelm" Date: Wed, 16 Nov 2022 14:39:46 -0300 Subject: [PATCH 1/8] link of architecture --- .../agent/components/register-agent.js | 64 ++++++++++++------- 1 file changed, 40 insertions(+), 24 deletions(-) diff --git a/public/controllers/agent/components/register-agent.js b/public/controllers/agent/components/register-agent.js index 25d90d9261..42f2718492 100644 --- a/public/controllers/agent/components/register-agent.js +++ b/public/controllers/agent/components/register-agent.js @@ -425,25 +425,25 @@ export const RegisterAgent = withErrorBoundary( resolveAMAZONLPackage() { switch (`${this.state.selectedVersion}-${this.state.selectedArchitecture}`) { - case '1-i386': + case 'amazonlinux1-i386': return `https://packages.wazuh.com/4.x/yum/wazuh-agent-${this.state.wazuhVersion}.i386.rpm`; - case '1-aarch64': + case 'amazonlinux1-aarch64': return `https://packages.wazuh.com/4.x/yum/wazuh-agent-${this.state.wazuhVersion}.aarch64.rpm`; - case '1-x86_64': + case 'amazonlinux1-x86_64': return `https://packages.wazuh.com/4.x/yum/wazuh-agent-${this.state.wazuhVersion}.x86_64.rpm`; - case '1-armhf': + case 'amazonlinux1-armhf': return `https://packages.wazuh.com/4.x/yum/wazuh-agent-${this.state.wazuhVersion}.armv7hl.rpm`; - case '1-powerpc': + case 'amazonlinux1-powerpc': return `https://packages.wazuh.com/4.x/yum/wazuh-agent-${this.state.wazuhVersion}.ppc64le.rpm`; - case '2-i386': + case 'amazonlinux2-i386': return `https://packages.wazuh.com/4.x/yum/wazuh-agent-${this.state.wazuhVersion}.i386.rpm`; - case '2-aarch64': + case 'amazonlinux2-aarch64': return `https://packages.wazuh.com/4.x/yum/wazuh-agent-${this.state.wazuhVersion}.aarch64.rpm`; - case '2-x86_64': + case 'amazonlinux2-x86_64': return `https://packages.wazuh.com/4.x/yum/wazuh-agent-${this.state.wazuhVersion}.x86_64.rpm`; - case '2-armhf': + case 'amazonlinux2-armhf': return `https://packages.wazuh.com/4.x/yum/wazuh-agent-${this.state.wazuhVersion}.armv7hl.rpm`; - case '2-powerpc': + case 'amazonlinux2-powerpc': return `https://packages.wazuh.com/4.x/yum/wazuh-agent-${this.state.wazuhVersion}.ppc64le.rpm`; case 'amazonlinux2022-i386': return `https://packages.wazuh.com/4.x/yum/wazuh-agent-${this.state.wazuhVersion}-1.i386.rpm`; @@ -476,7 +476,7 @@ export const RegisterAgent = withErrorBoundary( } resolveRASPBIANPackage() { - switch (`${this.state.selectedArchitecture}`) { + switch (`${this.state.selectedVersion}-${this.state.selectedArchitecture}`) { case 'busterorgreater-i386': return `https://packages.wazuh.com/4.x/apt/pool/main/w/wazuh-agent/wazuh-agent_${this.state.wazuhVersion}_i386.deb`; case 'busterorgreater-aarch64': @@ -494,14 +494,30 @@ export const RegisterAgent = withErrorBoundary( resolveUBUNTUPackage() { switch (`${this.state.selectedVersion}-${this.state.selectedArchitecture}`) { - case 'i386': + case 'ubuntu14-i386': return `https://packages.wazuh.com/4.x/apt/pool/main/w/wazuh-agent/wazuh-agent_${this.state.wazuhVersion}_i386.deb`; - case 'aarch64': + case 'ubuntu14-aarch64': + return `https://packages.wazuh.com/4.x/apt/pool/main/w/wazuh-agent/wazuh-agent_${this.state.wazuhVersion}_arm64.deb`; + case 'ubuntu14-armhf': + return `https://packages.wazuh.com/4.x/apt/pool/main/w/wazuh-agent/wazuh-agent_${this.state.wazuhVersion}_armhf.deb`; + case 'ubuntu14-x86_64': return `https://packages.wazuh.com/4.x/apt/pool/main/w/wazuh-agent/wazuh-agent_${this.state.wazuhVersion}_amd64.deb`; - case 'armhf': + case 'ubuntu15-i386': + return `https://packages.wazuh.com/4.x/apt/pool/main/w/wazuh-agent/wazuh-agent_${this.state.wazuhVersion}_i386.deb`; + case 'ubuntu15-aarch64': + return `https://packages.wazuh.com/4.x/apt/pool/main/w/wazuh-agent/wazuh-agent_${this.state.wazuhVersion}_arm64.deb`; + case 'ubuntu15-armhf': return `https://packages.wazuh.com/4.x/apt/pool/main/w/wazuh-agent/wazuh-agent_${this.state.wazuhVersion}_armhf.deb`; - case 'x86_64': + case 'ubuntu15-x86_64': + return `https://packages.wazuh.com/4.x/apt/pool/main/w/wazuh-agent/wazuh-agent_${this.state.wazuhVersion}_amd64.deb`; + case 'ubuntu16-i386': + return `https://packages.wazuh.com/4.x/apt/pool/main/w/wazuh-agent/wazuh-agent_${this.state.wazuhVersion}_i386.deb`; + case 'ubuntu16-aarch64': return `https://packages.wazuh.com/4.x/apt/pool/main/w/wazuh-agent/wazuh-agent_${this.state.wazuhVersion}_arm64.deb`; + case 'ubuntu16-armhf': + return `https://packages.wazuh.com/4.x/apt/pool/main/w/wazuh-agent/wazuh-agent_${this.state.wazuhVersion}_armhf.deb`; + case 'ubuntu16-x86_64': + return `https://packages.wazuh.com/4.x/apt/pool/main/w/wazuh-agent/wazuh-agent_${this.state.wazuhVersion}_amd64.deb`; default: return `https://packages.wazuh.com/4.x/apt/pool/main/w/wazuh-agent/wazuh-agent_${this.state.wazuhVersion}_amd64.deb`; } @@ -509,9 +525,9 @@ export const RegisterAgent = withErrorBoundary( resolveOPENSUSEPackage() { switch (`${this.state.selectedVersion}-${this.state.selectedArchitecture}`) { - case 'leap15-i386': - return `https://packages.wazuh.com/4.x/yum/i386/wazuh-agent-${this.state.wazuhVersion}.x86_64.rpm`; case 'leap15-x86_64': + return `https://packages.wazuh.com/4.x/yum/i386/wazuh-agent-${this.state.wazuhVersion}.x86_64.rpm`; + case 'leap15-ARM64': return `https://packages.wazuh.com/4.x/yum/x86_64/wazuh-agent-${this.state.wazuhVersion}.armv7hl.rpm` default: return `https://packages.wazuh.com/4.x/yum/wazuh-agent-${this.state.wazuhVersion}.x86_64.rpm`; @@ -521,15 +537,15 @@ export const RegisterAgent = withErrorBoundary( resolveSOLARISPackage() { switch (`${this.state.selectedVersion}-${this.state.selectedArchitecture}`) { case 'solaris10-i386': - return `https://packages.wazuh.com/4.x/yum/i386/wazuh-agent-${this.state.wazuhVersion}-sol10-i386.pkg`; - case 'solaris10-spark': - return `https://packages.wazuh.com/4.x/yum/i386/wazuh-agent-${this.state.wazuhVersion}-sol10-sparc.pkg`; + return `https://packages.wazuh.com/4.x/solaris/i386/10/wazuh-agent-${this.state.wazuhVersion}-sol10-i386.pkg`; + case 'solaris10-sparc': + return `https://packages.wazuh.com/4.x/solaris/sparc/10/wazuh-agent-${this.state.wazuhVersion}-sol10-sparc.pkg`; case 'solaris11-i386': - return `https://packages.wazuh.com/4.x/yum/i386/wazuh-agent-${this.state.wazuhVersion}-sol11-i386.p5p`; - case 'solaris11-spark': - return `https://packages.wazuh.com/4.x/yum/x86_64/wazuh-agent-${this.state.wazuhVersion}-sol11-sparc.p5p` + return `https://packages.wazuh.com/4.x/solaris/i386/11/wazuh-agent-${this.state.wazuhVersion}-sol11-i386.p5p`; + case 'solaris11-sparc': + return `https://packages.wazuh.com/4.x/solaris/sparc/11/wazuh-agent-${this.state.wazuhVersion}-sol11-sparc.p5p` default: - return `https://packages.wazuh.com/4.x/yum/wazuh-agent-${this.state.wazuhVersion}-sol11-sparc.p5p`; + return `https://packages.wazuh.com/4.x/solaris/sparc/11/wazuh-agent-${this.state.wazuhVersion}-sol11-sparc.p5p`; } } From 999e01fd6a961f974424c3150ca29fc51bd76a98 Mon Sep 17 00:00:00 2001 From: "chantal.kelm" Date: Wed, 16 Nov 2022 14:59:08 -0300 Subject: [PATCH 2/8] CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d4261f020..15bc69f939 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,7 @@ commands of Start the agent in the deploy new agent section [#4458](https://gith - Allowed to upload an image for the `customization.logo.*` settings in `Settings/Configuration` [#4504](https://github.com/wazuh/wazuh-kibana-app/pull/4504) - Fixed WAZUH_PROTOCOL param suggestion [#4849](https://github.com/wazuh/wazuh-kibana-app/pull/4849) - Add macOS version to wizard deploy agent [#4867](https://github.com/wazuh/wazuh-kibana-app/pull/4867) +- Raspbian OS, Ubuntu, Amazon Linux and Amazon Linux 2 commands in the wizard deploy agent now change when selecting a different architecture [#4876](https://github.com/wazuh/wazuh-kibana-app/pull/4876) ### Fixed From c13023fe43440650ae2ff2feeb23c35299f0be27 Mon Sep 17 00:00:00 2001 From: "chantal.kelm" Date: Thu, 17 Nov 2022 08:27:39 -0300 Subject: [PATCH 3/8] restore branch --- public/controllers/agent/components/register-agent.js | 1 + 1 file changed, 1 insertion(+) diff --git a/public/controllers/agent/components/register-agent.js b/public/controllers/agent/components/register-agent.js index 42f2718492..c357ada34e 100644 --- a/public/controllers/agent/components/register-agent.js +++ b/public/controllers/agent/components/register-agent.js @@ -533,6 +533,7 @@ export const RegisterAgent = withErrorBoundary( return `https://packages.wazuh.com/4.x/yum/wazuh-agent-${this.state.wazuhVersion}.x86_64.rpm`; } } + resolveSOLARISPackage() { switch (`${this.state.selectedVersion}-${this.state.selectedArchitecture}`) { From c3d5aa755c2769ccf9ae96a3dd3d9a7a2885fe79 Mon Sep 17 00:00:00 2001 From: "chantal.kelm" Date: Thu, 17 Nov 2022 08:32:57 -0300 Subject: [PATCH 4/8] fix link raspbian --- public/controllers/agent/components/register-agent.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/controllers/agent/components/register-agent.js b/public/controllers/agent/components/register-agent.js index c357ada34e..e841a22030 100644 --- a/public/controllers/agent/components/register-agent.js +++ b/public/controllers/agent/components/register-agent.js @@ -475,16 +475,16 @@ export const RegisterAgent = withErrorBoundary( } } - resolveRASPBIANPackage() { +resolveRASPBIANPackage() { switch (`${this.state.selectedVersion}-${this.state.selectedArchitecture}`) { case 'busterorgreater-i386': return `https://packages.wazuh.com/4.x/apt/pool/main/w/wazuh-agent/wazuh-agent_${this.state.wazuhVersion}_i386.deb`; case 'busterorgreater-aarch64': - return `https://packages.wazuh.com/4.x/apt/pool/main/w/wazuh-agent/wazuh-agent_${this.state.wazuhVersion}_amd64.deb`; + return `https://packages.wazuh.com/4.x/apt/pool/main/w/wazuh-agent/wazuh-agent_${this.state.wazuhVersion}_arm64.deb`; case 'busterorgreater-armhf': return `https://packages.wazuh.com/4.x/apt/pool/main/w/wazuh-agent/wazuh-agent_${this.state.wazuhVersion}_armhf.deb`; case 'busterorgreater-x86_64': - return `https://packages.wazuh.com/4.x/apt/pool/main/w/wazuh-agent/wazuh-agent_${this.state.wazuhVersion}_arm64.deb`; + return `https://packages.wazuh.com/4.x/apt/pool/main/w/wazuh-agent/wazuh-agent_${this.state.wazuhVersion}_amd64.deb`; case 'busterorgreater-powerpc': return `https://packages.wazuh.com/4.x/apt/pool/main/w/wazuh-agent/wazuh-agent_${this.state.wazuhVersion}.ppc64le.rpm`; default: From 858eb5c4bbc99a180702c6604f5e7ee02bd1684b Mon Sep 17 00:00:00 2001 From: "chantal.kelm" Date: Thu, 17 Nov 2022 08:39:46 -0300 Subject: [PATCH 5/8] space --- public/controllers/agent/components/register-agent.js | 1 - 1 file changed, 1 deletion(-) diff --git a/public/controllers/agent/components/register-agent.js b/public/controllers/agent/components/register-agent.js index e841a22030..dcd8a13896 100644 --- a/public/controllers/agent/components/register-agent.js +++ b/public/controllers/agent/components/register-agent.js @@ -534,7 +534,6 @@ resolveRASPBIANPackage() { } } - resolveSOLARISPackage() { switch (`${this.state.selectedVersion}-${this.state.selectedArchitecture}`) { case 'solaris10-i386': From 5cb904da0ecbce4d6d485404576c935765e93b8a Mon Sep 17 00:00:00 2001 From: "chantal.kelm" Date: Thu, 17 Nov 2022 08:45:38 -0300 Subject: [PATCH 6/8] CHANGELOG --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 15bc69f939..54b3a879dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,7 +39,7 @@ commands of Start the agent in the deploy new agent section [#4458](https://gith - Allowed to upload an image for the `customization.logo.*` settings in `Settings/Configuration` [#4504](https://github.com/wazuh/wazuh-kibana-app/pull/4504) - Fixed WAZUH_PROTOCOL param suggestion [#4849](https://github.com/wazuh/wazuh-kibana-app/pull/4849) - Add macOS version to wizard deploy agent [#4867](https://github.com/wazuh/wazuh-kibana-app/pull/4867) -- Raspbian OS, Ubuntu, Amazon Linux and Amazon Linux 2 commands in the wizard deploy agent now change when selecting a different architecture [#4876](https://github.com/wazuh/wazuh-kibana-app/pull/4876) +- Raspbian OS, Ubuntu, Amazon Linux and Amazon Linux 2 commands in the wizard deploy agent now change when selecting a different architecture [#4876](https://github.com/wazuh/wazuh-kibana-app/pull/4876)[#4880](https://github.com/wazuh/wazuh-kibana-app/pull/4880) ### Fixed From 6ec363daffce9d8625c44cf62b6b3dc6b377aeda Mon Sep 17 00:00:00 2001 From: "chantal.kelm" Date: Thu, 17 Nov 2022 12:45:23 -0300 Subject: [PATCH 7/8] debian link --- public/controllers/agent/components/register-agent.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/controllers/agent/components/register-agent.js b/public/controllers/agent/components/register-agent.js index 1ab57f73b3..1cbc327079 100644 --- a/public/controllers/agent/components/register-agent.js +++ b/public/controllers/agent/components/register-agent.js @@ -463,11 +463,11 @@ export const RegisterAgent = withErrorBoundary( case 'i386': return `https://packages.wazuh.com/4.x/apt/pool/main/w/wazuh-agent/wazuh-agent_${this.state.wazuhVersion}_i386.deb`; case 'aarch64': - return `https://packages.wazuh.com/4.x/apt/pool/main/w/wazuh-agent/wazuh-agent_${this.state.wazuhVersion}_amd64.deb`; + return `https://packages.wazuh.com/4.x/apt/pool/main/w/wazuh-agent/wazuh-agent_${this.state.wazuhVersion}_arm64.deb`; case 'armhf': return `https://packages.wazuh.com/4.x/apt/pool/main/w/wazuh-agent/wazuh-agent_${this.state.wazuhVersion}_armhf.deb`; case 'x86_64': - return `https://packages.wazuh.com/4.x/apt/pool/main/w/wazuh-agent/wazuh-agent_${this.state.wazuhVersion}_arm64.deb`; + return `https://packages.wazuh.com/4.x/apt/pool/main/w/wazuh-agent/wazuh-agent_${this.state.wazuhVersion}_amd64.deb`; case 'powerpc': return `https://packages.wazuh.com/4.x/apt/pool/main/w/wazuh-agent/wazuh-agent_${this.state.wazuhVersion}.ppc64le.rpm`; default: From cc8a9f7968ee5fc78a908e8fd109f4b33b331922 Mon Sep 17 00:00:00 2001 From: "chantal.kelm" Date: Thu, 17 Nov 2022 12:49:51 -0300 Subject: [PATCH 8/8] CHANGELOG --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 54b3a879dd..437d7158cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,7 +39,7 @@ commands of Start the agent in the deploy new agent section [#4458](https://gith - Allowed to upload an image for the `customization.logo.*` settings in `Settings/Configuration` [#4504](https://github.com/wazuh/wazuh-kibana-app/pull/4504) - Fixed WAZUH_PROTOCOL param suggestion [#4849](https://github.com/wazuh/wazuh-kibana-app/pull/4849) - Add macOS version to wizard deploy agent [#4867](https://github.com/wazuh/wazuh-kibana-app/pull/4867) -- Raspbian OS, Ubuntu, Amazon Linux and Amazon Linux 2 commands in the wizard deploy agent now change when selecting a different architecture [#4876](https://github.com/wazuh/wazuh-kibana-app/pull/4876)[#4880](https://github.com/wazuh/wazuh-kibana-app/pull/4880) +- Raspbian OS, Ubuntu, Amazon Linux and Amazon Linux 2 commands in the wizard deploy agent now change when selecting a different architecture [#4876](https://github.com/wazuh/wazuh-kibana-app/pull/4876) [#4880](https://github.com/wazuh/wazuh-kibana-app/pull/4880) ### Fixed