Merge 4.6.0 into 4.7.0 #4349
Merged
Merge 4.6.0 into 4.7.0 #4349
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add FIM Registry Wildcards IT support
* feat(#4281): New invalid decoder test case for wazuh-logtest * fix(#4281): Fix invalid_decoder_syntax.yaml file line lengths * feat(#4325): upgrade pyyaml to 6.0.1 * feat: bump version 4.5.2 * refactor(#4344): Add space to version json * feat(#4344): add Release section --------- Co-authored-by: Vikman Fernandez-Castro <vmfdez90@gmail.com> Co-authored-by: Victor M. Fernandez-Castro <victor@wazuh.com> Co-authored-by: jnasselle <jnasselle@gmail.com> Co-authored-by: Julia <juliamgnr@gmail.com> Co-authored-by: Julia Magán <80041853+juliamagan@users.noreply.github.com> Co-authored-by: David Jose Iglesias Lopez <davidj.iglesias@wazuh.com> Co-authored-by: Víctor Rebollo Pérez <victorrebollop@gmail.com>
BelenValdivia
suggested changes
Jul 21, 2023
BelenValdivia
approved these changes
Jul 21, 2023
|
I will merge because check failures will be removed. (#4291) |
damarisg
added a commit
that referenced
this pull request
Jul 21, 2023
* feat(#3693): add cases and configuration files * feat(#3693): add test_registry_wildcards module * feat(#3693): add new callbacks and event_monitor * docs(#3693): update changelog.md * style(#3693): fix whitelines * Merge 4.5.2 into 4.6.0 (#4348) * feat(#4281): New invalid decoder test case for wazuh-logtest * fix(#4281): Fix invalid_decoder_syntax.yaml file line lengths * feat(#4325): upgrade pyyaml to 6.0.1 * feat: bump version 4.5.2 * refactor(#4344): Add space to version json * feat(#4344): add Release section --------- * Move 4.5.0 `CHANGELOG.md` changes to 4.6.0 (#4331) * Move changes of 4.5.0 in CHANGELOG.md --------- Co-authored-by: Deblintrake09 <amicalizzi2005@gmail.com> Co-authored-by: Victor M. Fernandez-Castro <victor@wazuh.com> Co-authored-by: Vikman Fernandez-Castro <vmfdez90@gmail.com> Co-authored-by: jnasselle <jnasselle@gmail.com> Co-authored-by: Julia <juliamgnr@gmail.com> Co-authored-by: Julia Magán <80041853+juliamagan@users.noreply.github.com> Co-authored-by: David Jose Iglesias Lopez <davidj.iglesias@wazuh.com> Co-authored-by: Víctor Rebollo Pérez <victorrebollop@gmail.com>
damarisg
added a commit
that referenced
this pull request
Aug 24, 2023
* Merge 4.6.0 into 4.7.0 (#4349) * feat(#3693): add cases and configuration files * feat(#3693): add test_registry_wildcards module * feat(#3693): add new callbacks and event_monitor * docs(#3693): update changelog.md * style(#3693): fix whitelines * Merge 4.5.2 into 4.6.0 (#4348) * feat(#4281): New invalid decoder test case for wazuh-logtest * fix(#4281): Fix invalid_decoder_syntax.yaml file line lengths * feat(#4325): upgrade pyyaml to 6.0.1 * feat: bump version 4.5.2 * refactor(#4344): Add space to version json * feat(#4344): add Release section --------- Co-authored-by: Vikman Fernandez-Castro <vmfdez90@gmail.com> Co-authored-by: Victor M. Fernandez-Castro <victor@wazuh.com> Co-authored-by: jnasselle <jnasselle@gmail.com> Co-authored-by: Julia <juliamgnr@gmail.com> Co-authored-by: Julia Magán <80041853+juliamagan@users.noreply.github.com> Co-authored-by: David Jose Iglesias Lopez <davidj.iglesias@wazuh.com> Co-authored-by: Víctor Rebollo Pérez <victorrebollop@gmail.com> * Move 4.5.0 `CHANGELOG.md` changes to 4.6.0 (#4331) * Move changes of 4.5.0 in CHANGELOG.md --------- Co-authored-by: Deblintrake09 <amicalizzi2005@gmail.com> Co-authored-by: Victor M. Fernandez-Castro <victor@wazuh.com> Co-authored-by: Vikman Fernandez-Castro <vmfdez90@gmail.com> Co-authored-by: jnasselle <jnasselle@gmail.com> Co-authored-by: Julia <juliamgnr@gmail.com> Co-authored-by: Julia Magán <80041853+juliamagan@users.noreply.github.com> Co-authored-by: David Jose Iglesias Lopez <davidj.iglesias@wazuh.com> Co-authored-by: Víctor Rebollo Pérez <victorrebollop@gmail.com> * feat(#4045): add custom feed * feat(#4045): add test cases and configuration * feat(#4045): add test module * docs(#4045): case name and description * style(#4045): rename feed file name * style(#4045): fix description indentation * fix(#4356): fix configuration_templates path * docs(#4356): update test wazuh_min_version * refactor(#4404): update database version * refactor(#4404): updated changelog * Merge 4.6.0 into 4.7.0 (#4421) * docs(#3786): update changelog.md * feat(#3786): new event_monitors * fix(#3786): recursive_directory_creation perms * feat(#3786): new fixture * fix(#3786): configuration imports * feat(#3786): new test module * docs(#3786): update changelog.md * style(#3786): fix indentation and whitelines * style(#3786): fix indentation * feat(#3693): add cases and configuration files * feat(#3693): add test_registry_wildcards module * feat(#3693): add new callbacks and event_monitor * docs(#3693): update changelog.md * style(#3693): fix whitelines * feat(#4281): New invalid decoder test case for wazuh-logtest * fix(#4281): Fix invalid_decoder_syntax.yaml file line lengths * feat(#4325): upgrade pyyaml to 6.0.1 * feat: bump version 4.5.2 * fix(#4275): modified year field in test_update_from_year * fix(#4275): update custom feeds to NVD 2.0 structure * fix(#4275): deprecate NVD update_from_year option and related changes * fix(#4275): NVD feed must be in one line * fix(#4275): more NVD feed one line fix * style(#4275): fix quoted errors in YAML file * style(#4275): added changelog entry and fixed indexing problems * Merge 4.5.2 into 4.6.0 (#4348) * feat(#4281): New invalid decoder test case for wazuh-logtest * fix(#4281): Fix invalid_decoder_syntax.yaml file line lengths * feat(#4325): upgrade pyyaml to 6.0.1 * feat: bump version 4.5.2 * refactor(#4344): Add space to version json * feat(#4344): add Release section --------- Co-authored-by: Vikman Fernandez-Castro <vmfdez90@gmail.com> Co-authored-by: Victor M. Fernandez-Castro <victor@wazuh.com> Co-authored-by: jnasselle <jnasselle@gmail.com> Co-authored-by: Julia <juliamgnr@gmail.com> Co-authored-by: Julia Magán <80041853+juliamagan@users.noreply.github.com> Co-authored-by: David Jose Iglesias Lopez <davidj.iglesias@wazuh.com> Co-authored-by: Víctor Rebollo Pérez <victorrebollop@gmail.com> * Move 4.5.0 `CHANGELOG.md` changes to 4.6.0 (#4331) * Fix registry wildcards path (#4357) * fix(#4356): fix configuration_templates path * docs(#4356): update test wazuh_min_version * fix(#3786): imports and paths * fix: delete update_from_year for nvd * Added new test to verify every check tag in configuration * feat(#3723): Adds custom AlmaLinux OVAL feed * feat(#3723): Adds AlmaLinux to test_providers vd tests * feat(#3723): Adds AlmaLinux to test_scan_results vd tests * feat(#3723): Adds AlmaLinux to test_feeds vd tests * feat(#3723): Adds AlmaLinux to the remaining vd tests description * feat(#3723): Adds AlmaLinux init configurations * style(#3723): minor fixes * style(#3723): Formatting .yaml files according to linting test * fix: renamed syscollector wmodules prefix * fix(#4336): fix flaky test. * style(#4336): add missing line * fix(#4336): fix test logic * docs: include 4382 to changelog * fix(#4231): fix canonical tests * style(#3723): Fixing formatting for AlmaLinux .yaml config file * docs: include affected component to changelog Co-Authored-By: Juan Nicolas Asselle <jnasselle@gmail.com> * Fix FIM framework to validate path in event correctly * docs: update changelog * docs: update changelog --------- Co-authored-by: Deblintrake09 <amicalizzi2005@gmail.com> Co-authored-by: Vikman Fernandez-Castro <vmfdez90@gmail.com> Co-authored-by: Victor M. Fernandez-Castro <victor@wazuh.com> Co-authored-by: damarisg <seyladamaris@gmail.com> Co-authored-by: jnasselle <jnasselle@gmail.com> Co-authored-by: Julia <juliamgnr@gmail.com> Co-authored-by: Julia Magán <80041853+juliamagan@users.noreply.github.com> Co-authored-by: David Jose Iglesias Lopez <davidj.iglesias@wazuh.com> Co-authored-by: lsayanes <leandro.sayanes@gmail.com> Co-authored-by: Leonardo Quiceno <leonardo.quiceno@wazuh.com> Co-authored-by: Mateo Cervilla <mateo.cervilla@wazuh.com> Co-authored-by: lsayanes <leandro.sayanes@wazuh.com> Co-authored-by: Marcel Kemp <marcel.kemp@wazuh.com> Co-authored-by: Seyla Dámaris Gomez <seyla.gomez@wazuh.com> Co-authored-by: Octavio Valle <octa.tala@gmail.com> Co-authored-by: Jose Luis Carreras Marin <jose.carreras@wazuh.com> Co-authored-by: Matias Pereyra <matias.pereyra@wazuh.com> Co-authored-by: mauromalara <mmalara@outlook.es> Co-authored-by: BelenValdivia <belen.valdivia@wazuh.com> Co-authored-by: Javier Castro <javier.castro@wazuh.com> * Merge 4.6.0 into 4.7.0 (#4459) * docs(#3786): update changelog.md * feat(#3786): new event_monitors * fix(#3786): recursive_directory_creation perms * feat(#3786): new fixture * fix(#3786): configuration imports * feat(#3786): new test module * docs(#3786): update changelog.md * style(#3786): fix indentation and whitelines * style(#3786): fix indentation * feat(#3693): add cases and configuration files * feat(#3693): add test_registry_wildcards module * feat(#3693): add new callbacks and event_monitor * docs(#3693): update changelog.md * style(#3693): fix whitelines * feat(#4281): New invalid decoder test case for wazuh-logtest * fix(#4281): Fix invalid_decoder_syntax.yaml file line lengths * feat(#4325): upgrade pyyaml to 6.0.1 * feat: bump version 4.5.2 * fix(#4275): modified year field in test_update_from_year * fix(#4275): update custom feeds to NVD 2.0 structure * fix(#4275): deprecate NVD update_from_year option and related changes * fix(#4275): NVD feed must be in one line * fix(#4275): more NVD feed one line fix * style(#4275): fix quoted errors in YAML file * style(#4275): added changelog entry and fixed indexing problems * Merge 4.5.2 into 4.6.0 (#4348) * feat(#4281): New invalid decoder test case for wazuh-logtest * fix(#4281): Fix invalid_decoder_syntax.yaml file line lengths * feat(#4325): upgrade pyyaml to 6.0.1 * feat: bump version 4.5.2 * refactor(#4344): Add space to version json * feat(#4344): add Release section --------- Co-authored-by: Vikman Fernandez-Castro <vmfdez90@gmail.com> Co-authored-by: Victor M. Fernandez-Castro <victor@wazuh.com> Co-authored-by: jnasselle <jnasselle@gmail.com> Co-authored-by: Julia <juliamgnr@gmail.com> Co-authored-by: Julia Magán <80041853+juliamagan@users.noreply.github.com> Co-authored-by: David Jose Iglesias Lopez <davidj.iglesias@wazuh.com> Co-authored-by: Víctor Rebollo Pérez <victorrebollop@gmail.com> * Move 4.5.0 `CHANGELOG.md` changes to 4.6.0 (#4331) * Fix registry wildcards path (#4357) * fix(#4356): fix configuration_templates path * docs(#4356): update test wazuh_min_version * fix(#3786): imports and paths * fix: delete update_from_year for nvd * Added new test to verify every check tag in configuration * feat(#3723): Adds custom AlmaLinux OVAL feed * feat(#3723): Adds AlmaLinux to test_providers vd tests * feat(#3723): Adds AlmaLinux to test_scan_results vd tests * feat(#3723): Adds AlmaLinux to test_feeds vd tests * feat(#3723): Adds AlmaLinux to the remaining vd tests description * feat(#3723): Adds AlmaLinux init configurations * style(#3723): minor fixes * style(#3723): Formatting .yaml files according to linting test * fix: renamed syscollector wmodules prefix * fix(#4336): fix flaky test. * style(#4336): add missing line * fix(#4336): fix test logic * docs: include 4382 to changelog * fix(#4231): fix canonical tests * style(#3723): Fixing formatting for AlmaLinux .yaml config file * docs: include affected component to changelog Co-Authored-By: Juan Nicolas Asselle <jnasselle@gmail.com> * Fix FIM framework to validate path in event correctly * docs: update changelog * docs: update changelog * refactor: rename discard cases files * feat: add cloudwatch and inspector discard regex tests and cases * docs: add changelog entry * fix(#4368): Change test and config file * docs(#4368): update changelog * Fixed error related to logs format in reliability test (#4387) * fix(#4365): Adds new logs validations for Agent-groups_recv.yaml * fix(#4635): Remove single quotes * fix(#4635): Updates log messages * fix(#4635): Adds new line at end of Agent-groups_recv.yaml * fix(#4635): Adds PR to changelog. * fix(#4365): Update to changelog * fix(#4365): Update changelog. --------- Co-authored-by: GGP1 <gaston.palomeque@wazuh.com> Co-authored-by: mauromalara <mmalara@outlook.es> * docs: modify changelog and test cases descriptions * fix(#4423): fix NVD custom feed * Merge 4.5.2 into 4.6.0 (#4458) * refactor: bump revision * Fix package name in one_manager_agent system test environment * Add fix to changelog * Update CHANGELOG.md Co-authored-by: Víctor Rebollo Pérez <victorrebollop@gmail.com> * Update CHANGELOG.md Co-authored-by: Víctor Rebollo Pérez <victorrebollop@gmail.com> * Merge 4.5.1 into 4.5.2 (#4457) * fix: update VD validate xml test RHEL url * docs: include 4424 in changelog * fix(#4231): fix canonical tests * docs: change changelog line to include all changes * fix(#4411): Upgrading integration test dependencies for python in Mac (#4427) * docs: update changelog * docs: update changelog * docs: delete extra number sign * refactor: bump revision * Change revision to 4.5.1-rc2 (#4435) * Update Changelog --------- Co-authored-by: Víctor Rebollo Pérez <victorrebollop@gmail.com> Co-authored-by: BelenValdivia <belen.valdivia@wazuh.com> Co-authored-by: Jorge Marino <jorge.marino.dev@gmail.com> Co-authored-by: Julia Magán <80041853+juliamagan@users.noreply.github.com> Co-authored-by: Julia <juliamgnr@gmail.com> --------- Co-authored-by: Julia <juliamgnr@gmail.com> Co-authored-by: Julia Magán <80041853+juliamagan@users.noreply.github.com> Co-authored-by: Miguel Verdaguer Velázquez <verdx@riseup.net> Co-authored-by: Víctor Rebollo Pérez <victorrebollop@gmail.com> Co-authored-by: BelenValdivia <belen.valdivia@wazuh.com> Co-authored-by: Jorge Marino <jorge.marino.dev@gmail.com> --------- Co-authored-by: Deblintrake09 <amicalizzi2005@gmail.com> Co-authored-by: Vikman Fernandez-Castro <vmfdez90@gmail.com> Co-authored-by: Victor M. Fernandez-Castro <victor@wazuh.com> Co-authored-by: jnasselle <jnasselle@gmail.com> Co-authored-by: Julia <juliamgnr@gmail.com> Co-authored-by: Julia Magán <80041853+juliamagan@users.noreply.github.com> Co-authored-by: David Jose Iglesias Lopez <davidj.iglesias@wazuh.com> Co-authored-by: lsayanes <leandro.sayanes@gmail.com> Co-authored-by: Leonardo Quiceno <leonardo.quiceno@wazuh.com> Co-authored-by: Mateo Cervilla <mateo.cervilla@wazuh.com> Co-authored-by: lsayanes <leandro.sayanes@wazuh.com> Co-authored-by: Marcel Kemp <marcel.kemp@wazuh.com> Co-authored-by: Víctor Rebollo Pérez <victorrebollop@gmail.com> Co-authored-by: Octavio Valle <octa.tala@gmail.com> Co-authored-by: Jose Luis Carreras Marin <jose.carreras@wazuh.com> Co-authored-by: Matias Pereyra <matias.pereyra@wazuh.com> Co-authored-by: mauromalara <mmalara@outlook.es> Co-authored-by: BelenValdivia <belen.valdivia@wazuh.com> Co-authored-by: Facundo Dalmau <facundo.dalmau@wazuh.com> Co-authored-by: Selutario <joseluis.lopez@wazuh.com> Co-authored-by: Eduardo <eduardo.leon@wazuh.com> Co-authored-by: Javier Castro <javier.castro@wazuh.com> Co-authored-by: Federico Ramos <37565679+RamosFe@users.noreply.github.com> Co-authored-by: GGP1 <gaston.palomeque@wazuh.com> Co-authored-by: Miguel Verdaguer Velázquez <verdx@riseup.net> Co-authored-by: Jorge Marino <jorge.marino.dev@gmail.com> * Update Changelog --------- Co-authored-by: Deblintrake09 <amicalizzi2005@gmail.com> Co-authored-by: Victor M. Fernandez-Castro <victor@wazuh.com> Co-authored-by: Vikman Fernandez-Castro <vmfdez90@gmail.com> Co-authored-by: jnasselle <jnasselle@gmail.com> Co-authored-by: Julia <juliamgnr@gmail.com> Co-authored-by: Julia Magán <80041853+juliamagan@users.noreply.github.com> Co-authored-by: David Jose Iglesias Lopez <davidj.iglesias@wazuh.com> Co-authored-by: Víctor Rebollo Pérez <victorrebollop@gmail.com> Co-authored-by: Dwordcito <octa.tala@gmail.com> Co-authored-by: lsayanes <leandro.sayanes@gmail.com> Co-authored-by: Leonardo Quiceno <leonardo.quiceno@wazuh.com> Co-authored-by: Mateo Cervilla <mateo.cervilla@wazuh.com> Co-authored-by: lsayanes <leandro.sayanes@wazuh.com> Co-authored-by: Marcel Kemp <marcel.kemp@wazuh.com> Co-authored-by: Jose Luis Carreras Marin <jose.carreras@wazuh.com> Co-authored-by: Matias Pereyra <matias.pereyra@wazuh.com> Co-authored-by: mauromalara <mmalara@outlook.es> Co-authored-by: BelenValdivia <belen.valdivia@wazuh.com> Co-authored-by: Javier Castro <javier.castro@wazuh.com> Co-authored-by: Facundo Dalmau <facundo.dalmau@wazuh.com> Co-authored-by: Selutario <joseluis.lopez@wazuh.com> Co-authored-by: Eduardo <eduardo.leon@wazuh.com> Co-authored-by: Federico Ramos <37565679+RamosFe@users.noreply.github.com> Co-authored-by: GGP1 <gaston.palomeque@wazuh.com> Co-authored-by: Miguel Verdaguer Velázquez <verdx@riseup.net> Co-authored-by: Jorge Marino <jorge.marino.dev@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Scheduled upward merges for numbered branches - 4.6.0 into 4.7.0