Compare commits

...

443 Commits

Author SHA1 Message Date
Carlos Anguita
ce53f0f05e Merge pull request #1747 from wazuh/enhancement/1745-revert-image-tag
Revert docker image for 4.11.1-rc2
2025-03-10 10:27:01 +01:00
Enrique Araque
aa69278c44 Revert docker image for 4.11.1-rc2 2025-03-10 10:25:12 +01:00
Carlos Anguita
546f3cef9b Merge pull request #1746 from wazuh/enhancement/1745-bump-revision-and-change-docker-image-for-4.11.1-rc2
Bump revision and change docker image for 4.11.1-rc2
2025-03-10 10:22:23 +01:00
Enrique Araque
754c4b331e Bum revision and change docker image for 4.11.1-rc2 2025-03-10 10:16:10 +01:00
Carlos Bordon
fe0f76bd7b Merge pull request #1738 from wazuh/enhancement/1736-revert-bump-4.11.1-rc1
Revert image tag
2025-02-26 16:53:24 -03:00
Jesus Garcia
e4fec103ca Revert image tag 2025-02-26 14:50:55 -05:00
Carlos Bordon
28acd68e6e Merge pull request #1737 from wazuh/enhancement/1736-bump-4.11.1-rc1
Bump 4.11.1-rc1 revision
2025-02-26 16:43:40 -03:00
Jesus Garcia
fc8a8d6869 Bump 4.11.1-rc1 revision 2025-02-26 14:40:25 -05:00
Carlos Anguita
ff7c511f3b Merge pull request #1733 from wazuh/enhancement/1731-merge-4.11.0-into-4.11.1 2025-02-21 12:25:55 +01:00
Enrique Araque
5f689b8802 merge 4.11.0 into 4.11.1 2025-02-21 12:22:00 +01:00
Carlos Bordon
3d9981d9fa Merge pull request #1725 from wazuh/enhancement/1723-revert-image-tag
Revert docker image for 4.11.0-rc1
2025-02-14 08:51:25 -03:00
Enrique Araque
06821f172f Revert docker image for 4.11.0-rc1 2025-02-14 12:48:50 +01:00
Carlos Bordon
660e472b7c Merge pull request #1724 from wazuh/enhancement/1723-bump-revision-to-41103
Bump revision and change image tag
2025-02-14 08:44:46 -03:00
Enrique Araque
af33c2dd7c Fix revision 2025-02-14 12:40:55 +01:00
Enrique Araque
331fb1969e Bump revision and change image tag 2025-02-14 12:39:18 +01:00
Carlos Bordon
b88d852b9f Merge pull request #1718 from wazuh/enhancement/1716-revert-tags
Revert image tags for beta1
2025-02-06 13:55:19 -03:00
fcaffieri
281cde7292 Revert image tags for beta1 2025-02-06 13:53:46 -03:00
Carlos Bordon
c9bbf912b0 Merge pull request #1717 from wazuh/enhancement/1716-bump-revision
Revision bump
2025-02-06 13:47:06 -03:00
fcaffieri
7a189605eb Image tags changed for beta1 2025-02-06 13:36:38 -03:00
fcaffieri
ae32e0111d Revision bump 2025-02-06 13:29:27 -03:00
fcaffieri
e29dd1195b Revision bump 2025-02-06 13:27:42 -03:00
Carlos Bordon
dafe93039f Merge pull request #1715 from wazuh/enhancement/1714-support-new-version-4.11.1
Support new Wazuh version 4.11.1
2025-02-06 09:16:02 -03:00
Carlos Anguita López
0adf702f70 support new wazuh version 4.11.1 2025-02-06 13:08:58 +01:00
Carlos Bordon
f49bba385c Merge pull request #1710 from wazuh/merge-4.10.2-into-4.11.0
Merge 4.10.2 into 4.11.0
2025-02-04 09:21:48 -03:00
vcerenu
a7bb241f8a Resolving merge conflicts 2025-02-04 09:15:11 -03:00
vcerenu
6e0311a330 Resolving merge conflicts 2025-02-04 09:14:33 -03:00
vcerenu
bc6ab77773 Resolving merge conflicts 2025-02-04 08:57:45 -03:00
vcerenu
e4f782f55d Resolving merge conflicts 2025-02-04 08:47:46 -03:00
Gonzalo Acuña
b29bd6b936 Merge pull request #1706 from wazuh/enhancement/1703-revert-tags
Revert image tags for alpha1
2025-01-24 09:41:01 -03:00
Gonzalo Acuña
2bed6e2d95 Revert image tags for alpha1 2025-01-24 09:38:55 -03:00
Gonzalo Acuña
73253898a2 Merge pull request #1705 from wazuh/enhancement/1703-image-tags
Image tags changed for alpha1
2025-01-24 09:26:54 -03:00
Gonzalo Acuña
2b30318a08 Image tags changed for alpha1 2025-01-24 09:25:01 -03:00
Gonzalo Acuña
49fb35633c Merge pull request #1704 from wazuh/enhancement/1703-bump-revision
Revision bump
2025-01-24 09:23:05 -03:00
Gonzalo Acuña
052bce7ae1 Revision bump 2025-01-24 09:20:23 -03:00
Gonzalo Acuña
5fb9a0b6b1 Merge pull request #1698 from wazuh/enhancement/1697-bump-4.10.2-version
Bump 4.10.2 version
2025-01-17 15:40:32 -03:00
vcerenu
34d25df8ad bump 4.10.2 version 2025-01-17 15:29:56 -03:00
Enrique Araque
06e259714c Merge pull request #1695 from wazuh/merge-4.10.2-into-4.11.0 2025-01-17 11:34:22 +01:00
Enrique Araque
d2bb16a493 Merge 4.10.2 into 4.11.0 2025-01-17 11:27:24 +01:00
Enrique Araque
a0c1fd8bf5 Merge pull request #1681 from wazuh/enhancement/1678-revert-docker-image 2025-01-15 11:15:12 +01:00
Enrique Araque
c548f3e096 Revert docker image for 4.10.1-rc1 2025-01-15 11:11:51 +01:00
Carlos Anguita
69b4169fd5 Merge pull request #1680 from wazuh/enhancement/1678-change-docker-image 2025-01-15 11:08:32 +01:00
Enrique Araque
1ee604e4b1 Change docker image for 4.10.1-rc1 2025-01-15 11:05:59 +01:00
Carlos Anguita
5b3f46142e Merge pull request #1679 from wazuh/enhancement/1678-bump-revision-to-41011 2025-01-15 11:01:47 +01:00
Enrique Araque
845f7e59ec Bump revision for 4.10.1-rc1 2025-01-15 10:53:58 +01:00
Gonzalo Acuña
633c50bce6 Merge pull request #1674 from wazuh/bug/1673-add-permanent_data_excps
Add exceptions into PERMANENT_DATA script
2025-01-13 11:41:53 -03:00
vcerenu
347187c411 Add exceptions into PERMANENT_DATA script 2025-01-10 16:02:45 -03:00
Enrique Araque
a7cc8ef16e Merge pull request #1671 from wazuh/merge-4.10.1-into-4.11.0 2025-01-10 11:37:46 +01:00
Enrique Araque
79ead0cf55 Merge 4.10.1 into 4.11.0 2025-01-10 11:29:23 +01:00
Carlos Anguita
7b415dc700 Merge pull request #1670 from wazuh/merge-4.10.0-into-4.10.1 2025-01-10 11:23:43 +01:00
Enrique Araque
f2a5901fd6 Merge 4.10.0 into 4.10.1 2025-01-10 11:18:47 +01:00
Carlos Anguita
2f3f00fc51 Merge pull request #1667 from wazuh/enhancement/1664-revert-docker-image 2025-01-08 10:21:10 +01:00
Enrique Araque
98675f00fc Change docker image for 4.10.0-rc3 2025-01-08 10:16:58 +01:00
Carlos Anguita
26e94102ce Merge pull request #1666 from wazuh/enhancement/1664-change-docker-image 2025-01-08 10:13:02 +01:00
Enrique Araque
fc896872e2 Change docker image for 4.10.0-rc3 2025-01-08 10:10:42 +01:00
Carlos Anguita
e17302f280 Merge pull request #1665 from wazuh/enhancement/1664-bump-revision-41008 2025-01-08 10:07:45 +01:00
Enrique Araque
010642113b Bump revision for 4.10.0-rc3 2025-01-08 10:04:52 +01:00
Gonzalo Acuña
90f1d446c1 Merge pull request #1663 from wazuh/bug/1642-free-disk-step
Change the cleaning disk step
2024-12-23 08:51:47 -03:00
vcerenu
23848dc8bf Add changelog 2024-12-23 08:44:15 -03:00
vcerenu
9e6defa9d1 Change the cleaning disk step 2024-12-23 08:06:55 -03:00
Gonzalo Acuña
2060e2103b Merge pull request #1660 from wazuh/enhancement/1656-bump-4.11.0-version
Bump 4.11.0 version
2024-12-20 10:45:40 -03:00
vcerenu
66a1533425 Bump 4.11.0 version 2024-12-20 10:40:22 -03:00
Gonzalo Acuña
1f7eae1247 Merge pull request #1659 from wazuh/enhancement/1658-bump-4.10.1-version
Bump 4.10.1 version
2024-12-20 10:19:26 -03:00
vcerenu
2c2388ce4a Bump 4.10.1 version 2024-12-20 10:14:29 -03:00
Carlos Anguita
7b03b99022 Merge pull request #1649 from wazuh/enhancement/1646-revert-docker-image 2024-12-18 10:52:16 +01:00
Enrique Araque
8a925f010f Revert docker image for 4.10.0-rc2 2024-12-18 10:47:26 +01:00
Carlos Anguita
8468687b0c Merge pull request #1648 from wazuh/enhancement/1646-change-docker-image 2024-12-18 10:45:58 +01:00
Enrique Araque
da64bb47d5 Change docker image for 4.10.0-rc2 2024-12-18 10:44:05 +01:00
Carlos Anguita
f3b4631bb0 Merge pull request #1647 from wazuh/enhancement/1646-bump-revision-to-41007 2024-12-18 10:41:38 +01:00
Enrique Araque
2c6704652c Bump revision for 4.10.0-rc2 2024-12-18 10:38:59 +01:00
Gonzalo Acuña
7cfda0550d Merge pull request #1641 from wazuh/change/1640.artifact-actions-version
Change version for artifact manager actions
2024-12-16 15:30:34 -03:00
vcerenu
77e548485a Change version for artifact manager actions 2024-12-13 14:08:04 -03:00
Gonzalo Acuña
d9a2ebf090 Merge pull request #1638 from wazuh/merge-4.10.0-into-4.10.1
Merge 4.10.0 into 4.10.1
2024-12-13 09:25:38 -03:00
Enrique Araque
240f22b19c Merge 4.10.0 into 4.10.1 2024-12-13 13:19:45 +01:00
Carlos Anguita
8022d3a7fc Merge pull request #1636 from wazuh/enhancement/1633-revert-docker-image
Revert docker image for 4.10.0-rc1
2024-12-03 11:00:01 +01:00
Enrique Araque
12fab33f52 Revert docker image for 4.10.0-rc1 2024-12-03 10:58:17 +01:00
Carlos Anguita
71dac1f51b Merge pull request #1635 from wazuh/enhancement/1633-change-docker-image
Change docker image for 4.10.0-rc1
2024-12-03 10:55:50 +01:00
Enrique Araque
d31228306c Change docker image for 4.10.0-rc1 2024-12-03 10:53:48 +01:00
Carlos Anguita
d37474e7c9 Merge pull request #1634 from wazuh/enhancement/1633-bump-revision-41006
Bump revision for 4.10.0-rc1
2024-12-03 10:50:00 +01:00
Enrique Araque
3b91ae3668 Bump revision for 4.10.0-rc1 2024-12-03 10:48:18 +01:00
Carlos Anguita
edf7aef3cc Merge pull request #1628 from wazuh/enhancement/1625-revert-docker-image
Revert docker image for 4.10.0-beta1
2024-11-22 10:09:02 +01:00
Enrique Araque
25e21e71da Revert docker image for 4.10.0-beta1 2024-11-22 10:06:44 +01:00
Carlos Anguita
475d29db39 Merge pull request #1627 from wazuh/enhancement/1625-change-docker-image
Change docker image for 4.10.0-beta1
2024-11-22 09:59:02 +01:00
Enrique Araque
bc102ace7f Change docker image for 4.10.0-beta1 2024-11-22 09:56:53 +01:00
Carlos Anguita
08de09cd08 Merge pull request #1626 from wazuh/enhancement/1625-bump-revision-to-41005
Bump revision for 4.10.0-beta1
2024-11-22 09:54:32 +01:00
Enrique Araque
15995ac5db Bump revision for 4.10.0-beta1 2024-11-22 09:52:42 +01:00
Gonzalo Acuña
63f965d0fd Merge pull request #1619 from wazuh/bug/1618-unset-cap
Add unset capabilities
2024-11-13 09:52:07 -03:00
vcerenu
bfa6dfb3b3 Add Changelog 2024-11-13 08:11:40 -03:00
vcerenu
521711bf63 Add unset capabilities 2024-11-12 12:15:02 -03:00
Carlos Anguita
347132b589 Merge pull request #1617 from wazuh/enhancement/1614-revert-docker-image-tag
Revert docker image tag for 4.10.0-alpha3
2024-11-08 12:51:27 +01:00
Enrique Araque
53275bebb9 Revert docker image tag for 4.10.0-alpha3 2024-11-08 12:48:46 +01:00
Carlos Anguita
7ca2862ad3 Merge pull request #1616 from wazuh/enhancement/1614-change-docker-image-tag
Change docker image tag to 4.10.0-alpha3
2024-11-08 12:44:11 +01:00
Enrique Araque
5a13dd99a7 Change docker image tag to 4.10.0-alpha3 2024-11-08 12:41:10 +01:00
Gonzalo Acuña
a9f2263da8 Merge pull request #1615 from wazuh/enhancement/1614-bump-revision-to-41004
Bump revision to 41004 and update missing changelog entries
2024-11-08 08:36:34 -03:00
Enrique Araque
f6928b62e6 Bump revision to 41004 and update missing changelog entries 2024-11-08 12:34:30 +01:00
Carlos Bordon
5252ce6c53 Merge pull request #1608 from wazuh/merge-4.10.0-into-4.10.1
Merge 4.10.0 into 4.10.1
2024-11-04 16:00:31 -03:00
Gonzalo Acuña
5ef484647a Merge branch '4.10.1' into merge-4.10.0-into-4.10.1 2024-11-04 16:00:02 -03:00
Carlos Bordon
f9adac8c56 Merge pull request #1607 from wazuh/merge-4.9.2-into-4.10.0
Merge 4.9.2 into 4.10.0
2024-11-04 15:57:10 -03:00
Gonzalo Acuña
8bb96f3d69 Merge branch '4.10.0' into merge-4.9.2-into-4.10.0 2024-11-04 15:50:45 -03:00
Carlos Bordon
574c7b05c7 Merge pull request #1599 from wazuh/enhancement/1596-revert-images-tag
Revert images tag for 4.9.2 rc1
2024-10-28 11:36:46 -03:00
vcerenu
fc563acdaa Revert images tag 2024-10-28 11:34:08 -03:00
Gonzalo Acuña
0778474353 Merge pull request #1598 from wazuh/enhancement/1596-change-image-tag
Change images tag for 4.9.2 rc1
2024-10-28 11:31:22 -03:00
vcerenu
6038fce076 Change images tag 2024-10-28 11:24:12 -03:00
Gonzalo Acuña
3b7fa8d000 Merge pull request #1597 from wazuh/enhancement/1596-bump-revision
Update 4.9.2 Revision
2024-10-28 11:11:51 -03:00
vcerenu
4116634ddd Bump Revision 2024-10-28 11:06:52 -03:00
Carlos Anguita
fbaee58767 Merge pull request #1594 from wazuh/enhancement/1593-new-version-492
Support new wazuh version 4.9.2
2024-10-25 12:29:39 +02:00
Carlos Anguita López
8b18fb613c support new wazuh version 4.9.2 2024-10-25 12:09:57 +02:00
Carlos Anguita
45366e121f Merge pull request #1588 from wazuh/enhancement/1585-revert-image-tag
Revert image tag for 4.10.0-alpha2
2024-10-18 11:02:06 +02:00
Enrique Araque
93ea37158d Revert image tag for 4.10.0-alpha2 2024-10-18 10:59:10 +02:00
Carlos Anguita
1f58526256 Merge pull request #1587 from wazuh/enhancement/change-docker-image-tag
Change image tag for 4.10.0-alpha2
2024-10-18 10:54:30 +02:00
Enrique Araque
041cea8a9a Add alpha2 to docker 4.10.0 images 2024-10-18 10:50:04 +02:00
Carlos Anguita
53db9379b8 Merge pull request #1586 from wazuh/enhancement/1585-bump-revision-41003
Bump revision for 4.10.0-alpha2
2024-10-18 10:46:27 +02:00
Enrique Araque
02074c678e Bump revision to 41003 2024-10-18 10:43:01 +02:00
Gonzalo Acuña
ea0e679c27 Merge pull request #1582 from wazuh/merge-4.10.0-into-4.10.1
Merge 4.10.0 into 4.10.1
2024-10-17 12:42:06 -03:00
vcerenu
7ca14b9fc8 Resolve conflicts 2024-10-17 12:34:40 -03:00
vcerenu
42977e3131 Resolve conflicts 2024-10-17 12:33:13 -03:00
Gonzalo Acuña
f4e7d1938d Merge pull request #1581 from wazuh/merge-4.9.1-into-4-10-0
Merge 4.9.1 into 4.10.0
2024-10-17 12:28:24 -03:00
vcerenu
691694a38d Resolve conflicts 2024-10-17 12:22:38 -03:00
Gonzalo Acuña
19f4aaea4d Merge pull request #1577 from wazuh/enhancement/1574-revert-image-tag
Revert image tag for 4.9.1-rc4
2024-10-15 13:06:04 -03:00
vcerenu
5bbacebe89 Revert image tag for rc4 2024-10-15 12:59:17 -03:00
Carlos Bordon
f9c5215c8b Merge pull request #1576 from wazuh/enhancement/1574-change-image-tag
Change image tag for 4.9.1-rc4
2024-10-15 12:52:52 -03:00
vcerenu
564e2b3ec4 change image taf for rc4 2024-10-15 12:41:31 -03:00
Carlos Bordon
c5970f2922 Merge pull request #1575 from wazuh/enhancement/1574-bump-revision
Bump Revision of new stageRC 4 for 4.9.1
2024-10-15 12:36:03 -03:00
vcerenu
276c8a2e6c Bump revision 2024-10-15 12:05:27 -03:00
Gonzalo Acuña
b1f0a1f46a Merge pull request #1573 from wazuh/enhancement/1570-revert-image-tag
Revert image tag to 4.10.0
2024-10-10 13:15:17 -03:00
JESUS D. GARCIA
5795fa154d Revert image tag to 4.10.0 2024-10-10 11:10:29 -05:00
Gonzalo Acuña
424846ae40 Merge pull request #1572 from wazuh/enhancement/1570-docker-compose-version
Update image tag versions to 4.10.0-alpha2
2024-10-10 13:03:03 -03:00
JESUS D. GARCIA
db4133d7a8 Update docker-compose versions 2024-10-10 10:54:12 -05:00
Carlos Bordon
50769ef689 Merge pull request #1571 from wazuh/enhancement/1570-add-support-for-alpha-2
Add support for alpha 2
2024-10-10 12:48:49 -03:00
JESUS D. GARCIA
dbb776690d Bump revision 2024-10-10 10:43:13 -05:00
Gonzalo Acuña
60746362ac Merge pull request #1569 from wazuh/bug/1564-fix-typos-entrypoint
Fix typos into Wazuh manager entrypoint
2024-10-10 12:09:32 -03:00
vcerenu
f61af29c6b Add changelog 2024-10-10 12:07:39 -03:00
vcerenu
1aa149933b Fix typos 2024-10-10 11:09:09 -03:00
Gonzalo Acuña
06a797d793 Merge pull request #1568 from wazuh/merge-4.9.1-into-4.10.0
Merge 4.9.1 into 4.10.0
2024-10-10 08:39:25 -03:00
vcerenu
8695a087d5 Resolving merge conflicts 2024-10-10 08:05:07 -03:00
David Correa Rodríguez
61b3f5f6ed Merge pull request #1561 from wazuh/enhancement/1558-revert-image-tag
Reverted image tag for 4.9.1-rc3
2024-10-04 10:29:53 +02:00
David Correa Rodríguez
868c371c31 Reverted image tag for 4.9.1-rc3 2024-10-04 10:27:14 +02:00
David Correa Rodríguez
bd7aedc0dd Merge pull request #1560 from wazuh/enhancement/1558-change-image-tag
Changed image tag for 4.9.1-rc3
2024-10-04 10:25:18 +02:00
David Correa Rodríguez
4177d1095c Changed image tag for 4.9.1-rc3 2024-10-04 10:23:16 +02:00
David Correa Rodríguez
97e4dde53d Merge pull request #1559 from wazuh/enhancement/1558-bump-revision
Bumped revision for 4.9.1-RC3
2024-10-04 10:19:46 +02:00
David Correa Rodríguez
884151b322 Bumped revision for 4.9.1-RC3 2024-10-04 10:12:37 +02:00
Carlos Bordon
d237faa5ab Merge pull request #1555 from wazuh/bug/1554-wazuh-server-container-restarting-in-loop
Revert create_user.py script deletion
2024-10-03 08:38:10 -03:00
Enrique Araque
92d0582201 Revert create_user.py script deletion 2024-10-03 13:18:25 +02:00
Gonzalo Acuña
cc206659cc Merge pull request #1551 from wazuh/enhancement/1864-improve-push-docker-images-workflow
Improve the push docker images workflow
2024-10-01 15:21:25 -03:00
JESUS D. GARCIA
8bafe1295b Change the dev default value to true for the workflow_dispatch 2024-10-01 10:06:13 -05:00
JESUS D. GARCIA
027b26047f Update Procedure_push_docker_images.yml 2024-09-30 16:20:31 -05:00
Gonzalo Acuña
af023a9b44 Merge pull request #1550 from wazuh/enhancement/1547-revert-docker-image-tag
Revert Wazuh images to 4.9.1 version
2024-09-27 09:29:25 -03:00
c-bordon
0ec38df1c7 Revert Wazuh images to -rc2 version 2024-09-27 09:26:49 -03:00
David Correa Rodríguez
be0ac01c4a Merge pull request #1549 from wazuh/enhancement/1547-update-docker-image-tag
Updated Wazuh images to -rc2 version
2024-09-27 14:20:32 +02:00
c-bordon
62ae93eee9 Updated Wazuh images to -rc2 version 2024-09-27 09:18:13 -03:00
David Correa Rodríguez
e292957740 Merge pull request #1548 from wazuh/enhancement/1418-support-new-stage-rc2-for-491
Bump 4.9.1 revision
2024-09-27 14:14:26 +02:00
c-bordon
eb4efb3458 Bump 4.9.1 revision 2024-09-27 09:05:56 -03:00
Carlos Bordon
46d6dc8fe5 Merge pull request #1544 from wazuh/enhancement/1543-bump-4.10.1-version
Bump new Wazuh 4.10.1 version
2024-09-24 12:26:03 -03:00
vcerenu
08ba82d16d Bump new Wazuh 4.10.1 version 2024-09-24 12:09:02 -03:00
David Correa Rodríguez
9d882fcd67 Merge pull request #1541 from wazuh/enhancement/1535-revert-tag
Reverted image tag for 4.10.0-alpha1
2024-09-24 09:36:31 +02:00
David Correa Rodríguez
9e1c33245d Reverted image tag for 4.10.0-alpha1 2024-09-24 09:32:47 +02:00
David Correa Rodríguez
6dfa4a2e32 Merge pull request #1540 from wazuh/enhancement/1535-change-tag
Changed image tag for 4.10.0-alpha1
2024-09-24 09:30:23 +02:00
David Correa Rodríguez
8ab3018e62 Changed image tag for 4.10.0-alpha1 2024-09-24 09:28:31 +02:00
David Correa Rodríguez
e08a3d85db Merge pull request #1539 from wazuh/enhancement/1535-bump-revision
Bumped revision for 4.10.0-alpha1
2024-09-24 09:11:24 +02:00
David Correa Rodríguez
42db717668 Bumped revision for 4.10.0-alpha1 2024-09-24 08:50:11 +02:00
David Correa Rodríguez
7b1d2836fa Merge pull request #1537 from wazuh/merge-4.9.1-into-4.10.0
Merge 4.9.1 into 4.10.0
2024-09-23 12:29:41 +02:00
David Correa Rodríguez
301ea9e21a Merge branch '4.8.2' into merge-4.8.2-into-4.9.0 2024-09-23 10:20:48 +02:00
David Correa Rodríguez
0b3e9ba8e7 Merge pull request #1534 from wazuh/enhancement/1531-revert-image-tag
Revert rc1 tag from docker compose files
2024-09-20 13:03:41 +02:00
Enrique Araque
189e875939 Revert rc1 tag from docker compose files 2024-09-20 13:00:53 +02:00
Gonzalo Acuña
a335684a27 Merge pull request #1533 from wazuh/enhancement/1531-change-image-tag
Add rc1 tag to docker-compose files
2024-09-20 07:57:25 -03:00
Enrique Araque
9d851e6399 Add rc1 tag to docker-compose files 2024-09-20 12:54:10 +02:00
David Correa Rodríguez
c28d104022 Merge pull request #1532 from wazuh/enhancement/1531-bump-revision-to-40911 2024-09-20 12:50:10 +02:00
Enrique Araque
3859ca38ec Bump revision to 40911 2024-09-20 12:46:28 +02:00
Carlos Bordon
e06d5ae2e4 Merge pull request #1530 from wazuh/change/1529-update-security-policy-new-format
Changed SECURITY.md file
2024-09-16 15:37:36 -03:00
c-bordon
4ea8fc266e Changed SECURITY.md file 2024-09-16 15:17:18 -03:00
Jesús García
5771c49f0d Merge pull request #1524 from wazuh/enhancement/5651-new-workflow-push-docker-images
Update the Procedure push docker images workflow file
2024-09-13 12:51:16 -05:00
JESUS D. GARCIA
471aedae5b Update changelog 2024-09-13 12:49:10 -05:00
Carlos Bordon
82955c06ee Merge pull request #1523 from wazuh/change/1522-update-security-policy
Updated SECURITY.md file
2024-09-13 11:43:56 -03:00
David Correa Rodríguez
84280fae08 Updated SECURITY.md file 2024-09-13 13:24:32 +02:00
JESUS D. GARCIA
b38b3c7e59 * Update the Procedure push docker images workflow file
* Handle the build process exit code properly
2024-09-12 14:43:55 -05:00
Gonzalo Acuña
9c33d34254 Merge pull request #1525 from wazuh/enhancement/1509-modify-check-repository-script
Modify check repository script
2024-09-12 16:04:12 -03:00
Gonzalo Acuña
cd3e8b8b30 Merge pull request #1518 from wazuh/enhancement/5651-new-workflow-push-docker-images
Add the push_docker_images procedure workflow file
2024-09-09 08:44:19 -03:00
JESUS D. GARCIA
f0253ba984 Add Procedure_push_docker_images.yml workflow file 2024-09-06 19:40:54 -05:00
vcerenu
8e7b2cd390 Add delete of wazuh yum repo 2024-09-05 15:19:32 -03:00
Gonzalo Acuña
d43f85312a Merge pull request #1513 from wazuh/enhancement/1511-merge-4.9.1-into-4.10.0
Merge 4.9.1 into 4.10.0
2024-09-05 14:01:22 -03:00
Gonzalo Acuña
ae9d06ed35 Merge pull request #1512 from wazuh/enhancement/1511-merge-4.9.0-into-4.9.1
Merge 4.9.0 into 4.9.1
2024-09-05 13:46:52 -03:00
vcerenu
b84a49db92 Resolving conflicts 2024-09-05 13:26:41 -03:00
vcerenu
73fffcf52d Modify check repository for image builder 2024-09-05 13:12:47 -03:00
David Correa Rodríguez
999d01f48a Merge pull request #1507 from wazuh/enhancement/1504-revert-image-tag
Reverted image tag for 4.9.0-rc2
2024-08-30 10:18:55 +02:00
David Correa Rodríguez
bd758935e7 Reverted image tag for 4.9.0-rc2 2024-08-30 10:15:05 +02:00
David Correa Rodríguez
0e284a2309 Merge pull request #1506 from wazuh/enhancement/1504-change-image-tag
Changed image tag for 4.9.0-rc2
2024-08-30 10:12:40 +02:00
David Correa Rodríguez
b597e1cecc Changed image tag for 4.9.0-rc2 2024-08-30 10:11:00 +02:00
David Correa Rodríguez
247a6b0375 Merge pull request #1505 from wazuh/enhancement/1504-bump-revision
Bumped revision for 4.9.0-rc2
2024-08-30 10:07:28 +02:00
David Correa Rodríguez
879a10cc9f Bumped revision for 4.9.0-rc2 2024-08-30 10:03:33 +02:00
David Correa Rodríguez
0fef2182eb Merge pull request #1500 from wazuh/enhancement/1497-revert-image-tag
Reverted image tag for 4.9.0-RC1
2024-08-21 13:39:06 +02:00
David Correa Rodríguez
7b00fb8f73 Reverted image tag for 4.9.0-RC1 2024-08-21 13:35:25 +02:00
David Correa Rodríguez
cdbc5485b4 Merge pull request #1499 from wazuh/enhancement/1497-change-image-tag
Changed image tag for 4.9.0-RC1
2024-08-21 13:30:55 +02:00
David Correa Rodríguez
6249cb8f30 Changed image tag for 4.9.0-RC1 2024-08-21 13:29:24 +02:00
David Correa Rodríguez
7fe9ba2e19 Merge pull request #1498 from wazuh/enhancement/1497-bump-revision
Bumped revision for 4.9.0-rc1
2024-08-21 13:25:41 +02:00
David Correa Rodríguez
996c593242 Bumped revision for 4.9.0-rc1 2024-08-21 13:23:04 +02:00
David Correa Rodríguez
6eb3f60684 Merge pull request #1495 from wazuh/merge-4.9.1-into-4.10.0
Merge 4.9.1 into 4.10.0
2024-08-21 12:24:59 +02:00
David Correa Rodríguez
bbc4529088 Merge branch '4.9.1' into merge-4.9.1-into-4.10.0 2024-08-21 12:10:54 +02:00
David Correa Rodríguez
60e5304cd6 Merge pull request #1494 from wazuh/maintenance/1491-add-4.8.2-readme
Added 4.8.2 version to README.md file
2024-08-21 12:08:27 +02:00
David Correa Rodríguez
28f2320c6e Added 4.8.2 version to README.md file 2024-08-21 11:59:47 +02:00
David Correa Rodríguez
819880d1cf Merge pull request #1493 from wazuh/merge-4.9.0-into-4.9.1
Merge 4.9.0 into 4.9.1
2024-08-21 11:52:25 +02:00
David Correa Rodríguez
f08c39ed6d Merge branch '4.9.0' into merge-4.9.0-into-4.9.1 2024-08-21 11:45:09 +02:00
David Correa Rodríguez
1916f4166a Merge pull request #1492 from wazuh/merge-4.8.2-into-4.9.0
Merge 4.8.2 into 4.9.0
2024-08-21 11:41:21 +02:00
David Correa Rodríguez
36bdb5fedb Merge branch '4.8.2' into merge-4.8.2-into-4.9.0 2024-08-21 11:31:29 +02:00
Gonzalo Acuña
15a856dc32 Merge pull request #1489 from wazuh/enhancement/1485-revert-image-tag
Revert image tag
2024-08-19 12:03:40 -03:00
vcerenu
1486b5942c Revert image tag 2024-08-19 11:52:49 -03:00
Gonzalo Acuña
25319ee004 Merge pull request #1488 from wazuh/enhancement/1485-change-image-tag
Change image tag to RC1
2024-08-19 11:46:15 -03:00
vcerenu
f47ca7fbc0 Change image tag 2024-08-19 11:39:03 -03:00
Gonzalo Acuña
5ef94b819c Merge pull request #1487 from wazuh/enhancement/1485-fix-changelog-link
Fix changelog links
2024-08-19 11:29:20 -03:00
vcerenu
e77ceb6ad6 Fix changelog links 2024-08-19 11:16:06 -03:00
Gonzalo Acuña
127e74296a Merge pull request #1486 from wazuh/enhancement/1485-bump-revision
Bump 4.8.2 revision to 40819
2024-08-19 11:05:28 -03:00
vcerenu
0aa63db271 Bump REVISION to 40819 2024-08-19 10:50:11 -03:00
Carlos Bordon
583f75176d Merge pull request #1484 from wazuh/bump-4.8.2-to-4.8.2
Bump 4.8.2 branch to 4.8.2 version
2024-08-16 07:10:47 -03:00
c-bordon
11d2c84203 Fixed goos.yaml file 2024-08-16 07:09:50 -03:00
c-bordon
2e52ebd7b7 Bump 4.8.2 branch to 4.8.2 version 2024-08-16 06:48:46 -03:00
David Correa Rodríguez
4223b44f3f Merge pull request #1482 from wazuh/enhancement/1479-revert-image-tag
Reverted image tag for 4.9.0 beta2
2024-08-09 09:19:12 +02:00
David Correa Rodríguez
3fc48bec11 Reverted image tag for 4.9.0 beta2 2024-08-09 09:17:10 +02:00
David Correa Rodríguez
56750a07f2 Merge pull request #1481 from wazuh/enhancement/1479-change-image-tag
Changed image tag for 4.9.0 beta2
2024-08-09 09:14:29 +02:00
David Correa Rodríguez
b362e0774b Changed image tag for 4.9.0 beta2 2024-08-09 09:12:01 +02:00
David Correa Rodríguez
d11e421cdd Merge pull request #1480 from wazuh/enhancement/1479-bump-revision
Bumped revision for 4.9.0-beta2
2024-08-09 09:06:07 +02:00
David Correa Rodríguez
99c163f4e5 Bumped revision for 4.9.0-beta2 2024-08-09 08:54:44 +02:00
Gonzalo Acuña
acc3c22bed Merge pull request #1476 from wazuh/enhancement/1474-add-azure-wodle-files
Add Azure wodle files to persistence excepction
2024-08-06 14:57:23 -03:00
vcerenu
6eb435a82f Add Azure wodle files to persistence excepction 2024-08-06 09:37:47 -03:00
Gonzalo Acuña
ac760dbb14 Merge pull request #1475 from wazuh/bug/1473-docker-images-build-errors
Error messages building 4.9.0 Docker images
2024-08-06 09:08:06 -03:00
vcerenu
2adb0cc46d Fix docker-compose error during test 2024-08-06 08:17:22 -03:00
vcerenu
ca6cc555f2 Fix docker-compose error during test 2024-08-05 15:24:11 -03:00
vcerenu
eca65a8538 Fix docker-compose error during test 2024-08-05 15:02:52 -03:00
vcerenu
a063b27592 Fix Wazuh indexer and manager build error 2024-08-05 14:14:28 -03:00
vcerenu
bc2a446c17 Fix Wazuh indexer and manager build error 2024-08-05 12:13:20 -03:00
Carlos Bordon
80b7c047ec Merge pull request #1472 from wazuh/maintenance/1469-revert-image-tag
Revert image tag for 4.9.0 Beta1
2024-08-02 06:47:47 -03:00
c-bordon
4b0818bc2c Revert image tag for 4.9.0 Beta1 2024-08-02 06:44:37 -03:00
Carlos Bordon
28c051a05e Merge pull request #1470 from wazuh/enhancement/1469-bump-revision-40904
Bump REVISION to 40904
2024-08-02 06:38:43 -03:00
Carlos Bordon
1f0f98ddaa Merge pull request #1471 from wazuh/maintenance/1469-change-image-tag
Changed image tag for 4.9.0 Beta1
2024-08-02 06:31:18 -03:00
c-bordon
bc35a25b3b Added beta1 tag to docker-compose 2024-08-02 06:26:00 -03:00
Enrique Araque
0399e7b16a Bump REVISION to 40904 2024-08-02 11:01:57 +02:00
David Correa Rodríguez
e8f5fd25f2 Merge pull request #1466 from wazuh/enhancement/1465-new-version-4.9.1
Bump 4.9.1 version
2024-07-23 10:08:23 +02:00
David Correa Rodríguez
125053f6d5 Bump 4.9.1 version 2024-07-23 10:00:08 +02:00
Carlos Bordon
f38bc64415 Merge pull request #1463 from wazuh/bug/758-wazuh-api-error-k8s
Add eazuh.yml file in the Wazuh dashboard image build process
2024-07-19 12:49:15 -03:00
vcerenu
2ee7cfa515 Add eazuh.yml file in the Wazuh dashboard image build process 2024-07-19 12:25:09 -03:00
David Correa Rodríguez
701fdc33bb Merge pull request #1458 from wazuh/merge-4.9.0-into-4.10.0
Merge 4.9.0 into 4.10.0
2024-07-19 12:39:18 +02:00
David Correa Rodríguez
719d4c2b05 Merge branch '4.9.0' into merge-4.9.0-into-4.10.0 2024-07-19 11:32:51 +02:00
David Correa Rodríguez
78cb2fc571 Merge pull request #1456 from wazuh/maintenance/1452-revert-image-tag
Reverted image tag for 4.9.0 Alpha3
2024-07-19 10:35:43 +02:00
David Correa Rodríguez
6f49d17696 Reverted image tag for 4.9.0 Alpha3 2024-07-19 10:33:09 +02:00
David Correa Rodríguez
f0c56d6da2 Merge pull request #1455 from wazuh/maintenance/1452-change-image-tag
Changed image tag for 4.9.0 Alpha3
2024-07-19 10:28:26 +02:00
David Correa Rodríguez
e86fbd6791 Changed image tag for 4.9.0 Alpha3 2024-07-19 10:24:57 +02:00
David Correa Rodríguez
3e120aee77 Merge pull request #1454 from wazuh/maintenance/1452-bump-revision
Bumped revision for 4.9.0 Alpha3
2024-07-19 10:22:40 +02:00
David Correa Rodríguez
e10fd22fcc Bumped revision for 4.9.0 Alpha3 2024-07-19 10:19:37 +02:00
Carlos Bordon
4c3a6696f6 Merge pull request #1449 from wazuh/merge-4.8.1-into-4.9.0
Merge 4.8.1 into 4.9.0
2024-07-18 10:31:53 -03:00
David Correa Rodríguez
5ed2095854 Merge branch '4.8.1' into merge-4.8.1-into-4.9.0 2024-07-18 15:30:25 +02:00
Carlos Bordon
f3474a392e Merge pull request #1448 from wazuh/change/1445-update-readme
Updated files of README.MD
2024-07-18 10:28:57 -03:00
David Correa Rodríguez
62fc011c2c Updated files of README.MD 2024-07-18 15:26:39 +02:00
Carlos Bordon
bdce114251 Merge pull request #1446 from wazuh/merge-4.8.1-into-4.9.0
Merge 4.8.1 into 4.9.0
2024-07-18 09:37:07 -03:00
David Correa Rodríguez
0a440c0433 Removed whitespaces 2024-07-18 14:34:12 +02:00
David Correa Rodríguez
311ffc72d8 Merge branch '4.8.1' into merge-4.8.1-into-4.9.0 2024-07-18 14:28:33 +02:00
David Correa Rodríguez
65fe95472b Merge pull request #1442 from wazuh/enhancement/1439-revert-image-tag
Reverted image tag for 4.8.1 RC4
2024-07-17 12:24:57 +02:00
David Correa Rodríguez
21e1943cab Reverted image tag for 4.8.1 RC4 2024-07-17 12:22:15 +02:00
David Correa Rodríguez
4a2d9b54d3 Merge pull request #1441 from wazuh/enhancement/1439-change-image-tag
Changed image tag for 4.8.1-RC4
2024-07-17 12:17:44 +02:00
David Correa Rodríguez
3f320be95d Changed image tag for 4.8.1-RC4 2024-07-17 12:13:52 +02:00
David Correa Rodríguez
5712d37a7a Merge pull request #1440 from wazuh/enhancement/1439-bump-revision
Bumped revision for 4.8.1 RC4
2024-07-17 12:09:30 +02:00
David Correa Rodríguez
5d5cc9d30a Bumped revision for 4.8.1 RC4 2024-07-17 12:06:16 +02:00
David Correa Rodríguez
956d42e932 Merge pull request #1436 from wazuh/enhancement/1433-revert-image-tag
Reverted image tag for 4.8.1 RC3
2024-07-15 11:32:13 +02:00
David Correa Rodríguez
1e70aad5f8 Reverted image tag for 4.8.1 RC3 2024-07-15 11:30:08 +02:00
David Correa Rodríguez
09841ba9e4 Merge pull request #1435 from wazuh/enhancement/1433-chage-image-tag
Changed image tag for 4.8.1 RC3
2024-07-15 11:26:33 +02:00
David Correa Rodríguez
c014ea77f4 Changed image tag for 4.8.1 RC3 2024-07-15 11:23:03 +02:00
David Correa Rodríguez
12d8e8f122 Merge pull request #1434 from wazuh/enhancement/1433-bump-revision
Bumped revision for 4.8.1 RC3
2024-07-15 11:16:11 +02:00
David Correa Rodríguez
fe327f10a3 Bumped revision for 4.8.1 RC3 2024-07-15 11:10:52 +02:00
David Correa Rodríguez
5063213d39 Merge pull request #1431 from wazuh/enhancement/1430-revert-image-tag
Reverted image tag for `4.9.0-alpha2`
2024-07-12 10:25:49 +02:00
David Correa Rodríguez
dca7f9382e Reverted image tag for 4.9.0-alpha2 2024-07-12 10:22:27 +02:00
David Correa Rodríguez
577e533958 Merge pull request #1429 from wazuh/enhancement/1427-change-image-tag
Changed image tag for `4.9.0-alpha2`
2024-07-12 10:17:42 +02:00
David Correa Rodríguez
98930a6708 Changed image tag for 4.9.0-alpha2 2024-07-12 09:49:35 +02:00
David Correa Rodríguez
f08a3cf64d Merge pull request #1428 from wazuh/enhancement/1427-change-revision
Bumped revision for 4.9.0-alpha2
2024-07-12 09:46:21 +02:00
David Correa Rodríguez
8cf7909bc0 Bumped revision for 4.9.0-alpha2 2024-07-12 09:40:40 +02:00
Gonzalo Acuña
0c57402b94 Merge pull request #1426 from wazuh/revert-1419-enhancement/1414-add-new-keystore
Revert "Add new keystore certificate"
2024-07-11 14:31:04 -03:00
vcerenu
1e261c165e Revert test changes 2024-07-11 14:28:12 -03:00
Victor Ereñú
b60e875962 Revert "Add new keystore certificate" 2024-07-11 23:01:18 +10:00
Victor Ereñú
693b9d9c23 Merge pull request #1424 from wazuh/enhancemment/1418-merge-4.8.1-into-4.9.0
Merge 4.8.1 into 4.9.0
2024-07-08 14:47:11 -03:00
vcerenu
a275a08cfe Upward merge 2024-07-08 11:54:01 -03:00
Gonzalo Acuña
e74db2ad83 Merge pull request #1416 from wazuh/bug/1346-enable-additional-wazuh-modules-via-dashboard-environment-variables
Removed references to module enabling because they are now enabled by default.
2024-07-04 14:57:56 -03:00
Gonzalo Acuña
2709a8e457 Merge pull request #1422 from wazuh/enhancement/1417-rollback-image-version
Rollback image version
2024-07-04 14:48:42 -03:00
vcerenu
0682effeca Rollback image version 2024-07-04 14:43:23 -03:00
Gonzalo Acuña
c248592d39 Merge pull request #1421 from wazuh/enhancement/1417-change-image-version
Change image version por rc2
2024-07-04 14:38:49 -03:00
vcerenu
6049aec381 change image version por rc2 2024-07-04 14:32:07 -03:00
Gonzalo Acuña
ad6a08c2b0 Merge pull request #1420 from wazuh/enhancement/1417-bump-revision-number
Bump revision number
2024-07-04 14:24:01 -03:00
vcerenu
a583069698 Bump revision number 2024-07-04 14:13:07 -03:00
Gonzalo Acuña
a67c407bfe Merge pull request #1419 from wazuh/enhancement/1414-add-new-keystore
Add new keystore certificate
2024-07-04 13:59:36 -03:00
vcerenu
6138516ad9 Fix wazuh documents tests 2024-07-04 13:36:55 -03:00
vcerenu
665f6fd84a Fix goss test 2024-07-04 13:01:22 -03:00
Carlos Anguita López
9c36a8a13b Removed references to modules because they are now enabled by default 2024-07-04 12:53:33 +02:00
vcerenu
2487a5481e Add new keystore generation 2024-07-02 15:01:37 -03:00
David Correa Rodríguez
8cb7da82df Merge pull request #1413 from wazuh/enhancement/1410-revert-image-tag
Reverted image tag for 4.8.1 RC1
2024-07-02 10:29:05 +02:00
David Correa Rodríguez
91513bda93 Reverted image tag for 4.8.1 RC1 2024-07-02 10:24:17 +02:00
David Correa Rodríguez
6b62f1c738 Merge pull request #1412 from wazuh/enhancement/1410-change-image-tag
Changed image tag for 4.8.1 RC1
2024-07-02 10:21:31 +02:00
David Correa Rodríguez
7257ddc0aa Changed image tag for 4.8.1 RC1 2024-07-02 10:09:45 +02:00
David Correa Rodríguez
bdd919fc48 Merge pull request #1411 from wazuh/enhancement/1410-support-4.8.1-rc1-stage
Bumped REVISION to 40814
2024-07-02 10:04:46 +02:00
David Correa Rodríguez
3112eb2bd5 Bumped REVISION to 40814 2024-07-02 09:55:52 +02:00
Gonzalo Acuña
e9ed0d1d31 Merge pull request #1405 from wazuh/enhancement/6639-docker-images-build
Modify Wazuh indexer and dashboard Dockerfles
2024-06-25 13:42:37 -03:00
vcerenu
ed9b2f0d39 change version for goss 2024-06-25 12:21:58 -03:00
vcerenu
24f12a72d7 Modify Wazuh indexer and dashboard Dockerfles 2024-06-25 09:33:41 -03:00
David Correa Rodríguez
faddbe4af4 Merge pull request #1401 from wazuh/maintenance/1398-revert-tag
Reverted image tag from 4.9.0-alpha1
2024-06-20 10:40:21 +02:00
David Correa Rodríguez
f4596dc833 Reverted image tag from 4.9.0-alpha1 2024-06-20 10:35:59 +02:00
David Correa Rodríguez
78006fc5bd Merge pull request #1400 from wazuh/maintenance/1398-change-tag
Changed image tag for 4.9.0-alpha1
2024-06-20 10:32:35 +02:00
David Correa Rodríguez
956be62183 Changed image tag for 4.9.0-alpha1 2024-06-20 10:27:30 +02:00
David Correa Rodríguez
60d6fb8b98 Merge pull request #1399 from wazuh/maintenance/bump-revision-40901
Bumped revision to 40901
2024-06-20 10:23:31 +02:00
David Correa Rodríguez
2b10eff949 Bumped revision to 40901 2024-06-20 10:20:27 +02:00
Carlos Bordon
94b8b655cd Merge pull request #1396 from wazuh/enhancement/1395-bump-4.10.0-version
Bump 4.10.0 version
2024-06-19 10:53:50 -03:00
vcerenu
8019e386bc Bump 4.10.0 version 2024-06-19 10:20:28 -03:00
Gonzalo Acuña
3398c9f2b3 Merge pull request #1391 from wazuh/merge-4.8.1-into-4.9.0
Merge 4.8.1 into 4.9.0
2024-06-12 12:45:19 -03:00
Carlos Bordon
0763499562 Merge branch '4.9.0' into merge-4.8.1-into-4.9.0 2024-06-12 12:40:15 -03:00
Gonzalo Acuña
88842eede8 Merge pull request #1390 from wazuh/merge-4.8.0-into-4.8.1
Merge 4.8.0 into 4.8.1
2024-06-12 12:35:20 -03:00
c-bordon
ef4f28a0c1 Updated revision number 2024-06-12 12:31:22 -03:00
Carlos Bordon
79cdec2032 Merge branch '4.8.1' into merge-4.8.0-into-4.8.1 2024-06-12 12:23:53 -03:00
David Correa Rodríguez
829e43511e Merge pull request #1384 from wazuh/enhancement/revert-image-tag
Reverted image tag for 4.8.0-rc4
2024-06-06 09:36:01 +02:00
David Correa Rodríguez
e759449ca2 Reverted image tag for 4.8.0-rc4 2024-06-06 09:23:18 +02:00
David Correa Rodríguez
86845841c7 Merge pull request #1383 from wazuh/enhancement/change-image-tag
Changed image tag for 4.8.0-rc4
2024-06-06 09:20:19 +02:00
David Correa Rodríguez
b9c6d1b0dc Changed image tag for 4.8.0-rc4 2024-06-06 09:17:46 +02:00
David Correa Rodríguez
7974ed0e04 Merge pull request #1382 from wazuh/enhancement/bump-revision-40812
Bumped revision to 40812
2024-06-06 09:13:30 +02:00
David Correa Rodríguez
d7d12521d2 Bumped revision to 40812 2024-06-06 09:04:49 +02:00
Gonzalo Acuña
ec68bd1049 Merge pull request #1380 from wazuh/maintenance/1378-bump-4.8.1
Bump version and revision
2024-06-04 13:27:19 -03:00
Gonzalo Acuña
0650c53e47 Version bump 2024-06-04 13:02:47 -03:00
Gonzalo Acuña
3dfb3505a2 Merge pull request #1379 from wazuh/maintenance/1378-bump-4.8.1
Bump to 4.8.1
2024-06-04 12:12:14 -03:00
Gonzalo Acuña
f8b2399347 Bump to 4.8.1 2024-06-04 11:43:03 -03:00
Gonzalo Acuña
9d710e182d Merge pull request #1374 from wazuh/1371-merge-4.8.0-into-4.9.0
Merge 4.8.0 into 4.9.0
2024-05-31 11:22:07 -03:00
vcerenu
d59ee1bd35 merge 4.8.0 into 4.9.0 2024-05-31 11:00:50 -03:00
Gonzalo Acuña
53d1ad8e3e Merge pull request #1373 from wazuh/merge-4.7.5-into-4.8.0
Merge 4.7.5 into 4.8.0
2024-05-31 10:34:38 -03:00
vcerenu
f63c34d73b merge 4.7.5 into 4.8.0 2024-05-31 10:08:21 -03:00
Carlos Bordon
e60187803c Merge pull request #1366 from wazuh/1363-rollback-image-version
Rollback image version rc2
2024-05-29 12:30:57 -03:00
vcerenu
842180baa6 rollback image version 2024-05-29 12:22:43 -03:00
Carlos Bordon
f0488805a4 Merge pull request #1365 from wazuh/1363-commit-image-version
Commit image version rc2
2024-05-29 12:15:40 -03:00
vcerenu
ac6d9e576c commit image version 2024-05-29 12:02:50 -03:00
Carlos Bordon
2b44780605 Merge pull request #1364 from wazuh/1363-bump-revision
Bump revision rc2
2024-05-29 11:55:12 -03:00
vcerenu
c6b38e3de9 bump revision 2024-05-29 11:39:04 -03:00
David Correa Rodríguez
cfa0a220d6 Merge pull request #1360 from wazuh/1357-rollback-image-version
Rollback image version rc3
2024-05-24 09:53:14 +02:00
vcerenu
2125b08544 rollback image version 2024-05-24 04:46:12 -03:00
David Correa Rodríguez
98c0431498 Merge pull request #1359 from wazuh/1357-commit-image-version 2024-05-24 09:39:17 +02:00
vcerenu
e95dd33a89 commit image version 2024-05-24 04:36:20 -03:00
David Correa Rodríguez
817e864977 Merge pull request #1358 from wazuh/1357-bump-revision 2024-05-24 09:29:43 +02:00
vcerenu
78048b6a65 bump revision 2024-05-24 04:23:46 -03:00
Carlos Bordon
169d24af64 Merge pull request #1355 from wazuh/merge-4.7.5-into-4.8.0
Merge 4.7.5 into 4.8.0
2024-05-22 15:02:29 -03:00
Gonzalo Acuña
042d0bf075 Merge branch '4.8.0' into merge-4.7.5-into-4.8.0 2024-05-22 14:58:27 -03:00
Carlos Bordon
bac9daa337 Merge pull request #1354 from wazuh/1348-revert-tag
Revert docker image tag
2024-05-22 14:40:41 -03:00
Gonzalo Acuña
2c39ce5303 Revert docker image tag 2024-05-22 14:31:10 -03:00
Carlos Bordon
9487dd592e Merge pull request #1353 from wazuh/1348-change-tag
Change docker image tag
2024-05-22 14:19:29 -03:00
Gonzalo Acuña
a55eb7f14a Change docker image tag 2024-05-22 14:15:51 -03:00
Carlos Bordon
b0d14dca28 Merge pull request #1352 from wazuh/1348-bump-revision
Bump revision
2024-05-22 14:05:38 -03:00
Gonzalo Acuña
f96b340074 Bump revision 2024-05-22 13:57:22 -03:00
Gonzalo Acuña
2b25f362fd Merge pull request #1351 from wazuh/1348-rollback-image-version
Rollback rc1 image version
2024-05-22 12:05:17 -03:00
vcerenu
2e18b6a873 Rollback image version 2024-05-22 11:55:43 -03:00
Gonzalo Acuña
2bd7c0d6f1 Merge pull request #1350 from wazuh/1348-commit-image-version
Commit rc1 image version
2024-05-22 11:50:36 -03:00
vcerenu
ec69c20413 commit image version 2024-05-22 11:44:13 -03:00
Gonzalo Acuña
7df0ee2a22 Merge pull request #1345 from wazuh/bump-4.7.5-version
Bump 4.7.5 version
2024-05-15 07:27:47 -03:00
vcerenu
db89d2154f bump 4.7.5 version 2024-05-15 07:04:04 -03:00
David Correa Rodríguez
824265943f Merge pull request #1342 from wazuh/rollback-image-tag
Rollback image tag
2024-05-14 11:16:20 +02:00
vcerenu
de2f3995ec rollback image tag 2024-05-14 06:09:28 -03:00
David Correa Rodríguez
52eae12790 Merge pull request #1341 from wazuh/commit-image-tag
Commit image tag to rc2
2024-05-14 11:01:15 +02:00
vcerenu
efa179698e commit image tag 2024-05-14 05:57:49 -03:00
David Correa Rodríguez
5963054220 Merge pull request #1340 from wazuh/bump-revision-number
Bump revision number
2024-05-14 10:49:57 +02:00
vcerenu
902b165719 bump revision number 2024-05-14 05:39:47 -03:00
Victor Ereñú
7d2d8fe1c9 Merge pull request #1333 from wazuh/rollback-image-tag
rollback image tag
2024-05-03 05:32:16 -03:00
vcerenu
317643eabf rollback image tag 2024-05-03 05:27:47 -03:00
Victor Ereñú
d57ce6b432 Merge pull request #1332 from wazuh/change-image-tag
Change image tag for rc1
2024-05-03 05:20:40 -03:00
vcerenu
ef98a5dd83 change image tag for rc1 2024-05-03 05:13:12 -03:00
Victor Ereñú
c00960f7b4 Merge pull request #1331 from wazuh/bump-revision
Bump revision
2024-05-03 05:06:23 -03:00
vcerenu
097af398df bump revision 2024-05-03 04:50:08 -03:00
Victor Ereñú
b022f9f5c1 Merge pull request #1325 from wazuh/merge-4.8.0-into-4.9.0
Merge 4.8.0 into 4.9.0
2024-04-30 07:18:11 -03:00
vcerenu
390a71ebea resolving conflicts 2024-04-30 07:03:06 -03:00
Victor Ereñú
7063480f1f Merge pull request #1324 from wazuh/merge-4.7.4-into-4.8.0
Merge 4.7.4 into 4.8.0
2024-04-30 06:57:18 -03:00
vcerenu
4c74ebfc80 resolving conflicts 2024-04-30 05:39:50 -03:00
David Correa Rodríguez
ec76ea8d92 Merge pull request #1318 from wazuh/rollback-image-version 2024-04-25 10:32:50 +02:00
vcerenu
ce0a855c3d rollback image name 2024-04-25 05:25:17 -03:00
David Correa Rodríguez
d10af3b669 Merge pull request #1317 from wazuh/change-image-rc2 2024-04-25 10:19:01 +02:00
vcerenu
b7609311dc change image version 2024-04-25 05:12:59 -03:00
Victor Ereñú
81c42d02b1 Merge pull request #1316 from wazuh/bump-revision-474
Bump revision 40717
2024-04-25 05:09:32 -03:00
vcerenu
ee3159b225 bump revision 2024-04-25 04:58:29 -03:00
David Correa Rodríguez
3bed3a3a31 Merge pull request #1311 from wazuh/revert-tag-4.7.4-rc1
Reverted tag for 4.7.4 RC1
2024-04-23 09:51:10 +02:00
David Correa Rodríguez
9109104af2 Reverted tag for 4.7.4 RC1 2024-04-23 09:46:03 +02:00
David Correa Rodríguez
2efc6c56fa Merge pull request #1310 from wazuh/change-tag-4.7.4-rc1
Updated tag for 4.7.4 RC1
2024-04-23 09:41:01 +02:00
David Correa Rodríguez
daf1e837a1 Updated tag for 4.7.4 RC1 2024-04-23 09:32:02 +02:00
David Correa Rodríguez
9881957f86 Merge pull request #1309 from wazuh/bump-revision-40716
Bumped revision to 40716
2024-04-23 09:24:55 +02:00
David Correa Rodríguez
8c874235bf Bumped revision to 40716 2024-04-23 09:20:23 +02:00
Victor Ereñú
1e7d1c62ec Merge pull request #1305 from wazuh/revert-beta6
Rename docker image for 4.8.0
2024-04-19 05:57:31 -03:00
vcerenu
72421d608a revert beta6 changes 2024-04-19 05:50:57 -03:00
Victor Ereñú
a9efe64d33 Merge pull request #1304 from wazuh/beta6-tag
Rename docker image for beta6
2024-04-19 05:36:15 -03:00
vcerenu
650d2936c4 add beta6 tag 2024-04-19 05:19:41 -03:00
Victor Ereñú
c9cf940a19 Merge pull request #1303 from wazuh/bump-revision-40808
Bumped revision to 40808
2024-04-19 05:16:42 -03:00
David Correa Rodríguez
353ea5976a Bumped revision to 40808 2024-04-19 09:56:27 +02:00
Gonzalo Acuña
d2181f78cd Merge pull request #1300 from wazuh/bump-version-4.7.4
Bumped version to 4.7.4
2024-04-18 10:24:02 -03:00
David Correa Rodríguez
d904595787 Bumped version to 4.7.4 2024-04-18 15:16:32 +02:00
David Correa Rodríguez
6afcc00ba7 Merge pull request #1284 from wazuh/merge-4.8.2-into-4.9.0
Merge 4.8.2 into 4.9.0
2024-04-01 11:07:53 +02:00
David Correa Rodríguez
b13aef91d1 Merge branch '4.8.2' into merge-4.8.2-into-4.9.0 2024-04-01 10:58:25 +02:00
David Correa Rodríguez
b61953cc35 Merge pull request #1283 from wazuh/merge-4.8.1-into-4.8.2
Merge 4.8.1 into 4.8.2
2024-04-01 10:57:54 +02:00
David Correa Rodríguez
4b98b24999 Merge branch '4.8.1' into merge-4.8.1-into-4.8.2 2024-04-01 10:48:42 +02:00
David Correa Rodríguez
1fea52d4d0 Merge pull request #1282 from wazuh/merge-4.8.0-into-4.8.1
Merge 4.8.0 into 4.8.1
2024-04-01 10:47:39 +02:00
David Correa Rodríguez
97ba114f8e Merge branch '4.8.0' into merge-4.8.0-into-4.8.1 2024-04-01 10:06:22 +02:00
Gonzalo Acuña
12653111bd Merge pull request #1274 from wazuh/513-delete-create-user
Delete create_user.py script
2024-03-25 09:45:50 -03:00
vcerenu
e03cfde3bc delete create_user.py script 2024-03-22 08:47:32 -03:00
Gonzalo Acuña
654d1dbf36 Merge pull request #1268 from wazuh/bug/1193-review-version-references-in-the-master-branch
Fixed references to 4.8 version
2024-03-20 12:58:19 -03:00
David Correa Rodríguez
219843dbb8 Fixed references to 4.8 version 2024-03-19 11:32:06 +01:00
Gonzalo Acuña
92eef99c13 Merge pull request #1250 from wazuh/merge-4.8.2-into-4.9.0
Merge 4.8.2 into 4.9.0
2024-03-04 13:42:59 -03:00
David Correa Rodríguez
f5b237458a Merge branch '4.8.2' into merge-4.8.2-into-4.9.0 2024-03-04 17:39:42 +01:00
Gonzalo Acuña
04c64e78bc Merge pull request #1249 from wazuh/merge-4.8.1-into-4.8.2
Merge 4.8.1 into 4.8.2
2024-03-04 13:38:09 -03:00
David Correa Rodríguez
8d9d04adc5 Merge branch '4.8.1' into merge-4.8.1-into-4.8.2 2024-03-04 17:31:52 +01:00
Gonzalo Acuña
1e8db5cfbd Merge pull request #1248 from wazuh/merge-4.8.0-into-4.8.1
Merge 4.8.0 into 4.8.1
2024-03-04 13:28:41 -03:00
David Correa Rodríguez
59e0ec54bd Merge branch '4.8.0' into merge-4.8.0-into-4.8.1 2024-03-04 17:10:56 +01:00
Gonzalo Acuña
8f3478361d Merge pull request #1242 from wazuh/merge-4.8.2-into-4.9.0
Merge 4.8.2 into 4.9.0
2024-03-01 15:41:47 -03:00
Gonzalo Acuña
6a242a36ce Merge pull request #1240 from wazuh/merge-4.8.1-into-4.8.2
Merge 4.8.1 into 4.8.2
2024-03-01 14:43:38 -03:00
Gonzalo Acuña
520291162f Merge pull request #1238 from wazuh/merge-4.8.0-into-4.8.1
Merge 4.8.0 into 4.8.1
2024-03-01 08:42:44 -03:00
David Correa Rodríguez
63217770f7 Merge branch '4.8.0' into merge-4.8.0-into-4.8.1 2024-03-01 12:32:27 +01:00
Gonzalo Acuña
91a56eb429 Merge pull request #1204 from wazuh/merge-4.8.2-into-master
Merge `4.8.2` into `master`
2024-02-07 13:52:49 -03:00
Gonzalo Acuña
c99985f479 Merge pull request #1203 from wazuh/merge-4.8.1-into-4.8.2
Merge `4.8.1` into `4.8.2`
2024-02-07 13:46:23 -03:00
Gonzalo Acuña
a6d0a1ffeb Merge pull request #1202 from wazuh/merge-4.8.0-into-4.8.1
Merge `4.8.0` into `4.8.1`
2024-02-07 13:42:45 -03:00
Gonzalo Acuña
f746e96b74 Merge branch '4.8.1' into merge-4.8.0-into-4.8.1 2024-02-07 13:16:49 -03:00
Gonzalo Acuña
43ecb7f623 Merge pull request #1186 from wazuh/merge-4.8.2-into-master
Merge 4.8.2 into master
2024-01-10 14:09:13 -03:00
David Correa Rodríguez
0567dd1632 Merge branch '4.8.2' into merge-4.8.2-into-master 2024-01-10 18:04:39 +01:00
Gonzalo Acuña
6ef6883b8a Merge pull request #1185 from wazuh/merge-4.8.1-into-4.8.2
Merge 4.8.1 into 4.8.2
2024-01-10 14:03:25 -03:00
David Correa Rodríguez
41b25fe60f Merge branch '4.8.1' into merge-4.8.1-into-4.8.2 2024-01-10 18:01:07 +01:00
Gonzalo Acuña
a89eddb135 Merge pull request #1184 from wazuh/merge-4.8.0-into-4.8.1
Merge 4.8.0 into 4.8.1
2024-01-10 13:59:02 -03:00
David Correa Rodríguez
284b945cd8 Merge branch '4.8.1' into merge-4.8.1-into-master 2024-01-10 17:51:03 +01:00
Gonzalo Acuña
f1978f4b88 Merge pull request #1177 from wazuh/merge-4.8.2-into-master
Merge 4.8.2 into master
2024-01-04 15:07:53 -03:00
Gonzalo Acuña
b6ebf179db Merge branch 'master' into merge-4.8.2-into-master 2024-01-04 15:03:16 -03:00
Gonzalo Acuña
086b24c490 Merge pull request #1176 from wazuh/merge-4.8.1-into-4.8.2
Merge 4.8.1 into 4.8.2
2024-01-04 14:57:53 -03:00
Gonzalo Acuña
4e8569009e Merge pull request #1175 from wazuh/merge-4.8.0-into-4.8.1
Merge 4.8.0 into 4.8.1
2024-01-04 14:45:10 -03:00
Gonzalo Acuña
32809c9c52 Merge pull request #1170 from wazuh/bump-4.8.2
Bump 4.8.2 version
2024-01-04 10:06:05 -03:00
vcerenu
64ab19be1a bump 4.8.2 version 2024-01-04 10:01:05 -03:00
Gonzalo Acuña
27888e0b83 Merge pull request #1162 from wazuh/merge-4.8.1-into-master
Merge 4.8.1 into master
2023-12-20 15:23:00 -03:00
David Correa Rodríguez
5791218f83 Merge branch '4.8.1' into merge-4.8.1-into-master 2023-12-20 19:06:34 +01:00
Gonzalo Acuña
cc05d1a251 Merge pull request #1161 from wazuh/merge-4.8.0-into-4.8.1
Merge 4.8.0 into 4.8.1
2023-12-20 14:59:58 -03:00
David Correa Rodríguez
81b0172b37 Merge branch '4.8.0' into merge-4.8.0-into-4.8.1 2023-12-20 18:48:06 +01:00
David Correa Rodríguez
4c82d16144 Merge branch '4.7.2' into merge-4.8.0-into-4.8.1 2023-12-20 18:39:30 +01:00
Gonzalo Acuña
e756c20053 Merge pull request #1138 from wazuh/merge-4.8.1-into-master
Merge 4.8.1 into master
2023-11-27 14:23:28 -03:00
David Correa Rodríguez
0ef3428788 Merge branch '4.8.1' into merge-4.8.1-into-master 2023-11-27 18:18:42 +01:00
Gonzalo Acuña
52ddc7607f Merge pull request #1137 from wazuh/merge-4.8.0-into-4.8.1
Merge 4.8.0 into 4.8.1
2023-11-27 14:05:07 -03:00
David Correa Rodríguez
957de01c8f Merge branch '4.8.0' into merge-4.8.0-into-4.8.1 2023-11-27 17:56:51 +01:00
Gonzalo Acuña
45ca9a1b37 Merge pull request #1127 from wazuh/enhancement/bump-version-4.8.1
Bump version to 4.8.1
2023-11-22 08:39:12 -03:00
David Correa Rodríguez
8002f2d402 Bump version to 4.8.1 2023-11-22 11:18:14 +01:00
Victor Ereñú
dc167c2316 Merge pull request #1114 from wazuh/merge-4.8.0-into-master
Merge 4.8.0 into master
2023-11-14 08:08:04 -03:00
Victor Ereñú
6591e7e4a1 Merge pull request #1109 from wazuh/merge-4.7.0-into.4.7.1
Merge 4.7.0 into 4.7.1
2023-11-14 04:34:08 -03:00
vcerenu
a97c14e807 resolving conflicts 2023-11-14 04:29:00 -03:00
Carlos Bordon
49bc23682f Merge pull request #1093 from wazuh/merge-4.8.0-into-master
Merge 4.8.0 into master
2023-10-31 14:03:42 -03:00
David Correa Rodríguez
122acb404d Merge pull request #1083 from wazuh/merge-4.8.0-into-master
Merge 4.8.0 into master
2023-10-24 10:20:14 +02:00
David Correa Rodríguez
efac96b011 Merge branch '4.8.0' into merge-4.8.0-into-master 2023-10-24 10:12:51 +02:00
Victor Ereñú
ee9fdc383a Merge pull request #974 from DevinNorgarb/patch-1
Fix typos in README.md
2023-10-24 04:23:42 -03:00
Victor Ereñú
103c7e66df Merge pull request #1069 from wazuh/merge-4.8.0-into-master
Merge 4.8.0 into master
2023-10-23 05:48:29 -03:00
David Correa Rodríguez
8aef2921d9 Merge pull request #1055 from wazuh/enhancement/bump-version-4.9.0
Bump version to 4.9.0
2023-10-13 14:07:35 +02:00
David Correa Rodríguez
0d66cfbd5a Bump version to 4.9.0 2023-10-13 13:29:18 +02:00
Devin Norgarb
77c18adce5 Fix typos in README.md
Just a few typos that needed to be addressed.
2023-09-02 14:03:24 +02:00
30 changed files with 728 additions and 319 deletions

6
.env
View File

@@ -1,6 +1,6 @@
WAZUH_VERSION=4.8.0
WAZUH_IMAGE_VERSION=4.8.0
WAZUH_VERSION=4.11.1
WAZUH_IMAGE_VERSION=4.11.1
WAZUH_TAG_REVISION=1
FILEBEAT_TEMPLATE_BRANCH=4.8.0
FILEBEAT_TEMPLATE_BRANCH=4.11.1
WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.4.tar.gz
WAZUH_UI_REVISION=1

2
.github/.goss.yaml vendored
View File

@@ -56,7 +56,7 @@ package:
wazuh-manager:
installed: true
versions:
- 4.8.0
- 4.11.1
port:
tcp:1514:
listening: true

245
.github/free-disk-space/action.yml vendored Normal file
View File

@@ -0,0 +1,245 @@
name: "Free Disk Space (Ubuntu)"
description: "A configurable GitHub Action to free up disk space on an Ubuntu GitHub Actions runner."
# Thanks @jlumbroso for the action code https://github.com/jlumbroso/free-disk-space/
# See: https://docs.github.com/en/actions/creating-actions/metadata-syntax-for-github-actions#branding
inputs:
android:
description: "Remove Android runtime"
required: false
default: "true"
dotnet:
description: "Remove .NET runtime"
required: false
default: "true"
haskell:
description: "Remove Haskell runtime"
required: false
default: "true"
# option inspired by:
# https://github.com/apache/flink/blob/master/tools/azure-pipelines/free_disk_space.sh
large-packages:
description: "Remove large packages"
required: false
default: "true"
docker-images:
description: "Remove Docker images"
required: false
default: "true"
# option inspired by:
# https://github.com/actions/virtual-environments/issues/2875#issuecomment-1163392159
tool-cache:
description: "Remove image tool cache"
required: false
default: "false"
swap-storage:
description: "Remove swap storage"
required: false
default: "true"
runs:
using: "composite"
steps:
- shell: bash
run: |
# ======
# MACROS
# ======
# macro to print a line of equals
# (silly but works)
printSeparationLine() {
str=${1:=}
num=${2:-80}
counter=1
output=""
while [ $counter -le $num ]
do
output="${output}${str}"
counter=$((counter+1))
done
echo "${output}"
}
# macro to compute available space
# REF: https://unix.stackexchange.com/a/42049/60849
# REF: https://stackoverflow.com/a/450821/408734
getAvailableSpace() { echo $(df -a $1 | awk 'NR > 1 {avail+=$4} END {print avail}'); }
# macro to make Kb human readable (assume the input is Kb)
# REF: https://unix.stackexchange.com/a/44087/60849
formatByteCount() { echo $(numfmt --to=iec-i --suffix=B --padding=7 $1'000'); }
# macro to output saved space
printSavedSpace() {
saved=${1}
title=${2:-}
echo ""
printSeparationLine '*' 80
if [ ! -z "${title}" ]; then
echo "=> ${title}: Saved $(formatByteCount $saved)"
else
echo "=> Saved $(formatByteCount $saved)"
fi
printSeparationLine '*' 80
echo ""
}
# macro to print output of dh with caption
printDH() {
caption=${1:-}
printSeparationLine '=' 80
echo "${caption}"
echo ""
echo "$ dh -h /"
echo ""
df -h /
echo "$ dh -a /"
echo ""
df -a /
echo "$ dh -a"
echo ""
df -a
printSeparationLine '=' 80
}
# ======
# SCRIPT
# ======
# Display initial disk space stats
AVAILABLE_INITIAL=$(getAvailableSpace)
AVAILABLE_ROOT_INITIAL=$(getAvailableSpace '/')
printDH "BEFORE CLEAN-UP:"
echo ""
# Option: Remove Android library
if [[ ${{ inputs.android }} == 'true' ]]; then
BEFORE=$(getAvailableSpace)
sudo rm -rf /usr/local/lib/android || true
AFTER=$(getAvailableSpace)
SAVED=$((AFTER-BEFORE))
printSavedSpace $SAVED "Android library"
fi
# Option: Remove .NET runtime
if [[ ${{ inputs.dotnet }} == 'true' ]]; then
BEFORE=$(getAvailableSpace)
# https://github.community/t/bigger-github-hosted-runners-disk-space/17267/11
sudo rm -rf /usr/share/dotnet || true
AFTER=$(getAvailableSpace)
SAVED=$((AFTER-BEFORE))
printSavedSpace $SAVED ".NET runtime"
fi
# Option: Remove Haskell runtime
if [[ ${{ inputs.haskell }} == 'true' ]]; then
BEFORE=$(getAvailableSpace)
sudo rm -rf /opt/ghc || true
sudo rm -rf /usr/local/.ghcup || true
AFTER=$(getAvailableSpace)
SAVED=$((AFTER-BEFORE))
printSavedSpace $SAVED "Haskell runtime"
fi
# Option: Remove large packages
# REF: https://github.com/apache/flink/blob/master/tools/azure-pipelines/free_disk_space.sh
if [[ ${{ inputs.large-packages }} == 'true' ]]; then
BEFORE=$(getAvailableSpace)
sudo apt-get remove -y '^aspnetcore-.*' || echo "::warning::The command [sudo apt-get remove -y '^aspnetcore-.*'] failed to complete successfully. Proceeding..."
sudo apt-get remove -y '^dotnet-.*' --fix-missing || echo "::warning::The command [sudo apt-get remove -y '^dotnet-.*' --fix-missing] failed to complete successfully. Proceeding..."
sudo apt-get remove -y '^llvm-.*' --fix-missing || echo "::warning::The command [sudo apt-get remove -y '^llvm-.*' --fix-missing] failed to complete successfully. Proceeding..."
sudo apt-get remove -y 'php.*' --fix-missing || echo "::warning::The command [sudo apt-get remove -y 'php.*' --fix-missing] failed to complete successfully. Proceeding..."
sudo apt-get remove -y '^mongodb-.*' --fix-missing || echo "::warning::The command [sudo apt-get remove -y '^mongodb-.*' --fix-missing] failed to complete successfully. Proceeding..."
sudo apt-get remove -y '^mysql-.*' --fix-missing || echo "::warning::The command [sudo apt-get remove -y '^mysql-.*' --fix-missing] failed to complete successfully. Proceeding..."
sudo apt-get remove -y azure-cli google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri --fix-missing || echo "::warning::The command [sudo apt-get remove -y azure-cli google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri --fix-missing] failed to complete successfully. Proceeding..."
sudo apt-get remove -y google-cloud-sdk --fix-missing || echo "::debug::The command [sudo apt-get remove -y google-cloud-sdk --fix-missing] failed to complete successfully. Proceeding..."
sudo apt-get remove -y google-cloud-cli --fix-missing || echo "::debug::The command [sudo apt-get remove -y google-cloud-cli --fix-missing] failed to complete successfully. Proceeding..."
sudo apt-get autoremove -y || echo "::warning::The command [sudo apt-get autoremove -y] failed to complete successfully. Proceeding..."
sudo apt-get clean || echo "::warning::The command [sudo apt-get clean] failed to complete successfully. Proceeding..."
AFTER=$(getAvailableSpace)
SAVED=$((AFTER-BEFORE))
printSavedSpace $SAVED "Large misc. packages"
fi
# Option: Remove Docker images
if [[ ${{ inputs.docker-images }} == 'true' ]]; then
BEFORE=$(getAvailableSpace)
sudo docker image prune --all --force || true
AFTER=$(getAvailableSpace)
SAVED=$((AFTER-BEFORE))
printSavedSpace $SAVED "Docker images"
fi
# Option: Remove tool cache
# REF: https://github.com/actions/virtual-environments/issues/2875#issuecomment-1163392159
if [[ ${{ inputs.tool-cache }} == 'true' ]]; then
BEFORE=$(getAvailableSpace)
sudo rm -rf "$AGENT_TOOLSDIRECTORY" || true
AFTER=$(getAvailableSpace)
SAVED=$((AFTER-BEFORE))
printSavedSpace $SAVED "Tool cache"
fi
# Option: Remove Swap storage
if [[ ${{ inputs.swap-storage }} == 'true' ]]; then
BEFORE=$(getAvailableSpace)
sudo swapoff -a || true
sudo rm -f /mnt/swapfile || true
free -h
AFTER=$(getAvailableSpace)
SAVED=$((AFTER-BEFORE))
printSavedSpace $SAVED "Swap storage"
fi
# Output saved space statistic
AVAILABLE_END=$(getAvailableSpace)
AVAILABLE_ROOT_END=$(getAvailableSpace '/')
echo ""
printDH "AFTER CLEAN-UP:"
echo ""
echo ""
echo "/dev/root:"
printSavedSpace $((AVAILABLE_ROOT_END - AVAILABLE_ROOT_INITIAL))
echo "overall:"
printSavedSpace $((AVAILABLE_END - AVAILABLE_INITIAL))

