Merged file correctly generated #4129

pro-akim · 2023-04-26T16:31:32Z

Related issue
#3278

Description

Wazuh manager should be able to create merged.mg file in order to share files with group of agents.
In order to do it, when new files are present in any directory in /var/ossec/share/ , those files must be monitored and to be taken in consideration by merged.mg

This test suite tests the correct functioning of the mentioned use case.

Added
-test_correct_merged_file_generation[Check_merged_updated_manager_starts]
-test_correct_merged_file_generation[Check_merged_updated_10_sec]
-test_correct_merged_file_generation[Add_non_zero_file_default_folder_check_merged_created_starts]
-test_correct_merged_file_generation[Add_zero_file_default_folder_check_merged_created_when_manager_starts]
-test_correct_merged_file_generation[Add_non_zero_size_file_default_folder_check_merged_updated_10_sec]
-test_correct_merged_file_generation[Add_non_zero_size_file_TestGroup1_folder_check_merged_updated_manager_starts]
-test_correct_merged_file_generation[Add_non_zero_size_file_TestGroup1_folder_check_merged_updated_10_sec]
-test_correct_merged_file_generation[Add_non_zero_size_file_default_folder_check_merged_updated_10_sec]
-test_correct_merged_file_generation[Add_zero_size_file_TestGroup1_folder_check_merged_updated_manager_starts]
-test_correct_merged_file_generation[Add_zero_size_file_TestGroup1_folder_check_merged_updated_10_sec]
-test_correct_merged_file_generation[Add_serveral_zero_size_file_default_folder_check_merged_updated_manager_starts]
-test_correct_merged_file_generation[Add_serveral_zero_size_file_TestGroup1_folder_check_merged_updated_manager_starts]

Testing performed

Tester	Test path	Jenkins	Local	OS	Commit	Notes
@pro-akim (Developer)		⚫⚫⚫	🟢🟢🟢			Nothing to highlight
@user (Reviewer)		⚫⚫⚫	⚫⚫⚫			Nothing to highlight

CHANGELOG.md

...stem/test_cluster/test_correct_merged_file_generation/test_correct_merged_file_generation.py

pro-akim · 2023-07-17T17:39:58Z

Update

Fixes done, report is updated

juliamagan

Add this test to system README, please

...stem/test_cluster/test_correct_merged_file_generation/test_correct_merged_file_generation.py

tests/system/test_cluster/test_correct_merged_file_generation/data/messages.yaml

pro-akim · 2023-07-21T13:33:19Z

Update

Changes were done after review.
Tests performed.
Reports updated.

juliamagan

LGTM

Changelog conflics

pro-akim · 2023-08-01T14:03:59Z

Update

Merge conflicts already fixed.
Conventional commit unit test is failing because of a wrong commit message format in the past.

juliamagan

LGTM

davidjiglesias · 2023-08-03T10:39:38Z

This PR needs a rebase

pro-akim · 2023-08-03T18:57:56Z

Update

Rebased with @jnasselle
From 4.5.0 to 4.6.0
Moving issue to pending review

CHANGELOG.md

pro-akim · 2023-08-04T08:13:08Z

Update

Changelog order fixed.
Moved to pending review

juliamagan

LGTM

pro-akim · 2023-09-08T12:07:06Z

Update

Rebased to 4.8.0

pro-akim self-assigned this Apr 26, 2023

pro-akim linked an issue Apr 26, 2023 that may be closed by this pull request

Tests development - Correct merged.mg file generation #3278

Closed

1 task

pro-akim requested a review from juliamagan May 3, 2023 08:59

pro-akim force-pushed the 3278-correct_merged_file_generation branch from 5bf367d to f6600e6 Compare May 4, 2023 18:25

pro-akim marked this pull request as draft June 13, 2023 15:32

pro-akim marked this pull request as ready for review June 13, 2023 15:32

pro-akim marked this pull request as draft June 14, 2023 08:15

pro-akim marked this pull request as ready for review June 14, 2023 08:15

pro-akim marked this pull request as draft June 14, 2023 08:26

pro-akim marked this pull request as ready for review June 14, 2023 08:26

pro-akim marked this pull request as draft June 14, 2023 08:29

pro-akim marked this pull request as ready for review June 14, 2023 08:33

pro-akim marked this pull request as draft June 14, 2023 08:36

