Merge v4.4.5-7.10.2 into 4.4-7.10 (#5667)

* [Backport 4.4.5-7.10] Bump Wazuh and platform versions for v4.4.5 (#5639) (#5642) * 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 b33c4a5) * 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 b33c4a5) --------- Co-authored-by: Nicolas Agustin Guevara Pihen <[email protected]> * [Backport 4.4.5-7.10] Prepare tag.py for v4.4.5-rc1 (#5648) Prepare tag.py for v4.4.5-rc1 (#5645) Add -rc1 tag suffix (cherry picked from commit c10eb4e) * Fix incompatible version of triple-beam subdependency (#5651) fix: add yarn.lock file and set version of triple-beam in yarn.lock * [Backport 4.4.5-7.10] Update unit-test.yml (#5656) Update unit-test.yml (#5655) (cherry picked from commit 29ec6f9) Co-authored-by: Álex Ruiz <[email protected]> * [Backport 4.4.5-7.10] Add support for Wazuh 4.4.5-rc2 (#5660) * Add support for Wazuh 4.4.5-rc2 (#5659) (cherry picked from commit 1103a0c) * Update revision of v4.4.5 in the Changelog --------- Co-authored-by: Álex Ruiz <[email protected]> * Bump v4.4.5-7.10.2-rc2 --------- Co-authored-by: Nicolas Agustin Guevara Pihen <[email protected]> Co-authored-by: Álex Ruiz <[email protected]> Co-authored-by: Antonio <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
wazuh · Jul 18, 2023 · bc6e504 · bc6e504
1 parent bf3f31e
commit bc6e504
Show file tree

Hide file tree

Showing 8 changed files with 2,437 additions and 19 deletions.
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -24,11 +24,6 @@ on:
         options:
         - 'yarn test:jest'
   pull_request:
-    branches:
-      - 'master'
-      - '*.*-*.*'
-      - '*.*-*.*-wzd'
-      - '[0-9].[0-9]+'
 
 jobs:
   # Run unit tests with Jest

diff --git a/.gitignore b/.gitignore
@@ -72,8 +72,6 @@ typings/
 target/
 build/
 
-yarn.lock
-
 cypress/node_modules/
 cypress/.idea/
 cypress/cypress.env.json
@@ -84,4 +82,4 @@ cypress/cookies.json
 public/assets/custom/*
 
 # Mac files
-.DS_Store
+.DS_Store
diff --git 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 02
+
+### 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
@@ -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.10.2
 - Elasticsearch 7.10.2
 
@@ -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.10.2-1.zip
+sudo -u kibana bin/kibana-plugin install https://packages.wazuh.com/4.x/ui/kibana/wazuh_kibana-4.4.5_7.10.2-1.zip
 ```
 
 Restart Kibana
@@ -198,7 +198,7 @@ Install the Wazuh app
 
 ```
 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.10.2-1.zip
+sudo -u kibana bin/kibana-plugin install https://packages.wazuh.com/4.x/ui/kibana/wazuh_kibana-4.4.5_7.10.2-1.zip
 ```
 
 Update configuration file permissions.

diff --git a/kibana.json b/kibana.json
@@ -1,6 +1,6 @@
 {
   "id": "wazuh",
-  "version": "4.4.4-01",
+  "version": "4.4.5-02",
   "kibanaVersion": "kibana",
   "configPath": [
     "wazuh"

diff --git a/package.json b/package.json
@@ -1,9 +1,9 @@
 {
   "name": "wazuh",
-  "version": "4.4.4",
-  "revision": "01",
+  "version": "4.4.5",
+  "revision": "02",
   "stage": "stable",
-  "commit": "7489f9237",
+  "commit": "3d1f43450",
   "pluginPlatform": {
     "version": "7.10.2"
   },

diff --git a/scripts/tag.py b/scripts/tag.py
@@ -15,12 +15,12 @@
 # ======================================================= #
 
 # Wazuh version: major.minor.patch
-version = '4.4.4'
+version = '4.4.5'
 # App's revision number (previous rev + 1)
-revision = '01'
+revision = '02'
 # One of 'pre-alpha', 'alpha', 'beta', 'release-candidate', 'stable'
 stage = 'stable'
-# Tag suffix. Usually set to stage + stage iteration.
+# Tag suffix. Usually set to stage + stage iteration. E.g. '-rc1'
 tag_suffix = '-rc2'
 
 # ================================================ #
@@ -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 = [