View File

@@ -0,0 +1,167 @@
run-name: Launch Push Docker Images - ${{ inputs.id }}
name: Push Docker Images
on:
workflow_dispatch:
inputs:
image_tag:
description: 'Docker image tag'
default: '4.11.1'
required: true
docker_reference:
description: 'wazuh-docker reference'
default: 'v4.11.1'
required: true
products:
description: 'Comma-separated list of the image names to build and push'
default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer'
required: true
filebeat_module_version:
description: 'Filebeat module version'
default: '0.4'
required: true
revision:
description: 'Package revision'
default: '1'
required: true
push_images:
description: 'Push images'
type: boolean
default: true
required: true
id:
description: "ID used to identify the workflow uniquely."
type: string
required: false
dev:
description: "Add tag suffix '-dev' to the image tag ?"
type: boolean
default: true
required: false
workflow_call:
inputs:
image_tag:
description: 'Docker image tag'
default: '4.11.1'
required: true
type: string
docker_reference:
description: 'wazuh-docker reference'
default: 'v4.11.1'
required: false
type: string
products:
description: 'Comma-separated list of the image names to build and push'
default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer'
required: true
type: string
filebeat_module_version:
description: 'Filebeat module version'
default: '0.4'
required: true
type: string
revision:
description: 'Package revision'
default: '1'
required: true
type: string
push_images:
description: 'Push images'
type: boolean
default: true
required: true
id:
description: "ID used to identify the workflow uniquely."
type: string
required: false
dev:
description: "Add tag suffix '-dev' to the image tag ?"
type: boolean
default: false
required: false
jobs:
build-and-push:
runs-on: ubuntu-latest
steps:
- name: Print inputs
run: |
echo "---------------------------------------------"
echo "Running Procedure_push_docker_images workflow"
echo "---------------------------------------------"
echo "* BRANCH: ${{ github.ref }}"
echo "* COMMIT: ${{ github.sha }}"
echo "---------------------------------------------"
echo "Inputs provided:"
echo "---------------------------------------------"
echo "* id: ${{ inputs.id }}"
echo "* image_tag: ${{ inputs.image_tag }}"
echo "* docker_reference: ${{ inputs.docker_reference }}"
echo "* products: ${{ inputs.products }}"
echo "* filebeat_module_version: ${{ inputs.filebeat_module_version }}"
echo "* revision: ${{ inputs.revision }}"
echo "* push_images: ${{ inputs.push_images }}"
echo "* dev: ${{ inputs.dev }}"
echo "---------------------------------------------"
- name: Checkout repository
uses: actions/checkout@v4
with:
ref: ${{ inputs.docker_reference }}
- name: Log in to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}
- name: Install Docker Compose
run: |
sudo apt-get update
sudo apt-get install -y docker-compose
echo "Installed Docker Compose version: $(docker-compose --version)"
- name: Build Wazuh images
run: |
IMAGE_TAG=${{ inputs.image_tag }}
FILEBEAT_MODULE_VERSION=${{ inputs.filebeat_module_version }}
REVISION=${{ inputs.revision }}
if [[ "$IMAGE_TAG" == *"-"* ]]; then
IFS='-' read -r -a tokens <<< "$IMAGE_TAG"
if [ -z "${tokens[1]}" ]; then
echo "Invalid image tag: $IMAGE_TAG"
exit 1
fi
DEV_STAGE=${tokens[1]}
WAZUH_VER=${tokens[0]}
./build-docker-images/build-images.sh -v $WAZUH_VER -r $REVISION -d $DEV_STAGE -f $FILEBEAT_MODULE_VERSION
else
./build-docker-images/build-images.sh -v $IMAGE_TAG -r $REVISION -f $FILEBEAT_MODULE_VERSION
fi
# Save .env file (generated by build-images.sh) contents to $GITHUB_ENV
ENV_FILE_PATH=".env"
if [ -f $ENV_FILE_PATH ]; then
while IFS= read -r line || [ -n "$line" ]; do
echo "$line" >> $GITHUB_ENV
done < $ENV_FILE_PATH
else
echo "The environment file $ENV_FILE_PATH does not exist!"
exit 1
fi
- name: Tag and Push Wazuh images
if: ${{ inputs.push_images }}
run: |
IMAGE_TAG="${{ inputs.image_tag }}$( [ "${{ inputs.dev }}" == "true" ] && echo '-dev' || true )"
IMAGE_NAMES=${{ inputs.products }}
IFS=',' read -r -a images <<< "$IMAGE_NAMES"
for image in "${images[@]}"; do
echo "Tagging and pushing wazuh/$image:${WAZUH_VERSION} to wazuh/$image:$IMAGE_TAG"
docker tag wazuh/$image:${WAZUH_VERSION} wazuh/$image:$IMAGE_TAG
echo "Pushing wazuh/$image:$IMAGE_TAG ..."
docker push wazuh/$image:$IMAGE_TAG
done

