Logcollector integration tests T0: reconnect_time option #1312
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
Rebits
changed the title
BraulioV
suggested changes
May 10, 2021
Comment on lines
219
to
223
| return monitoring.make_callback(pattern=msg, prefix=prefix, escape=escape) | ||
|
|
||
|
|
||
|
|
||
| def callback_event_log_service_down(location, severity='WARNING'): |
There was a problem hiding this comment.
Suggested change
| return monitoring.make_callback(pattern=msg, prefix=prefix, escape=escape) | |
| def callback_event_log_service_down(location, severity='WARNING'): | |
| return monitoring.make_callback(pattern=msg, prefix=prefix, escape=escape) | |
| def callback_event_log_service_down(location, severity='WARNING'): |
Comment on lines
236
to
239
| print(f"{log_format_message}") | ||
| return monitoring.make_callback(pattern=log_format_message, prefix=monitoring.AGENT_DETECTOR_PREFIX) | ||
|
|
||
| def callback_trying_to_reconnect(location, reconnect_time): |
There was a problem hiding this comment.
Suggested change
| print(f"{log_format_message}") | |
| return monitoring.make_callback(pattern=log_format_message, prefix=monitoring.AGENT_DETECTOR_PREFIX) | |
| def callback_trying_to_reconnect(location, reconnect_time): | |
| return monitoring.make_callback(pattern=log_format_message, prefix=monitoring.AGENT_DETECTOR_PREFIX) | |
| def callback_trying_to_reconnect(location, reconnect_time): |
Comment on lines
252
to
255
| print(f"{log_format_message}") | ||
| return monitoring.make_callback(pattern=log_format_message, prefix=monitoring.AGENT_DETECTOR_PREFIX) | ||
|
|
||
| def callback_reconnect_eventchannel(location): |
There was a problem hiding this comment.
Suggested change
| print(f"{log_format_message}") | |
| return monitoring.make_callback(pattern=log_format_message, prefix=monitoring.AGENT_DETECTOR_PREFIX) | |
| def callback_reconnect_eventchannel(location): | |
| return monitoring.make_callback(pattern=log_format_message, prefix=monitoring.AGENT_DETECTOR_PREFIX) | |
| def callback_reconnect_eventchannel(location): |
Comment on lines
256
to
258
| """ | ||
|
|
||
| """ |
There was a problem hiding this comment.
Something is missing here 🤔
Comment on lines
240
to
243
| """Control Windows event log service | ||
|
|
||
| Args: | ||
| control (str): Start or Stop |
There was a problem hiding this comment.
Suggested change
| """Control Windows event log service | |
| Args: | |
| control (str): Start or Stop | |
| """Control Windows event log service. | |
| Args: | |
| control (str): Start or Stop. |
Raises section is missing here.
Comment on lines
24
to
25
| - Fail if Wazuh agent does not reconnect to Windows event log at the time specified by `reconnect_time ` | ||
| - Fail if Wazuh agent does not generate a debug message when Windows event log is down |
There was a problem hiding this comment.
Suggested change
| - Fail if Wazuh agent does not reconnect to Windows event log at the time specified by `reconnect_time ` | |
| - Fail if Wazuh agent does not generate a debug message when Windows event log is down | |
| - Fail if Wazuh agent does not reconnect to Windows event log at the time specified by `reconnect_time`. | |
| - Fail if Wazuh agent does not generate a debug message when the Windows event log is down. |
Comment on lines
16
to
19
| if sys.platform != 'win32': | ||
| pytestmark = [pytest.mark.skip, pytest.mark.tier(level=0)] | ||
| else: | ||
| pytestmark = pytest.mark.tier(level=0) |
There was a problem hiding this comment.
Suggested change
| if sys.platform != 'win32': | |
| pytestmark = [pytest.mark.skip, pytest.mark.tier(level=0)] | |
| else: | |
| pytestmark = pytest.mark.tier(level=0) | |
| pytestmark = [pytest.mark.win32, pytest.mark.tier(level=0)] |
| config = get_configuration['metadata'] | ||
|
|
||
| if time_to_seconds(config['reconnect_time']) >= timeout_callback_reconnect_time: | ||
| pytest.xfail("Expected fail: ") |
There was a problem hiding this comment.
Add more detail here explaining why the error is expected.
|
|
||
| before = str(datetime.now()) | ||
|
|
||
| if time_to_seconds(config['reconnect_time']) >= timeout_callback_reconnect_time: |
There was a problem hiding this comment.
Suggested change
| if time_to_seconds(config['reconnect_time']) >= timeout_callback_reconnect_time: | |
| if time_to_seconds(config['reconnect_time']) >= timeout_callback_reconnect_time: |
Add issue to xfail case description for reconnect_time logcollector test Fix minnor documentation error
BraulioV
approved these changes
May 12, 2021
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
This PR adds logcollector tests for reconnect_time option.
reconnect_timevalue.This test is valid for Windows agents.
Every case of
reconnect_timegreater than 30 seconds will be marked as xfail due to this issue: wazuh/wazuh#8580Test results
Windows - Agent
Documentation
Test reconnect time