Merge 4.8.0 into 4.9.0 #23191

MarcelKemp · 2024-04-30T09:35:11Z

Related issue
#23180

- Improved indexer connector logging - Factorized out callbacks used on indexer connector

- Fixed coverity defects - Use of auto causes copy - Copy instead of move - Use of & to prevent copy

- Reverted style changes

…t-at-shared-modules-1 Fix coverity defects for 4.8.0

Rename legacy-template.json

…lize-indexerconnector-for-index-wazuh-states-vulnerabilities Improving indexer connector log messages

- Fix behavior if the feed have less or invalid data.

…reloaded-var Add new preloaded var to disable `update_check`

…of-rocksdb Changes to limit the memory usage in write/read operations with rocksdb.

…ng-on-content-updater Update the log level in the vulnerability scanner content-updater

- Implement L1 logic - Partial implement L2 logic

- Implement translation logic - Restore deleted file - Add TC-008 for windows scenario

- Fix new line

- Fix errors related with string_view - Add filter logic

- Fix segfault. - Add documentation.

- Refactoring, move L2 to databaseFeedManager. - Delete filter. - Split translation package scanner in a new function. - Add cases for QA python testing. - Restor cacheLRU.

- Fix style.

- Fixed typo on column name

Bump revision to 40717

- Add custom exception. - Enum possible errors. - Difference error from warning.

- Apply review comments.

- Add try/catch for packages

- Add review comments.

- Fix review comments.

- Remove catch for SocketDbWrapperException

Adds "ignore" section as a list in localfile JSON.

- Fix error.

…bwrapper Improve error logging in `socketDbWrapper`

- Fixed typo - Updated logging - Moved to debug - Aligned logging message

…ility-scanner-facade-logging-with-current-changes Align vulnerability scanner logging with current changes

Merge 4.7.4 into 4.8.0

JcabreraC · 2024-04-30T10:50:49Z

Checks:
- Integration tests for fim on MacOS - Tier 0 and 1 / build
- Integration tests for logcollector on MacOS - Tier 0 and 1 / build

that fail are discussed in the following issue: #23148

MarcelKemp · 2024-04-30T10:52:02Z

Failing checks

Integration tests for logcollector on MacOS - Tier 0 and 1 / build (pull_request)
Integration tests for fim on MacOS - Tier 0 and 1 / build (pull_request)
- It seems to be due to the use of macos-latest as a runner, and its recent update (using macOS 14 ARM).
- Fixed in f527538
Integration tests for Wazuh_db - Tier 0 and 1 / build (pull_request)
- It seems that ITs need to be updated with the recent changes in 4.7.4.
- Partially fixed in: c5d4eac
- Created issue for the failed check: Fix failed wazuh-db integration tests in 4.9.0 #23201
Integration API endpoints test
- The checks are those executed by Wazuh CI, so they would be the old ones.
- Related with: Investigate test_cluster_endpoints unstable AIT #23195

MarcelKemp · 2024-04-30T11:17:39Z

After merging the packages PR, when the reference branch was removed, the Build... packages checks failed.

Merge 4.8.0 into 4.9.0 wazuh-packages#2934

sebasfalcone and others added 30 commits March 21, 2024 18:54

CL:

c04d53b

- Improved indexer connector logging - Factorized out callbacks used on indexer connector

Rename legacy-template.json

0cf51ec

Changes to limit the memory usage in write/read operations with rocksdb.

84b510a

Add cna mapping feature.

00b1d75

CL:

91e7364

- Fixed coverity defects - Use of auto causes copy - Copy instead of move - Use of & to prevent copy

CL:

1081744

- Reverted style changes

Merge pull request #22523 from wazuh/dev-20772-auto-causes-copy-defec…

bbc26ed

…t-at-shared-modules-1 Fix coverity defects for 4.8.0

Fix unit tests.

7321fb4

Add USER_ENABLE_UPDATE_CHECK preloaded var

99e7ca8

Update preloaded-vars template

48cd8c2

Merge pull request #22684 from wazuh/22681/rename-vd-index-template

f5b4cce

Rename legacy-template.json

Improving indexerConnector logging

ce833f3

Merge pull request #22682 from wazuh/dev-22532-worker-fails-to-initia…

9d37705

…lize-indexerconnector-for-index-wazuh-states-vulnerabilities Improving indexer connector log messages

- Add unit tests

5b09573

- Fix behavior if the feed have less or invalid data.

Add requested changes.

528196b

- Fix invalid call during reload json maps.

e59e2a0

Merge pull request #22719 from wazuh/enhancement/22706-update-check-p…