View File

@@ -10,6 +10,11 @@ jobs:
- name: Check out code
uses: actions/checkout@v3
- name: Install docker-compose
run: |
curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
chmod +x /usr/local/bin/docker-compose
- name: Build Wazuh images
run: build-docker-images/build-images.sh
@@ -24,21 +29,21 @@ jobs:
docker save wazuh/wazuh-dashboard:${{env.WAZUH_IMAGE_VERSION}} -o /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-dashboard.tar
- name: Temporarily save Wazuh manager Docker image
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: docker-artifact-manager
path: /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-manager.tar
retention-days: 1
- name: Temporarily save Wazuh indexer Docker image
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: docker-artifact-indexer
path: /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-indexer.tar
retention-days: 1
- name: Temporarily save Wazuh dashboard Docker image
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: docker-artifact-dashboard
path: /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-dashboard.tar
@@ -63,21 +68,26 @@ jobs:
- name: Check out code
uses: actions/checkout@v3
- name: Install docker-compose
run: |
curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
chmod +x /usr/local/bin/docker-compose
- name: Create enviroment variables
run: cat .env > $GITHUB_ENV
- name: Retrieve saved Wazuh indexer Docker image
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: docker-artifact-indexer
- name: Retrieve saved Wazuh manager Docker image
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: docker-artifact-manager
- name: Retrieve saved Wazuh dashboard Docker image
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: docker-artifact-dashboard
@@ -186,29 +196,29 @@ jobs:
- name: Check out code
uses: actions/checkout@v3
- name: Install docker-compose
run: |
curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
chmod +x /usr/local/bin/docker-compose
- name: Create enviroment variables
run: cat .env > $GITHUB_ENV
- name: free disk space
run: |
sudo swapoff -a
sudo rm -f /swapfile
sudo apt clean
docker rmi $(docker image ls -aq)
df -h
uses: ./.github/free-disk-space
- name: Retrieve saved Wazuh dashboard Docker image
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: docker-artifact-dashboard
- name: Retrieve saved Wazuh manager Docker image
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: docker-artifact-manager
- name: Retrieve saved Wazuh indexer Docker image
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: docker-artifact-indexer
@@ -232,7 +242,7 @@ jobs:
echo 'Waiting for Wazuh indexer start'
free -m
df -h
sleep 10
sleep 120
done
status_green="`curl -XGET "https://0.0.0.0:9200/_cluster/health" -u admin:SecretPassword -k -s | grep green | wc -l`"
if [[ $status_green -eq 1 ]]; then
@@ -270,7 +280,7 @@ jobs:
sleep 10
done
docs="`curl -XGET "https://0.0.0.0:9200/wazuh-alerts*/_count" -u admin:SecretPassword -k -s | jq -r ".count"`"
if [[ $docs -gt 1 ]]; then
if [[ $docs -gt 0 ]]; then
echo "wazuh-alerts index documents: ${docs}"
else
echo "wazuh-alerts index documents: ${docs}"

