From b87b0268db018982f6a0382d90252cb1c1e64e3b Mon Sep 17 00:00:00 2001 From: Antonio <34042064+Desvelao@users.noreply.github.com> Date: Fri, 25 Oct 2024 12:32:54 +0200 Subject: [PATCH 1/3] Bump 4.9.2 rev 00 (#7126) * chore: bump 4.9.2 rev 00 * chore(changelog): add entry * feat(bump): add ability to edit the imposter specification file reference on bump script of main plugin --- CHANGELOG.md | 6 +++ docker/imposter/wazuh-config.yml | 2 +- plugins/main/opensearch_dashboards.json | 2 +- plugins/main/package.json | 4 +- plugins/main/scripts/release/bump.js | 43 +++++++++++++++++++ .../opensearch_dashboards.json | 2 +- plugins/wazuh-check-updates/package.json | 4 +- plugins/wazuh-core/opensearch_dashboards.json | 2 +- plugins/wazuh-core/package.json | 4 +- 9 files changed, 59 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d023a77b81..05e7e38146 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes to the Wazuh app project will be documented in this file. +## Wazuh v4.9.2 - OpenSearch Dashboards 2.13.0 - Revision 00 + +### Added + +- Support for Wazuh 4.9.2 + ## Wazuh v4.9.1 - OpenSearch Dashboards 2.13.0 - Revision 04 ### Added diff --git a/docker/imposter/wazuh-config.yml b/docker/imposter/wazuh-config.yml index 8f99c6897e..d8c2ae672a 100755 --- a/docker/imposter/wazuh-config.yml +++ b/docker/imposter/wazuh-config.yml @@ -1,6 +1,6 @@ --- plugin: openapi -specFile: https://raw.githubusercontent.com/wazuh/wazuh/master/api/api/spec/spec.yaml +specFile: https://raw.githubusercontent.com/wazuh/wazuh/4.9.2/api/api/spec/spec.yaml system: stores: # this store is preloaded from file diff --git a/plugins/main/opensearch_dashboards.json b/plugins/main/opensearch_dashboards.json index 6fce1510e4..b9b73e5517 100644 --- a/plugins/main/opensearch_dashboards.json +++ b/plugins/main/opensearch_dashboards.json @@ -1,6 +1,6 @@ { "id": "wazuh", - "version": "4.9.1-04", + "version": "4.9.2-00", "opensearchDashboardsVersion": "opensearchDashboards", "configPath": ["wazuh"], "requiredPlugins": [ diff --git a/plugins/main/package.json b/plugins/main/package.json index af2557b1da..4325fedb44 100644 --- a/plugins/main/package.json +++ b/plugins/main/package.json @@ -1,7 +1,7 @@ { "name": "wazuh", - "version": "4.9.1", - "revision": "04", + "version": "4.9.2", + "revision": "00", "pluginPlatform": { "version": "2.13.0" }, diff --git a/plugins/main/scripts/release/bump.js b/plugins/main/scripts/release/bump.js index d76addd24b..a8f342f4ba 100644 --- a/plugins/main/scripts/release/bump.js +++ b/plugins/main/scripts/release/bump.js @@ -53,6 +53,47 @@ const cli = require('../../../../scripts/lib/cli/cli')( ], ); +function updateImposterSpecificationReference(configuration, logger) { + try { + logger.debug('Editing imposter specification reference'); + const fs = require('fs'); + const path = require('path'); + const specificationFile = path.join( + __dirname, + '../../../..', + 'docker/imposter/wazuh-config.yml', + ); + + logger.debug(`Reading ${specificationFile} file`); + const content = fs.readFileSync(specificationFile, 'utf8'); + + const { version } = configuration; + + if (!version) { + throw new Error('Version is not specified.'); + } + + // specFile: https://raw.githubusercontent.com/wazuh/wazuh//api/api/spec/spec.yaml + const updatedContent = content.replace( + /specFile:\s+\S+/m, + `specFile: https://raw.githubusercontent.com/wazuh/wazuh/${version}/api/api/spec/spec.yaml`, + ); + + if (content !== updatedContent) { + logger.debug( + `Updating [${specificationFile}] imposter specification file with latest changes`, + ); + fs.writeFileSync(specificationFile, updatedContent, 'utf8'); + logger.info(`${specificationFile} file has been updated`); + } else { + logger.debug(`Nothing to change in ${specificationFile} file`); + } + } catch (error) { + logger.error(`Error editing the specification file: ${error.message}`); + process.exit(1); + } +} + function run(configuration, logger) { let localConfiguration = { ...configuration, @@ -90,6 +131,8 @@ function run(configuration, logger) { ); process.exit(1); } + + updateImposterSpecificationReference(localConfiguration, logger); } const logger = require('../../../../scripts/release/lib/logger').create([ diff --git a/plugins/wazuh-check-updates/opensearch_dashboards.json b/plugins/wazuh-check-updates/opensearch_dashboards.json index ff7eb1c5e0..4c0572390e 100644 --- a/plugins/wazuh-check-updates/opensearch_dashboards.json +++ b/plugins/wazuh-check-updates/opensearch_dashboards.json @@ -1,6 +1,6 @@ { "id": "wazuhCheckUpdates", - "version": "4.9.1-04", + "version": "4.9.2-00", "opensearchDashboardsVersion": "opensearchDashboards", "server": true, "ui": true, diff --git a/plugins/wazuh-check-updates/package.json b/plugins/wazuh-check-updates/package.json index c1bd160044..05ba1f7860 100644 --- a/plugins/wazuh-check-updates/package.json +++ b/plugins/wazuh-check-updates/package.json @@ -1,7 +1,7 @@ { "name": "wazuh-check-updates", - "version": "4.9.1", - "revision": "04", + "version": "4.9.2", + "revision": "00", "pluginPlatform": { "version": "2.13.0" }, diff --git a/plugins/wazuh-core/opensearch_dashboards.json b/plugins/wazuh-core/opensearch_dashboards.json index 4a80f42b28..d06a31df4e 100644 --- a/plugins/wazuh-core/opensearch_dashboards.json +++ b/plugins/wazuh-core/opensearch_dashboards.json @@ -1,6 +1,6 @@ { "id": "wazuhCore", - "version": "4.9.1-04", + "version": "4.9.2-00", "opensearchDashboardsVersion": "opensearchDashboards", "server": true, "ui": true, diff --git a/plugins/wazuh-core/package.json b/plugins/wazuh-core/package.json index 44272d720a..5848556277 100644 --- a/plugins/wazuh-core/package.json +++ b/plugins/wazuh-core/package.json @@ -1,7 +1,7 @@ { "name": "wazuh-core", - "version": "4.9.1", - "revision": "04", + "version": "4.9.2", + "revision": "00", "pluginPlatform": { "version": "2.13.0" }, From 632f493217d29b73fff08bc75bf39b3943c00ba4 Mon Sep 17 00:00:00 2001 From: Federico Rodriguez Date: Fri, 25 Oct 2024 13:09:52 +0200 Subject: [PATCH 2/3] Fix vulnerability inventory table scroll (#7128) * Fix vulnerability inventory table scroll * Add changelog --- CHANGELOG.md | 4 ++++ .../vulnerabilities/dashboards/inventory/inventory.scss | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 05e7e38146..37f7212cbb 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.9.2 +### Fixed + +- Fixed vulnerabilities inventory table scroll [#7128](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7128) + ## Wazuh v4.9.1 - OpenSearch Dashboards 2.13.0 - Revision 04 ### Added diff --git a/plugins/main/public/components/overview/vulnerabilities/dashboards/inventory/inventory.scss b/plugins/main/public/components/overview/vulnerabilities/dashboards/inventory/inventory.scss index 4844141f13..46eab9c020 100644 --- a/plugins/main/public/components/overview/vulnerabilities/dashboards/inventory/inventory.scss +++ b/plugins/main/public/components/overview/vulnerabilities/dashboards/inventory/inventory.scss @@ -5,11 +5,6 @@ height: max-content !important; } - // This makes the table not generate an unnecessary scroll when filtering data from 1 page and then do another search for more pages. - .vulsInventoryDataGrid { - height: calc(100vh - 216px) !important; - } - .euiDataGrid--fullScreen { height: calc(100vh - 49px); bottom: 0; From 713f4a60b493f451751d3425a2b2a84d14f20333 Mon Sep 17 00:00:00 2001 From: Antonio <34042064+Desvelao@users.noreply.github.com> Date: Mon, 28 Oct 2024 15:40:11 +0100 Subject: [PATCH 3/3] Bump 4.9.2 rev01 (#7134) chore: bump 4.9.2 rev01 --- CHANGELOG.md | 2 +- plugins/main/opensearch_dashboards.json | 2 +- plugins/main/package.json | 2 +- plugins/wazuh-check-updates/opensearch_dashboards.json | 2 +- plugins/wazuh-check-updates/package.json | 2 +- plugins/wazuh-core/opensearch_dashboards.json | 2 +- plugins/wazuh-core/package.json | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 37f7212cbb..20aebf1819 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.9.2 - OpenSearch Dashboards 2.13.0 - Revision 00 +## Wazuh v4.9.2 - OpenSearch Dashboards 2.13.0 - Revision 01 ### Added diff --git a/plugins/main/opensearch_dashboards.json b/plugins/main/opensearch_dashboards.json index b9b73e5517..bd0235a0e9 100644 --- a/plugins/main/opensearch_dashboards.json +++ b/plugins/main/opensearch_dashboards.json @@ -1,6 +1,6 @@ { "id": "wazuh", - "version": "4.9.2-00", + "version": "4.9.2-01", "opensearchDashboardsVersion": "opensearchDashboards", "configPath": ["wazuh"], "requiredPlugins": [ diff --git a/plugins/main/package.json b/plugins/main/package.json index 4325fedb44..89cdee3c90 100644 --- a/plugins/main/package.json +++ b/plugins/main/package.json @@ -1,7 +1,7 @@ { "name": "wazuh", "version": "4.9.2", - "revision": "00", + "revision": "01", "pluginPlatform": { "version": "2.13.0" }, diff --git a/plugins/wazuh-check-updates/opensearch_dashboards.json b/plugins/wazuh-check-updates/opensearch_dashboards.json index 4c0572390e..814ab83336 100644 --- a/plugins/wazuh-check-updates/opensearch_dashboards.json +++ b/plugins/wazuh-check-updates/opensearch_dashboards.json @@ -1,6 +1,6 @@ { "id": "wazuhCheckUpdates", - "version": "4.9.2-00", + "version": "4.9.2-01", "opensearchDashboardsVersion": "opensearchDashboards", "server": true, "ui": true, diff --git a/plugins/wazuh-check-updates/package.json b/plugins/wazuh-check-updates/package.json index 05ba1f7860..728bad47f4 100644 --- a/plugins/wazuh-check-updates/package.json +++ b/plugins/wazuh-check-updates/package.json @@ -1,7 +1,7 @@ { "name": "wazuh-check-updates", "version": "4.9.2", - "revision": "00", + "revision": "01", "pluginPlatform": { "version": "2.13.0" }, diff --git a/plugins/wazuh-core/opensearch_dashboards.json b/plugins/wazuh-core/opensearch_dashboards.json index d06a31df4e..a77821f642 100644 --- a/plugins/wazuh-core/opensearch_dashboards.json +++ b/plugins/wazuh-core/opensearch_dashboards.json @@ -1,6 +1,6 @@ { "id": "wazuhCore", - "version": "4.9.2-00", + "version": "4.9.2-01", "opensearchDashboardsVersion": "opensearchDashboards", "server": true, "ui": true, diff --git a/plugins/wazuh-core/package.json b/plugins/wazuh-core/package.json index 5848556277..9bc499a2e3 100644 --- a/plugins/wazuh-core/package.json +++ b/plugins/wazuh-core/package.json @@ -1,7 +1,7 @@ { "name": "wazuh-core", "version": "4.9.2", - "revision": "00", + "revision": "01", "pluginPlatform": { "version": "2.13.0" },