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

Bump version 4.6.0 #4245

Merged
merged 2 commits into from
Jun 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

All notable changes to this project will be documented in this file.

## [4.6.0] - TBD

Wazuh commit: TBD \
Release report: TBD

## [4.5.0] - TBD

Wazuh commit: TBD \
Expand Down
1 change: 1 addition & 0 deletions deps/wazuh_testing/wazuh_testing/qa_docs/schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ predefined_values:
- 4.4.2
- 4.4.3
- 4.5.0
- 4.6.0
tags:
- active_response
- agentd
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,7 @@ def test_authd_use_password_invalid(metadata, configuration, truncate_monitored_
to come from the cases yaml, this is done this way to handle easily
the different error logs that could be raised from different inputs.

wazuh_min_version:
4.5.0
wazuh_min_version: 4.6.0

tier: 1

Expand Down
6 changes: 3 additions & 3 deletions tests/integration/test_aws/test_basic.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def test_bucket_defaults(
- teardown:
- Truncate wazuh logs.
- Restore initial configuration, both ossec.conf and local_internal_options.conf.
wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0
parameters:
- configuration:
type: dict
Expand Down Expand Up @@ -146,7 +146,7 @@ def test_service_defaults(
- teardown:
- Truncate wazuh logs.
- Restore initial configuration, both ossec.conf and local_internal_options.conf.
wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0
parameters:
- configuration:
type: dict
Expand Down Expand Up @@ -248,7 +248,7 @@ def test_inspector_defaults(
- teardown:
- Truncate wazuh logs.
- Restore initial configuration, both ossec.conf and local_internal_options.conf.
wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0
parameters:
- configuration:
type: dict
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/test_aws/test_discard_regex.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def test_discard_regex(
- Truncate wazuh logs.
- Restore initial configuration, both ossec.conf and local_internal_options.conf.
- Delete the uploaded file
wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0
parameters:
- configuration:
type: dict
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/test_aws/test_log_groups.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def test_log_groups(
- Truncate wazuh logs.
- Restore initial configuration, both ossec.conf and local_internal_options.conf.
- Delete the uploaded file.
wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0
parameters:
- configuration:
type: dict
Expand Down
16 changes: 8 additions & 8 deletions tests/integration/test_aws/test_only_logs_after.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def test_bucket_without_only_logs_after(
- Truncate wazuh logs.
- Restore initial configuration, both ossec.conf and local_internal_options.conf.
- Delete the uploaded file.
wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0
parameters:
- configuration:
type: dict
Expand Down Expand Up @@ -188,7 +188,7 @@ def test_service_without_only_logs_after(
- Truncate wazuh logs.
- Restore initial configuration, both ossec.conf and local_internal_options.conf.
- Delete the uploaded file.
wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0
parameters:
- configuration:
type: dict
Expand Down Expand Up @@ -302,7 +302,7 @@ def test_bucket_with_only_logs_after(
- Truncate wazuh logs.
- Restore initial configuration, both ossec.conf and local_internal_options.conf.
- Delete the uploaded file.
wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0
parameters:
- configuration:
type: dict
Expand Down Expand Up @@ -422,7 +422,7 @@ def test_cloudwatch_with_only_logs_after(
- Truncate wazuh logs.
- Restore initial configuration, both ossec.conf and local_internal_options.conf.
- Delete the uploaded file.
wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0
parameters:
- configuration:
type: dict
Expand Down Expand Up @@ -540,7 +540,7 @@ def test_inspector_with_only_logs_after(
- Truncate wazuh logs.
- Restore initial configuration, both ossec.conf and local_internal_options.conf.
- Delete the uploaded file.
wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0
parameters:
- configuration:
type: dict
Expand Down Expand Up @@ -657,7 +657,7 @@ def test_bucket_multiple_calls(
- teardown:
- Delete the `s3_cloudtrail.db`.
- Delete the uploaded files.
wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0
parameters:
- metadata:
type: dict
Expand Down Expand Up @@ -761,7 +761,7 @@ def test_inspector_multiple_calls(
were processed, there were no duplicates.
- teardown:
- Delete the `aws_services.db`.
wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0
parameters:
- metadata:
type: dict
Expand Down Expand Up @@ -848,7 +848,7 @@ def test_cloudwatch_multiple_calls(
- teardown:
- Delete the `aws_services.db`.
- Delete the uploaded files.
wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0
parameters:
- metadata:
type: dict
Expand Down
16 changes: 8 additions & 8 deletions tests/integration/test_aws/test_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def test_bucket_and_service_missing(
- teardown:
- Truncate wazuh logs.
- Restore initial configuration, both ossec.conf and local_internal_options.conf.
wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0
parameters:
- configuration:
type: dict
Expand Down Expand Up @@ -130,7 +130,7 @@ def test_type_missing_in_bucket(
- teardown:
- Truncate wazuh logs.
- Restore initial configuration, both ossec.conf and local_internal_options.conf.
wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0
parameters:
- configuration:
type: dict
Expand Down Expand Up @@ -201,7 +201,7 @@ def test_type_missing_in_service(
- teardown:
- Truncate wazuh logs.
- Restore initial configuration, both ossec.conf and local_internal_options.conf.
wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0
parameters:
- configuration:
type: dict
Expand Down Expand Up @@ -273,7 +273,7 @@ def test_empty_values_in_bucket(
- teardown:
- Truncate wazuh logs.
- Restore initial configuration, both ossec.conf and local_internal_options.conf.
wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0
parameters:
- configuration:
type: dict
Expand Down Expand Up @@ -344,7 +344,7 @@ def test_empty_values_in_service(
- teardown:
- Truncate wazuh logs.
- Restore initial configuration, both ossec.conf and local_internal_options.conf.
wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0
parameters:
- configuration:
type: dict
Expand Down Expand Up @@ -416,7 +416,7 @@ def test_invalid_values_in_bucket(
- teardown:
- Truncate wazuh logs.
- Restore initial configuration, both ossec.conf and local_internal_options.conf.
wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0
parameters:
- configuration:
type: dict
Expand Down Expand Up @@ -487,7 +487,7 @@ def test_invalid_values_in_service(
- teardown:
- Truncate wazuh logs.
- Restore initial configuration, both ossec.conf and local_internal_options.conf.
wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0
parameters:
- configuration:
type: dict
Expand Down Expand Up @@ -558,7 +558,7 @@ def test_multiple_bucket_and_service_tags(
- teardown:
- Truncate wazuh logs.
- Restore initial configuration, both ossec.conf and local_internal_options.conf.
wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0
parameters:
- configuration:
type: dict
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/test_aws/test_path.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def test_path(
- Truncate wazuh logs.
- Restore initial configuration, both ossec.conf and local_internal_options.conf.
- Delete the uploaded file.
wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0
parameters:
- configuration:
type: dict
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/test_aws/test_path_suffix.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def test_path_suffix(
- Truncate wazuh logs.
- Restore initial configuration, both ossec.conf and local_internal_options.conf.
- Delete the uploaded file.
wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0
parameters:
- configuration:
type: dict
Expand Down
6 changes: 3 additions & 3 deletions tests/integration/test_aws/test_regions.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def test_regions(
- Truncate wazuh logs.
- Restore initial configuration, both ossec.conf and local_internal_options.conf.
- Delete the uploaded file.
wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0
parameters:
- configuration:
type: dict
Expand Down Expand Up @@ -201,7 +201,7 @@ def test_cloudwatch_regions(
- Truncate wazuh logs.
- Restore initial configuration, both ossec.conf and local_internal_options.conf.
- Delete the uploaded file.
wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0
parameters:
- configuration:
type: dict
Expand Down Expand Up @@ -341,7 +341,7 @@ def test_inspector_regions(
- Truncate wazuh logs.
- Restore initial configuration, both ossec.conf and local_internal_options.conf.
- Delete the uploaded file.
wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0
parameters:
- configuration:
type: dict
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/test_aws/test_remove_from_bucket.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def test_remove_from_bucket(
- teardown:
- Truncate wazuh logs.
- Restore initial configuration, both ossec.conf and local_internal_options.conf.
wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0
parameters:
- configuration:
type: dict
Expand Down Expand Up @@ -156,7 +156,7 @@ def test_remove_log_stream(
- teardown:
- Truncate wazuh logs.
- Restore initial configuration, both ossec.conf and local_internal_options.conf.
wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0
parameters:
- configuration:
type: dict
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ def test_agent_auth_enrollment(configure_environment, shutdown_agentd, get_curre
error log. Agent-auth will be executed using the different parameters and with different keys and password
files scenarios as described in the test cases."

wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0

tier: 0

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ def test_file_limit_capacity_alert(percentage, configure_local_internal_options_
the total and when the number is less than that percentage. Finally, the test will verify that
on the FIM event, inodes and monitored files number match.

wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0

tier: 1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ def test_file_limit_default(configure_local_internal_options_module, get_configu
a directory and wait for FIM to start and generate an event indicating the maximum number of files
to monitor. Finally, the test will verify that this number matches the default value (100000).

wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0

tier: 1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ def test_file_limit_delete_full(folder, file_name, configure_local_internal_opti
no FIM events to be generated (file limit reached). Finally, it will delete 'test_file10'
and verify that the 'deleted' FIM event matches that file.

wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0

tier: 1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ def test_file_limit_full(configure_local_internal_options_module, get_configurat
when a new testing file is added to the monitored directory. Finally, the test will verify that
on the FIM event, inodes and monitored files number match.

wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0

tier: 1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def test_file_limit_no_limit(configure_local_internal_options_module, get_config
For this purpose, the test will monitor a testing directory, and finally, it will verify
that the FIM event 'no limit' is generated.

wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0

tier: 1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ def test_file_limit_values(configure_local_internal_options_module, get_configur
is generated and has the correct value. Finally, the test will verify that on the FIM event,
inodes and monitored files number match.

wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0

tier: 1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ def test_max_eps(configure_local_internal_options_module, get_configuration, con
the testing files created. Finally, it will verify the limit of events per second (eps)
is not exceeded by checking the creation time of the testing files.

wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0

tier: 1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ def test_diff_size_limit_configured(configure_local_internal_options_module, get
the test will verify that the value gotten from that FIM event corresponds with the one set
in the 'diff_size_limit'.

wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0

tier: 1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def test_diff_size_limit_default(configure_local_internal_options_module, get_co
file size to generate 'diff' information. Finally, the test will verify that the value gotten
from that FIM event corresponds with the default value of the 'diff_size_limit' attribute (50MB).

wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0

tier: 1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ def test_disk_quota_default(get_configuration, configure_environment,
disk quota to store 'diff' information. Finally, the test will verify that the value gotten from
that FIM event corresponds with the default value of the 'disk_quota' tag (1GB).

wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0

tier: 1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ def test_disk_quota_disabled(filename, folder, size, get_configuration, configur
'disk_quota' limit. Finally, the test will verify that the FIM event related
to the reached disk quota has not been generated.

wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0

tier: 1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ def test_file_size_default(filename, folder, get_configuration, configure_enviro
reached file size limit has been generated, and the compressed file in the 'queue/diff/local'
directory does not exist.

wazuh_min_version: 4.5.0
wazuh_min_version: 4.6.0

tier: 1

Expand Down
Loading