Merge 4.7.0 into 4.7.1 (#5981)

Merge 4.7.0 into 4.7.1 > IMPORTANT: Merge PR strategy: Create a merge commit
wazuh · Oct 6, 2023 · 7817a6b · 7817a6b
2 parents a5f14b2 + 98f572b
commit 7817a6b
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -33,7 +33,7 @@ All notable changes to the Wazuh app project will be documented in this file.
 
 - Removed views in JSON and XML formats from management settings. [#5747](https://github.com/wazuh/wazuh-kibana-app/pull/5747)
 
-## Wazuh v4.6.0 - OpenSearch Dashboards 2.8.0 - Revision 00
+## Wazuh v4.6.0 - OpenSearch Dashboards 2.8.0 - Revision 02
 
 ### Added
 
@@ -85,12 +85,16 @@ All notable changes to the Wazuh app project will be documented in this file.
 - Removed obsolete code that caused duplicate requests to the api in `Management`. [#5485](https://github.com/wazuh/wazuh-kibana-app/pull/5485)
 - Removed unused embedded jquery-ui [#5592](https://github.com/wazuh/wazuh-kibana-app/pull/5592)
 
-## Wazuh v4.5.3 - OpenSearch Dashboards 2.6.0 - Revision 01
+## Wazuh v4.5.3 - OpenSearch Dashboards 2.6.0 - Revision 02
 
 ### Added
 
 - Support for Wazuh 4.5.3
 
+### Changed
+
+- Changed the command to install the agent on SUSE uses zypper [#5925](https://github.com/wazuh/wazuh-kibana-app/pull/5925)
+
 ## Wazuh v4.5.2 - OpenSearch Dashboards 2.6.0 - Revision 02
 
 ### Added

diff --git a/plugins/main/opensearch_dashboards.json b/plugins/main/opensearch_dashboards.json
@@ -24,4 +24,4 @@
   ],
   "server": true,
   "ui": true
-}
+}
diff --git a/plugins/main/package.json b/plugins/main/package.json
@@ -85,4 +85,4 @@
     "redux-mock-store": "^1.5.4",
     "swagger-client": "^3.19.11"
   }
-}
+}
diff --git a/plugins/main/public/components/security/roles/edit-role-table.tsx b/plugins/main/public/components/security/roles/edit-role-table.tsx
@@ -87,7 +87,7 @@ export const EditRolesTable = ({
               iconType='trash'
               color='danger'
               isDisabled={isDisabled && !isLoading}
-              onClick={async item => {
+              onClick={async ev => {
                 try {
                   setIsLoading(true);
                   const response = await WzRequest.apiReq(

diff --git a/plugins/main/public/controllers/agent/components/register-agent.js b/plugins/main/public/controllers/agent/components/register-agent.js
@@ -1042,7 +1042,7 @@ apk add wazuh-agent=${this.state.wazuhVersion}-r1`,
         amazonlinuxText: `sudo ${this.optionalDeploymentVariables()}${this.agentNameVariable()}yum install -y ${this.optionalPackages()}`,
         fedoraText: `sudo ${this.optionalDeploymentVariables()}${this.agentNameVariable()}yum install -y ${this.optionalPackages()}`,
         oraclelinuxText: `sudo ${this.optionalDeploymentVariables()}${this.agentNameVariable()}yum install -y ${this.optionalPackages()}`,
-        suseText: `sudo ${this.optionalDeploymentVariables()}${this.agentNameVariable()}yum install -y ${this.optionalPackages()}`,
+        suseText: `sudo rpm --import https://packages.wazuh.com/key/GPG-KEY-WAZUH && sudo ${this.optionalDeploymentVariables()}${this.agentNameVariable()}zypper install -y ${this.optionalPackages()}`,
         raspbianText: `curl -so wazuh-agent.deb ${this.optionalPackages()} && sudo ${this.optionalDeploymentVariables()}${this.agentNameVariable()}dpkg -i ./wazuh-agent.deb`,
       };
 

diff --git a/plugins/main/scripts/release/tag.js b/plugins/main/scripts/release/tag.js
@@ -50,7 +50,7 @@ function getSupportedVersions(pluginVersion) {
       branch: `${pluginVersion}-7.16`,
       versions: [
         ...[...Array(4).keys()].map(idx => `7.16.${idx}`),
-        ...[...Array(11).keys()].map(idx => `7.17.${idx}`),
+        ...[...Array(14).keys()].map(idx => `7.17.${idx}`),
       ],
       manifestPluginPath: 'kibana.json',
     },
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,4 +24,4 @@ @@
       ],
       "server": true,
       "ui": true
-    }
+    }