From b971437a0a648743e855e0e67aa1ae6e487b4822 Mon Sep 17 00:00:00 2001 From: Nicolas Agustin Guevara Pihen <42900763+Tostti@users.noreply.github.com> Date: Fri, 7 Jul 2023 05:38:37 -0300 Subject: [PATCH 1/3] Bump Wazuh and platform versions for v4.4.5 (#5639) * Update changelog * Update opensearch_dashboards.json * Update package.json * Update readme * Update tag script (cherry picked from commit b33c4a5dfcc4349dd0c4635f8b242f5208f17722) --- CHANGELOG.md | 6 ++++++ README.md | 4 ++-- kibana.json | 8 +++----- package.json | 2 +- scripts/tag.py | 2 +- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b194799bbd..2b49c7fb61 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.4.5 - Kibana 7.10.2, 7.16.x, 7.17.x - Revision 01 + +### Added + +- Support for Wazuh 4.4.5 + ## Wazuh v4.4.4 - Kibana 7.10.2, 7.16.x, 7.17.x - Revision 01 ### Added diff --git a/README.md b/README.md index e7bd80a8c3..672f564a0d 100644 --- a/README.md +++ b/README.md @@ -89,7 +89,7 @@ This plugin for Kibana allows you to visualize and analyze Wazuh alerts stored i ## Requisites -- Wazuh HIDS 4.4.4 +- Wazuh HIDS 4.4.5 - Kibana 7.16.x or 7.17.x - Elasticsearch 7.16.x or 7.17.x @@ -107,7 +107,7 @@ Install the Wazuh app plugin for Kibana ``` cd /usr/share/kibana -sudo -u kibana bin/kibana-plugin install https://packages.wazuh.com/4.x/ui/kibana/wazuh_kibana-4.4.4_7.16.0-1.zip +sudo -u kibana bin/kibana-plugin install https://packages.wazuh.com/4.x/ui/kibana/wazuh_kibana-4.4.5_7.16.0-1.zip ``` Restart Kibana diff --git a/kibana.json b/kibana.json index 21cd11af9c..d0c261fcd5 100644 --- a/kibana.json +++ b/kibana.json @@ -1,10 +1,8 @@ { "id": "wazuh", - "version": "4.4.4-01", + "version": "4.4.5-01", "kibanaVersion": "kibana", - "configPath": [ - "wazuh" - ], + "configPath": ["wazuh"], "requiredPlugins": [ "navigation", "data", @@ -30,4 +28,4 @@ "owner": { "name": "Wazuh, Inc" } -} \ No newline at end of file +} diff --git a/package.json b/package.json index 5510e78bb5..892e55aabd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wazuh", - "version": "4.4.4", + "version": "4.4.5", "revision": "01", "stage": "stable", "commit": "6267c16e8", diff --git a/scripts/tag.py b/scripts/tag.py index 0038bf0900..1bf6447edc 100644 --- a/scripts/tag.py +++ b/scripts/tag.py @@ -15,7 +15,7 @@ # ======================================================= # # Wazuh version: major.minor.patch -version = '4.4.4' +version = '4.4.5' # App's revision number (previous rev + 1) revision = '01' # One of 'pre-alpha', 'alpha', 'beta', 'release-candidate', 'stable' From 35359698c5e412795dd18ca735f0b7b31c7d74a0 Mon Sep 17 00:00:00 2001 From: Federico Rodriguez Date: Fri, 7 Jul 2023 11:10:47 +0200 Subject: [PATCH 2/3] Change tag.py version value --- scripts/tag.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/tag.py b/scripts/tag.py index 1bf6447edc..12ce705433 100644 --- a/scripts/tag.py +++ b/scripts/tag.py @@ -30,7 +30,7 @@ TAGS_FILE = 'tags.log' # Global variable. Will be set later branch = None -minor = ".".join(version.split('.')[:2]) +minor = version # Supported versions of Kibana kbn_versions = [ From d8c16a2b826c45de5f6ebc9e1cf86c2d732a9dcb Mon Sep 17 00:00:00 2001 From: Federico Rodriguez Date: Fri, 7 Jul 2023 11:21:04 +0200 Subject: [PATCH 3/3] Empty tag suffix --- scripts/tag.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/tag.py b/scripts/tag.py index 12ce705433..689d57c725 100644 --- a/scripts/tag.py +++ b/scripts/tag.py @@ -20,8 +20,8 @@ revision = '01' # One of 'pre-alpha', 'alpha', 'beta', 'release-candidate', 'stable' stage = 'stable' -# Tag suffix. Usually set to stage + stage iteration. -tag_suffix = '-rc2' +# Tag suffix. Usually set to stage + stage iteration. E.g. '-rc1' +tag_suffix = '' # ================================================ # # Constants and global variables #