View File

@@ -1,11 +1,137 @@
# Change Log
All notable changes to this project will be documented in this file.
## [4.11.1]
### Added
- None
### Changed
- None
### Fixed
- None
### Deleted
- None
## [4.11.0]
### Added
- None
### Changed
- None
### Fixed
- Change the cleaning disk step ([#1663](https://github.com/wazuh/wazuh-docker/pull/1663))
### Deleted
- None
## [4.10.1]
### Added
- None
### Changed
- None
### Fixed
- None
### Deleted
- None
## [4.10.0]
### Added
- Improve the push docker images workflow ([#1551](https://github.com/wazuh/wazuh-docker/pull/1551))
- Update the Procedure push docker images workflow file ([#1524](https://github.com/wazuh/wazuh-docker/pull/1524))
- Add the push_docker_images procedure workflow file ([#1518](https://github.com/wazuh/wazuh-docker/pull/1518))
### Changed
- None
### Fixed
- Add unset capabilities. ([#1619](https://github.com/wazuh/wazuh-docker/pull/1619))
- Removed references to module enabling because they are now enabled by default. ([#1416](https://github.com/wazuh/wazuh-docker/pull/1416))
### Deleted
- None
## [4.9.2]
### Added
- Update Wazuh to version [4.9.2](https://github.com/wazuh/wazuh/blob/v4.9.2/CHANGELOG.md#v492)
## [4.9.1]
### Added
- None
### Changed
- None
### Fixed
- Fix typos into Wazuh manager entrypoint ([#1569](https://github.com/wazuh/wazuh-docker/pull/1569))
### Deleted
- None
## Wazuh Docker v4.9.0
### Added
- Update Wazuh to version [4.9.0](https://github.com/wazuh/wazuh/blob/v4.9.0/CHANGELOG.md#v490)
## Wazuh Docker v4.8.2
### Added
- Update Wazuh to version [4.8.2](https://github.com/wazuh/wazuh/blob/v4.8.2/CHANGELOG.md#v482)
## Wazuh Docker v4.8.1
### Added
- Update Wazuh to version [4.8.1](https://github.com/wazuh/wazuh/blob/v4.8.1/CHANGELOG.md#v481)
## Wazuh Docker v4.8.0
### Added
- Update Wazuh to version [4.8.0](https://github.com/wazuh/wazuh/blob/v4.8.0/CHANGELOG.md#v480)
## Wazuh Docker v4.7.5
### Added
- Update Wazuh to version [4.7.5](https://github.com/wazuh/wazuh/blob/v4.7.5/CHANGELOG.md#v475)
## Wazuh Docker v4.7.4
### Added
- Update Wazuh to version [4.7.4](https://github.com/wazuh/wazuh/blob/v4.7.4/CHANGELOG.md#v474)
## Wazuh Docker v4.7.3
### Added

View File

@@ -8,19 +8,19 @@
In this repository you will find the containers to run:
* Wazuh manager: it runs the Wazuh manager, Wazuh API and Filebeat OSS
* Wazuh dashboard: provides a web user interface to browse through alerts data and allows you to visualize agents configuration and status.
* Wazuh dashboard: provides a web user interface to browse through alert data and allows you to visualize the agents configuration and status.
* Wazuh indexer: Wazuh indexer container (working as a single-node cluster or as a multi-node cluster). **Be aware to increase the `vm.max_map_count` setting, as it's detailed in the [Wazuh documentation](https://documentation.wazuh.com/current/docker/wazuh-container.html#increase-max-map-count-on-your-host-linux).**
The folder `build-docker-images` contains a README explaining how to build the Wazuh images and the necessary assets.
The folder `indexer-certs-creator` contains a README explaining how to create the certificates creator tool and the necessary assets.
The folder `single-node` contains a README explaining how to run a Wazuh environment with one Wazuh manager, one Wazuh indexer, and one Wazuh dashboard.
The folder `multi-node` contains a README explaining how to run a Wazuh environment with two Wazuh managers, three Wazuh indexer, and one Wazuh dashboard.
The folder `multi-node` contains a README explaining how to run a Wazuh environment with two Wazuh managers, three Wazuh indexers, and one Wazuh dashboard.
## Documentation
* [Wazuh full documentation](http://documentation.wazuh.com)
* [Wazuh documentation for Docker](https://documentation.wazuh.com/current/docker/index.html)
* [Docker hub](https://hub.docker.com/u/wazuh)
* [Docker Hub](https://hub.docker.com/u/wazuh)
### Setup SSL certificate
@@ -38,7 +38,7 @@ Default values are included when available.
```
API_USERNAME="wazuh-wui" # Wazuh API username
API_PASSWORD="MyS3cr37P450r.*-" # Wazuh API password - Must comply with requirements
# (8+ length, uppercase, lowercase, specials chars)
# (8+ length, uppercase, lowercase, special chars)
INDEXER_URL=https://wazuh.indexer:9200 # Wazuh indexer URL
INDEXER_USERNAME=admin # Wazuh indexer Username
@@ -53,25 +53,11 @@ SSL_KEY="" # Path of Filebeat SSL Key
```
PATTERN="wazuh-alerts-*" # Default index pattern to use
CHECKS_PATTERN=true # Defines which checks must to be consider by the healthcheck
CHECKS_TEMPLATE=true # step once the Wazuh app starts. Values must to be true or false
CHECKS_PATTERN=true # Defines which checks must be considered by the healthcheck
CHECKS_TEMPLATE=true # step once the Wazuh app starts. Values must be true or false
CHECKS_API=true
CHECKS_SETUP=true
EXTENSIONS_PCI=true # Enable PCI Extension
EXTENSIONS_GDPR=true # Enable GDPR Extension
EXTENSIONS_HIPAA=true # Enable HIPAA Extension
EXTENSIONS_NIST=true # Enable NIST Extension
EXTENSIONS_TSC=true # Enable TSC Extension
EXTENSIONS_AUDIT=true # Enable Audit Extension
EXTENSIONS_OSCAP=false # Enable OpenSCAP Extension
EXTENSIONS_CISCAT=false # Enable CISCAT Extension
EXTENSIONS_AWS=false # Enable AWS Extension
EXTENSIONS_GCP=false # Enable GCP Extension
EXTENSIONS_VIRUSTOTAL=false # Enable Virustotal Extension
EXTENSIONS_OSQUERY=false # Enable OSQuery Extension
EXTENSIONS_DOCKER=false # Enable Docker Extension
APP_TIMEOUT=20000 # Defines maximum timeout to be used on the Wazuh app requests
API_SELECTOR=true Defines if the user is allowed to change the selected API directly from the Wazuh app top menu
@@ -89,19 +75,23 @@ WAZUH_MONITORING_REPLICAS=0 ##
## Directory structure
├── build-docker-images
│   ├── docker-compose.yml
│   ├── build-images.sh
│   ├── build-images.yml
│   ├── README.md
│   ├── wazuh-dashboard
│   │   ├── config
│   │   │   ├── config.sh
│   │   │   ├── config.yml
│   │   │   ├── dl_base.sh
│   │   │   ├── entrypoint.sh
│   │   │   ├── install_wazuh_app.sh
│   │   │   ├── opensearch_dashboards.yml
│   │   │   ├── wazuh_app_config.sh
│   │   │   └── wazuh.yml
│   │   └── Dockerfile
│   ├── wazuh-indexer
│   │   ├── config
│ │ ├── action_groups.yml
   │   │   ├── action_groups.yml
│   │   │   ├── config.sh
│   │   │   ├── config.yml
│   │   │   ├── entrypoint.sh
@@ -113,6 +103,7 @@ WAZUH_MONITORING_REPLICAS=0 ##
│   │   └── Dockerfile
│   └── wazuh-manager
│   ├── config
│   │   ├── check_repository.sh
│   │   ├── create_user.py
│   │   ├── etc
│   │   │   ├── cont-init.d
@@ -125,19 +116,21 @@ WAZUH_MONITORING_REPLICAS=0 ##
│   │   │   │   └── run
│   │   │   └── ossec-logs
│   │   │   └── run
│   │   ├── filebeat_module.sh
│   │   ├── filebeat.yml
│   │   ├── permanent_data.env
│   │   ── permanent_data.sh
│   │   └── wazuh.repo
│   │   ── permanent_data.sh
│   └── Dockerfile
├── CHANGELOG.md
├── indexer-certs-creator
│   ├── config
│   │   └── entrypoint.sh
│   ── Dockerfile
│   ── Dockerfile
│   └── README.md
├── LICENSE
├── multi-node
│   ├── config
│   │   ├── certs.yml
│   │   ├── nginx
│   │   │   └── nginx.conf
│   │   ├── wazuh_cluster
@@ -146,40 +139,29 @@ WAZUH_MONITORING_REPLICAS=0 ##
│   │   ├── wazuh_dashboard
│   │   │   ├── opensearch_dashboards.yml
│   │   │   └── wazuh.yml
│   │   ── wazuh_indexer
│   │   │   ├── internal_users.yml
│   │   │   ├── wazuh1.indexer.yml
│   │   │   ├── wazuh2.indexer.yml
│   │   │   └── wazuh3.indexer.yml
│   │   └── wazuh_indexer_ssl_certs
│   │   └── certs.yml
│   │   ── wazuh_indexer
│   │   ├── internal_users.yml
│   │   ├── wazuh1.indexer.yml
│   │   ├── wazuh2.indexer.yml
│   │   └── wazuh3.indexer.yml
│   ├── docker-compose.yml
│   ├── generate-indexer-certs.yml
│   ├── Migration-to-Wazuh-4.3.md
│   ├── Migration-to-Wazuh-4.4.md
│   ├── README.md
│   └── volume-migrator.sh
├── README.md
├── SECURITY.md
├── single-node
│   ├── config
│   │   ├── certs.yml
│   │   ├── wazuh_cluster
│   │   │   └── wazuh_manager.conf
│   │   ├── wazuh_dashboard
│   │   │   ├── opensearch_dashboards.yml
│   │   │   └── wazuh.yml
│   │   ── wazuh_indexer
│   │   │   ├── internal_users.yml
│   │   │   └── wazuh.indexer.yml
│   │   └── wazuh_indexer_ssl_certs
│   │   ├── admin-key.pem
│   │   ├── admin.pem
│   │   ├── certs.yml
│   │   ├── root-ca.key
│   │   ├── root-ca.pem
│   │   ├── wazuh.dashboard-key.pem
│   │   ├── wazuh.dashboard.pem
│   │   ├── wazuh.indexer-key.pem
│   │   ├── wazuh.indexer.pem
│   │   ├── wazuh.manager-key.pem
│   │   └── wazuh.manager.pem
│   │   ── wazuh_indexer
│   │   ├── internal_users.yml
│   │   └── wazuh.indexer.yml
│   ├── docker-compose.yml
│   ├── generate-indexer-certs.yml
│   └── README.md
@@ -190,13 +172,24 @@ WAZUH_MONITORING_REPLICAS=0 ##
## Branches
* `master` branch contains the latest code, be aware of possible bugs on this branch.
* `stable` branch on correspond to the last Wazuh stable version.
* `stable` branch corresponds to the last Wazuh stable version.
## Compatibility Matrix
| Wazuh version | ODFE | XPACK |
|---------------|---------|--------|
| v4.11.1 | | |
| v4.11.0 | | |
| v4.10.1 | | |
| v4.10.0 | | |
| v4.9.2 | | |
| v4.9.1 | | |
| v4.9.0 | | |
| v4.8.2 | | |
| v4.8.1 | | |
| v4.8.0 | | |
| v4.7.5 | | |
| v4.7.4 | | |
| v4.7.3 | | |
| v4.7.2 | | |
| v4.7.1 | | |
@@ -252,7 +245,7 @@ These Docker containers are based on:
* "deviantony" dockerfiles which can be found at [https://github.com/deviantony/docker-elk](https://github.com/deviantony/docker-elk)
* "xetus-oss" dockerfiles, which can be found at [https://github.com/xetus-oss/docker-ossec-server](https://github.com/xetus-oss/docker-ossec-server)
We thank you them and everyone else who has contributed to this project.
We thank them and everyone else who has contributed to this project.
## License and copyright

View File

@@ -16,11 +16,11 @@ Please submit your findings as security advisories under the "Security" tab in t
## Vulnerability Disclosure Policy
Upon receiving a report of a potential vulnerability, our team will initiate an investigation. If the reported issue is confirmed as a vulnerability, we will take the following steps:
- Acknowledgment: We will acknowledge the receipt of your vulnerability report and begin our investigation.
- Validation: We will validate the issue and work on reproducing it in our environment.
- Remediation: We will work on a fix and thoroughly test it
- Release & Disclosure: After 90 days from the discovery of the vulnerability, or as soon as a fix is ready and thoroughly tested (whichever comes first), we will release a security update for the affected project. We will also publicly disclose the vulnerability by publishing a CVE (Common Vulnerabilities and Exposures) and acknowledging the discovering party.
- Exceptions: In order to preserve the security of the Wazuh community at large, we might extend the disclosure period to allow users to patch their deployments.
1. Acknowledgment: We will acknowledge the receipt of your vulnerability report and begin our investigation.
2. Validation: We will validate the issue and work on reproducing it in our environment.
3. Remediation: We will work on a fix and thoroughly test it
4. Release & Disclosure: After 90 days from the discovery of the vulnerability, or as soon as a fix is ready and thoroughly tested (whichever comes first), we will release a security update for the affected project. We will also publicly disclose the vulnerability by publishing a CVE (Common Vulnerabilities and Exposures) and acknowledging the discovering party.
5. Exceptions: In order to preserve the security of the Wazuh community at large, we might extend the disclosure period to allow users to patch their deployments.
This 90-day period allows for end-users to update their systems and minimizes the risk of widespread exploitation of the vulnerability.
@@ -33,7 +33,7 @@ We believe in giving credit where credit is due. If you report a security vulner
We do appreciate and encourage feedback from our community, but currently we do not have a bounty program. We might start bounty programs in the future.
## Compliance with this Policy
We consider the discovery and reporting of security vulnerabilities an important public service. We encourage responsible reporting of any vulnerabilities that may be found in our site or applications.
We consider the discovery and reporting of security vulnerabilities an important public service. We encourage responsible reporting of any vulnerabilities that may be found in our site or applications.
Furthermore, we will not take legal action against or suspend or terminate access to the site or services of those who discover and report security vulnerabilities in accordance with this policy because of the fact.
@@ -42,4 +42,4 @@ We ask that all users and contributors respect this policy and the security of o
## Changes to this Security Policy
This policy may be revised from time to time. Each version of the policy will be identified at the top of the page by its effective date.
If you have any questions about this Security Policy, please contact us at [security@wazuh.com](mailto:security@wazuh.com).
If you have any questions about this Security Policy, please contact us at [security@wazuh.com](mailto:security@wazuh.com)

View File

@@ -1,2 +1,2 @@
WAZUH-DOCKER_VERSION="4.8.0"
REVISION="40807"
WAZUH-DOCKER_VERSION="4.11.1"
REVISION="41112"

View File

@@ -13,7 +13,7 @@ This script initializes the environment variables needed to build each of the im
The script allows you to build images from other versions of Wazuh, to do this you must use the -v or --version argument:
```
$ build-docker-images/build-images.sh -v 4.8.0
$ build-docker-images/build-images.sh -v 4.11.1
```
To get all the available script options use the -h or --help option:
@@ -26,7 +26,7 @@ Usage: build-docker-images/build-images.sh [OPTIONS]
-d, --dev <ref> [Optional] Set the development stage you want to build, example rc1 or beta1, not used by default.
-f, --filebeat-module <ref> [Optional] Set Filebeat module version. By default 0.4.
-r, --revision <rev> [Optional] Package revision. By default 1
-v, --version <ver> [Optional] Set the Wazuh version should be builded. By default, 4.8.0.
-v, --version <ver> [Optional] Set the Wazuh version should be builded. By default, 4.11.1.
-h, --help Show this help.
```

View File

@@ -1,4 +1,4 @@
WAZUH_IMAGE_VERSION=4.8.0
WAZUH_IMAGE_VERSION=4.11.1
WAZUH_VERSION=$(echo $WAZUH_IMAGE_VERSION | sed -e 's/\.//g')
WAZUH_TAG_REVISION=1
WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '["]tag_name["]:' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2- | sed -e 's/\.//g')
@@ -12,7 +12,7 @@ IMAGE_VERSION=${WAZUH_IMAGE_VERSION}
# License (version 2) as published by the FSF - Free Software
# Foundation.
WAZUH_IMAGE_VERSION="4.8.0"
WAZUH_IMAGE_VERSION="4.11.1"
WAZUH_TAG_REVISION="1"
WAZUH_DEV_STAGE=""
FILEBEAT_MODULE_VERSION="0.4"
@@ -70,7 +70,7 @@ build() {
echo WAZUH_FILEBEAT_MODULE=$WAZUH_FILEBEAT_MODULE >> .env
echo WAZUH_UI_REVISION=$WAZUH_UI_REVISION >> .env
docker-compose -f build-docker-images/build-images.yml --env-file .env build --no-cache
docker-compose -f build-docker-images/build-images.yml --env-file .env build --no-cache || clean 1
return 0
}

View File

@@ -3,37 +3,31 @@ FROM amazonlinux:2023 AS builder
ARG WAZUH_VERSION
ARG WAZUH_TAG_REVISION
ARG INSTALL_DIR=/usr/share/wazuh-dashboard
ARG WAZUH_UI_REVISION
ARG INSTALL_DIR=/usr/share/wazuh-dashboard
# Update and install dependencies
RUN yum install curl-minimal libcap xz tar openssl -y
RUN yum install curl-minimal libcap openssl -y
# Create Install dir
RUN mkdir -p $INSTALL_DIR
COPY config/check_repository.sh /
RUN chmod 775 /check_repository.sh && \
source /check_repository.sh
# Download and extract Wazuh dashboard base
COPY config/dl_base.sh .
RUN bash dl_base.sh
# Generate certificates
COPY config/config.sh .
COPY config/config.yml /
RUN bash config.sh
COPY config/install_wazuh_app.sh /
RUN chmod 775 /install_wazuh_app.sh
RUN bash /install_wazuh_app.sh
# Copy and set permissions to config files
COPY config/opensearch_dashboards.yml $INSTALL_DIR/config/
COPY config/wazuh.yml $INSTALL_DIR/data/wazuh/config/
RUN chmod 664 $INSTALL_DIR/config/opensearch_dashboards.yml
RUN yum install wazuh-dashboard-${WAZUH_VERSION}-${WAZUH_TAG_REVISION} -y && \
yum clean all
# Create and set permissions to data directories
RUN mkdir -p $INSTALL_DIR/data/wazuh && chmod -R 775 $INSTALL_DIR/data/wazuh
RUN mkdir -p $INSTALL_DIR/data/wazuh/config && chmod -R 775 $INSTALL_DIR/data/wazuh/config
RUN mkdir -p $INSTALL_DIR/data/wazuh/logs && chmod -R 775 $INSTALL_DIR/data/wazuh/logs
COPY config/wazuh.yml $INSTALL_DIR/data/wazuh/config/
RUN setcap 'cap_net_bind_service=-ep' /usr/share/wazuh-dashboard/node/bin/node
RUN setcap 'cap_net_bind_service=-ep' /usr/share/wazuh-dashboard/node/fallback/bin/node
# Generate certificates
COPY config/config.sh .
COPY config/config.yml /
RUN bash config.sh
################################################################################
# Build stage 1 (the current Wazuh dashboard image):
@@ -56,21 +50,6 @@ ENV PATTERN="" \
CHECKS_TEMPLATE="" \
CHECKS_API="" \
CHECKS_SETUP="" \
EXTENSIONS_PCI="" \
EXTENSIONS_GDPR="" \
EXTENSIONS_HIPAA="" \
EXTENSIONS_NIST="" \
EXTENSIONS_TSC="" \
EXTENSIONS_AUDIT="" \
EXTENSIONS_OSCAP="" \
EXTENSIONS_CISCAT="" \
EXTENSIONS_AWS="" \
EXTENSIONS_GCP="" \
EXTENSIONS_GITHUB=""\
EXTENSIONS_OFFICE=""\
EXTENSIONS_VIRUSTOTAL="" \
EXTENSIONS_OSQUERY="" \
EXTENSIONS_DOCKER="" \
APP_TIMEOUT="" \
API_SELECTOR="" \
IP_SELECTOR="" \

View File

@@ -0,0 +1,15 @@
## variables
APT_KEY=https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH
GPG_SIGN="gpgcheck=1\ngpgkey=${APT_KEY}]"
REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages-dev.wazuh.com/pre-release/yum/\nprotect=1"
WAZUH_TAG=$(curl --silent https://api.github.com/repos/wazuh/wazuh/git/refs/tags | grep '["]ref["]:' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 11- | grep ^v${WAZUH_VERSION}$)
## check tag to use the correct repository
if [[ -n "${WAZUH_TAG}" ]]; then
APT_KEY=https://packages.wazuh.com/key/GPG-KEY-WAZUH
GPG_SIGN="gpgcheck=1\ngpgkey=${APT_KEY}]"
REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages.wazuh.com/4.x/yum/\nprotect=1"
fi
rpm --import "${APT_KEY}"
echo -e "${REPOSITORY}" | tee /etc/yum.repos.d/wazuh.repo

View File

@@ -9,8 +9,8 @@ export CONFIG_DIR=${INSTALLATION_DIR}/config
## Variables
CERT_TOOL=wazuh-certs-tool.sh
PACKAGES_URL=https://packages.wazuh.com/4.8/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.8/
PACKAGES_URL=https://packages.wazuh.com/4.11/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.11/
## Check if the cert tool exists in S3 buckets
CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk '{print $2}')

View File

@@ -1,25 +0,0 @@
REPOSITORY="packages.wazuh.com/4.x"
WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '["]tag_name["]:' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2-)
MAJOR_BUILD=$(echo $WAZUH_VERSION | cut -d. -f1)
MID_BUILD=$(echo $WAZUH_VERSION | cut -d. -f2)
MINOR_BUILD=$(echo $WAZUH_VERSION | cut -d. -f3)
MAJOR_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f1)
MID_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f2)
MINOR_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f3)
## check version to use the correct repository
if [ "$MAJOR_BUILD" -gt "$MAJOR_CURRENT" ]; then
REPOSITORY="packages-dev.wazuh.com/pre-release"
elif [ "$MAJOR_BUILD" -eq "$MAJOR_CURRENT" ]; then
if [ "$MID_BUILD" -gt "$MID_CURRENT" ]; then
REPOSITORY="packages-dev.wazuh.com/pre-release"
elif [ "$MID_BUILD" -eq "$MID_CURRENT" ]; then
if [ "$MINOR_BUILD" -gt "$MINOR_CURRENT" ]; then
REPOSITORY="packages-dev.wazuh.com/pre-release"
fi
fi
fi
curl -o wazuh-dashboard-base.tar.xz https://${REPOSITORY}/stack/dashboard/wazuh-dashboard-base-${WAZUH_VERSION}-${WAZUH_TAG_REVISION}-linux-x64.tar.xz
tar -xf wazuh-dashboard-base.tar.xz --directory $INSTALL_DIR --strip-components=1

View File

@@ -1,35 +0,0 @@
## variables
WAZUH_APP=https://packages.wazuh.com/4.x/ui/dashboard/wazuh-${WAZUH_VERSION}-${WAZUH_UI_REVISION}.zip
WAZUH_CHECK_UPDATES=https://packages.wazuh.com/4.x/ui/dashboard/wazuhCheckUpdates-${WAZUH_VERSION}-${WAZUH_UI_REVISION}.zip
WAZUH_CORE=https://packages.wazuh.com/4.x/ui/dashboard/wazuhCore-${WAZUH_VERSION}-${WAZUH_UI_REVISION}.zip
WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '["]tag_name["]:' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2-)
MAJOR_BUILD=$(echo $WAZUH_VERSION | cut -d. -f1)
MID_BUILD=$(echo $WAZUH_VERSION | cut -d. -f2)
MINOR_BUILD=$(echo $WAZUH_VERSION | cut -d. -f3)
MAJOR_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f1)
MID_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f2)
MINOR_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f3)
## check version to use the correct repository
if [ "$MAJOR_BUILD" -gt "$MAJOR_CURRENT" ]; then
WAZUH_APP=https://packages-dev.wazuh.com/pre-release/ui/dashboard/wazuh-${WAZUH_VERSION}-${WAZUH_UI_REVISION}.zip
WAZUH_CHECK_UPDATES=https://packages-dev.wazuh.com/pre-release/ui/dashboard/wazuhCheckUpdates-${WAZUH_VERSION}-${WAZUH_UI_REVISION}.zip
WAZUH_CORE=https://packages-dev.wazuh.com/pre-release/ui/dashboard/wazuhCore-${WAZUH_VERSION}-${WAZUH_UI_REVISION}.zip
elif [ "$MAJOR_BUILD" -eq "$MAJOR_CURRENT" ]; then
if [ "$MID_BUILD" -gt "$MID_CURRENT" ]; then
WAZUH_APP=https://packages-dev.wazuh.com/pre-release/ui/dashboard/wazuh-${WAZUH_VERSION}-${WAZUH_UI_REVISION}.zip
WAZUH_CHECK_UPDATES=https://packages-dev.wazuh.com/pre-release/ui/dashboard/wazuhCheckUpdates-${WAZUH_VERSION}-${WAZUH_UI_REVISION}.zip
WAZUH_CORE=https://packages-dev.wazuh.com/pre-release/ui/dashboard/wazuhCore-${WAZUH_VERSION}-${WAZUH_UI_REVISION}.zip
elif [ "$MID_BUILD" -eq "$MID_CURRENT" ]; then
if [ "$MINOR_BUILD" -gt "$MINOR_CURRENT" ]; then
WAZUH_APP=https://packages-dev.wazuh.com/pre-release/ui/dashboard/wazuh-${WAZUH_VERSION}-${WAZUH_UI_REVISION}.zip
WAZUH_CHECK_UPDATES=https://packages-dev.wazuh.com/pre-release/ui/dashboard/wazuhCheckUpdates-${WAZUH_VERSION}-${WAZUH_UI_REVISION}.zip
WAZUH_CORE=https://packages-dev.wazuh.com/pre-release/ui/dashboard/wazuhCore-${WAZUH_VERSION}-${WAZUH_UI_REVISION}.zip
fi
fi
fi
# Install Wazuh App
$INSTALL_DIR/bin/opensearch-dashboards-plugin install $WAZUH_APP --allow-root
$INSTALL_DIR/bin/opensearch-dashboards-plugin install $WAZUH_CHECK_UPDATES --allow-root
$INSTALL_DIR/bin/opensearch-dashboards-plugin install $WAZUH_CORE --allow-root

View File

@@ -1,13 +0,0 @@
server.host: 0.0.0.0
server.port: 5601
opensearch.hosts: https://wazuh.indexer:9200
opensearch.ssl.verificationMode: none
opensearch.requestHeadersWhitelist: [ authorization,securitytenant ]
opensearch_security.multitenancy.enabled: false
opensearch_security.readonly_mode.roles: ["kibana_read_only"]
server.ssl.enabled: true
server.ssl.key: "/usr/share/wazuh-dashboard/config/certs/dashboard-key.pem"
server.ssl.certificate: "/usr/share/wazuh-dashboard/config/certs/dashboard.pem"
opensearch.ssl.certificateAuthorities: ["/usr/share/wazuh-dashboard/config/certs/root-ca.pem"]
uiSettings.overrides.defaultRoute: /app/wz-home

View File

@@ -15,21 +15,6 @@ declare -A CONFIG_MAP=(
[checks.template]=$CHECKS_TEMPLATE
[checks.api]=$CHECKS_API
[checks.setup]=$CHECKS_SETUP
[extensions.pci]=$EXTENSIONS_PCI
[extensions.gdpr]=$EXTENSIONS_GDPR
[extensions.hipaa]=$EXTENSIONS_HIPAA
[extensions.nist]=$EXTENSIONS_NIST
[extensions.tsc]=$EXTENSIONS_TSC
[extensions.audit]=$EXTENSIONS_AUDIT
[extensions.oscap]=$EXTENSIONS_OSCAP
[extensions.ciscat]=$EXTENSIONS_CISCAT
[extensions.aws]=$EXTENSIONS_AWS
[extensions.gcp]=$EXTENSIONS_GCP
[extensions.github]=$EXTENSIONS_GITHUB
[extensions.office]=$EXTENSIONS_OFFICE
[extensions.virustotal]=$EXTENSIONS_VIRUSTOTAL
[extensions.osquery]=$EXTENSIONS_OSQUERY
[extensions.docker]=$EXTENSIONS_DOCKER
[timeout]=$APP_TIMEOUT
[api.selector]=$API_SELECTOR
[ip.selector]=$IP_SELECTOR

View File

@@ -6,6 +6,13 @@ ARG WAZUH_TAG_REVISION
RUN yum install curl-minimal openssl xz tar findutils shadow-utils -y
COPY config/check_repository.sh /
RUN chmod 775 /check_repository.sh && \
source /check_repository.sh
RUN yum install wazuh-indexer-${WAZUH_VERSION}-${WAZUH_TAG_REVISION} -y && \
yum clean all
COPY config/opensearch.yml /
COPY config/config.sh .
@@ -59,7 +66,8 @@ RUN chmod 700 /entrypoint.sh && chmod 700 /securityadmin.sh
RUN chown 1000:1000 /*.sh
COPY --from=builder --chown=1000:1000 /debian/wazuh-indexer/usr/share/wazuh-indexer /usr/share/wazuh-indexer
COPY --from=builder --chown=1000:1000 /usr/share/wazuh-indexer /usr/share/wazuh-indexer
COPY --from=builder --chown=1000:1000 /etc/wazuh-indexer /usr/share/wazuh-indexer
COPY --from=builder --chown=0:0 /debian/wazuh-indexer/usr/lib/systemd /usr/lib/systemd
COPY --from=builder --chown=0:0 /debian/wazuh-indexer/usr/lib/sysctl.d /usr/lib/sysctl.d
COPY --from=builder --chown=0:0 /debian/wazuh-indexer/usr/lib/tmpfiles.d /usr/lib/tmpfiles.d

View File

@@ -0,0 +1,15 @@
## variables
APT_KEY=https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH
GPG_SIGN="gpgcheck=1\ngpgkey=${APT_KEY}]"
REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages-dev.wazuh.com/pre-release/yum/\nprotect=1"
WAZUH_TAG=$(curl --silent https://api.github.com/repos/wazuh/wazuh/git/refs/tags | grep '["]ref["]:' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 11- | grep ^v${WAZUH_VERSION}$)
## check tag to use the correct repository
if [[ -n "${WAZUH_TAG}" ]]; then
APT_KEY=https://packages.wazuh.com/key/GPG-KEY-WAZUH
GPG_SIGN="gpgcheck=1\ngpgkey=${APT_KEY}]"
REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages.wazuh.com/4.x/yum/\nprotect=1"
fi
rpm --import "${APT_KEY}"
echo -e "${REPOSITORY}" | tee /etc/yum.repos.d/wazuh.repo

View File

@@ -19,42 +19,11 @@ export INDEXER_FILE=wazuh-indexer-base.tar.xz
export BASE_FILE=wazuh-indexer-base-${VERSION}-linux-x64.tar.xz
export REPO_DIR=/unattended_installer
rm -rf ${INSTALLATION_DIR}/
## variables
REPOSITORY="packages.wazuh.com/4.x"
WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '["]tag_name["]:' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2-)
MAJOR_BUILD=$(echo $WAZUH_VERSION | cut -d. -f1)
MID_BUILD=$(echo $WAZUH_VERSION | cut -d. -f2)
MINOR_BUILD=$(echo $WAZUH_VERSION | cut -d. -f3)
MAJOR_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f1)
MID_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f2)
MINOR_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f3)
## check version to use the correct repository
if [ "$MAJOR_BUILD" -gt "$MAJOR_CURRENT" ]; then
REPOSITORY="packages-dev.wazuh.com/pre-release"
elif [ "$MAJOR_BUILD" -eq "$MAJOR_CURRENT" ]; then
if [ "$MID_BUILD" -gt "$MID_CURRENT" ]; then
REPOSITORY="packages-dev.wazuh.com/pre-release"
elif [ "$MID_BUILD" -eq "$MID_CURRENT" ]; then
if [ "$MINOR_BUILD" -gt "$MINOR_CURRENT" ]; then
REPOSITORY="packages-dev.wazuh.com/pre-release"
fi
fi
fi
curl -o ${INDEXER_FILE} https://${REPOSITORY}/stack/indexer/${BASE_FILE}
tar -xf ${INDEXER_FILE}
## TOOLS
## Variables
CERT_TOOL=wazuh-certs-tool.sh
PASSWORD_TOOL=wazuh-passwords-tool.sh
PACKAGES_URL=https://packages.wazuh.com/4.8/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.8/
PACKAGES_URL=https://packages.wazuh.com/4.11/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.11/
## Check if the cert tool exists in S3 buckets
CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk '{print $2}')
@@ -103,20 +72,6 @@ mkdir -p ${TARGET_DIR}/usr/lib/tmpfiles.d
mkdir -p ${TARGET_DIR}/usr/lib/sysctl.d
mkdir -p ${TARGET_DIR}/usr/lib/systemd/system
mkdir -p ${TARGET_DIR}${CONFIG_DIR}/certs
# Move configuration files for wazuh-indexer
mv -f ${BASE_DIR}/etc/init.d/${NAME} ${TARGET_DIR}/etc/init.d/${NAME}
mv -f ${BASE_DIR}/etc/wazuh-indexer/* ${TARGET_DIR}${CONFIG_DIR}
mv -f ${BASE_DIR}/etc/sysconfig/${NAME} ${TARGET_DIR}/etc/default/
mv -f ${BASE_DIR}/usr/lib/tmpfiles.d/* ${TARGET_DIR}/usr/lib/tmpfiles.d/
mv -f ${BASE_DIR}/usr/lib/sysctl.d/* ${TARGET_DIR}/usr/lib/sysctl.d/
mv -f ${BASE_DIR}/usr/lib/systemd/system/* ${TARGET_DIR}/usr/lib/systemd/system/
rm -rf ${BASE_DIR}/etc
rm -rf ${BASE_DIR}/usr
# Copy installation files to final location
cp -pr ${BASE_DIR}/* ${TARGET_DIR}${INSTALLATION_DIR}
# Copy the security tools
cp /$CERT_TOOL ${TARGET_DIR}${INSTALLATION_DIR}/plugins/opensearch-security/tools/
cp /$PASSWORD_TOOL ${TARGET_DIR}${INSTALLATION_DIR}/plugins/opensearch-security/tools/
# Copy Wazuh's config files for the security plugin
cp -pr /roles_mapping.yml ${TARGET_DIR}${INSTALLATION_DIR}/opensearch-security/
cp -pr /roles.yml ${TARGET_DIR}${INSTALLATION_DIR}/opensearch-security/
@@ -132,9 +87,9 @@ cp -pr /wazuh-certificates/admin.pem ${TARGET_DIR}${CONFIG_DIR}/certs/admin.pem
cp -pr /wazuh-certificates/admin-key.pem ${TARGET_DIR}${CONFIG_DIR}/certs/admin-key.pem
# Delete xms and xmx parameters in jvm.options
sed '/-Xms/d' -i ${TARGET_DIR}${CONFIG_DIR}/jvm.options
sed '/-Xmx/d' -i ${TARGET_DIR}${CONFIG_DIR}/jvm.options
sed -i 's/-Djava.security.policy=file:\/\/\/etc\/wazuh-indexer\/opensearch-performance-analyzer\/opensearch_security.policy/-Djava.security.policy=file:\/\/\/usr\/share\/wazuh-indexer\/opensearch-performance-analyzer\/opensearch_security.policy/g' ${TARGET_DIR}${CONFIG_DIR}/jvm.options
sed '/-Xms/d' -i /etc/wazuh-indexer/jvm.options
sed '/-Xmx/d' -i /etc/wazuh-indexer/jvm.options
sed -i 's/-Djava.security.policy=file:\/\/\/etc\/wazuh-indexer\/opensearch-performance-analyzer\/opensearch_security.policy/-Djava.security.policy=file:\/\/\/usr\/share\/wazuh-indexer\/opensearch-performance-analyzer\/opensearch_security.policy/g' /etc/wazuh-indexer/jvm.options
chmod -R 500 ${TARGET_DIR}${CONFIG_DIR}/certs

View File

@@ -60,6 +60,8 @@ RUN mkdir -p /var/ossec/var/multigroups && \
sync && /permanent_data.sh && \
sync && rm /permanent_data.sh
RUN rm /etc/yum.repos.d/wazuh.repo
# Services ports
EXPOSE 55000/tcp 1514/tcp 1515/tcp 514/udp 1516/tcp

View File

@@ -1,29 +1,14 @@
## variables
APT_KEY=https://packages.wazuh.com/key/GPG-KEY-WAZUH
APT_KEY=https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH
GPG_SIGN="gpgcheck=1\ngpgkey=${APT_KEY}]"
REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages.wazuh.com/4.x/yum/\nprotect=1"
WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '["]tag_name["]:' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2-)
MAJOR_BUILD=$(echo $WAZUH_VERSION | cut -d. -f1)
MID_BUILD=$(echo $WAZUH_VERSION | cut -d. -f2)
MINOR_BUILD=$(echo $WAZUH_VERSION | cut -d. -f3)
MAJOR_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f1)
MID_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f2)
MINOR_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f3)
REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages-dev.wazuh.com/pre-release/yum/\nprotect=1"
WAZUH_TAG=$(curl --silent https://api.github.com/repos/wazuh/wazuh/git/refs/tags | grep '["]ref["]:' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 11- | grep ^v${WAZUH_VERSION}$)
## check version to use the correct repository
if [ "$MAJOR_BUILD" -gt "$MAJOR_CURRENT" ]; then
APT_KEY=https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH
REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages-dev.wazuh.com/pre-release/yum/\nprotect=1"
elif [ "$MAJOR_BUILD" -eq "$MAJOR_CURRENT" ]; then
if [ "$MID_BUILD" -gt "$MID_CURRENT" ]; then
APT_KEY=https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH
REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages-dev.wazuh.com/pre-release/yum/\nprotect=1"
elif [ "$MID_BUILD" -eq "$MID_CURRENT" ]; then
if [ "$MINOR_BUILD" -gt "$MINOR_CURRENT" ]; then
APT_KEY=https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH
REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages-dev.wazuh.com/pre-release/yum/\nprotect=1"
fi
fi
## check tag to use the correct repository
if [[ -n "${WAZUH_TAG}" ]]; then
APT_KEY=https://packages.wazuh.com/key/GPG-KEY-WAZUH
GPG_SIGN="gpgcheck=1\ngpgkey=${APT_KEY}]"
REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages.wazuh.com/4.x/yum/\nprotect=1"
fi
rpm --import "${APT_KEY}"

View File

@@ -51,7 +51,7 @@ mount_permanent_data() {
print "Installing ${permanent_dir}"
exec_cmd "cp -a ${data_tmp}. ${permanent_dir}"
else
print "The path ${permanent_dir} is empty, skiped"
print "The path ${permanent_dir} is empty, skipped"
fi
fi
done
@@ -199,7 +199,7 @@ main() {
# Restore files stored in permanent data that are not permanent (i.e. internal_options.conf)
apply_exclusion_data
# Apply correct permission and ownership
set_correct_permOwner

View File

@@ -4,7 +4,7 @@
set -e
if [ "$INDEXER_URL" != "" ]; then
>&2 echo "Customize Elasticsearch ouput IP"
>&2 echo "Customize Elasticsearch output IP"
sed -i "s|hosts:.*|hosts: ['$INDEXER_URL']|g" /etc/filebeat/filebeat.yml
fi

View File

@@ -1,23 +1,10 @@
REPOSITORY="packages.wazuh.com/4.x"
WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '["]tag_name["]:' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2-)
MAJOR_BUILD=$(echo $WAZUH_VERSION | cut -d. -f1)
MID_BUILD=$(echo $WAZUH_VERSION | cut -d. -f2)
MINOR_BUILD=$(echo $WAZUH_VERSION | cut -d. -f3)
MAJOR_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f1)
MID_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f2)
MINOR_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f3)
## variables
REPOSITORY="packages-dev.wazuh.com/pre-release"
WAZUH_TAG=$(curl --silent https://api.github.com/repos/wazuh/wazuh/git/refs/tags | grep '["]ref["]:' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 11- | grep ^v${WAZUH_VERSION}$)
## check version to use the correct repository
if [ "$MAJOR_BUILD" -gt "$MAJOR_CURRENT" ]; then
REPOSITORY="packages-dev.wazuh.com/pre-release"
elif [ "$MAJOR_BUILD" -eq "$MAJOR_CURRENT" ]; then
if [ "$MID_BUILD" -gt "$MID_CURRENT" ]; then
REPOSITORY="packages-dev.wazuh.com/pre-release"
elif [ "$MID_BUILD" -eq "$MID_CURRENT" ]; then
if [ "$MINOR_BUILD" -gt "$MINOR_CURRENT" ]; then
REPOSITORY="packages-dev.wazuh.com/pre-release"
fi
fi
## check tag to use the correct repository
if [[ -n "${WAZUH_TAG}" ]]; then
REPOSITORY="packages.wazuh.com/4.x"
fi
curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/${FILEBEAT_CHANNEL}-${FILEBEAT_VERSION}-x86_64.rpm &&\

View File

@@ -79,7 +79,14 @@ PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/subscribers/sqs_message_proc
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/subscribers/sqs_queue.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/azure-logs"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/azure-logs.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/orm.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/db/orm.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/db/utils.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/db/__init__.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/azure_utils.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/azure_services/__init__.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/azure_services/analytics.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/azure_services/graph.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/azure_services/storage.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/docker/DockerListener"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/docker/DockerListener.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/gcloud"
@@ -87,6 +94,9 @@ PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/gcloud.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/integration.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/tools.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/exceptions.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/buckets/bucket.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/buckets/access_logs.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/pubsub/subscriber.py"
export PERMANENT_DATA_EXCP
# Files mounted in a volume that should be deleted

View File

@@ -8,8 +8,8 @@
## Variables
CERT_TOOL=wazuh-certs-tool.sh
PASSWORD_TOOL=wazuh-passwords-tool.sh
PACKAGES_URL=https://packages.wazuh.com/4.8/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.8/
PACKAGES_URL=https://packages.wazuh.com/4.11/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.11/
## Check if the cert tool exists in S3 buckets
CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk '{print $2}')

View File

@@ -3,7 +3,7 @@ version: '3.7'
services:
wazuh.master:
image: wazuh/wazuh-manager:4.8.0
image: wazuh/wazuh-manager:4.11.1
hostname: wazuh.master
restart: always
ulimits:
@@ -45,7 +45,7 @@ services:
- ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
wazuh.worker:
image: wazuh/wazuh-manager:4.8.0
image: wazuh/wazuh-manager:4.11.1
hostname: wazuh.worker
restart: always
ulimits:
@@ -81,7 +81,7 @@ services:
- ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf
wazuh1.indexer:
image: wazuh/wazuh-indexer:4.8.0
image: wazuh/wazuh-indexer:4.11.1
hostname: wazuh1.indexer
restart: always
ports:
@@ -107,7 +107,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
wazuh2.indexer:
image: wazuh/wazuh-indexer:4.8.0
image: wazuh/wazuh-indexer:4.11.1
hostname: wazuh2.indexer
restart: always
environment:
@@ -129,7 +129,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
wazuh3.indexer:
image: wazuh/wazuh-indexer:4.8.0
image: wazuh/wazuh-indexer:4.11.1
hostname: wazuh3.indexer
restart: always
environment:
@@ -151,7 +151,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
wazuh.dashboard:
image: wazuh/wazuh-dashboard:4.8.0
image: wazuh/wazuh-dashboard:4.11.1
hostname: wazuh.dashboard
restart: always
ports:

View File

@@ -3,7 +3,7 @@ version: '3.7'
services:
wazuh.manager:
image: wazuh/wazuh-manager:4.8.0
image: wazuh/wazuh-manager:4.11.1
hostname: wazuh.manager
restart: always
ulimits:
@@ -46,7 +46,7 @@ services:
- ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
wazuh.indexer:
image: wazuh/wazuh-indexer:4.8.0
image: wazuh/wazuh-indexer:4.11.1
hostname: wazuh.indexer
restart: always
ports:
@@ -71,7 +71,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
wazuh.dashboard:
image: wazuh/wazuh-dashboard:4.8.0
image: wazuh/wazuh-dashboard:4.11.1
hostname: wazuh.dashboard
restart: always
ports: