Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 4.7.0 into master #5712

Merged
merged 7 commits into from
Jul 20, 2023
Merged

Merge 4.7.0 into master #5712

merged 7 commits into from
Jul 20, 2023

Conversation

Desvelao
Copy link
Member

@Desvelao Desvelao commented Jul 20, 2023

Description

Merge 4.7.0 into master

Issues Resolved

#5664

Check List

  • All tests pass
    • yarn test:jest
  • New functionality includes testing.
  • New functionality has been documented.
  • Update CHANGELOG.md
  • Commits are signed per the DCO using --signoff

AlexRuiz7 and others added 7 commits June 27, 2023 17:39
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 <34042064+Desvelao@users.noreply.github.com>
(cherry picked from commit 1ae5f19)
* feat(rbac): add specific RBAC permissions to actions and views

- Add specific RBAC permissions to actions and views
- Remove unused code

* changelog: add pull request entry

* feat(imposter): add mocked API request to imposter

* fix: change title of Security>Roles mapping

* feat: rename files related to API mocked request and add response for GET /security/rules

* fix: fix layout of edit security role flyout

* fix: add missing security permission when the new user is assigned some roles

* Add security actions response

* Add PLUGIN_SECURITY_POLICIES_DENY_UPDATE_POLICY

* fix: permissions when creating or editing a security Role mapping

* fix: remove unused code

* fix: use constant instead of hardcoded values for the WUI security rules from API

* fix: use optional chaining operator

---------

Co-authored-by: yenienserrano <ian.serrano@wazuh.com>
* fix(script): fix documentation link generated from API spec

* fix: fix API endpoint documentation link in static file
* Bump 4.7.0

* Update snapshots

* Bump API spec

---------

Co-authored-by: Alex Ruiz Becerra <alejandro.ruiz.becerra@wazuh.com>
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

---------



* 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

---------






* 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

---------



* 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

---------



* [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

---------


(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

---------



* 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: Julio César Biset <43619595+jbiset@users.noreply.github.com>
Co-authored-by: Antonio <34042064+Desvelao@users.noreply.github.com>
Co-authored-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com>
Co-authored-by: Nicolas Agustin Guevara Pihen <42900763+Tostti@users.noreply.github.com>
Co-authored-by: Antonio David Gutiérrez <antonio.gutierrez@wazuh.com>
Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com>
* 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 <alejandro.ruiz.becerra@wazuh.com>

* 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 <antonio.gutierrez@wazuh.com>
Co-authored-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com>
Co-authored-by: yenienserrano <ian.serrano@wazuh.com>
Co-authored-by: Antonio <34042064+Desvelao@users.noreply.github.com>

* 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 <alejandro.ruiz.becerra@wazuh.com>

* 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 <alejandro.ruiz.becerra@wazuh.com>

* [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 <34042064+Desvelao@users.noreply.github.com>
(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 <34042064+Desvelao@users.noreply.github.com>

* 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 <42900763+Tostti@users.noreply.github.com>
Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com>
Co-authored-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com>
Co-authored-by: Antonio <34042064+Desvelao@users.noreply.github.com>

---------

Co-authored-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com>
Co-authored-by: Antonio <34042064+Desvelao@users.noreply.github.com>
Co-authored-by: Nicolas Agustin Guevara Pihen <42900763+Tostti@users.noreply.github.com>
Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com>

---------

Co-authored-by: Julio César Biset <43619595+jbiset@users.noreply.github.com>
Co-authored-by: Antonio <34042064+Desvelao@users.noreply.github.com>
Co-authored-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com>
Co-authored-by: Nicolas Agustin Guevara Pihen <42900763+Tostti@users.noreply.github.com>
Co-authored-by: Antonio David Gutiérrez <antonio.gutierrez@wazuh.com>
Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com>

* Remove unused embedded jquery-ui (#5592)

* fix: remove unused embedded jquery-ui dependency

* changelog: add pull request entry

---------

Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com>

* 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

---------

Co-authored-by: Ian Yenien Serrano <63758389+yenienserrano@users.noreply.github.com>
Co-authored-by: Julio César Biset <43619595+jbiset@users.noreply.github.com>
Co-authored-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com>
Co-authored-by: Nicolas Agustin Guevara Pihen <42900763+Tostti@users.noreply.github.com>
Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com>
@Desvelao Desvelao requested a review from a team as a code owner July 20, 2023 11:33
@Desvelao Desvelao self-assigned this Jul 20, 2023
Copy link
Member

@yenienserrano yenienserrano left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@github-actions
Copy link
Contributor

Code coverage (Jest) % values
Statements 10.28% ( 3490 / 33944 )
Branches 6.16% ( 1424 / 23087 )
Functions 9.24% ( 744 / 8047 )
Lines 10.38% ( 3371 / 32468 )

@Desvelao Desvelao merged commit 84f2f70 into master Jul 20, 2023
@Desvelao Desvelao deleted the merge-4.7.0-into-master branch July 20, 2023 11:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants