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

FIM RSync as a new synchronization mechanism - Fix tests #2728

Merged
merged 199 commits into from
Feb 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
199 commits
Select commit Hold shift + click to select a range
46084df
Merge branch '2354-fix-fim-file-limit' into new-synchronization-mecha…
damarisg Feb 21, 2022
e43118f
Merge branch '2434-fim-synchronizaton-agent-stopped' into new-synchro…
damarisg Feb 21, 2022
032c134
Merge branch '2353-refactor-registry-file-limit' into new-synchroniza…
damarisg Feb 21, 2022
f6c644b
Merge branch '2321-fim-max-eps-sync' into new-synchronization-mechanism
damarisg Feb 21, 2022
a1269f5
Merge branch 'master' into new-synchronization-mechanism
damarisg Feb 22, 2022
fb42f84
fix: Changes log messages and organize variables
damarisg Mar 3, 2022
4526ad7
fix: import variables
damarisg Mar 3, 2022
2c45826
add: delete conf deprecated
damarisg Mar 7, 2022
f149a3b
fix: Order of messages
damarisg Mar 7, 2022
bc53943
add: spaces recommended
damarisg Mar 7, 2022
91b3f1c
rm: conf deprecated
damarisg Mar 7, 2022
56b51d4
rm: logs deprecated
damarisg Mar 7, 2022
bfe6f5b
rf: fix messages and callbacks
Deblintrake09 Mar 8, 2022
e73274d
rf: remove hardcoded marks
Deblintrake09 Mar 8, 2022
6c20616
fix: log message to Windows
damarisg Mar 8, 2022
3805c56
rf: add test to validate registry key limit
Deblintrake09 Mar 8, 2022
035a09f
rf: test_registry_limit_full for registry values
Deblintrake09 Mar 8, 2022
9454a26
add: new test_registry_key_limit_values
Deblintrake09 Mar 9, 2022
00133bf
rm: unused lines
Deblintrake09 Mar 9, 2022
99abeaa
rf: test_registry_limit_values - update docu
Deblintrake09 Mar 9, 2022
640d468
rf: test_registry_limit_capacity_alerts - fix docu
Deblintrake09 Mar 9, 2022
2189e30
rf: test_registr_limit_values - fix documentation
Deblintrake09 Mar 9, 2022
1de69ab
rf: test_registry_value_limit_full - fix docu
Deblintrake09 Mar 9, 2022
6d7e774
rf: test_registry_key_limit_full - fix docu
Deblintrake09 Mar 9, 2022
ff6cb76
rf: fix format of key_limit_full
Deblintrake09 Mar 9, 2022
9c0e36a
rf: fix syscheck_event_windows.json
Deblintrake09 Mar 9, 2022
9497681
rm: Skip fixed
damarisg Mar 17, 2022
e481749
refactor: Variables defined + Solved conflicts
damarisg Mar 18, 2022
df6fd3d
rm: variables name to DB.
damarisg Mar 18, 2022
7f00f14
add: variable error and archives.log to Windows.
damarisg Mar 18, 2022
98542b5
Change owner to root
CamiRomero Mar 21, 2022
5b04d50
Fx:Update msg to detect that fim scan was finish
CamiRomero Mar 21, 2022
228b1b0
Merge branch 'tmp-fix-registry-limit' into 2315-fim-sync-on-win-registry
damarisg Mar 21, 2022
5149e14
add: Migration of methods.
damarisg Mar 21, 2022
54b3504
fix: Change messages- Remove skips- Change field name of events.
damarisg Mar 22, 2022
a8b0e21
skΓ­p: Tier 2 has to refactor required.
damarisg Mar 23, 2022
f83ff1e
fix: Change log messages - Remove a callback.
damarisg Mar 23, 2022
2627bb4
fix: Add file created to check events.
damarisg Mar 23, 2022
46a513b
fix: Check fim_registry event component not exists.
damarisg Mar 23, 2022
2fdb8bd
Merge pull request #2707 from wazuh/2586_refactor_test_sync
damarisg Mar 28, 2022
d7b5ec7
add: Check that Audit is started when working with whodata.
damarisg Mar 28, 2022
bdeb12e
fix: Check files created - Add callback of sync initial scan - Remove…
damarisg Apr 6, 2022
f5f8c1d
fix: Check asserts - Remove duplicates variables
damarisg Apr 7, 2022
94bd580
fix test_sync_max_eps for scheduled mode
Deblintrake09 Apr 13, 2022
0b52024
add: new test_sync_max_eps for realtime/whodata
Deblintrake09 Apr 13, 2022
1c48cec
rf: extract common functions and messages
Deblintrake09 Apr 13, 2022
3cc1502
rf: update wazuh_conf and remove invalid test
Deblintrake09 Apr 13, 2022
7bd50a9
rf: fix test_max_eps.py
Deblintrake09 Apr 13, 2022
8753a06
rf: fix wait_for_fim_start_function
Deblintrake09 Apr 13, 2022
dcf2ca1
rf: fix test_max_eps for realtime file events
Deblintrake09 Apr 18, 2022
76822f0
rf: fix callback
Deblintrake09 Apr 18, 2022
ce6581e
Fx: Apply Pycodestyle
CamiRomero Apr 18, 2022
a4a4b62
rf: fix callback an fim_local_internal_options
Deblintrake09 Apr 18, 2022
3c7caf2
rf: fix codestyle to adhere to pep8
Deblintrake09 Apr 18, 2022
69fe718
rf: added whodata cases for test_max_eps
Deblintrake09 Apr 18, 2022
7e55c54
Merge branch '1915-fim-rsync-new-synchronization-mechanism' into tmp-…
CamiRomero Apr 18, 2022
d70f8f4
rf: fix whodata callback for windows
Deblintrake09 Apr 18, 2022
98a9d74
Merge pull request #2791 from wazuh/tmp-fix-registry-limit
damarisg Apr 18, 2022
03e76b9
Merge branch '1915-fim-rsync-new-synchronization-mechanism' into new-…
CamiRomero Apr 18, 2022
887cd9f
rf: skipped test because of jenkins behaviour
Deblintrake09 Apr 18, 2022
19f83ae
Apply suggestions from code review
Deblintrake09 Apr 18, 2022
3228179
rf: fix variables name in functions
Deblintrake09 Apr 18, 2022
cbb4ed6
rf: fix find_value_in_list function
Deblintrake09 Apr 18, 2022
464e674
rf: fix pycodestyle
Deblintrake09 Apr 18, 2022
76175f0
Merge branch '1915-fim-rsync-new-synchronization-mechanism' into 2315…
Deblintrake09 Apr 19, 2022
7372c64
rf: remove hardcoded timeouts
Deblintrake09 Apr 19, 2022
6e6e44b
rf: remove skip to test on Jenkins
Deblintrake09 Apr 19, 2022
e123e12
refac: disable unneeded fim modules
Deblintrake09 Apr 20, 2022
20f8500
fix: fix indentation
Deblintrake09 Apr 20, 2022
5897dd9
test: skip test_registry_responses_win3
Deblintrake09 Apr 20, 2022
ef867d5
fix: modify config yml file
Deblintrake09 Apr 20, 2022
9fe2165
rf: extracted error messages
Deblintrake09 Apr 20, 2022
1643532
fix: added local_internal_options, extracted error messages and fixed…
Deblintrake09 Apr 20, 2022
bc83610
style: fix to adhere to pep8
Deblintrake09 Apr 20, 2022
007f69b
fix: Fix timeout
CamiRomero May 2, 2022
c2cd98a
rm: remove unnecesary section in test cases
CamiRomero May 2, 2022
fd747da
Merge pull request #2799 from wazuh/new-synchronization-mechanism
damarisg May 2, 2022
c3cf60f
style: Fix spacing and line lenght
Deblintrake09 May 31, 2022
a894438
fix: Modify CB_REGISTRY_DBSYNC_NO_DATA
Deblintrake09 May 31, 2022
8d86ebb
fix: Path check in find_value_in_event_list
Deblintrake09 May 31, 2022
ddf70cd
fix: Callbacks to detect fim_registry_key/value
Deblintrake09 May 31, 2022
ce84283
fix: update imports to module.fim.utils
Deblintrake09 May 31, 2022
46b3c82
rm: Delete unused file fim_synchronization.py
Deblintrake09 May 31, 2022
eed2602
Merge branch '1915-fim-rsync-new-synchronization-mechanism' into 2315…
Deblintrake09 May 31, 2022
a60ae95
add: registry_integrity_event callbacks
Deblintrake09 Jun 1, 2022
e7a65b0
fix: event detection in test_sync_enabled_win32
Deblintrake09 Jun 1, 2022
45ca763
fix: Callback get registry_key or registry_value
Deblintrake09 Jun 10, 2022
0b40f0a
style: removed whitespaces
Deblintrake09 Jun 13, 2022
5b06304
style: Modify comments and Documentation
Deblintrake09 Jun 13, 2022
4c3da95
style: rename variable
Deblintrake09 Jun 13, 2022
f575c12
rm: Delete unused functions
Deblintrake09 Jun 13, 2022
585afaa
rm: Delete duplicated fixture
Deblintrake09 Jun 13, 2022
382b155
fix: Add deleted _create_regular functions
Deblintrake09 Jun 13, 2022
47fc806
Merge pull request #2802 from wazuh/2315-fim-sync-on-win-registry
damarisg Jun 14, 2022
b5c26a6
Merge branch 'master' into 1915-fim-rsync-new-synchronization-mechanism
Deblintrake09 Jun 16, 2022
3b57903
fix import errors
Deblintrake09 Jun 21, 2022
3c8c607
fix: Callback CB_INODE_ENTRIES_PATH_COUNT
Deblintrake09 Jun 21, 2022
7faf75b
Merge branch 'master' into 1915-fim-rsync
Deblintrake09 Sep 8, 2022
02be715
fix(#3036): fix file_limit configs
Deblintrake09 Sep 9, 2022
418115e
docu(#3036): update tests min version
Deblintrake09 Sep 9, 2022
7d0582c
fix(#3036): fix test_registry_limit configs
Deblintrake09 Sep 9, 2022
2ac318f
docu(#3036): fix min_version
Deblintrake09 Sep 9, 2022
122ff7c
fix(#3036): CB registry_key_limit_full
Deblintrake09 Sep 9, 2022
37153ce
fix(#3036): fix test_file_limit_no_limit callback
Deblintrake09 Sep 9, 2022
a18eaf3
fix(#3036): add local_internal_options to tests
Deblintrake09 Sep 9, 2022
6715418
fix(#3036): test_registry_key_full cb and key
Deblintrake09 Sep 12, 2022
5925a14
feat(#3053): add callbacks to fim.event_monitor
Deblintrake09 Sep 14, 2022
cceaea9
feat(#3053): add fixtures to fim conftest
Deblintrake09 Sep 14, 2022
a14e2a5
feat(#3053): add test_sync_overlap test skeleton
Deblintrake09 Sep 14, 2022
19fc49a
refactor(#3053): move CBs to fim.event_monitor
Deblintrake09 Sep 14, 2022
eed7a20
fix(#3053): add new case to test_sync_overlap
Deblintrake09 Sep 19, 2022
4151038
fix(#3053): fix truncate_monitored_files fixture
Deblintrake09 Sep 19, 2022
f77498c
feat(#3053): add create_files_in_folder fixture
Deblintrake09 Sep 19, 2022
772fa4f
docu(#3053): fix test_sync_interval docu and style
Deblintrake09 Sep 19, 2022
94f22a5
style(#3053): fix blank lines in conftest.py
Deblintrake09 Sep 19, 2022
5098130
docu(#3053): update changelog.md
Deblintrake09 Sep 19, 2022
f649ecf
style(#3053): fix spacing and indentations
Deblintrake09 Sep 20, 2022
75c8c45
style(#3053): update spacing and indentation
Deblintrake09 Sep 20, 2022
2796c98
fix(#3053): fix config format to work on macOS
Deblintrake09 Sep 20, 2022
d4e7555
fix(#3053): fix config format to work on macOS
Deblintrake09 Sep 20, 2022
d2a5269
fix(#3053): update spacing in configuration
Deblintrake09 Sep 20, 2022
744d1e9
fix(#3053): remove unnecesary list conversion
Deblintrake09 Sep 20, 2022
2120467
refactor(#3036): move CB and import to modules.fim
Deblintrake09 Sep 22, 2022
4a7f9c8
docs(#3036): add fixture documentation in tests
Deblintrake09 Sep 22, 2022
5e8f6ca
fix(#3036): update config with correct values
Deblintrake09 Sep 22, 2022
280133b
style(#3036): fix spacing in yaml conf files
Deblintrake09 Sep 23, 2022
5c4fcba
fix(#3036): fix config yaml spacing
Deblintrake09 Sep 23, 2022
1852642
style(#3036): fix style and indentations
Deblintrake09 Sep 27, 2022
1473a60
fix(#3036): fix wazuh_conf.yaml spacing
Deblintrake09 Sep 27, 2022
1fb3633
docs(#3036): update changelog.md
Deblintrake09 Sep 27, 2022
47e20b7
fix(#3053): fix and add cases test_sync_overlap
Deblintrake09 Sep 28, 2022
41b1d81
refactor(#3053): extract variables and callbacks
Deblintrake09 Sep 28, 2022
8513def
docs(#3053): update changelog.md
Deblintrake09 Sep 28, 2022
16f2002
style(#3053): fix spacing
Deblintrake09 Sep 28, 2022
978ced0
fix(#3053): add monitored_dir parameter to test
Deblintrake09 Sep 28, 2022
2bad3e2
fix(#3053): fix invalid max_interval value test
Deblintrake09 Sep 29, 2022
1a528c0
fix(#3036): increase test_max_eps created files
Deblintrake09 Sep 29, 2022
ef18eec
docu(#3053): update event_monitor documentation
Deblintrake09 Oct 17, 2022
ebc42e1
docu(#3053): fix fim.event_monitor docu
Deblintrake09 Oct 20, 2022
76a316c
refactor(#3036): cleaned up callbacks
Deblintrake09 Oct 20, 2022
5ed00cd
style(#3036): removed trailing whitespace
Deblintrake09 Oct 20, 2022
e21ae6a
feat(#3053): add new callbacks
Deblintrake09 Oct 21, 2022
9ca0bdb
feat(#3053): new test_sync_time module
Deblintrake09 Oct 21, 2022
e1dcb2c
fix(#3053): remove unused callbacks
Deblintrake09 Oct 21, 2022
112e1d6
docu(#3053): update test_sync_time docu
Deblintrake09 Oct 21, 2022
26f9a61
style(#3053): fix test_sync_time spacing
Deblintrake09 Oct 21, 2022
b835ace
style(#3053): fix test_sync_time spacing
Deblintrake09 Oct 21, 2022
237ed73
docu(#3036): update chengelog.md
Deblintrake09 Oct 26, 2022
d528ba6
Merge pull request #3381 from wazuh/3036-fimdb-limits
damarisg Oct 26, 2022
562fb8b
Merge branch '1915-fim-rsync-new-synchronization-mechanism' into 3053…
Deblintrake09 Oct 28, 2022
f21ac15
docs(#3053): update tests documentation
Deblintrake09 Oct 28, 2022
fe1859c
style(#3053): remove whitespaces
Deblintrake09 Oct 28, 2022
6b66bc8
docs(#3053): added comments and docu
Deblintrake09 Oct 28, 2022
220a2e2
style(#3053): fixed indentation issue
Deblintrake09 Oct 28, 2022
b4581d1
Merge pull request #3380 from wazuh/3053-sync-overlap-mechanism
damarisg Nov 25, 2022
b0f831b
refactor(#1915): merge master - fix conflics
Deblintrake09 Nov 28, 2022
e9df6ba
refactor(#1915): refactor fim framework
Deblintrake09 Nov 28, 2022
05d3634
fix(#1915): fix imports
Deblintrake09 Nov 28, 2022
61e0dfd
style(#1915): fix spacing and indentations
Deblintrake09 Nov 29, 2022
48d6f53
fix(#1915): add missing fixture
Deblintrake09 Nov 29, 2022
5bd0df6
style(#1915): fix spacing in yaml files
Deblintrake09 Nov 30, 2022
39c99d2
fix(#1915): fix callbacks and fixture import
Deblintrake09 Nov 30, 2022
67b32d5
refactor(#1915): move callbacks to event_monitor
Deblintrake09 Dec 1, 2022
67d982c
refactor(#1915): update callback imports
Deblintrake09 Dec 1, 2022
6f1e312
style(#1915): fix indentation and spacing
Deblintrake09 Dec 1, 2022
8d1be96
feat(#1915): update callbacks and functions
Deblintrake09 Dec 5, 2022
a2a433f
refactor(#1915): update imports from fim framework
Deblintrake09 Dec 5, 2022
501e975
fix(#1915): fix regular_file_cud function
Deblintrake09 Dec 21, 2022
b5b21d2
fix(#1915): fix delete_file usage instances
Deblintrake09 Jan 3, 2023
36d10ab
Merge branch 'master' into 1915-fim-rsync-new-synchronization-mechanism
Deblintrake09 Jan 3, 2023
08604f0
fix(#1915): fix test_max_eps
Deblintrake09 Jan 4, 2023
46dce50
style(#1915): fix indentation and whitespaces
Deblintrake09 Jan 4, 2023
e5ed781
fix(#1915): skip test_max_eps module
Deblintrake09 Jan 13, 2023
280a219
merge(#1915): merge master into branch
Deblintrake09 Jan 18, 2023
070d51d
merge(#1915): master into dev branch
Deblintrake09 Jan 19, 2023
e6652b2
merge(#1915): 'master' into dev branch
Deblintrake09 Jan 26, 2023
73233f4
fix(#1915): replace removed fixture
Deblintrake09 Jan 26, 2023
c362a8b
fix(#1915): fix test_synchronize_integrity conf
Deblintrake09 Jan 27, 2023
d671b56
merge(#1915): merge master into branch
Deblintrake09 Jan 27, 2023
d6f560f
fix(#1915): fix test_restrict_valid scheduled mode
Deblintrake09 Jan 30, 2023
caecd65
style(#1915): fix test_restrict_valid conf spacing
Deblintrake09 Jan 30, 2023
99cfcf0
style(#1915): remove confs redundant quotes
Deblintrake09 Jan 30, 2023
eaaa642
fix(#1915): fix test_restrict_valid cases
Deblintrake09 Jan 30, 2023
469828c
fix(#1915): fix windows test cases
Deblintrake09 Jan 31, 2023
d0ff742
chore: bump version to 4.6
jmv74211 Feb 1, 2023
bbedbc9
merge(#1915): 'master' into dev branch
Deblintrake09 Feb 6, 2023
5e0240d
fix(#1915): revert merge 'master' into dev branch"
Deblintrake09 Feb 6, 2023
7c41de2
merge(#1915): '4.5' into 'dev branch'
Deblintrake09 Feb 6, 2023
b1d6703
fix(#1915): remove duplicated fixture
Deblintrake09 Feb 6, 2023
183ffa6
fix(#1915): add delay for difffolder deletion
Deblintrake09 Feb 7, 2023
87fad43
style(#1915): fix whitespaces and file names
Deblintrake09 Feb 7, 2023
a7b5653
fix(#1915): remove redundant vars and functions
Deblintrake09 Feb 9, 2023
aa1c50c
style(#1915): improve documentation
Deblintrake09 Feb 9, 2023
2cb2b0f
fix(#1915): extract duplicated function
Deblintrake09 Feb 9, 2023
d211506
docs(#1915): improve documentation
Deblintrake09 Feb 9, 2023
876c3b0
merge(#1915): '4.5' into dev branch
Deblintrake09 Feb 9, 2023
37e3e0d
fix(#1915): remove unneeded file
Deblintrake09 Feb 9, 2023
a51e6a4
merge: '4.5' branch into 1915-fim-rsync-new-synchronization-mechanism
jmv74211 Feb 15, 2023
60e814b
chore(#1915): remove unused imports
jmv74211 Feb 15, 2023
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Release report: TBD

### Added

- Add tests with new options to avoid FIM synchronization overlapping. ([#3318](https://github.com/wazuh/wazuh-qa/pull/3318)) \- (Framework + tests)
- Add Logcollector millisecond granularity support test case ([#3910](https://github.com/wazuh/wazuh-qa/pull/3910)) \- (Tests)
- Add Windows System folders FIM monitoring tests ([#3720](https://github.com/wazuh/wazuh-qa/pull/3720)) \- (Tests)
- Add 'test_whodata_policy_changes' tests ([#3627](https://github.com/wazuh/wazuh-qa/pull/3627)) \- (Framework + Tests)
Expand All @@ -18,6 +19,8 @@ Release report: TBD

### Changed

- Update FIM test to new FIM DBSync process ([#2728](https://github.com/wazuh/wazuh-qa/pull/2728)) \- (Framework + Tests)
- Update file_limit and registry_limit tests ([#3280](https://github.com/wazuh/wazuh-qa/pull/3280)) \- (Tests)
- Change expected timestamp for proftpd analysisd test predecoder test case ([#3900](https://github.com/wazuh/wazuh-qa/pull/3900)) \- (Tests)
- Skip test_large_changes test module ([#3783](https://github.com/wazuh/wazuh-qa/pull/3783)) \- (Tests)
- Update report_changes tests ([#3405](https://github.com/wazuh/wazuh-qa/pull/3405)) \- (Tests)
Expand Down
1 change: 0 additions & 1 deletion deps/wazuh_testing/wazuh_testing/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
WAZUH_CONF_PATH = os.path.join(WAZUH_PATH, 'etc', 'ossec.conf')
WAZUH_LOGS_PATH = os.path.join(WAZUH_PATH, 'logs')
CLIENT_KEYS_PATH = os.path.join(WAZUH_PATH, 'etc' if platform.system() == 'Linux' else '', 'client.keys')
DB_PATH = os.path.join(WAZUH_PATH, 'queue', 'db')
QUEUE_DB_PATH = os.path.join(WAZUH_PATH, 'queue', 'db')
damarisg marked this conversation as resolved.
Show resolved Hide resolved
QUEUE_SOCKETS_PATH = os.path.join(WAZUH_PATH, 'queue', 'sockets')
WAZUH_DB_SOCKET_PATH = os.path.join(QUEUE_DB_PATH, 'wdb')
Expand Down
Loading