Merge 4.5.0 into 4.5.1 (#5670)

* Update test snapshots for 4.5 (#5601)

* Add missing supported versions to the Docker environments (#5584)

feat(environments): add latest versions to Docker environments

- Add Kibana versions: 7.17.7, 7.17.8, 7.17.9 and 7.17.10
- Add OpenSearch: 2.6.0
- Add OpenSearch Dashboards: 2.6.0
- Add Wazuh 4.4.1, 4.4.2, 4.4.3 and 4.4.4

* Update test snapshost

* Update API data to 4.5

* Update branch patterns for GH Actions

---------

Co-authored-by: Antonio <[email protected]>

* Fix API reference links in endpoints.json

* Merge 4.4 into 4.5.0 (#5669)

Merge v4.4.5-2.6.0 into 4.4 (#5665)

* Bump Wazuh and platform versions for v4.4.5 (#5639)

* Update changelog

* Update opensearch_dashboards.json

* Update package.json

* Update readme

* Update tag script

* Change tag.py version value

* Empty tag suffix

* Prepare tag.py for v4.4.5-rc1 (#5645)

Add -rc1 tag suffix

* Fix incompatible version of triple-beam subdependency (#5652)

fix: add yarn.lock file and set version of triple-beam in yarn.lock

* Update unit-test.yml (#5655)

* Add support for Wazuh 4.4.5-rc2 (#5659)

* Update revision of v4.4.5 in the Changelog

* Bump v4.4.5-2.6.0-rc2

---------

Co-authored-by: Nicolas Agustin Guevara Pihen <[email protected]>
Co-authored-by: Federico Rodriguez <[email protected]>
Co-authored-by: Álex Ruiz <[email protected]>
Co-authored-by: Antonio <[email protected]>

---------

Co-authored-by: Álex Ruiz <[email protected]>
Co-authored-by: Antonio <[email protected]>
Co-authored-by: Nicolas Agustin Guevara Pihen <[email protected]>
Co-authored-by: Federico Rodriguez <[email protected]>

.github/workflows/unit-test.yml

@@ -24,11 +24,6 @@ on:
  options:
  - 'yarn test:jest'
  pull_request:
- branches:
- - 'master'
- - '[345].[0-9]+' # Minor branches
- - '[345].[0-9]+.[0-9]+' # Patch branches
- - '[345].[0-9]+.[0-9]+-7.[0-9]+' # Minor branches - Kibana
 
 jobs:
  # Run unit tests with Jest

.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

CHANGELOG.md

@@ -28,6 +28,12 @@ All notable changes to the Wazuh app project will be documented in this file.
 
 - Support for Wazuh 4.5.0
 
+## Wazuh v4.4.5 - OpenSearch Dashboards 2.6.0 - Revision 02
+
+### Added
+
+- Support for Wazuh 4.4.5
+
 ## Wazuh v4.4.4 - OpenSearch Dashboards 2.6.0 - Revision 01
 
 

README.md

@@ -93,6 +93,7 @@ This plugin for OpenSearch Dashboards allows you to visualize and analyze Wazuh
 - Wazuh dashboard 4.5.1
 - Wazuh indexer 4.5.1
 
+
 ## Contribute
 
 If you want to contribute to our project please don't hesitate to send a pull request. You can also join our users [mailing list](https://groups.google.com/d/forum/wazuh), by sending an email to [[email protected]](mailto:[email protected]), to ask questions and participate in discussions.

docker/wazuh-4.4-wz/pre.sh

@@ -6,6 +6,7 @@ versions=(
  "4.4.2"
  "4.4.3"
  "4.4.4"
+ "4.4.5"
  "4.5.0"
  "4.5.1"
 )

docker/wazuh-4.4-wz/rel.sh

@@ -6,6 +6,7 @@ versions=(
  "4.4.2"
  "4.4.3"
  "4.4.4"
+ "4.4.5"
  "4.5.0"
  "4.5.1"
 )

docker/wazuh-4.x-es/pre.sh

@@ -16,6 +16,7 @@ elastic_versions=(
  "7.17.8"
  "7.17.9"
  "7.17.10"
+ "7.17.11"
 )
 
 wazuh_api_version=(
@@ -35,6 +36,7 @@ wazuh_api_version=(
  "4.4.2"
  "4.4.3"
  "4.4.4"
+ "4.4.5"
  "4.5.0"
  "4.5.1"
 )

docker/wazuh-4.x-es/rel.sh

@@ -16,6 +16,7 @@ elastic_versions=(
  "7.17.8"
  "7.17.9"
  "7.17.10"
+ "7.17.11"
 )
 
 wazuh_versions=(
@@ -35,7 +36,8 @@ wazuh_versions=(
  "4.4.2"
  "4.4.3"
  "4.4.4"
- "4.5.0"
+ "4.4.5"
+ "4.5.0"
  "4.5.1"
 )
 

package.json

@@ -3,7 +3,7 @@
  "version": "4.5.1",
  "revision": "01",
  "stage": "stable",
- "commit": "0e7201ff8",
+ "commit": "c805cbcd0",
  "pluginPlatform": {
  "version": "2.6.0"
  },

scripts/tag.py

@@ -17,9 +17,9 @@
 # Wazuh version: major.minor.patch
 version = '4.5.1'
 # App's revision number (previous rev + 1)
-revision = '01'
+revision = '02'
 # One of 'pre-alpha', 'alpha', 'beta', 'release-candidate', 'stable'
-stage = 'alpha'
+stage = 'stable'
 # Tag suffix. Usually set to stage + stage iteration.
 tag_suffix = '-alpha1'
 
@@ -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 = [