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.4 into 4.5 #4193

Merged
merged 16 commits into from
May 23, 2023
Merged

Merge 4.4 into 4.5 #4193

merged 16 commits into from
May 23, 2023

Conversation

Rebits
Copy link
Member

@Rebits Rebits commented May 23, 2023

Related issue
#4192

Description

This PR merges 4.4 into 4.5

juliamagan and others added 15 commits March 17, 2023 12:34
* fix(#3862): delete default group check

* feat(#3862): update changelog

* refactor(#3862): add expected logs
* refactor: bump version to 4.3.10

* refactor: update changelog

---------

Co-authored-by: jmv74211 <[email protected]>
* fix(#4079): test active response log format

* fix(#4079): remove log monitor to avoid race condition

* fix(#4079): internal option fixture call

* fix(#4079): enrollment cluster log path typo

* docs(#4070): include missing tests in README

* feat(#4079): include marks to system tests

* docs(#4070): update changelog

* docs(#4079): restore deleted commentary

* docs(#4079): move pr changes to fixed category
* fix(#3942): include simulator teardown

* style(#3943): pep8

* docs(#3942): include 3973 changelog

* docs(#3942): move pr changes to fixed category

* refactor(#3942): remove unnecessary scopes

* docs(#3942): change changelog pr entry

* docs(#3942): move change to 4.4.2

* docs(#3942): include teardown documentation
* feat(#3912): add function to get group id

* feat(#3912): add test for group deletion

* feat(#3912): add test cases

* fix(#3912): fix linter errors

* feat(#3912): update changelog

* fix(#3912): fix typo

* docs(#3912): improve description

* fix(#3912): change import

* docs(#3912): improve documentation

* fix(#3912): delete created group during tear down

* docs(#3912): add documentation

* refactor(#3912)!: change delete function and test cases

* refactor(#3912): change affected tests

* feat(#3912): store binary path

* docs(#3912): add function documentation

* fix(#3912): update changelog
* feat(#4089): bump version to 4.4.2

* refactor(#4089): change revision
* feat(#3545): add test to check the syscollector configuration.

* fix(#3545): fix errors when running tests in agents.

* fix(#3545): modify the way the test restarts deamons.

* fix(#3545): fix syscollector DB path in Windows.

* fix(#3545): fix syscollector db path variable name.

* fix(#3545): fix globalDB error due to execution in agent.

* style(#3545): fix linter errors.

* docs(#3545): add PR to changelog.

* fix(#3545): fix some errors present in Windows tests.

* fix(#3545): fix file monitor declaration.

* fix(#3545): fix all_scans_disabled test.

* refactor(#3545): change the timeout of filemonitor.

* fix(#3545): fix macOS tests.

* refactor(#3545): add mark to run the test on unix only.

* fix(#3545): fix Windows tests.

* docs(#3545): mark test as xfail because of an existing bug.

* fix(#3545): remove the mark from unix tests.

* fix(#3545): reuse an existing function and remove the utilized.

* style(#3545): apply identation.

* fix(#3545): fix naming and used functions.

* fix(#3545): move fixture to integration conftest.

* fix(#3545): improve a function name.

* refactor(#3545): add new case, disable unused modules and minor changes.

* fix(#3545): fix prefix.

* fix(#3545): fix metadata because NoneType error.

* fix(#3545): fix event monitor and truncate function.

* refactor(#3545): remove the max_eps empty test case.

It is not a critical field, so it will not thrown an error when empty.

* fix(#3545): solve the log position problem when searching a message.

* fix(#3545): apply linter corrections.

* fix(#3545): fix the test configuration data.

* fix(#3545): remove unused import and docs changed.

* fix(#3545): change way of importing and minor changes.

* fix(#3545): use param depending on the platform.

* refactor(#3545): remove unused fixture and change callback.

* fix(#3545): change the default argument for prefix.

* style(#3545): add spaces for better visualization.

* refactor(#3545): improve docs and change some logic.

* docs(#3545): add comments and new documentation.

* fix(#3545): fix NoneType error.

* docs(#3545): fix changelog.

* docs(#3545): add docs for file_to_monitor param.

Improve existing docs.

* refactor(#3545): remove duplicated function and improve

documentation

* fix(#3545): remove unused imports and sort the remaining ones.

* docs(#3545): add docs to wrapped fixture.

* fix(#3545): remove xfail mark and add note to mark.

* docs(#3545): remove duplicated line.

* style(#3545): sort imports according the guidelines.

* docs(#3545): move change to 4.4.2 section in CHANGELOG.
* fix(#4111): make_callback function

* fix(#4111): typo in set agent groups tcases

* fix(#4111): stop agent simulator after test end

* docs(#4111): update changelog
* fix(#4123): fix daemons_handler fixture.

* fix(#4123): remove some analysisd on test_gcloud

* fix(#4123): change test_logging fixtures to module

* fix(#4123): start analysisd in test max messages

* docs(#4123): add fix to CHANGELOG.

---------

Co-authored-by: jnasselle <[email protected]>
Co-authored-by: Víctor Rebollo Pérez <[email protected]>
* refactor(#4137): change when the check is executed

* fix(#4137): revert draft condition
@Rebits Rebits reopened this May 23, 2023
@Rebits Rebits merged commit 1797098 into 4.5 May 23, 2023
@Rebits Rebits deleted the 4.5-merge-4.4 branch May 23, 2023 12:43
Rebits added a commit that referenced this pull request May 23, 2023
Rebits added a commit that referenced this pull request May 23, 2023
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.

6 participants