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.

Sign up for GitHub

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

Jump to bottom

Merge 4.6.0 into 4.7.0 #4470

Merged
merged 121 commits into from
Aug 26, 2023
Merged

Merge 4.6.0 into 4.7.0 #4470

merged 121 commits into from
Aug 26, 2023

Conversation

jnasselle
Copy link
Member

Related issue
#4456

Description

Merge 4.6.0 into 4.7.0

Deblintrake09 and others added 30 commits July 3, 2023 09:03
@Deblintrake09
docs(#3786): update changelog.md
37aa66b
@Deblintrake09
feat(#3786): new event_monitors
9814d4c
@Deblintrake09
fix(#3786): recursive_directory_creation perms
9c3c4c7
@Deblintrake09
feat(#3786): new fixture
2d00264
@Deblintrake09
fix(#3786): configuration imports
f4ed7a2
@Deblintrake09
feat(#3786): new test module
1536dd8
@Deblintrake09
docs(#3786): update changelog.md
5ebed16
@Deblintrake09
style(#3786): fix indentation and whitelines
6454c40
@Deblintrake09
style(#3786): fix indentation
6552baa
@Deblintrake09
feat(#3693): add cases and configuration files
5add503
@Deblintrake09
feat(#3693): add test_registry_wildcards module
7bb1de6
@Deblintrake09
feat(#3693): add new callbacks and event_monitor
da94243
@Deblintrake09
docs(#3693): update changelog.md
c50aa1a
@Deblintrake09
style(#3693): fix whitelines
be7b95b
@vikman90
feat(#4281): New invalid decoder test case for wazuh-logtest
bb56c93
@vikman90
fix(#4281): Fix invalid_decoder_syntax.yaml file line lengths
145d456
@vikman90
Merge pull request #4286 from wazuh/4281-add-analysisd-decoder-test
989f966 
Add an integration test to check the wazuh-analysisd's decoder parser
@damarisg
Merge branch '4.6.0' into 3693-registry-wildcards
83ca604
@vikman90
Merge pull request #4270 from wazuh/3693-registry-wildcards
8027793 
Add FIM Registry Wildcards IT support
@jnasselle
feat(#4325): upgrade pyyaml to 6.0.1
c31208d
@juliamagan
feat: bump version 4.5.2
cb06e6b
@juliamagan
Merge pull request #4329 from wazuh/bump-version-4.5.2
b908d39 
Bump version to 4.5.2
@davidjiglesias
Merge pull request #4326 from wazuh/fix/4325-upgrade-pyyaml-to-6.0.1
2ad0ac5 
Upgrade PyYAML to 6.0.1
@lsayanes @MarcelKemp
fix(#4275): modified year field in test_update_from_year
0344a58
@Leoquicenoz @MarcelKemp
fix(#4275): update custom feeds to NVD 2.0 structure
912c80e
@mateocervilla @MarcelKemp
fix(#4275): deprecate NVD update_from_year option and related changes
0eda4d6
@mateocervilla @MarcelKemp
fix(#4275): NVD feed must be in one line
ca2ba0e
@mateocervilla @MarcelKemp
fix(#4275): more NVD feed one line fix
29fb4ce
@MarcelKemp
style(#4275): fix quoted errors in YAML file
918ac65
@MarcelKemp
style(#4275): added changelog entry and fixed indexing problems
7811dd6
MiguelazoDS and others added 18 commits August 24, 2023 16:51
@MiguelazoDS
fix: Update database version
48d57b5
@juliamagan
Update enrollment logs in system test (#4442)
e435afa 
* fix: update enrollment logs

* docs: update changelog
@MiguelazoDS
fix: Set location default value as a space string
89d56c6
@Dwordcito
Merge pull request #4451 from wazuh/dev-18219-update-schema-sysprograms
3229b83 
Update schema sys_programs table
@davidjiglesias
Merge pull request #4379 from wazuh/4282-update-framework-known-flaws…
36c6d3b 
…-4-5-0

Update known flaws files 4.5.2
@nico-stefani @Selutario
refactor(#4283): Fix directories to exclude format
f638aba
@nico-stefani @Selutario
refactor(#4283): Minor fixes
5abced8
@nico-stefani @Selutario
docs(#4283): Add changelog
7fa2fb4
@nico-stefani @Selutario
refactor(#4283): Linter fixes
b43d484
@nico-stefani @Selutario
style(#4283): Apply suggestions from code review
a07f22a 
Co-authored-by: José Luis López Sánchez <joseluis.lopez@wazuh.com>
@davidjiglesias
Merge pull request #4439 from wazuh/4283-fix-security-flaws-check-4-5-2
41242ef 
Security flaws check improvements 4.5.2
@davidjiglesias
Merge pull request #4380 from wazuh/4282-update-framework-known-flaws…
ffcdeba 
…-4-6-0

Update known flaws files 4.6.0
@vikman90
Update test_agent_database_version.py
63e6fc6 
Version 4.6.0 uses DB version 12
@mauromalara
fix changelog (#4468)
e480363
@vikman90
Merge pull request #4467 from wazuh/4.6.0-db-version
d43cf5b 
Update test_agent_database_version.py
@jnasselle
Merge branch '4.5.2' into 4.6.0
0177869
@TomasTurina
Merge pull request #4469 from wazuh/merge-4.5.2-into-4.6.0
a7d85ae 
Merge 4.5.2 into 4.6.0
@jnasselle
Merge branch '4.6.0' into 4.7.0
d10b59e
@jnasselle jnasselle requested a review from mauromalara August 25, 2023 19:34
@jnasselle jnasselle self-assigned this Aug 25, 2023
@jnasselle jnasselle mentioned this pull request Aug 25, 2023
Closed
6 tasks
mauromalara
mauromalara previously approved these changes Aug 25, 2023
View reviewed changes
Copy link
Contributor

@mauromalara mauromalara left a comment

Choose a reason for hiding this comment

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

LGTM

TomasTurina
TomasTurina previously approved these changes Aug 26, 2023
View reviewed changes
@TomasTurina TomasTurina merged commit d897015 into 4.7.0 Aug 26, 2023
@TomasTurina TomasTurina deleted the merge-4.6.0-into-4.7.0 branch August 26, 2023 13:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TomasTurina TomasTurina TomasTurina approved these changes

@mauromalara mauromalara mauromalara left review comments

Assignees

@jnasselle jnasselle

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.