pro-akim marked this pull request as ready for review June 14, 2023 08:36

pro-akim marked this pull request as draft June 14, 2023 08:56

pro-akim marked this pull request as ready for review June 14, 2023 08:56

juliamagan requested changes Jul 17, 2023

View reviewed changes

pro-akim requested a review from juliamagan July 17, 2023 17:40

juliamagan requested changes Jul 20, 2023

View reviewed changes

...stem/test_cluster/test_correct_merged_file_generation/test_correct_merged_file_generation.py Show resolved Hide resolved

tests/system/test_cluster/test_correct_merged_file_generation/data/messages.yaml Outdated Show resolved Hide resolved

pro-akim requested a review from juliamagan July 21, 2023 13:33

juliamagan previously approved these changes Jul 24, 2023

View reviewed changes

juliamagan previously approved these changes Aug 2, 2023

View reviewed changes

pro-akim dismissed juliamagan’s stale review via 66aa413 August 3, 2023 13:07

pro-akim force-pushed the 3278-correct_merged_file_generation branch 2 times, most recently from 80bcd6a to 175b3bc Compare August 3, 2023 14:05

pro-akim added 13 commits August 3, 2023 15:08

refactor(#3278): Fixes pre-review

0ad6216

refactor(#3278): Fixes after review

058734b

refactor(#3278): Refactor after linter

1e28ed4

refactor(#3278): Refactor after linter

a804ca3

refactor(#3278): Refactor after linter

d3f42c6

refactor(#3278): Refactor after linter adding whitespace

3f11a52

refactor(#3278): Refactor after linter last change

0523a2e

fix(#3278): fixes after linter

954d581

fix(#3278): fixes after review

8184a53

merge(#3278): CHANGELOG fixes

bb1f3a5

merge(#3278): assert fixed

d559ba3

fixes(#3278): fixes after review

2950589

fixes(#3278): removing #

0bc31b5

jnasselle force-pushed the 3278-correct_merged_file_generation branch 2 times, most recently from 8ac8a73 to f9696f5 Compare August 3, 2023 18:28

fix(#3278): fixes after second review

6247a80

jnasselle force-pushed the 3278-correct_merged_file_generation branch from f9696f5 to 6247a80 Compare August 3, 2023 18:29

juliamagan requested changes Aug 4, 2023

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

fix(#3278): CHANGELOG tests order fix

f19249d

pro-akim requested a review from juliamagan August 4, 2023 08:12

juliamagan previously approved these changes Aug 4, 2023

View reviewed changes

merge(#3278): Merge

6560175

pro-akim dismissed juliamagan’s stale review via 6560175 September 8, 2023 11:34

pro-akim changed the base branch from 4.6.0 to master September 8, 2023 11:39

fix(#3278): fixing CHANGELOG issue reference error

f58c0b1

davidjiglesias merged commit 92b223d into master Sep 14, 2023

davidjiglesias deleted the 3278-correct_merged_file_generation branch September 14, 2023 09:41

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merged file correctly generated #4129

Merged file correctly generated #4129

pro-akim commented Apr 26, 2023 •

edited

Loading

pro-akim commented Jul 17, 2023

juliamagan left a comment

pro-akim commented Jul 21, 2023

juliamagan left a comment

pro-akim commented Aug 1, 2023

juliamagan left a comment

davidjiglesias commented Aug 3, 2023

pro-akim commented Aug 3, 2023

pro-akim commented Aug 4, 2023

juliamagan left a comment

pro-akim commented Sep 8, 2023

Merged file correctly generated #4129

Merged file correctly generated #4129

Conversation

pro-akim commented Apr 26, 2023 • edited Loading

Description

Testing performed

pro-akim commented Jul 17, 2023

Update

juliamagan left a comment

Choose a reason for hiding this comment

pro-akim commented Jul 21, 2023

Update

juliamagan left a comment

Choose a reason for hiding this comment

pro-akim commented Aug 1, 2023

Update

juliamagan left a comment

Choose a reason for hiding this comment

davidjiglesias commented Aug 3, 2023

pro-akim commented Aug 3, 2023

Update

pro-akim commented Aug 4, 2023

Update

juliamagan left a comment

Choose a reason for hiding this comment

pro-akim commented Sep 8, 2023

Update

pro-akim commented Apr 26, 2023 •

edited

Loading