8853bfb

…reloaded-var Add new preloaded var to disable `update_check`

Update error remediation message

b1a79a2

Update log level

94cacab

Merge pull request #22693 from wazuh/fix/22581-fix-memory-management-…

68435a5

…of-rocksdb Changes to limit the memory usage in write/read operations with rocksdb.

Merge pull request #22737 from wazuh/dev-22721-reduce-verbosity-loggi…

780d1de

…ng-on-content-updater Update the log level in the vulnerability scanner content-updater

CL:

06936d6

- Implement L1 logic - Partial implement L2 logic

CL:

ff62168

- Implement translation logic - Restore deleted file - Add TC-008 for windows scenario

CL:

e20431f

- Fix new line

CL:

67b65fc

- Fix errors related with string_view - Add filter logic

CL:

5df1bd0

- Fix segfault. - Add documentation.

CL:

a366f29

- Fix segfault. - Add documentation.

CL:

454ee64

- Refactoring, move L2 to databaseFeedManager. - Delete filter. - Split translation package scanner in a new function. - Add cases for QA python testing. - Restor cacheLRU.

CL:

0a3edce

- Fix style.

CL:

d3bf835

- Fixed typo on column name

MarcelKemp and others added 15 commits April 25, 2024 10:44

Merge pull request #23130 from wazuh/maintenance/23127-bump-revision

f094086

Bump revision to 40717

CL:

5d112bb

- Add custom exception. - Enum possible errors. - Difference error from warning.

CL:

042bfbc

- Apply review comments.

CL:

68e7c4f

- Add try/catch for packages

CL:

acb3091

- Add review comments.

CL:

5500e37

- Fix review comments.

CL:

b2290a6

- Remove catch for SocketDbWrapperException

Merge pull request #23120 from wazuh/fix/23095-localfile-ignore-section

f898f3a

Adds "ignore" section as a list in localfile JSON.

CL:

b985989

- Fix error.

Merge pull request #23075 from wazuh/bug/23064-improve-loggin-socketd…

755ddbd

…bwrapper Improve error logging in `socketDbWrapper`

CL:

543896a

- Fixed typo - Updated logging - Moved to debug - Aligned logging message

Merge pull request #23151 from wazuh/enhancement/23150-align-vulnerab…

7f0ad45

…ility-scanner-facade-logging-with-current-changes Align vulnerability scanner logging with current changes

Merge branch '4.7.4' into merge-4.7.4-into-4.8.0

bd4982f

Merge pull request #23190 from wazuh/merge-4.7.4-into-4.8.0

fe72bb5

Merge 4.7.4 into 4.8.0

Merge branch '4.8.0' into merge-4.8.0-into-4.9.0

56e8a3d

MarcelKemp requested a review from JcabreraC April 30, 2024 09:35

MarcelKemp self-assigned this Apr 30, 2024

MarcelKemp added the type/maintenance Maintenance issues. label Apr 30, 2024

MarcelKemp linked an issue Apr 30, 2024 that may be closed by this pull request

Post release tasks for 4.7.4 #23180

Closed

4 tasks

fix: downgrade macOS image version for ITs

f527538

MarcelKemp mentioned this pull request Apr 30, 2024

Post release tasks for 4.7.4 #23180

Closed

4 tasks

test: expect synchronous=NORMAL at global database

c5d4eac

vikman90 force-pushed the merge-4.8.0-into-4.9.0 branch from 5d1eb3e to c5d4eac Compare April 30, 2024 15:05

MarcelKemp mentioned this pull request Apr 30, 2024

Fix failed wazuh-db integration tests in 4.9.0 #23201

Closed

vikman90 approved these changes Apr 30, 2024

View reviewed changes

vikman90 merged commit f4de366 into 4.9.0 Apr 30, 2024
145 of 146 checks passed

vikman90 deleted the merge-4.8.0-into-4.9.0 branch April 30, 2024 16:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge 4.8.0 into 4.9.0 #23191

Merge 4.8.0 into 4.9.0 #23191

MarcelKemp commented Apr 30, 2024

JcabreraC commented Apr 30, 2024

MarcelKemp commented Apr 30, 2024 •

edited

MarcelKemp commented Apr 30, 2024

Merge 4.8.0 into 4.9.0 #23191

Merge 4.8.0 into 4.9.0 #23191

Conversation

MarcelKemp commented Apr 30, 2024

JcabreraC commented Apr 30, 2024

MarcelKemp commented Apr 30, 2024 • edited

Failing checks

MarcelKemp commented Apr 30, 2024

MarcelKemp commented Apr 30, 2024 •

edited