Skip to content

Commit

Permalink
merge: 4.4 into master branch
Browse files Browse the repository at this point in the history
  • Loading branch information
jmv74211 committed Dec 2, 2022
2 parents 17ff847 + c99ef14 commit 1333324
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ Release report: TBD

### Changed

- Adapt wazuhdb integration tests for auto-vacuum ([#3613](https://github.com/wazuh/wazuh-qa/issues/3613)) \- (Tests)
- Update logcollector format test due to audit changes ([#3641](https://github.com/wazuh/wazuh-qa/pull/3641)) \- (Framework)
- Refactor `test_basic_usage_realtime_unsupported` FIM test to avoid using time travel ([#3623](https://github.com/wazuh/wazuh-qa/pull/3623)) \- (Tests)
- Add `monitord.rotate_log` to `local_internal_options` file for `test_macos_format_query` ([#3602](https://github.com/wazuh/wazuh-qa/pull/3602)) \- (Tests)
- Adapt analysisd integration tests for EPS ([#3559](https://github.com/wazuh/wazuh-qa/issues/3559)) \- (Tests)
Expand Down
2 changes: 1 addition & 1 deletion deps/wazuh_testing/wazuh_testing/logcollector.py
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ def callback_invalid_format_value(line, option, location):
if option == 'json':
msg = fr"DEBUG: Line '{line}' read from '{location}' is not a JSON object."
elif option == 'audit':
msg = fr"ERROR: Discarding audit message because of invalid syntax."
msg = "WARNING: Discarding audit message because of invalid syntax."
elif option == 'nmapg':
msg = fr"ERROR: Bad formated nmap grepable file."
elif option == 'djb-multilog':
Expand Down
10 changes: 5 additions & 5 deletions deps/wazuh_testing/wazuh_testing/remote.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
import multiprocessing
import pytest
import wazuh_testing.tools.agent_simulator as ag
from wazuh_testing import UDP, TCP
from wazuh_testing.tools import ARCHIVES_LOG_FILE_PATH, LOG_FILE_PATH, QUEUE_SOCKETS_PATH, WAZUH_PATH
from wazuh_testing import UDP, TCP, ARCHIVES_LOG_PATH, LOG_FILE_PATH, QUEUE_SOCKETS_PATH, WAZUH_PATH
from wazuh_testing.tools.file import bind_unix_socket, truncate_file
from wazuh_testing.tools.monitoring import FileMonitor, make_callback, ManInTheMiddle, QueueMonitor, \
REMOTED_DETECTOR_PREFIX
from wazuh_testing.tools.services import control_service


REMOTED_GLOBAL_TIMEOUT = 10
SYNC_FILES_TIMEOUT = 10
EXAMPLE_MESSAGE_EVENT = '1:/root/test.log:Feb 23 17:18:20 35-u20-manager4 sshd[40657]: Accepted publickey for root' \
Expand Down Expand Up @@ -326,8 +326,8 @@ def create_archives_log_monitor():
FileMonitor: object to monitor the archives.log.
"""
# Reset archives.log and start a new monitor
truncate_file(ARCHIVES_LOG_FILE_PATH)
wazuh_archives_log_monitor = FileMonitor(ARCHIVES_LOG_FILE_PATH)
truncate_file(ARCHIVES_LOG_PATH)
wazuh_archives_log_monitor = FileMonitor(ARCHIVES_LOG_PATH)

return wazuh_archives_log_monitor

Expand Down Expand Up @@ -653,7 +653,7 @@ def keep_alive_until_group_configuration_sent(sender, interval=1, timeout=20):
error_message='The start up message has not been found in the logs')

wazuh_log_monitor = FileMonitor(LOG_FILE_PATH)

sender.send_event(agent.keep_alive_event)

# Check up file (push start) message
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
-
input: '{"version": 1, "origin": {"module": "api"}, "command": "getconfig", "module": "api", "parameters": {
"section": "internal"}}'
output: '"data":{"wazuh_db":{"commit_time_max":60,"commit_time_min":10,"open_db_limit":64,"worker_pool_size":8}}'
output: '"data":{"wazuh_db":{"commit_time_max":60,"commit_time_min":10,"open_db_limit":64,"worker_pool_size":8,"fragmentation_threshold":80,"fragmentation_delta":5,"free_pages_percentage":5,"max_fragmentation":95,"check_fragmentation_interval":43200}}'
-
name: Get wdb config
test_case:
Expand Down

0 comments on commit 1333324

Please sign in to comment.