Merge 4.6.0 into 4.7.0 (#5722)

* Merge 4.5.1 into 4.6.0 (#5671) * Change windows agent service name (#5538) * Change windows agent service name to Wazuh Change windows agent service name to Wazuh * Add CHANGELOG * Remove agent name in agent info ribbon (#5497) * remove: agent name in agent info ribbon * changelog: add pull request entry --------- Co-authored-by: Álex Ruiz <[email protected]> * Fix IPV6 visualizations (#5471) * add ipv6 service * add test for service * Fix issue in agents-table * fix issue in agents-info * fix groups agents issue * Fix width in groups agents * use mapResponseItem * Add copy button to groups * Add copy button to info * fix for node list * Optimize code * Fix styles * Edit changelog * Edit changelog * Add imposter changes to test ipv6 * Replace onMouseDown with onClick * Move copy buttons to the left * fix: removed compressipv6 property of TableWzAPI * feat: add tableLayout property to some tables and remove IPv6 address compression add tableLayout=auto property to some tables: - Agents/{agent_id}/Inventory data - Management/Cluster/Nodes - Agents - Management/Configuration/Client - Management/Global configuration/Remote remove IPv6 address compression * remove: remove unused service to IPv6 compression * revert: revert changes in TableWzAPI component * add: add mocked responses to some syscollector endpoints * remove: unwanted table columns properties * changelog: add pull request entry * Fix imposter --------- Co-authored-by: Antonio David Gutiérrez <[email protected]> Co-authored-by: Álex Ruiz <[email protected]> Co-authored-by: yenienserrano <[email protected]> Co-authored-by: Antonio <[email protected]> * Bump v4.4.4-2.6.0-rc2 * Add Apple Silicon architecture to the register Agent wizard (#5478) * Add Apple Silicon architecture * Add changelog * Change macOS environment variables * Revert "Change macOS environment variables" This reverts commit 108e866. * Change macOS architecture ids * 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 * Bump 4.5.1 * Change the method to make the redirect (#5539) * Change the metod to make the redirect * Remove unused code * Add changelog --------- Co-authored-by: Álex Ruiz <[email protected]> * Fix agents active coverage stat as NaN (#5490) * fix: agents active coverate stat as NaN Ensure the values used to calculate have the expected types and the total count is greater than 0. * remove: unused openRegistrationDocs method * changelog: add entry * fix: check if agents active coverage is a NaN * changelog: fix entry --------- Co-authored-by: Álex Ruiz <[email protected]> * [Backport 4.5.1] Update test snapshots for 4.5 (#5607) * 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]> (cherry picked from commit 1ae5f19) * Fix API reference links in endpoints.json * Add kbn-dev 7.17.11 (#5628) * 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]> --------- Co-authored-by: Julio César Biset <[email protected]> Co-authored-by: Antonio <[email protected]> Co-authored-by: Álex Ruiz <[email protected]> Co-authored-by: Nicolas Agustin Guevara Pihen <[email protected]> Co-authored-by: Antonio David Gutiérrez <[email protected]> Co-authored-by: Federico Rodriguez <[email protected]> * Remove unused embedded jquery-ui (#5592) * fix: remove unused embedded jquery-ui dependency * changelog: add pull request entry --------- Co-authored-by: Federico Rodriguez <[email protected]> * Fixes redirection problem to inventory data, stats and configuration in an agent (#5685) Fix redirect to inventory data, stats and configuration * Fix conflicts in branch synchronization (#5708) * fix: fix conflicts * changelog: remove entry * Fix 4.6.0 changelog merge errors (#5692) * Update changelog * Update CHANGELOG.md * Merge 4.5.2 into 4.6.0 (#5721) --------- Co-authored-by: Ian Yenien Serrano <[email protected]> Co-authored-by: Julio César Biset <[email protected]> Co-authored-by: Álex Ruiz <[email protected]> Co-authored-by: Nicolas Agustin Guevara Pihen <[email protected]> Co-authored-by: Federico Rodriguez <[email protected]>
wazuh · Jul 21, 2023 · a9886fc · a9886fc
1 parent 6595071
commit a9886fc
Show file tree

Hide file tree

Showing 21 changed files with 1,216 additions and 257 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -57,25 +57,11 @@ All notable changes to the Wazuh app project will be documented in this file.
 - Removed obsolete code that caused duplicate requests to the api in `Management`. [#5485](https://github.com/wazuh/wazuh-kibana-app/pull/5485)
 - Removed unused embedded jquery-ui [#5592](https://github.com/wazuh/wazuh-kibana-app/pull/5592)
 
-## Wazuh v4.5.1 - OpenSearch Dashboards 2.6.0 - Revision 01
+## Wazuh v4.5.2 - OpenSearch Dashboards 2.6.0 - Revision 01
 
 ### Added
 
-- Add Apple Silicon architecture button to the register Agent wizard [#5478](https://github.com/wazuh/wazuh-kibana-app/pull/5478)
-
-### Fixed
-
-- Fixed the rendering of tables that contains IPs and agent overview [#5471](https://github.com/wazuh/wazuh-kibana-app/pull/5471)
-- Fixed the agents active coverage stat as NaN in Details panel of Agents section [#5490](https://github.com/wazuh/wazuh-kibana-app/pull/5490)
-
-### Removed
-
-- Removed the agent name in the agent info ribbon [#5497](https://github.com/wazuh/wazuh-kibana-app/pull/5497)
-
-### Changed
-
-- Changed method to perform redirection on agent table buttons [#5539](https://github.com/wazuh/wazuh-kibana-app/pull/5539)
-- Changed windows agent service name in the deploy agent wizard [#5538](https://github.com/wazuh/wazuh-kibana-app/pull/5538)
+- Support for Wazuh 4.5.2
 
 ## Wazuh v4.5.1 - OpenSearch Dashboards 2.6.0 - Revision 01
 

diff --git a/Makefile b/Makefile
@@ -5,7 +5,3 @@ prebuild:
 	@echo "- Updating project's versions ..."
 	@node scripts/generate-build-version
 
-tags:
-	@echo "- Generating Git tags ..."
-	@python3 scripts/tag.py
-
diff --git a/RELEASING.md b/RELEASING.md
@@ -0,0 +1,243 @@
+## Releasing
+
+## Runbook
+
+### Overview
+
+### Release Phase 1 - Preparation
+
+#### Files
+
+The following files must be updated:
+
+- `package.json`: Defines the package manifest. It contains the following properties:
+  - `version`: Plugin version. Schema: `{major}.{minor}.{patch}`. Example: 4.4.5
+  - `revision`: Plugin revision. Schema: number with 2 digits. This value is reset for each version to `01` and increament for following revisions.
+  - `pluginPlatform.version`: version of the plugin platform.
+- `opensearch_dashboards.json` or `kibana.json`: Defines the plugin manifest. It contains the following properties:
+  - `version`: Combination of version and revision of the plugin: `{version}-{revision}`.
+- `README.md`: References to the version of server, indexer and dashboard applications.
+- `CHANGELOG.md`: Changelog of the new release.
+- `common/api-info/endpoints.json`: Data related to endpoints and extracted from server's API
+- `common/api-info/security-actions.json`: Data related to security actions of extracted from server's API
+- Unit tests
+
+To bump the version, see [# Bump](#Bump)
+
+#### Create tags
+
+After the base branches have set the expected [# Files](#files), we must create the tags.
+
+The tag name follows the pattern:
+- final release tag: `v{version}-{platform version}`. Example: `v4.4.5-2.6.0`.
+- non-final release tag: `v{version}-{platform version}{suffix}`. Example: `v4.4.5-2.6.0-pre-alpha1`, `v4.4.5-2.6.0-alpha1`, `v4.4.5-2.6.0-rc1`.
+
+> See the [script instructions](#create-tags---script) that reduces this job.
+
+#### Create tags - Manually
+
+Steps:
+
+1. Switch and update the base branch
+
+```
+git checkout <base_branch>
+git pull
+```
+
+2. Review if the version, revision and platform values are defined to the target release in the [#Files](#files), if not accomodate them (creating a new commit).
+
+3. Create the tag
+
+```
+git tag {tag} -a -m "Wazuh {version} for {platform} {platform version}"
+```
+
+> replace the placeholders:
+>
+> - `{tag}`: tag name. Use this schema: `v{version}-{platform version}`. We add suffixes for release candidates or alpha versions:
+>   - pre-alpha: `-pre-alpha{number}`. Example: `-pre-alpha1`.
+>   - release candidates: `-rc{number}`. Example: `-rc1`.
+> - `{version}`: plugin version
+> - `{platform}`: platform name. One of `OpenSearch` or `Kibana`
+> - `{platform}`: platform version.
+
+4. Push the tag
+
+```
+git push origin {tag}
+```
+
+> replace the placeholder:
+
+- `{tag}`: tag name
+
+#### Create tags - Script
+
+The process to create all the required tags can be run through a script ( `scripts/release/tag` ).
+
+For each supported version defined in `scripts/release/tag`
+
+- edit `revision` package manifest file: `package.json`
+- edit the `version` property in plugin manifest file: `opensearch_dashboards.json` or `kibana.json`
+- commit
+- create tag
+- push tag
+
+The script can be run through the package script `yarn release:tag` too. This is the prefered method because defines some required parameters.
+
+Steps:
+
+1. Ensure the target versions are defined as the supported versions in `scripts/release/tag` and the others files are updated.
+   Currently there are 3 platforms: OpenDistro (Kibana 7.10.2), Kibana 7.16-7.17 and OpenSearch (Wazuh stack).
+
+2. Bump version/revision/platform version and create the local and remote tag using the package script
+
+```console
+yarn release:tag --revision <bump_revision>
+```
+
+> If the version or the revision is not specified, then it will use the current values from the package manifest file (package.json).
+> You can bump the `version` or `platform-version` too or combine them.
+> :warning: if the `version` is set, the base branches must exist in the remote repository.
+
+```console
+yarn release:tag --version <bump_version>
+yarn release:tag --revision <bump_revision>
+yarn release:tag --platform-version <bump_platform_version>
+yarn release:tag --version <version> --revision <revision> --platform-version <bump_platform_version>
+```
+
+Examples:
+
+- Change the plugin version
+
+```
+yarn release:tag --version 4.5.0
+```
+- Change the plugin revision
+
+```
+yarn release:tag --revision 02
+```
+- Change the platform version
+
+```
+yarn release:tag --platform-version 2.8.0
+```
+- Change the plugin version, revision and platform version
+
+```
+yarn release:tag --version 4.5.0 --revision 02 --platform-version 2.8.0
+```
+For tags that needs a suffix, use the `--tag-suffix <tag-suffix>` flag.
+
+```
+yarn release:tag --tag-suffix <tag-suffix> <options>
+```
+
+Example:
+
+```
+yarn release:tag --tag-suffix -rc2 --revision 02
+```
+
+If you want to get a report of the tags generated and stored locally, use the `--export-tags <file>`.
+
+```
+yarn release:tag --revision <bump_revision> --export-tags <file>
+```
+
+Example:
+
+```
+yarn release:tag --version 4.5.0 --export-tags tags.log
+```
+
+3. Review the new tags were pushed to the remote repository.
+
+### Build packages
+
+## Release Phase 2 - Release testing
+
+### Release Phase 3 - Release Announcement
+
+### Release Phase 4 - Post-Release
+
+### Bump
+
+It means to increment the version number to a new, unique value.
+
+Bumping the version requires to do some changes in the source code of the application. See [# Files](#files).
+
+We have a script (`scripts/release/bump`) to update some of these files:
+
+- package.json
+- opensearch_dashboards.json or kibana.json
+
+This can be run through the `yarn release:bump` package script too. This is the prefered method because defines some required parameters. **The rest of the files should be changed manually.**
+
+> The package script sets some required parameters related to manifest files.
+
+Steps:
+
+1. Switch to new branch from the base branch to bump
+
+```console
+git checkout <base_branch>
+git pull
+git checkout -b <bump_branch>
+```
+
+2. Bump the version/revision/platform version using the package script
+
+```console
+yarn release:bump --version <bump_version>
+```
+
+> You can bump the `revision` or `platform-version` too or combine them.
+
+```console
+yarn release:bump --version <bump_version>
+yarn release:bump --revision <bump_revision>
+yarn release:bump --platform-version <bump_platform_version>
+yarn release:bump --version <version> --revision <revision> --platform-version <bump_platform_version>
+```
+
+Examples:
+
+- Change the plugin version
+
+```
+yarn release:bump --version 4.5.0
+```
+
+- Change the plugin revision
+
+```
+yarn release:bump --revision 02
+```
+
+- Change the platform version
+
+```
+yarn release:bump --platform-version 2.8.0
+```
+
+- Change the plugin version, revision and platform version
+
+```
+yarn release:bump --version 4.5.0 --revision 02 --platform-version 2.8.0
+```
+
+3. Apply manually the changes to the rest of files if needed it. See [# Files](#Files).
+
+4. Optional. Commit and push the new branch to the remote repository.
+
+```
+git add .
+git commit -m "bump: Bump version/revision/platform version to <version/revision/platform version>"
+git push origin <branch_name>
+```
+
+A new branch will be created in the remote and will be ready to receive pull requests or use as source to create the tags.
diff --git a/docker/imposter/agents/agent.json b/docker/imposter/agents/agent.json
@@ -24,7 +24,7 @@
         "node_name": "master",
         "group": ["default", "debian"],
         "lastKeepAlive": "2022-09-12T08:48:40Z",
-        "version": "Wazuh v4.5.0"
+        "version": "Wazuh v4.3.7"
       }
     ],
     "total_affected_items": 1,

diff --git a/docker/imposter/agents/agents.json b/docker/imposter/agents/agents.json
@@ -10,8 +10,6 @@
           "uname": "Linux |wazuh-manager-master-0 |4.14.114-105.126.amzn2.x86_64 |#1 SMP Tue May 7 02:26:40 UTC 2019 |x86_64",
           "version": "2"
         },
-        "ip": "127.0.0.1",
-        "id": "001",
         "group": [
           "default",
           "test",
@@ -21,16 +19,42 @@
           "test5",
           "test6",
           "test7",
-          "test8"
+          "test8",
+          "test9",
+          "test10"
         ],
-        "registerIP": "127.0.0.1",
+        "ip": "FE80:0034:0223:A000:0002:B3FF:0000:8329",
+        "id": "000",
+        "registerIP": "FE80:0034:0223:A000:0002:B3FF:0000:8329",
         "dateAdd": "2022-08-25T16:17:46Z",
-        "name": "Debian agent",
+        "name": "wazuh-manager-master-0",
         "status": "active",
         "manager": "wazuh-manager-master-0",
         "node_name": "master",
         "lastKeepAlive": "9999-12-31T23:59:59Z",
-        "version": "Wazuh v4.5.0",
+        "version": "Wazuh v4.4.0",
+        "group_config_status": "synced"
+      },
+      {
+        "os": {
+          "arch": "x86_64",
+          "major": "2",
+          "name": "Amazon Linux",
+          "platform": "amzn",
+          "uname": "Linux |wazuh-manager-master-0 |4.14.114-105.126.amzn2.x86_64 |#1 SMP Tue May 7 02:26:40 UTC 2019 |x86_64",
+          "version": "2"
+        },
+        "group": ["default", "test", "test2", "test3", "test4", "test5"],
+        "ip": "FE80:1234:2223:A000:2202:B3FF:FE1E:8329",
+        "id": "001",
+        "registerIP": "FE80:1234:2223:A000:2202:B3FF:FE1E:8329",
+        "dateAdd": "2022-08-25T16:17:46Z",
+        "name": "wazuh-manager-master-0",
+        "status": "active",
+        "manager": "wazuh-manager-master-0",
+        "node_name": "master",
+        "lastKeepAlive": "9999-12-31T23:59:59Z",
+        "version": "Wazuh v4.4.0",
         "group_config_status": "not synced"
       },
       {
@@ -42,17 +66,17 @@
           "uname": "Linux |wazuh-manager-master-0 |4.14.114-105.126.amzn2.x86_64 |#1 SMP Tue May 7 02:26:40 UTC 2019 |x86_64",
           "version": "2"
         },
+        "group": ["default", "test", "test2"],
         "ip": "127.0.0.1",
         "id": "002",
-        "group": ["default", "test", "test2", "test3", "test4"],
         "registerIP": "127.0.0.1",
         "dateAdd": "2022-08-25T16:17:46Z",
         "name": "wazuh-manager-master-0",
         "status": "active",
         "manager": "wazuh-manager-master-0",
         "node_name": "master",
         "lastKeepAlive": "9999-12-31T23:59:59Z",
-        "version": "Wazuh v4.5.0",
+        "version": "Wazuh v4.4.0",
         "group_config_status": "synced"
       },
       {

diff --git a/docker/imposter/api-info/api_info.json b/docker/imposter/api-info/api_info.json
@@ -2,7 +2,7 @@
   "data": {
     "title": "Wazuh API REST",
     "api_version": "4.6.0",
-    "revision": 4600,
+    "revision": 1,
     "license_name": "GPL 2.0",
     "license_url": "https://github.com/wazuh/wazuh/blob/4.5/LICENSE",
     "hostname": "imposter",

diff --git a/docker/osd-dev/dev.sh b/docker/osd-dev/dev.sh
@@ -8,7 +8,6 @@ os_versions=(
   '2.3.0'
   '2.4.0'
   '2.4.1'
-  '2.5.0'
   '2.6.0'
 )
 
@@ -20,7 +19,6 @@ osd_versions=(
   '2.3.0'
   '2.4.0'
   '2.4.1'
-  '2.5.0'
   '2.6.0'
 )
 

diff --git a/docker/wazuh-4.4-wz/pre.sh b/docker/wazuh-4.4-wz/pre.sh
@@ -9,6 +9,8 @@ versions=(
   "4.4.5"
 	"4.5.0"
 	"4.5.1"
+  "4.5.2"
+  "4.6.0"
 )
 
 wazuh_api_version=(
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,6 @@ os_versions=( @@
       '2.3.0'
       '2.4.0'
       '2.4.1'
-      '2.5.0'
       '2.6.0'
     )
@@ Expand All / @@ -20,7 +19,6 @@ osd_versions=( @@
       '2.3.0'
       '2.4.0'
       '2.4.1'
-      '2.5.0'
       '2.6.0'
     )
@@ Expand Down @@