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

Merge 4.3.6 into master #696

Merged
merged 192 commits into from
Jul 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
192 commits
Select commit Hold shift + click to select a range
43d86dd
add variables from wazuh version
vcerenu May 3, 2022
cb06e15
bump develope to 4.3.1
vcerenu May 17, 2022
c2712a3
test ci actions
vcerenu May 17, 2022
e99476a
test ci actions
vcerenu May 17, 2022
8b39bff
test ci actions
vcerenu May 17, 2022
316db4f
test ci actions
vcerenu May 17, 2022
e39f5a9
test ci actions
vcerenu May 17, 2022
8746063
test ci actions
vcerenu May 17, 2022
a40c870
test ci actions
vcerenu May 17, 2022
bbeb831
change path for env file
vcerenu May 23, 2022
2d77063
test CI
vcerenu May 23, 2022
fe104c7
test CI
vcerenu May 23, 2022
5b03281
test CI
vcerenu May 23, 2022
e1fc82a
test CI
vcerenu May 23, 2022
4e975f8
test CI
vcerenu May 24, 2022
baa24a7
test CI
vcerenu May 24, 2022
b1e13d3
test CI
vcerenu May 24, 2022
db3d37a
test CI
vcerenu May 24, 2022
65f499c
test CI
vcerenu May 24, 2022
5211401
test CI
vcerenu May 24, 2022
894ba9d
test CI
vcerenu May 26, 2022
59ad1b1
test CI
vcerenu May 26, 2022
79ac17d
test CI
vcerenu May 26, 2022
bb11f13
test CI
vcerenu May 26, 2022
d22547b
test CI
vcerenu May 26, 2022
3a87d83
test CI
vcerenu May 26, 2022
3d3a3d1
test CI
vcerenu May 26, 2022
b10a00c
test CI
vcerenu May 26, 2022
9fdf342
test CI
vcerenu May 26, 2022
5f063fc
test CI
vcerenu May 26, 2022
ec6bfa9
test CI
vcerenu May 26, 2022
469f7db
test CI
vcerenu May 26, 2022
7e8055f
test CI
vcerenu May 26, 2022
872c121
test CI
vcerenu May 26, 2022
1820291
test CI
vcerenu May 26, 2022
7e26034
test CI
vcerenu May 26, 2022
ccc7810
test CI
vcerenu May 26, 2022
571fad7
test CI
vcerenu May 26, 2022
330763b
test CI
vcerenu May 26, 2022
ceb920e
test CI
vcerenu May 26, 2022
dfa11c0
test CI
vcerenu May 26, 2022
579fa10
test CI
vcerenu May 27, 2022
704b183
test CI
vcerenu May 27, 2022
111cfca
test CI
vcerenu May 27, 2022
b7a55ab
test CI
vcerenu May 27, 2022
19e5c24
test CI
vcerenu May 27, 2022
ba3409a
test CI
vcerenu May 27, 2022
e0c7194
test CI
vcerenu May 27, 2022
5475605
test CI
vcerenu May 27, 2022
bb7723d
test CI
vcerenu May 27, 2022
11b3160
test CI
vcerenu May 27, 2022
cacc8fc
test CI
vcerenu May 27, 2022
66dda69
test CI
vcerenu May 27, 2022
2e0a7b7
test CI
vcerenu May 27, 2022
9ef724b
test CI
vcerenu May 27, 2022
19fdf93
test CI
vcerenu May 27, 2022
3ab210f
test CI
vcerenu May 27, 2022
30ed0e6
test CI
vcerenu May 27, 2022
111f04f
test CI
vcerenu May 27, 2022
77520d5
test CI
vcerenu May 27, 2022
613dc9f
test CI
vcerenu May 27, 2022
d149913
test CI
vcerenu May 27, 2022
290affd
test CI
vcerenu May 27, 2022
8b2f64a
test CI
vcerenu May 27, 2022
5591833
test CI
vcerenu May 27, 2022
de1e435
test CI
vcerenu May 27, 2022
8795763
test CI
vcerenu May 27, 2022
de28f0b
test CI
vcerenu May 27, 2022
83400ba
bump 4.3.3
vcerenu Jun 2, 2022
fb66a35
Merge pull request #667 from wazuh/bump_4_3_3
teddytpc1 Jun 2, 2022
437fbe6
Test CI
vcerenu Jun 2, 2022
0f2fd84
Test CI
vcerenu Jun 2, 2022
0313563
Test CI
vcerenu Jun 2, 2022
d7e937d
Test CI
vcerenu Jun 2, 2022
d578dfb
Test CI
vcerenu Jun 3, 2022
2fdb06d
Test CI
vcerenu Jun 3, 2022
8f6d24d
Test CI
vcerenu Jun 3, 2022
add81b0
Test CI
vcerenu Jun 3, 2022
73c25e8
Test CI
vcerenu Jun 3, 2022
7d39469
Test CI
vcerenu Jun 3, 2022
1645f8b
Test CI
vcerenu Jun 6, 2022
f67f8d1
Test CI
vcerenu Jun 6, 2022
9fb941f
Test CI
vcerenu Jun 6, 2022
a8bd7cb
Test CI
vcerenu Jun 6, 2022
525bb0c
Test CI
vcerenu Jun 6, 2022
ec16fdf
Test CI
vcerenu Jun 6, 2022
ac92c2f
Test CI
vcerenu Jun 6, 2022
c1ca498
Test CI
vcerenu Jun 7, 2022
3d4a707
Test CI
vcerenu Jun 7, 2022
4b1c420
Test CI
vcerenu Jun 7, 2022
5d5f01a
Test CI
vcerenu Jun 7, 2022
c631489
Test CI
vcerenu Jun 7, 2022
5418494
Test CI
vcerenu Jun 7, 2022
281f745
Test CI
vcerenu Jun 7, 2022
3b740e5
Test CI
vcerenu Jun 7, 2022
7fdb1a9
Test CI
vcerenu Jun 7, 2022
a40c510
Test CI
vcerenu Jun 7, 2022
95207b0
Test CI
vcerenu Jun 7, 2022
637d5cc
Test CI
vcerenu Jun 7, 2022
d5550ca
Test CI
vcerenu Jun 7, 2022
0520a77
Bumped version
alberpilot Jun 8, 2022
b3d5766
Added UI revision
alberpilot Jun 8, 2022
01a0e3d
Fixed typo defining variable
alberpilot Jun 8, 2022
237b180
Test CI
vcerenu Jun 8, 2022
adfaab6
Test CI
vcerenu Jun 8, 2022
f711968
Test CI
vcerenu Jun 8, 2022
fea54b3
Test CI
vcerenu Jun 8, 2022
27a7479
Test CI
vcerenu Jun 8, 2022
131c44b
Test CI
vcerenu Jun 8, 2022
719dc7d
Test CI
vcerenu Jun 8, 2022
1738968
Test CI
vcerenu Jun 8, 2022
439a3fe
Test CI
vcerenu Jun 8, 2022
451e91e
Test CI
vcerenu Jun 8, 2022
e9c2f59
Test CI
vcerenu Jun 8, 2022
1a60522
Test CI
vcerenu Jun 8, 2022
5e211d2
Test CI
vcerenu Jun 8, 2022
6042329
Test CI
vcerenu Jun 8, 2022
8748cd1
Test CI
vcerenu Jun 8, 2022
0c2cb41
Test CI
vcerenu Jun 8, 2022
0e2d942
Test CI
vcerenu Jun 8, 2022
19a5a37
Test CI
vcerenu Jun 8, 2022
d4b0d60
Test CI
vcerenu Jun 8, 2022
35dfd86
Test CI
vcerenu Jun 8, 2022
22958aa
Test CI
vcerenu Jun 8, 2022
4266700
Test CI
vcerenu Jun 8, 2022
3656850
Test CI
vcerenu Jun 8, 2022
f06a7ec
Test CI
vcerenu Jun 8, 2022
8ae1cd3
Test CI
vcerenu Jun 8, 2022
0d7d469
Test CI
vcerenu Jun 8, 2022
a626216
Test CI
vcerenu Jun 8, 2022
40f55cf
Test CI
vcerenu Jun 8, 2022
8e8b53e
Test CI
vcerenu Jun 8, 2022
b95e02d
Test CI
vcerenu Jun 8, 2022
42c2ea5
Test CI
vcerenu Jun 8, 2022
a34e0af
Test CI
vcerenu Jun 8, 2022
67dc3e6
Test CI
vcerenu Jun 8, 2022
b28ae3b
Test CI
vcerenu Jun 8, 2022
ddc0369
Test CI
vcerenu Jun 8, 2022
961b8ba
Test CI
vcerenu Jun 9, 2022
6591e9a
Test CI
vcerenu Jun 9, 2022
7c64263
Allow other Exceptions to bubble up a stack trace instead of silently…
daxxog Feb 10, 2022
03764ea
Test CI
vcerenu Jun 9, 2022
8976d2f
Test CI
vcerenu Jun 9, 2022
c17cc9a
Test CI
vcerenu Jun 9, 2022
731d3c3
Test CI
vcerenu Jun 9, 2022
b718d75
Test CI
vcerenu Jun 9, 2022
46740f3
Test CI
vcerenu Jun 9, 2022
01e616c
Test CI
vcerenu Jun 9, 2022
919eab0
Test CI
vcerenu Jun 9, 2022
8d4c6c4
Test CI
vcerenu Jun 9, 2022
0384112
Test CI
vcerenu Jun 9, 2022
94f62d2
Test CI
vcerenu Jun 9, 2022
f5ba937
Test CI
vcerenu Jun 9, 2022
1c80201
Test CI
vcerenu Jun 10, 2022
de41cd0
Test CI
vcerenu Jun 10, 2022
20d065c
Test CI
vcerenu Jun 10, 2022
6dbfc1b
Test CI
vcerenu Jun 10, 2022
d3954c9
Test CI
vcerenu Jun 10, 2022
174cf64
Test CI
vcerenu Jun 10, 2022
d655716
Test CI
vcerenu Jun 10, 2022
3059de4
Test CI
vcerenu Jun 10, 2022
9b9c422
Test CI
vcerenu Jun 10, 2022
8fb1b51
Test CI
vcerenu Jun 10, 2022
ecef793
Test CI
vcerenu Jun 10, 2022
672d1fc
Test CI
vcerenu Jun 13, 2022
a84ff7b
Test CI
vcerenu Jun 14, 2022
0f2b153
Test CI
vcerenu Jun 14, 2022
5d98c15
Merge pull request #669 from wazuh/fix-test-ci
alberpilot Jun 20, 2022
c3375e0
modify variable
vcerenu Jun 21, 2022
dc76918
modify variable
vcerenu Jun 21, 2022
2fe1eae
Merge pull request #676 from wazuh/fix_ck_conf
alberpilot Jun 22, 2022
61791c1
Bump 4.3.5
vcerenu Jun 23, 2022
46ec0bd
Add tag revision for Wazuh indexer and dashboard
vcerenu Jun 23, 2022
3d4521c
Merge pull request #678 from wazuh/bump-4-3-5
alberpilot Jun 24, 2022
84c4aab
Change readme note for build docker images process
vcerenu Jun 29, 2022
868424c
Change readme note for build docker images process
vcerenu Jun 29, 2022
2f2b8bc
Merge pull request #682 from wazuh/bump-4-3-5
okynos Jun 30, 2022
f933733
add option to recreate keystore in entrypoint
vcerenu Jul 1, 2022
9c06760
add option to recreate keystore in entrypoint
vcerenu Jul 1, 2022
5774b93
Merge pull request #684 from wazuh/fix-keystore-create
teddytpc1 Jul 1, 2022
28641ac
disable filebeat metrics
fcaffieri Jul 1, 2022
265dfd3
disable filebeat metrics
fcaffieri Jul 4, 2022
1d8d594
Merge pull request #685 from wazuh/1667-disable-filebeat-metrics-to4.3
okynos Jul 4, 2022
b6aa782
Add fix to avoid GLIBC crash
fcaffieri Jul 6, 2022
adf95cd
Add fix to avoid GLIBC crash, fix identation
fcaffieri Jul 6, 2022
23cb741
Merge pull request #689 from wazuh/1665-Fix-filebeat-crash-due-to-gli…
okynos Jul 7, 2022
a9ea60b
fix uid and gid for wazuh manager keys
vcerenu Jul 7, 2022
0245a7e
Merge pull request #692 from wazuh/fix-key-generator
okynos Jul 8, 2022
296de14
bump 4.3.6 version
vcerenu Jul 18, 2022
80e8057
Merge pull request #694 from wazuh/bump-4-3-6
okynos Jul 19, 2022
d227048
bump 4.3 into master
vcerenu Jul 22, 2022
9d65678
bump 4.3 into master
vcerenu Jul 22, 2022
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 .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
WAZUH_VERSION=4.3.6
WAZUH_IMAGE_VERSION=4.3.6
WAZUH_TAG_REVISION=1
34 changes: 11 additions & 23 deletions .github/.goss.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ package:
wazuh-manager:
installed: true
versions:
- 4.5.0
- 4.5.0-1
port:
tcp:1514:
listening: true
Expand All @@ -70,28 +70,6 @@ port:
listening: true
ip:
- 0.0.0.0
user:
wazuh:
exists: true
groups:
- wazuh
home: /var/ossec
shell: /sbin/nologin
wazuh:
exists: true
groups:
- wazuh
home: /var/ossec
shell: /sbin/nologin
wazuh:
exists: true
groups:
- wazuh
home: /var/ossec
shell: /sbin/nologin
group:
wazuh:
exists: true
process:
filebeat:
running: true
Expand All @@ -113,3 +91,13 @@ process:
running: true
wazuh-modulesd:
running: true
user:
wazuh:
exists: true
groups:
- wazuh
home: /var/ossec
shell: /sbin/nologin
group:
wazuh:
exists: true
18 changes: 18 additions & 0 deletions .github/multi-node-filebeat-check.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
filebeatout1=$(docker exec multi-node_wazuh.master_1 sh -c 'filebeat test output')
filebeatstatus1=$(echo "${filebeatout1}" | grep -c OK)
if [[ filebeatstatus1 -eq 7 ]]; then
echo "No errors in master filebeat"
else
echo "Errors in master filebeat"
echo "${filebeatout1}"
exit 1
fi
filebeatout2=$(docker exec multi-node_wazuh.worker_1 sh -c 'filebeat test output')
filebeatstatus2=$(echo "${filebeatout2}" | grep -c OK)
if [[ filebeatstatus2 -eq 7 ]]; then
echo "No errors in worker filebeat"
else
echo "Errors in worker filebeat"
echo "${filebeatout2}"
exit 1
fi
16 changes: 16 additions & 0 deletions .github/multi-node-log-check.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
log1=$(docker exec multi-node_wazuh.master_1 sh -c 'cat /var/ossec/logs/ossec.log' | grep -P "ERR|WARN|CRIT")
if [[ -z "$log1" ]]; then
echo "No errors in master ossec.log"
else
echo "Errors in master ossec.log:"
echo "${log1}"
exit 1
fi
log2=$(docker exec multi-node_wazuh.worker_1 sh -c 'cat /var/ossec/logs/ossec.log' | grep -P "ERR|WARN|CRIT")
if [[ -z "${log2}" ]]; then
echo "No errors in worker ossec.log"
else
echo "Errors in worker ossec.log:"
echo "${log2}"
exit 1
fi
9 changes: 9 additions & 0 deletions .github/single-node-filebeat-check.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
filebeatout=$(docker exec single-node_wazuh.manager_1 sh -c 'filebeat test output')
filebeatstatus=$(echo "${filebeatout}" | grep -c OK)
if [[ filebeatstatus -eq 7 ]]; then
echo "No errors in filebeat"
else
echo "Errors in filebeat"
echo "${filebeatout}"
exit 1
fi
8 changes: 8 additions & 0 deletions .github/single-node-log-check.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
log=$(docker exec single-node_wazuh.manager_1 sh -c 'cat /var/ossec/logs/ossec.log' | grep -P "ERR|WARN|CRIT")
if [[ -z "$log" ]]; then
echo "No errors in ossec.log"
else
echo "Errors in ossec.log:"
echo "${log}"
exit 1
fi
Loading