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.5.0-7.10 into 4.5.1-7.10 #5694

Merged
merged 5 commits into from
Jul 18, 2023
Merged

Conversation

Machi3mfl
Copy link
Member

@Machi3mfl Machi3mfl commented Jul 18, 2023

Description

Merge 4.5.0-7.10 into 4.5.1-7.10

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

github-actions bot and others added 4 commits June 27, 2023 14:16
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)

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

---------



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



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

---------



* Bump v4.4.5-7.10.2-rc2

---------

Co-authored-by: Ian Yenien Serrano <63758389+yenienserrano@users.noreply.github.com>
Co-authored-by: Nicolas Agustin Guevara Pihen <42900763+Tostti@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: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
jbiset
jbiset previously approved these changes Jul 18, 2023
@github-actions
Copy link
Contributor

Code coverage (Jest) % values
Statements 8.82% ( 3261 / 36985 )
Branches 4.48% ( 1285 / 28692 )
Functions 7.68% ( 703 / 9159 )
Lines 8.88% ( 3146 / 35420 )

Copy link
Member

@Desvelao Desvelao left a comment

Choose a reason for hiding this comment

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

LGTM!

@Desvelao Desvelao merged commit 6c2d91e into 4.5.1-7.10 Jul 18, 2023
@Desvelao Desvelao deleted the merge-4.5.0-7.10-into-4.5.1-7.10 branch July 18, 2023 15:25
Desvelao added a commit that referenced this pull request Jul 20, 2023
* [Backport 4.4-7.10] Fix IPV6 visualizations (#5560)

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>
(cherry picked from commit 1153509)

Co-authored-by: Nicolas Agustin Guevara Pihen <42900763+Tostti@users.noreply.github.com>

* [Backport 4.4-7.10] Change windows agent service name (#5563)

* Change windows agent service name (#5538)

* Change windows agent service name to Wazuh

Change windows agent service name to Wazuh

* Add CHANGELOG

(cherry picked from commit 2bc8984)

* Fix changelog

* [Backport 4.4-7.10] Remove agent name in agent info ribbon (#5558)

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>
(cherry picked from commit 858205f)

* Bump v4.4.4-7.10.2-rc2

* [Backport 4.4-7.10] Add Apple Silicon architecture to the register Agent wizard (#5570)

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

(cherry picked from commit 0135df9)

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

* [Backport 4.4-7.10] Add missing supported versions to the Docker environments (#5586)

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

(cherry picked from commit b6813de)

Co-authored-by: Antonio <34042064+Desvelao@users.noreply.github.com>

* Bump 4.5.1

* [Backport 4.5.1-7.10] Change the method to make the redirect (#5595)

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>
(cherry picked from commit 74927fb)

Co-authored-by: Ian Yenien Serrano <63758389+yenienserrano@users.noreply.github.com>

* [Backport 4.5.1-7.10] Update test snapshots for 4.5 (#5605)

* 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

* [Backport 4.5.1-7.10] Fix agents active coverage stat as NaN (#5598)

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>
(cherry picked from commit 53bf022)

Co-authored-by: Ian Yenien Serrano <63758389+yenienserrano@users.noreply.github.com>

* [Backport 4.5.1-7.10] Add kbn-dev 7.17.11 (#5635)

Add kbn-dev 7.17.11 (#5633)

(cherry picked from commit 5958e78)

Co-authored-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com>

* Merge 4.5.0-7.10 into 4.5.1-7.10 (#5694)

* [Backport 4.5.0-7.10] Update test snapshots for 4.5 (#5603)

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)

Co-authored-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com>

* Fix API reference links in endpoints.json

* Merge 4.4 7.10 into 4.5.0 7.10 (#5693)

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)

---------



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



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

---------



* Bump v4.4.5-7.10.2-rc2

---------

Co-authored-by: Ian Yenien Serrano <63758389+yenienserrano@users.noreply.github.com>
Co-authored-by: Nicolas Agustin Guevara Pihen <42900763+Tostti@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: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Add new line header 4.5.0

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com>
Co-authored-by: Ian Yenien Serrano <63758389+yenienserrano@users.noreply.github.com>
Co-authored-by: Nicolas Agustin Guevara Pihen <42900763+Tostti@users.noreply.github.com>
Co-authored-by: Antonio <34042064+Desvelao@users.noreply.github.com>

* Added break line in CHANGELOG

* fix: fix conflicts

* fix: fix conflicts

* changelog: remove entry

---------

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: Julio César Biset <43619595+jbiset@users.noreply.github.com>
Co-authored-by: yenienserrano <ian.serrano@wazuh.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com>
Co-authored-by: Ian Yenien Serrano <63758389+yenienserrano@users.noreply.github.com>
Co-authored-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com>
Co-authored-by: Antonio David Gutiérrez <antonio.gutierrez@wazuh.com>
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