From 810ab4aa074a1d4e8440b40c23af27372e7e3c92 Mon Sep 17 00:00:00 2001 From: Tostti Date: Fri, 16 Feb 2024 15:24:24 -0300 Subject: [PATCH 1/6] Update changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 71533135b6..596abb0be2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ All notable changes to the Wazuh app project will be documented in this file. +## Wazuh v4.7.3 - OpenSearch Dashboards 2.8.0 - Revision 00 + +### Added + +- Support for Wazuh 4.7.3 ## Wazuh v4.7.2 - OpenSearch Dashboards 2.8.0 - Revision 02 From 5fc2fe989c9ff9ff25cf7fd86f14832262285d36 Mon Sep 17 00:00:00 2001 From: Tostti Date: Fri, 16 Feb 2024 15:24:36 -0300 Subject: [PATCH 2/6] Update package.json --- plugins/main/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/main/package.json b/plugins/main/package.json index 61c22c2644..4c0732a19c 100644 --- a/plugins/main/package.json +++ b/plugins/main/package.json @@ -1,7 +1,7 @@ { "name": "wazuh", - "version": "4.7.2", - "revision": "02", + "version": "4.7.3", + "revision": "00", "pluginPlatform": { "version": "2.8.0" }, From a24a219e5348dc9c7a66f493b9de06c6567d9805 Mon Sep 17 00:00:00 2001 From: Tostti Date: Fri, 16 Feb 2024 15:24:50 -0300 Subject: [PATCH 3/6] update opensearch_dashboards.json --- plugins/main/opensearch_dashboards.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/main/opensearch_dashboards.json b/plugins/main/opensearch_dashboards.json index a7321ce579..36ca2b458e 100644 --- a/plugins/main/opensearch_dashboards.json +++ b/plugins/main/opensearch_dashboards.json @@ -1,6 +1,6 @@ { "id": "wazuh", - "version": "4.7.2-02", + "version": "4.7.3-00", "opensearchDashboardsVersion": "opensearchDashboards", "configPath": [ "wazuh" From 7ae57cc74ad268d06a8bdf2317f1cc993e3500fe Mon Sep 17 00:00:00 2001 From: Nicolas Agustin Guevara Pihen <42900763+Tostti@users.noreply.github.com> Date: Wed, 21 Feb 2024 14:12:09 -0300 Subject: [PATCH 4/6] Bump revision 01 for 4.7.3 RC1 (#6437) * Update changelog * Update opensearch_dashboards.json * Update package json --- CHANGELOG.md | 2 +- plugins/main/opensearch_dashboards.json | 2 +- plugins/main/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 596abb0be2..f8f5d044b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to the Wazuh app project will be documented in this file. -## Wazuh v4.7.3 - OpenSearch Dashboards 2.8.0 - Revision 00 +## Wazuh v4.7.3 - OpenSearch Dashboards 2.8.0 - Revision 01 ### Added diff --git a/plugins/main/opensearch_dashboards.json b/plugins/main/opensearch_dashboards.json index 36ca2b458e..c2d141a13f 100644 --- a/plugins/main/opensearch_dashboards.json +++ b/plugins/main/opensearch_dashboards.json @@ -1,6 +1,6 @@ { "id": "wazuh", - "version": "4.7.3-00", + "version": "4.7.3-01", "opensearchDashboardsVersion": "opensearchDashboards", "configPath": [ "wazuh" diff --git a/plugins/main/package.json b/plugins/main/package.json index 4c0732a19c..799bcbc890 100644 --- a/plugins/main/package.json +++ b/plugins/main/package.json @@ -1,7 +1,7 @@ { "name": "wazuh", "version": "4.7.3", - "revision": "00", + "revision": "01", "pluginPlatform": { "version": "2.8.0" }, From 97aa0ed3f6999c8e3d148dd70d84b846eb155400 Mon Sep 17 00:00:00 2001 From: Federico Rodriguez Date: Thu, 29 Feb 2024 10:49:24 +0100 Subject: [PATCH 5/6] Bump revision 02 for 4.7.3 RC2 (#6456) Bump revision to 02 --- CHANGELOG.md | 2 +- plugins/main/opensearch_dashboards.json | 2 +- plugins/main/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f8f5d044b5..820269b5ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to the Wazuh app project will be documented in this file. -## Wazuh v4.7.3 - OpenSearch Dashboards 2.8.0 - Revision 01 +## Wazuh v4.7.3 - OpenSearch Dashboards 2.8.0 - Revision 02 ### Added diff --git a/plugins/main/opensearch_dashboards.json b/plugins/main/opensearch_dashboards.json index c2d141a13f..2b976f93f0 100644 --- a/plugins/main/opensearch_dashboards.json +++ b/plugins/main/opensearch_dashboards.json @@ -1,6 +1,6 @@ { "id": "wazuh", - "version": "4.7.3-01", + "version": "4.7.3-02", "opensearchDashboardsVersion": "opensearchDashboards", "configPath": [ "wazuh" diff --git a/plugins/main/package.json b/plugins/main/package.json index 799bcbc890..0263ab867d 100644 --- a/plugins/main/package.json +++ b/plugins/main/package.json @@ -1,7 +1,7 @@ { "name": "wazuh", "version": "4.7.3", - "revision": "01", + "revision": "02", "pluginPlatform": { "version": "2.8.0" }, From 568f1e211c501c65eaa29e4e6699ddb712fc026d Mon Sep 17 00:00:00 2001 From: Federico Rodriguez Date: Thu, 29 Feb 2024 13:06:18 +0100 Subject: [PATCH 6/6] Remove relative_dirname from CDB List (#6458) * Remove relative_dirname * Add changelog --- CHANGELOG.md | 4 ++++ .../components/management/common/resources-handler.ts | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 820269b5ca..18a038a3dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ All notable changes to the Wazuh app project will be documented in this file. - Support for Wazuh 4.7.3 +### Fixed + +- Fixed CDB List import file feature [#6458](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6458) + ## Wazuh v4.7.2 - OpenSearch Dashboards 2.8.0 - Revision 02 ### Added diff --git a/plugins/main/public/controllers/management/components/management/common/resources-handler.ts b/plugins/main/public/controllers/management/components/management/common/resources-handler.ts index de4583b4f0..f0b57c0625 100644 --- a/plugins/main/public/controllers/management/components/management/common/resources-handler.ts +++ b/plugins/main/public/controllers/management/components/management/common/resources-handler.ts @@ -93,7 +93,7 @@ export class ResourcesHandler { fileName: string, content: string, overwrite: boolean, - relativeDirname: string, + relativeDirname?: string, ) { try { const result = await WzRequest.apiReq( @@ -102,7 +102,9 @@ export class ResourcesHandler { { params: { overwrite: overwrite, - relative_dirname: relativeDirname, + ...(this.resource !== 'lists' + ? { relative_dirname: relativeDirname } + : {}), }, body: content.toString(), origin: 'raw', @@ -119,7 +121,7 @@ export class ResourcesHandler { * @param {Resource} resource * @param {String} fileName */ - async deleteFile(fileName: string, relativeDirname: string = '') { + async deleteFile(fileName: string, relativeDirname?: string) { try { const result = await WzRequest.apiReq( 'DELETE',