Compare commits

..

338 Commits

Author SHA1 Message Date
vcerenu
e20e92e475 Add Changelog 2024-12-02 10:42:58 -03:00
vcerenu
61c32079fa Add Changelog 2024-12-02 10:40:05 -03:00
vcerenu
5be199b9df Delete service tag and modifiy docker-compose execution for a new version 2024-12-02 10:30:09 -03:00
Carlos Bordon
971858cddd Merge pull request #1610 from wazuh/merge-4.10.2-into-master
Merge 4.10.2 into master
2024-11-04 16:05:40 -03:00
Carlos Bordon
b9a52df0ff Merge pull request #1609 from wazuh/merge-4.10.1-into-4.10.2
Merge 4.10.1 into 4.10.2
2024-11-04 16:03:32 -03: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
084530ef80 Merge pull request #1584 from wazuh/merge-4.10.2-into-master
Merge 4.10.2 into master
2024-10-17 13:06:55 -03:00
vcerenu
69df531ca9 Resolve conflicts 2024-10-17 13:04:31 -03:00
Gonzalo Acuña
f809a1ebbb Merge pull request #1583 from wazuh/merge-4.10.1-into-4.10.2
Merge 4.10.1 into 4.10.2
2024-10-17 12:52:29 -03:00
vcerenu
a5c313843e Resolve conflicts 2024-10-17 12:49:32 -03: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
447c0bdaf8 Merge pull request #1557 from wazuh/Bump-4.10.2-branch
Bumped branch 4.10.2 to 4.10.2 version
2024-10-03 12:31:49 -03:00
c-bordon
e6c5e82a32 Bumped branch 4.10.2 to 4.10.2 version 2024-10-03 12:11:27 -03: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
205983317f Merge pull request #1521 from wazuh/maintenance/5651-merge-4.10.0-into-master
Maintenance/5651 merge 4.10.0 into master
2024-09-10 11:36:17 -03:00
JESUS D. GARCIA
570bf081bc Update default values in Procedure_push_docker_images.yml 2024-09-10 09:35:12 -05: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
8522ec23b9 Merge pull request #1514 from wazuh/enhancement/1511-merge-4.10.0-into-master
Merge 4.10.0 into master
2024-09-05 14:13:57 -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
4f4edab1a9 Merge pull request #1496 from wazuh/merge-4.10.0-into-master
Merge 4.10.0 into master
2024-08-21 12:48:11 +02:00
David Correa Rodríguez
d5a60b7264 Merge branch '4.10.0' into merge-4.10.0-into-master 2024-08-21 12:30:00 +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
Carlos Bordon
39554677bf Merge pull request #1459 from wazuh/merge-4.10.0-into-master
Merge 4.10.0 into master
2024-07-19 10:39:37 -03:00
David Correa Rodríguez
1a1bc2d72b Merge branch 'master' into merge-4.10.0-into-master 2024-07-19 15:38:49 +02:00
Carlos Bordon
34bd04e5fc Merge pull request #1462 from wazuh/revert-1451-maintenance/1445-revert-merge-4.9.0-into-master
Revert "Revert merges of 4.9.0 branch into master branch"
2024-07-19 10:35:23 -03:00
Carlos Bordon
54b2d4ce33 Revert "Revert merges of 4.9.0 branch into master branch" 2024-07-19 10:34:13 -03:00
David Correa Rodríguez
096f0abb32 Merge branch '4.10.0' into merge-4.10.0-into-master 2024-07-19 13:19:41 +02: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
8a1e5043c6 Merge pull request #1451 from wazuh/maintenance/1445-revert-merge-4.9.0-into-master
Revert merges of 4.9.0 branch into master branch
2024-07-19 11:18:39 +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
David Correa Rodríguez
eded59bc25 Revert "Merge branch '4.9.0' into merge-4.9.0-into-master"
This reverts commit 4923750ea4, reversing
changes made to e1d70c35fe.
2024-07-19 09:27:46 +02:00
David Correa Rodríguez
0110e696d0 Revert "Merge branch '4.9.0' into merge-4.9.0-into-master"
This reverts commit 622c67d2cc, reversing
changes made to 55f209e57f.
2024-07-19 09:27:32 +02:00
Carlos Bordon
6e30c077d6 Merge pull request #1450 from wazuh/merge-4.9.0-into-master
Merge 4.9.0 into master
2024-07-18 10:35:54 -03:00
David Correa Rodríguez
622c67d2cc Merge branch '4.9.0' into merge-4.9.0-into-master 2024-07-18 15:33:47 +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
David Correa Rodríguez
55f209e57f Merge pull request #1447 from wazuh/merge-4.9.0-into-master
Merge 4.9.0 into master
2024-07-18 15:03:02 +02:00
David Correa Rodríguez
4923750ea4 Merge branch '4.9.0' into merge-4.9.0-into-master 2024-07-18 14:48:50 +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
e1d70c35fe Merge pull request #1392 from wazuh/merge-4.9.0-into-master
Merge 4.9.0 into master
2024-06-12 12:55:42 -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
Gonzalo Acuña
7eb5d0843c Merge pull request #1385 from wazuh/enhancement/1256-wazuh-cert-tool
Add Wazuh cert tool image build into Wazuh images build process
2024-06-12 07:09:12 -03:00
vcerenu
36e7160332 Add save and load process for Wazuh Cert Tool image 2024-06-11 10:19:50 -03:00
vcerenu
cf3eb61081 Add save and load process for Wazuh Cert Tool image 2024-06-11 10:16:22 -03:00
vcerenu
fda4a171f4 Add save and load process for Wazuh Cert Tool image 2024-06-11 10:14:19 -03:00
vcerenu
1e6f93b20a Correct the name of the certificate generator script 2024-06-11 09:46:53 -03:00
vcerenu
aed1004471 Change the generator script in multi node deployment 2024-06-10 07:13:09 -03:00
vcerenu
450a59a7c8 Change the name dir to Wazuh cert tool Dockerfile 2024-06-10 07:11:20 -03:00
vcerenu
6d63befeb7 Modify yaml script name generator 2024-06-07 07:57:03 -03:00
vcerenu
1f32d2a358 Modify yaml script name generator 2024-06-07 07:42:13 -03:00
vcerenu
fc1ece705e Add the build of Wazuh cert tool image to build image process 2024-06-07 05:44:14 -03: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
4ba7cba72d Merge pull request #1375 from wazuh/1371-merge-4.9.0-into-master
Merge 4.9.0 into master
2024-05-31 12:41:01 -03:00
vcerenu
37918b47cd Merge branch 'master' of github.com:wazuh/wazuh-docker into 4.9.0 2024-05-31 11:58:30 -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
937b5fad87 Merge pull request #1312 from wazuh/461-conf-files-environment
Add environment for configure wazuh indexer and dashboard files
2024-05-17 09:36:41 -03:00
Gonzalo Acuña
3d7c673671 Merge pull request #1327 from wazuh/merge-4.9.0-into-master
Merge 4.9.0 into master
2024-04-30 08:21:30 -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
vcerenu
7ec98fedf9 correct environment settings in services 2024-04-24 05:57:27 -03:00
vcerenu
10f278cadb add environment variables for configure wazuh indexer and dashboard files 2024-04-23 11:43:29 -03:00
Gonzalo Acuña
fa025c602e Merge pull request #1292 from wazuh/enhancement/#1291-remove-commented-lines
securityadmin commented lines in Wazuh indexer entrypoint removed
2024-04-09 10:22:32 -03:00
Carlos Anguita López
f4ccd4b0a6 Removed commented lines 87 to 91 2024-04-09 09:26:47 +02:00
David Correa Rodríguez
c95eb42902 Merge pull request #1285 from wazuh/merge-4.9.0-into-master
Merge 4.9.0 into master
2024-04-01 11:31:30 +02:00
David Correa Rodríguez
f685bfaa9d Merge branch 'master' into merge-4.9.0-into-master 2024-04-01 11:26:05 +02:00
David Correa Rodríguez
dc13ef3f72 Merge branch '4.9.0' into merge-4.9.0-into-master 2024-04-01 11:11:14 +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
9918f95f3f Merge pull request #1269 from wazuh/bug/1193-review-version-references-in-the-master-branch-5.0
Fixed references to 4.8 in `master`
2024-03-20 12:58:23 -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
935aee6d2a Fixed references to 4.8 in master 2024-03-19 11:39:01 +01:00
David Correa Rodríguez
219843dbb8 Fixed references to 4.8 version 2024-03-19 11:32:06 +01:00
Gonzalo Acuña
e8d2463d99 Merge pull request #1251 from wazuh/merge-4.9.0-into-master
Merge 4.9.0 into master
2024-03-04 13:47:24 -03:00
David Correa Rodríguez
4f0da7a58e Merge branch '4.9.0' into merge-4.9.0-into-master 2024-03-04 17:44:19 +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
799dadc1cf Merge pull request #1243 from wazuh/merge-4.9.0-into-master
Merge 4.9.0 into master
2024-03-01 15:55:14 -03: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
David Correa Rodríguez
b47361e4c9 Merge pull request #1207 from wazuh/bump-5.0.0
Bump version to 5.0.0
2024-02-13 10:37:26 +01:00
David Correa Rodríguez
d3d2ae7b86 Bump version to 5.0.0 2024-02-13 10:32:58 +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
49 changed files with 1227 additions and 919 deletions

6
.env
View File

@@ -1,6 +1,6 @@
WAZUH_VERSION=4.8.0
WAZUH_IMAGE_VERSION=4.8.0
WAZUH_VERSION=5.0.0
WAZUH_IMAGE_VERSION=5.0.0
WAZUH_TAG_REVISION=1
FILEBEAT_TEMPLATE_BRANCH=4.8.0
FILEBEAT_TEMPLATE_BRANCH=5.0.0
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-1
- 5.0.0-1
port:
tcp:1514:
listening: true

View File

@@ -0,0 +1,161 @@
run-name: Launch Push Docker Images - ${{ inputs.id }}
name: Push Docker Images
on:
workflow_dispatch:
inputs:
image_tag:
description: 'Docker image tag'
default: '5.0.0'
required: true
docker_reference:
description: 'wazuh-docker reference'
default: 'v5.0.0'
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: '5.0.0'
required: true
type: string
docker_reference:
description: 'wazuh-docker reference'
default: 'v5.0.0'
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: 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

@@ -22,6 +22,7 @@ jobs:
docker save wazuh/wazuh-manager:${{env.WAZUH_IMAGE_VERSION}} -o /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-manager.tar
docker save wazuh/wazuh-indexer:${{env.WAZUH_IMAGE_VERSION}} -o /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-indexer.tar
docker save wazuh/wazuh-dashboard:${{env.WAZUH_IMAGE_VERSION}} -o /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-dashboard.tar
docker save wazuh/wazuh-cert-tool:${{env.WAZUH_IMAGE_VERSION}} -o /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-cert-tool.tar
- name: Temporarily save Wazuh manager Docker image
uses: actions/upload-artifact@v3
@@ -44,6 +45,13 @@ jobs:
path: /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-dashboard.tar
retention-days: 1
- name: Temporarily save Wazuh Cert Tool Docker image
uses: actions/upload-artifact@v3
with:
name: docker-artifact-cert-tool
path: /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-cert-tool.tar
retention-days: 1
- name: Install Goss
uses: e1himself/goss-installation-action@v1.0.3
with:
@@ -81,18 +89,25 @@ jobs:
with:
name: docker-artifact-dashboard
- name: Retrieve saved Wazuh Cert Tool Docker image
uses: actions/download-artifact@v3
with:
name: docker-artifact-cert-tool
- name: Docker load
run: |
docker load --input ./wazuh-indexer.tar
docker load --input ./wazuh-dashboard.tar
docker load --input ./wazuh-manager.tar
docker load --input ./wazuh-cert-tool.tar
rm -rf wazuh-manager.tar wazuh-indexer.tar wazuh-dashboard.tar wazuh-cert-tool.tar
- name: Create single node certficates
run: docker-compose -f single-node/generate-indexer-certs.yml run --rm generator
run: docker compose -f single-node/generate-certs.yml run --rm generator
- name: Start single node stack
run: docker-compose -f single-node/docker-compose.yml up -d
run: docker compose -f single-node/docker-compose.yml up -d
- name: Check Wazuh indexer start
run: |
@@ -212,18 +227,24 @@ jobs:
with:
name: docker-artifact-indexer
- name: Retrieve saved Wazuh Cert Tool Docker image
uses: actions/download-artifact@v3
with:
name: docker-artifact-cert-tool
- name: Docker load
run: |
docker load --input ./wazuh-manager.tar
docker load --input ./wazuh-indexer.tar
docker load --input ./wazuh-dashboard.tar
rm -rf wazuh-manager.tar wazuh-indexer.tar wazuh-dashboard.tar
docker load --input ./wazuh-manager.tar
docker load --input ./wazuh-cert-tool.tar
rm -rf wazuh-manager.tar wazuh-indexer.tar wazuh-dashboard.tar wazuh-cert-tool.tar
- name: Create multi node certficates
run: docker-compose -f multi-node/generate-indexer-certs.yml run --rm generator
run: docker compose -f multi-node/generate-certs.yml run --rm generator
- name: Start multi node stack
run: docker-compose -f multi-node/docker-compose.yml up -d
run: docker compose -f multi-node/docker-compose.yml up -d
- name: Check Wazuh indexer start
run: |
@@ -232,7 +253,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 +291,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,6 +1,120 @@
# Change Log
All notable changes to this project will be documented in this file.
## [5.0.0]
### Added
- none
### Changed
- Delete service tag and modifiy docker-compose execution for a new version ([#1632](https://github.com/wazuh/wazuh-docker/pull/1632))
- Remove deprecated attribute version in docker-compose.yml ([#1595](https://github.com/wazuh/wazuh-docker/pull/1595)) by https://github.com/h3ssan
### Fixed
- None
### Deleted
- None
## [4.10.2]
### Added
- none
### Changed
- None
### Fixed
- None
### Deleted
- None
## [4.10.1]
### Added
- none
### Changed
- None
### Fixed
- None
### Deleted
- None
## [4.10.0]
### Added
- Migrate the push docker images procedure to GitHub Actions ([#5651](https://github.com/wazuh/wazuh-qa/issues/5651))
### Changed
- None
### Fixed
- None
### 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

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,56 +139,53 @@ 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
└── VERSION
## 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 |
|---------------|---------|--------|
| v5.0.0 | | |
| v4.10.2 | | |
| 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 | | |
@@ -254,7 +244,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="40812"
WAZUH-DOCKER_VERSION="5.0.0"
REVISION="50000"

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 5.0.0
```
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, 5.0.0.
-h, --help Show this help.
```

View File

@@ -1,4 +1,4 @@
WAZUH_IMAGE_VERSION=4.8.0
WAZUH_IMAGE_VERSION=5.0.0
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="5.0.0"
WAZUH_TAG_REVISION="1"
WAZUH_DEV_STAGE=""
FILEBEAT_MODULE_VERSION="0.4"
@@ -70,7 +70,8 @@ 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
docker build -t wazuh/wazuh-cert-tool:$WAZUH_IMAGE_VERSION build-docker-images/cert-tool-image/
return 0
}

View File

@@ -1,6 +1,4 @@
# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
version: '3.7'
services:
wazuh.manager:
build:

View File

@@ -1,7 +1,8 @@
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
FROM ubuntu:focal
FROM amazonlinux:2023
RUN apt-get update && apt-get install openssl curl -y
RUN yum install curl-minimal openssl -y &&\
yum clean all
WORKDIR /

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/5.0/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/5.0/
## 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,37 +3,29 @@ 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/
# Generate certificates
COPY config/config.sh .
COPY config/config.yml /
RUN bash config.sh
################################################################################
# Build stage 1 (the current Wazuh dashboard image):
@@ -56,21 +48,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="" \
@@ -108,6 +85,15 @@ COPY --from=builder --chown=1000:1000 $INSTALL_DIR $INSTALL_DIR
RUN mkdir -p /usr/share/wazuh-dashboard/plugins/wazuh/public/assets/custom
RUN chown 1000:1000 /usr/share/wazuh-dashboard/plugins/wazuh/public/assets/custom
# Set $JAVA_HOME
RUN echo "export JAVA_HOME=$INSTALL_DIR/jdk" >> /etc/profile.d/java_home.sh && \
echo "export PATH=\$PATH:\$JAVA_HOME/bin" >> /etc/profile.d/java_home.sh
ENV JAVA_HOME=$INSTALL_DIR/jdk
ENV PATH=$PATH:$JAVA_HOME/bin:$INSTALL_DIR/bin
# Add k-NN lib directory to library loading path variable
ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$INSTALL_DIR/plugins/opensearch-knn/lib"
# Set workdir and user
WORKDIR $INSTALL_DIR
USER wazuh-dashboard
@@ -116,3 +102,5 @@ USER wazuh-dashboard
EXPOSE 443
ENTRYPOINT [ "/entrypoint.sh" ]
CMD ["opensearch-dashboards"]

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/5.0/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/5.0/
## 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}')
@@ -34,8 +34,8 @@ chmod 755 $CERT_TOOL && bash /$CERT_TOOL -A
mkdir -p ${CONFIG_DIR}/certs
# Copy Wazuh dashboard certs to install config dir
cp /wazuh-certificates/demo.dashboard.pem ${CONFIG_DIR}/certs/dashboard.pem
cp /wazuh-certificates/demo.dashboard-key.pem ${CONFIG_DIR}/certs/dashboard-key.pem
cp /wazuh-certificates/dashboard.pem ${CONFIG_DIR}/certs/dashboard.pem
cp /wazuh-certificates/dashboard-key.pem ${CONFIG_DIR}/certs/dashboard-key.pem
cp /wazuh-certificates/root-ca.pem ${CONFIG_DIR}/certs/root-ca.pem
chmod -R 500 ${CONFIG_DIR}/certs

View File

@@ -1,5 +1,5 @@
nodes:
# Wazuh dashboard server nodes
dashboard:
- name: demo.dashboard
ip: demo.dashboard
- name: dashboard
ip: wazuh.dashboard

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

@@ -2,6 +2,215 @@
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
INSTALL_DIR=/usr/share/wazuh-dashboard
export OPENSEARCH_DASHBOARDS_HOME=$INSTALL_DIR
WAZUH_CONFIG_MOUNT=/wazuh-config-mount
opensearch_dashboards_vars=(
console.enabled
console.proxyConfig
console.proxyFilter
ops.cGroupOverrides.cpuPath
ops.cGroupOverrides.cpuAcctPath
cpu.cgroup.path.override
cpuacct.cgroup.path.override
server.basePath
server.customResponseHeaders
server.compression.enabled
server.compression.referrerWhitelist
server.cors
server.cors.origin
server.defaultRoute
server.host
server.keepAliveTimeout
server.maxPayloadBytes
server.name
server.port
csp.rules
csp.strict
csp.warnLegacyBrowsers
data.search.usageTelemetry.enabled
opensearch.customHeaders
opensearch.hosts
opensearch.logQueries
opensearch.memoryCircuitBreaker.enabled
opensearch.memoryCircuitBreaker.maxPercentage
opensearch.password
opensearch.pingTimeout
opensearch.requestHeadersWhitelist
opensearch.requestHeadersAllowlist
opensearch_security.multitenancy.enabled
opensearch_security.readonly_mode.roles
opensearch.requestTimeout
opensearch.shardTimeout
opensearch.sniffInterval
opensearch.sniffOnConnectionFault
opensearch.sniffOnStart
opensearch.ssl.alwaysPresentCertificate
opensearch.ssl.certificate
opensearch.ssl.key
opensearch.ssl.keyPassphrase
opensearch.ssl.keystore.path
opensearch.ssl.keystore.password
opensearch.ssl.truststore.path
opensearch.ssl.truststore.password
opensearch.ssl.verificationMode
opensearch.username
i18n.locale
interpreter.enableInVisualize
opensearchDashboards.autocompleteTerminateAfter
opensearchDashboards.autocompleteTimeout
opensearchDashboards.defaultAppId
opensearchDashboards.index
logging.dest
logging.json
logging.quiet
logging.rotate.enabled
logging.rotate.everyBytes
logging.rotate.keepFiles
logging.rotate.pollingInterval
logging.rotate.usePolling
logging.silent
logging.useUTC
logging.verbose
map.includeOpenSearchMapsService
map.proxyOpenSearchMapsServiceInMaps
map.regionmap
map.tilemap.options.attribution
map.tilemap.options.maxZoom
map.tilemap.options.minZoom
map.tilemap.options.subdomains
map.tilemap.url
monitoring.cluster_alerts.email_notifications.email_address
monitoring.enabled
monitoring.opensearchDashboards.collection.enabled
monitoring.opensearchDashboards.collection.interval
monitoring.ui.container.opensearch.enabled
monitoring.ui.container.logstash.enabled
monitoring.ui.opensearch.password
monitoring.ui.opensearch.pingTimeout
monitoring.ui.opensearch.hosts
monitoring.ui.opensearch.username
monitoring.ui.opensearch.logFetchCount
monitoring.ui.opensearch.ssl.certificateAuthorities
monitoring.ui.opensearch.ssl.verificationMode
monitoring.ui.enabled
monitoring.ui.max_bucket_size
monitoring.ui.min_interval_seconds
newsfeed.enabled
ops.interval
path.data
pid.file
regionmap
security.showInsecureClusterWarning
server.rewriteBasePath
server.socketTimeout
server.customResponseHeaders
server.ssl.enabled
server.ssl.key
server.ssl.keyPassphrase
server.ssl.keystore.path
server.ssl.keystore.password
server.ssl.truststore.path
server.ssl.truststore.password
server.ssl.cert
server.ssl.certificate
server.ssl.certificateAuthorities
server.ssl.cipherSuites
server.ssl.clientAuthentication
opensearch.ssl.certificateAuthorities
server.ssl.redirectHttpFromPort
server.ssl.supportedProtocols
server.xsrf.disableProtection
server.xsrf.whitelist
status.allowAnonymous
status.v6ApiFormat
tilemap.options.attribution
tilemap.options.maxZoom
tilemap.options.minZoom
tilemap.options.subdomains
tilemap.url
timeline.enabled
vega.enableExternalUrls
apm_oss.apmAgentConfigurationIndex
apm_oss.indexPattern
apm_oss.errorIndices
apm_oss.onboardingIndices
apm_oss.spanIndices
apm_oss.sourcemapIndices
apm_oss.transactionIndices
apm_oss.metricsIndices
telemetry.allowChangingOptInStatus
telemetry.enabled
telemetry.optIn
telemetry.optInStatusUrl
telemetry.sendUsageFrom
vis_builder.enabled
data_source.enabled
data_source.encryption.wrappingKeyName
data_source.encryption.wrappingKeyNamespace
data_source.encryption.wrappingKey
data_source.audit.enabled
data_source.audit.appender.kind
data_source.audit.appender.path
data_source.audit.appender.layout.kind
data_source.audit.appender.layout.highlight
data_source.audit.appender.layout.pattern
ml_commons_dashboards.enabled
assistant.chat.enabled
observability.query_assist.enabled
uiSettings.overrides.defaultRoute
)
print() {
echo -e $1
}
error_and_exit() {
echo "Error executing command: '$1'."
echo 'Exiting.'
exit 1
}
exec_cmd() {
eval $1 > /dev/null 2>&1 || error_and_exit "$1"
}
exec_cmd_stdout() {
eval $1 2>&1 || error_and_exit "$1"
}
function runOpensearchDashboards {
touch $OPENSEARCH_DASHBOARDS_HOME/config/opensearch_dashboards.yml
for opensearch_dashboards_var in ${opensearch_dashboards_vars[*]}; do
env_var=$(echo ${opensearch_dashboards_var^^} | tr . _)
value=${!env_var}
if [[ -n $value ]]; then
longoptfile="${opensearch_dashboards_var}: ${value}"
if grep -q $opensearch_dashboards_var $OPENSEARCH_DASHBOARDS_HOME/config/opensearch_dashboards.yml; then
sed -i "/${opensearch_dashboards_var}/ s|^.*$|${longoptfile}|" $OPENSEARCH_DASHBOARDS_HOME/config/opensearch_dashboards.yml
else
echo $longoptfile >> $OPENSEARCH_DASHBOARDS_HOME/config/opensearch_dashboards.yml
fi
fi
done
umask 0002
/usr/share/wazuh-dashboard/bin/opensearch-dashboards -c $OPENSEARCH_DASHBOARDS_HOME/config/opensearch_dashboards.yml \
--cpu.cgroup.path.override=/ \
--cpuacct.cgroup.path.override=/
}
mount_files() {
if [ -e $WAZUH_CONFIG_MOUNT/* ]
then
print "Identified Wazuh cdashboard onfiguration files to mount..."
exec_cmd_stdout "cp --verbose -r $WAZUH_CONFIG_MOUNT/* $INSTALL_DIR"
else
print "No Wazuh dashboard configuration files to mount..."
fi
}
DASHBOARD_USERNAME="${DASHBOARD_USERNAME:-kibanaserver}"
DASHBOARD_PASSWORD="${DASHBOARD_PASSWORD:-kibanaserver}"
@@ -17,4 +226,14 @@ echo $DASHBOARD_PASSWORD | $INSTALL_DIR/bin/opensearch-dashboards-keystore add o
/wazuh_app_config.sh $WAZUH_UI_REVISION
/usr/share/wazuh-dashboard/bin/opensearch-dashboards -c /usr/share/wazuh-dashboard/config/opensearch_dashboards.yml
mount_files
if [ $# -eq 0 ] || [ "${1:0:1}" = '-' ]; then
set -- opensearch-dashboards "$@"
fi
if [ "$1" = "opensearch-dashboards" ]; then
runOpensearchDashboards "$@"
else
exec "$@"
fi

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,20 +6,19 @@ 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 .
COPY config/config.yml /
COPY config/action_groups.yml /
COPY config/internal_users.yml /
COPY config/roles_mapping.yml /
COPY config/roles.yml /
RUN bash config.sh
################################################################################
@@ -36,6 +35,15 @@ ENV USER="wazuh-indexer" \
NAME="wazuh-indexer" \
INSTALL_DIR="/usr/share/wazuh-indexer"
# Set $JAVA_HOME
RUN echo "export JAVA_HOME=$INSTALL_DIR/jdk" >> /etc/profile.d/java_home.sh && \
echo "export PATH=\$PATH:\$JAVA_HOME/bin" >> /etc/profile.d/java_home.sh
ENV JAVA_HOME="$INSTALL_DIR/jdk"
ENV PATH=$PATH:$JAVA_HOME/bin:$INSTALL_DIR/bin
# Add k-NN lib directory to library loading path variable
ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$INSTALL_DIR/plugins/opensearch-knn/lib"
RUN yum install curl-minimal shadow-utils findutils hostname -y
RUN getent group $GROUP || groupadd -r -g 1000 $GROUP
@@ -59,7 +67,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

@@ -1,12 +0,0 @@
---
_meta:
type: "actiongroups"
config_version: 2
# ISM API permissions group
manage_ism:
reserved: true
hidden: false
allowed_actions:
- "cluster:admin/opendistro/ism/*"
static: false

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/5.0/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/5.0/
## 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

@@ -7,12 +7,272 @@ umask 0002
export USER=wazuh-indexer
export INSTALLATION_DIR=/usr/share/wazuh-indexer
export OPENSEARCH_PATH_CONF=${INSTALLATION_DIR}
export JAVA_HOME=${INSTALLATION_DIR}/jdk
export DISCOVERY=$(grep -oP "(?<=discovery.type: ).*" ${OPENSEARCH_PATH_CONF}/opensearch.yml)
export CACERT=$(grep -oP "(?<=plugins.security.ssl.transport.pemtrustedcas_filepath: ).*" ${OPENSEARCH_PATH_CONF}/opensearch.yml)
export CERT="${OPENSEARCH_PATH_CONF}/certs/admin.pem"
export KEY="${OPENSEARCH_PATH_CONF}/certs/admin-key.pem"
opensearch_vars=(
cluster.name
node.name
node.roles
path.data
path.logs
bootstrap.memory_lock
network.host
http.port
transport.port
network.bind_host
network.publish_host
transport.tcp.port
compatibility.override_main_response_version
http.host
http.bind_host
http.publish_host
http.compression
transport.host
transport.bind_host
transport.publish_host
discovery.seed_hosts
discovery.seed_providers
discovery.type
cluster.initial_cluster_manager_nodes
cluster.initial_master_nodes
node.max_local_storage_nodes
gateway.recover_after_nodes
gateway.recover_after_data_nodes
gateway.expected_data_nodes
gateway.recover_after_time
plugins.security.nodes_dn
plugins.security.nodes_dn_dynamic_config_enabled
plugins.security.authcz.admin_dn
plugins.security.roles_mapping_resolution
plugins.security.dls.mode
plugins.security.compliance.salt
config.dynamic.http.anonymous_auth_enabled
plugins.security.restapi.roles_enabled
plugins.security.restapi.password_validation_regex
plugins.security.restapi.password_validation_error_message
plugins.security.restapi.password_min_length
plugins.security.restapi.password_score_based_validation_strength
plugins.security.unsupported.restapi.allow_securityconfig_modification
plugins.security.authcz.impersonation_dn
plugins.security.authcz.rest_impersonation_user
plugins.security.allow_default_init_securityindex
plugins.security.allow_unsafe_democertificates
plugins.security.system_indices.permission.enabled
plugins.security.config_index_name
plugins.security.cert.oid
plugins.security.cert.intercluster_request_evaluator_class
plugins.security.enable_snapshot_restore_privilege
plugins.security.check_snapshot_restore_write_privileges
plugins.security.cache.ttl_minutes
plugins.security.protected_indices.enabled
plugins.security.protected_indices.roles
plugins.security.protected_indices.indices
plugins.security.system_indices.enabled
plugins.security.system_indices.indices
plugins.security.audit.enable_rest
plugins.security.audit.enable_transport
plugins.security.audit.resolve_bulk_requests
plugins.security.audit.config.disabled_categories
plugins.security.audit.ignore_requests
plugins.security.audit.threadpool.size
plugins.security.audit.threadpool.max_queue_len
plugins.security.audit.ignore_users
plugins.security.audit.type
plugins.security.audit.config.http_endpoints
plugins.security.audit.config.index
plugins.security.audit.config.type
plugins.security.audit.config.username
plugins.security.audit.config.password
plugins.security.audit.config.enable_ssl
plugins.security.audit.config.verify_hostnames
plugins.security.audit.config.enable_ssl_client_auth
plugins.security.audit.config.cert_alias
plugins.security.audit.config.pemkey_filepath
plugins.security.audit.config.pemkey_content
plugins.security.audit.config.pemkey_password
plugins.security.audit.config.pemcert_filepath
plugins.security.audit.config.pemcert_content
plugins.security.audit.config.pemtrustedcas_filepath
plugins.security.audit.config.pemtrustedcas_content
plugins.security.audit.config.webhook.url
plugins.security.audit.config.webhook.format
plugins.security.audit.config.webhook.ssl.verify
plugins.security.audit.config.webhook.ssl.pemtrustedcas_filepath
plugins.security.audit.config.webhook.ssl.pemtrustedcas_content
plugins.security.audit.config.log4j.logger_name
plugins.security.audit.config.log4j.level
opendistro_security.audit.config.disabled_rest_categories
opendistro_security.audit.config.disabled_transport_categories
plugins.security.ssl.transport.enforce_hostname_verification
plugins.security.ssl.transport.resolve_hostname
plugins.security.ssl.http.clientauth_mode
plugins.security.ssl.http.enabled_ciphers
plugins.security.ssl.http.enabled_protocols
plugins.security.ssl.transport.enabled_ciphers
plugins.security.ssl.transport.enabled_protocols
plugins.security.ssl.transport.keystore_type
plugins.security.ssl.transport.keystore_filepath
plugins.security.ssl.transport.keystore_alias
plugins.security.ssl.transport.keystore_password
plugins.security.ssl.transport.truststore_type
plugins.security.ssl.transport.truststore_filepath
plugins.security.ssl.transport.truststore_alias
plugins.security.ssl.transport.truststore_password
plugins.security.ssl.http.enabled
plugins.security.ssl.http.keystore_type
plugins.security.ssl.http.keystore_filepath
plugins.security.ssl.http.keystore_alias
plugins.security.ssl.http.keystore_password
plugins.security.ssl.http.truststore_type
plugins.security.ssl.http.truststore_filepath
plugins.security.ssl.http.truststore_alias
plugins.security.ssl.http.truststore_password
plugins.security.ssl.transport.enable_openssl_if_available
plugins.security.ssl.http.enable_openssl_if_available
plugins.security.ssl.transport.pemkey_filepath
plugins.security.ssl.transport.pemkey_password
plugins.security.ssl.transport.pemcert_filepath
plugins.security.ssl.transport.pemtrustedcas_filepath
plugins.security.ssl.http.pemkey_filepath
plugins.security.ssl.http.pemkey_password
plugins.security.ssl.http.pemcert_filepath
plugins.security.ssl.http.pemtrustedcas_filepath
plugins.security.ssl.transport.enabled
plugins.security.ssl.transport.client.pemkey_password
plugins.security.ssl.transport.keystore_keypassword
plugins.security.ssl.transport.server.keystore_keypassword
plugins.sercurity.ssl.transport.server.keystore_alias
plugins.sercurity.ssl.transport.client.keystore_alias
plugins.sercurity.ssl.transport.server.truststore_alias
plugins.sercurity.ssl.transport.client.truststore_alias
plugins.security.ssl.client.external_context_id
plugins.secuirty.ssl.transport.principal_extractor_class
plugins.security.ssl.http.crl.file_path
plugins.security.ssl.http.crl.validate
plugins.security.ssl.http.crl.prefer_crlfile_over_ocsp
plugins.security.ssl.http.crl.check_only_end_entitites
plugins.security.ssl.http.crl.disable_ocsp
plugins.security.ssl.http.crl.disable_crldp
plugins.security.ssl.allow_client_initiated_renegotiation
indices.breaker.total.use_real_memory
indices.breaker.total.limit
indices.breaker.fielddata.limit
indices.breaker.fielddata.overhead
indices.breaker.request.limit
indices.breaker.request.overhead
network.breaker.inflight_requests.limit
network.breaker.inflight_requests.overhead
cluster.routing.allocation.enable
cluster.routing.allocation.node_concurrent_incoming_recoveries
cluster.routing.allocation.node_concurrent_outgoing_recoveries
cluster.routing.allocation.node_concurrent_recoveries
cluster.routing.allocation.node_initial_primaries_recoveries
cluster.routing.allocation.same_shard.host
cluster.routing.rebalance.enable
cluster.routing.allocation.allow_rebalance
cluster.routing.allocation.cluster_concurrent_rebalance
cluster.routing.allocation.balance.shard
cluster.routing.allocation.balance.index
cluster.routing.allocation.balance.threshold
cluster.routing.allocation.balance.prefer_primary
cluster.routing.allocation.disk.threshold_enabled
cluster.routing.allocation.disk.watermark.low
cluster.routing.allocation.disk.watermark.high
cluster.routing.allocation.disk.watermark.flood_stage
cluster.info.update.interval
cluster.routing.allocation.shard_movement_strategy
cluster.blocks.read_only
cluster.blocks.read_only_allow_delete
cluster.max_shards_per_node
cluster.persistent_tasks.allocation.enable
cluster.persistent_tasks.allocation.recheck_interval
cluster.search.request.slowlog.threshold.warn
cluster.search.request.slowlog.threshold.info
cluster.search.request.slowlog.threshold.debug
cluster.search.request.slowlog.threshold.trace
cluster.search.request.slowlog.level
cluster.fault_detection.leader_check.timeout
cluster.fault_detection.follower_check.timeout
action.auto_create_index
action.destructive_requires_name
cluster.default.index.refresh_interval
cluster.minimum.index.refresh_interval
cluster.indices.close.enable
indices.recovery.max_bytes_per_sec
indices.recovery.max_concurrent_file_chunks
indices.recovery.max_concurrent_operations
indices.recovery.max_concurrent_remote_store_streams
indices.time_series_index.default_index_merge_policy
indices.fielddata.cache.size
index.number_of_shards
index.number_of_routing_shards
index.shard.check_on_startup
index.codec
index.codec.compression_level
index.routing_partition_size
index.soft_deletes.retention_lease.period
index.load_fixed_bitset_filters_eagerly
index.hidden
index.merge.policy
index.merge_on_flush.enabled
index.merge_on_flush.max_full_flush_merge_wait_time
index.merge_on_flush.policy
index.check_pending_flush.enabled
index.number_of_replicas
index.auto_expand_replicas
index.search.idle.after
index.refresh_interval
index.max_result_window
index.max_inner_result_window
index.max_rescore_window
index.max_docvalue_fields_search
index.max_script_fields
index.max_ngram_diff
index.max_shingle_diff
index.max_refresh_listeners
index.analyze.max_token_count
index.highlight.max_analyzed_offset
index.max_terms_count
index.max_regex_length
index.query.default_field
index.query.max_nested_depth
index.routing.allocation.enable
index.routing.rebalance.enable
index.gc_deletes
index.default_pipeline
index.final_pipeline
index.optimize_doc_id_lookup.fuzzy_set.enabled
index.optimize_doc_id_lookup.fuzzy_set.false_positive_probability
search.max_buckets
search.phase_took_enabled
search.allow_expensive_queries
search.default_allow_partial_results
search.cancel_after_time_interval
search.default_search_timeout
search.default_keep_alive
search.keep_alive_interval
search.max_keep_alive
search.low_level_cancellation
search.max_open_scroll_context
search.request_stats_enabled
search.highlight.term_vector_multi_value
snapshot.max_concurrent_operations
cluster.remote_store.translog.buffer_interval
remote_store.moving_average_window_size
opensearch.notifications.core.allowed_config_types
opensearch.notifications.core.email.minimum_header_length
opensearch.notifications.core.email.size_limit
opensearch.notifications.core.http.connection_timeout
opensearch.notifications.core.http.host_deny_list
opensearch.notifications.core.http.max_connection_per_route
opensearch.notifications.core.http.max_connections
opensearch.notifications.core.http.socket_timeout
opensearch.notifications.core.tooltip_support
opensearch.notifications.general.filter_by_backend_roles
)
run_as_other_user_if_needed() {
if [[ "$(id -u)" == "0" ]]; then
# If running as root, drop to specified UID and run command
@@ -24,6 +284,37 @@ run_as_other_user_if_needed() {
fi
}
function buildOpensearchConfig {
echo "" >> $OPENSEARCH_PATH_CONF/opensearch.yml
for opensearch_var in ${opensearch_vars[*]}; do
env_var=$(echo ${opensearch_var^^} | tr . _)
value=${!env_var}
if [[ -n $value ]]; then
if grep -q $opensearch_var $OPENSEARCH_PATH_CONF/opensearch.yml; then
lineNum="$(grep -n "$opensearch_var" $OPENSEARCH_PATH_CONF/opensearch.yml | head -n 1 | cut -d: -f1)"
sed -i "${lineNum}d" $OPENSEARCH_PATH_CONF/opensearch.yml
charline=$(awk "NR == ${lineNum}" $OPENSEARCH_PATH_CONF/opensearch.yml | head -c 1)
fi
while :
do
case "$charline" in
"-"| "#" |" ") sed -i "${lineNum}d" $OPENSEARCH_PATH_CONF/opensearch.yml;;
*) break;;
esac
charline=$(awk "NR == ${lineNum}" $OPENSEARCH_PATH_CONF/opensearch.yml | head -c 1)
done
longoptfile="${opensearch_var}: ${value}"
if grep -q $opensearch_var $OPENSEARCH_PATH_CONF/opensearch.yml; then
sed -i "/${opensearch_var}/ s|^.*$|${longoptfile}|" $OPENSEARCH_PATH_CONF/opensearch.yml
else
echo $longoptfile >> $OPENSEARCH_PATH_CONF/opensearch.yml
fi
fi
done
}
buildOpensearchConfig
# Allow user specify custom CMD, maybe bin/opensearch itself
# for example to directly specify `-E` style parameters for opensearch on k8s
# or simply to run /bin/bash to check the image
@@ -84,10 +375,4 @@ if [[ "$(id -u)" == "0" ]]; then
fi
#if [[ "$DISCOVERY" == "single-node" ]] && [[ ! -f "/var/lib/wazuh-indexer/.flag" ]]; then
# run securityadmin.sh for single node with CACERT, CERT and KEY parameter
# nohup /securityadmin.sh &
# touch "/var/lib/wazuh-indexer/.flag"
#fi
run_as_other_user_if_needed /usr/share/wazuh-indexer/bin/opensearch <<<"$KEYSTORE_PASSWORD"

View File

@@ -1,74 +0,0 @@
---
# This is the internal user database
# The hash value is a bcrypt hash and can be generated with plugin/tools/hash.sh
_meta:
type: "internalusers"
config_version: 2
# Define your internal users here
## Demo users
admin:
hash: "$2a$12$VcCDgh2NDk07JGN0rjGbM.Ad41qVR/YFJcgHp0UGns5JDymv..TOG"
reserved: true
backend_roles:
- "admin"
description: "Demo admin user"
kibanaserver:
hash: "$2a$12$4AcgAt3xwOWadA5s5blL6ev39OXDNhmOesEoo33eZtrq2N0YrU3H."
reserved: true
description: "Demo kibanaserver user"
kibanaro:
hash: "$2a$12$JJSXNfTowz7Uu5ttXfeYpeYE0arACvcwlPBStB1F.MI7f0U9Z4DGC"
reserved: false
backend_roles:
- "kibanauser"
- "readall"
attributes:
attribute1: "value1"
attribute2: "value2"
attribute3: "value3"
description: "Demo kibanaro user"
logstash:
hash: "$2a$12$u1ShR4l4uBS3Uv59Pa2y5.1uQuZBrZtmNfqB3iM/.jL0XoV9sghS2"
reserved: false
backend_roles:
- "logstash"
description: "Demo logstash user"
readall:
hash: "$2a$12$ae4ycwzwvLtZxwZ82RmiEunBbIPiAmGZduBAjKN0TXdwQFtCwARz2"
reserved: false
backend_roles:
- "readall"
description: "Demo readall user"
snapshotrestore:
hash: "$2y$12$DpwmetHKwgYnorbgdvORCenv4NAK8cPUg8AI6pxLCuWf/ALc0.v7W"
reserved: false
backend_roles:
- "snapshotrestore"
description: "Demo snapshotrestore user"
wazuh_admin:
hash: "$2y$12$d2awHiOYvZjI88VfsDON.u6buoBol0gYPJEgdG1ArKVE0OMxViFfu"
reserved: true
hidden: false
backend_roles: []
attributes: {}
opendistro_security_roles: []
static: false
wazuh_user:
hash: "$2y$12$BQixeoQdRubZdVf/7sq1suHwiVRnSst1.lPI2M0.GPZms4bq2D9vO"
reserved: true
hidden: false
backend_roles: []
attributes: {}
opendistro_security_roles: []
static: false

View File

@@ -1,26 +0,0 @@
network.host: "0.0.0.0"
node.name: "wazuh.indexer"
path.data: /var/lib/wazuh-indexer
path.logs: /var/log/wazuh-indexer
discovery.type: single-node
compatibility.override_main_response_version: true
plugins.security.ssl.http.pemcert_filepath: /usr/share/wazuh-indexer/certs/indexer.pem
plugins.security.ssl.http.pemkey_filepath: /usr/share/wazuh-indexer/certs/indexer-key.pem
plugins.security.ssl.http.pemtrustedcas_filepath: /usr/share/wazuh-indexer/certs/root-ca.pem
plugins.security.ssl.transport.pemcert_filepath: /usr/share/wazuh-indexer/certs/indexer.pem
plugins.security.ssl.transport.pemkey_filepath: /usr/share/wazuh-indexer/certs/indexer-key.pem
plugins.security.ssl.transport.pemtrustedcas_filepath: /usr/share/wazuh-indexer/certs/root-ca.pem
plugins.security.ssl.http.enabled: true
plugins.security.ssl.transport.enforce_hostname_verification: false
plugins.security.ssl.transport.resolve_hostname: false
plugins.security.authcz.admin_dn:
- "CN=admin,OU=Wazuh,O=Wazuh,L=California,C=US"
plugins.security.check_snapshot_restore_write_privileges: true
plugins.security.enable_snapshot_restore_privilege: true
plugins.security.nodes_dn:
- "CN=demo.indexer,OU=Wazuh,O=Wazuh,L=California,C=US"
plugins.security.restapi.roles_enabled:
- "all_access"
- "security_rest_api_access"
plugins.security.system_indices.enabled: true
plugins.security.system_indices.indices: [".opendistro-alerting-config", ".opendistro-alerting-alert*", ".opendistro-anomaly-results*", ".opendistro-anomaly-detector*", ".opendistro-anomaly-checkpoints", ".opendistro-anomaly-detection-state", ".opendistro-reports-*", ".opendistro-notifications-*", ".opendistro-notebooks", ".opensearch-observability", ".opendistro-asynchronous-search-response*", ".replication-metadata-store"]

View File

@@ -1,171 +0,0 @@
_meta:
type: "roles"
config_version: 2
# Restrict users so they can only view visualization and dashboards on kibana
kibana_read_only:
reserved: true
# The security REST API access role is used to assign specific users access to change the security settings through the REST API.
security_rest_api_access:
reserved: true
# Allows users to view monitors, destinations and alerts
alerting_read_access:
reserved: true
cluster_permissions:
- 'cluster:admin/opendistro/alerting/alerts/get'
- 'cluster:admin/opendistro/alerting/destination/get'
- 'cluster:admin/opendistro/alerting/monitor/get'
- 'cluster:admin/opendistro/alerting/monitor/search'
# Allows users to view and acknowledge alerts
alerting_ack_alerts:
reserved: true
cluster_permissions:
- 'cluster:admin/opendistro/alerting/alerts/*'
# Allows users to use all alerting functionality
alerting_full_access:
reserved: true
cluster_permissions:
- 'cluster_monitor'
- 'cluster:admin/opendistro/alerting/*'
index_permissions:
- index_patterns:
- '*'
allowed_actions:
- 'indices_monitor'
- 'indices:admin/aliases/get'
- 'indices:admin/mappings/get'
# Allow users to read Anomaly Detection detectors and results
anomaly_read_access:
reserved: true
cluster_permissions:
- 'cluster:admin/opendistro/ad/detector/info'
- 'cluster:admin/opendistro/ad/detector/search'
- 'cluster:admin/opendistro/ad/detectors/get'
- 'cluster:admin/opendistro/ad/result/search'
- 'cluster:admin/opendistro/ad/tasks/search'
# Allows users to use all Anomaly Detection functionality
anomaly_full_access:
reserved: true
cluster_permissions:
- 'cluster_monitor'
- 'cluster:admin/opendistro/ad/*'
index_permissions:
- index_patterns:
- '*'
allowed_actions:
- 'indices_monitor'
- 'indices:admin/aliases/get'
- 'indices:admin/mappings/get'
# Allows users to read Notebooks
notebooks_read_access:
reserved: true
cluster_permissions:
- 'cluster:admin/opendistro/notebooks/list'
- 'cluster:admin/opendistro/notebooks/get'
# Allows users to all Notebooks functionality
notebooks_full_access:
reserved: true
cluster_permissions:
- 'cluster:admin/opendistro/notebooks/create'
- 'cluster:admin/opendistro/notebooks/update'
- 'cluster:admin/opendistro/notebooks/delete'
- 'cluster:admin/opendistro/notebooks/get'
- 'cluster:admin/opendistro/notebooks/list'
# Allows users to read and download Reports
reports_instances_read_access:
reserved: true
cluster_permissions:
- 'cluster:admin/opendistro/reports/instance/list'
- 'cluster:admin/opendistro/reports/instance/get'
- 'cluster:admin/opendistro/reports/menu/download'
# Allows users to read and download Reports and Report-definitions
reports_read_access:
reserved: true
cluster_permissions:
- 'cluster:admin/opendistro/reports/definition/get'
- 'cluster:admin/opendistro/reports/definition/list'
- 'cluster:admin/opendistro/reports/instance/list'
- 'cluster:admin/opendistro/reports/instance/get'
- 'cluster:admin/opendistro/reports/menu/download'
# Allows users to all Reports functionality
reports_full_access:
reserved: true
cluster_permissions:
- 'cluster:admin/opendistro/reports/definition/create'
- 'cluster:admin/opendistro/reports/definition/update'
- 'cluster:admin/opendistro/reports/definition/on_demand'
- 'cluster:admin/opendistro/reports/definition/delete'
- 'cluster:admin/opendistro/reports/definition/get'
- 'cluster:admin/opendistro/reports/definition/list'
- 'cluster:admin/opendistro/reports/instance/list'
- 'cluster:admin/opendistro/reports/instance/get'
- 'cluster:admin/opendistro/reports/menu/download'
# Allows users to use all asynchronous-search functionality
asynchronous_search_full_access:
reserved: true
cluster_permissions:
- 'cluster:admin/opendistro/asynchronous_search/*'
index_permissions:
- index_patterns:
- '*'
allowed_actions:
- 'indices:data/read/search*'
# Allows users to read stored asynchronous-search results
asynchronous_search_read_access:
reserved: true
cluster_permissions:
- 'cluster:admin/opendistro/asynchronous_search/get'
wazuh_ui_user:
reserved: true
hidden: false
cluster_permissions: []
index_permissions:
- index_patterns:
- "wazuh-*"
dls: ""
fls: []
masked_fields: []
allowed_actions:
- "read"
tenant_permissions: []
static: false
wazuh_ui_admin:
reserved: true
hidden: false
cluster_permissions: []
index_permissions:
- index_patterns:
- "wazuh-*"
dls: ""
fls: []
masked_fields: []
allowed_actions:
- "read"
- "delete"
- "manage"
- "index"
tenant_permissions: []
static: false
# ISM API permissions role
manage_ism:
reserved: true
hidden: false
cluster_permissions:
- "manage_ism"
static: false

View File

@@ -1,78 +0,0 @@
---
# In this file users, backendroles and hosts can be mapped to Wazuh indexer Security roles.
# Permissions for Wazuh indexer roles are configured in roles.yml
_meta:
type: "rolesmapping"
config_version: 2
# Define your roles mapping here
## Demo roles mapping
all_access:
reserved: false
backend_roles:
- "admin"
description: "Maps admin to all_access"
own_index:
reserved: false
users:
- "*"
description: "Allow full access to an index named like the username"
logstash:
reserved: false
backend_roles:
- "logstash"
kibana_user:
reserved: false
backend_roles:
- "kibanauser"
users:
- "wazuh_user"
- "wazuh_admin"
description: "Maps kibanauser to kibana_user"
readall:
reserved: false
backend_roles:
- "readall"
manage_snapshots:
reserved: false
backend_roles:
- "snapshotrestore"
kibana_server:
reserved: true
users:
- "kibanaserver"
wazuh_ui_admin:
reserved: true
hidden: false
backend_roles: []
hosts: []
users:
- "wazuh_admin"
- "kibanaserver"
and_backend_roles: []
wazuh_ui_user:
reserved: true
hidden: false
backend_roles: []
hosts: []
users:
- "wazuh_user"
and_backend_roles: []
# ISM API permissions role mapping
manage_ism:
reserved: true
hidden: false
users:
- "kibanaserver"

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,9 @@ 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/docker/DockerListener"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/docker/DockerListener.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/gcloud"

View File

@@ -1,9 +0,0 @@
# Certificate creation image build
The dockerfile hosted in this directory is used to build the image used to boot Wazuh's single node and multi node stacks.
To create the image, the following command must be executed:
```
$ docker build -t wazuh/wazuh-certs-generator:0.0.1 .
```

View File

@@ -354,7 +354,7 @@ docker container run --rm -it \
```
git checkout 4.4
cd multi-node
docker-compose -f generate-indexer-certs.yml run --rm generator
docker-compose -f generate-certs.yml run --rm generator
docker-compose up -d
```

View File

@@ -1,6 +1,6 @@
# Deploy Wazuh Docker in multi node configuration
This deployment is defined in the `docker-compose.yml` file with two Wazuh manager containers, three Wazuh indexer containers, and one Wazuh dashboard container. It can be deployed by following these steps:
This deployment is defined in the `docker-compose.yml` file with two Wazuh manager containers, three Wazuh indexer containers, and one Wazuh dashboard container. It can be deployed by following these steps:
1) Increase max_map_count on your host (Linux). This command must be run with root permissions:
```
@@ -8,18 +8,18 @@ $ sysctl -w vm.max_map_count=262144
```
2) Run the certificate creation script:
```
$ docker-compose -f generate-indexer-certs.yml run --rm generator
$ docker compose -f generate-certs.yml run --rm generator
```
3) Start the environment with docker-compose:
3) Start the environment with docker compose:
- In the foregroud:
```
$ docker-compose up
$ docker compose up
```
- In the background:
```
$ docker-compose up -d
$ docker compose up -d
```

View File

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

View File

@@ -1,38 +0,0 @@
network.host: wazuh1.indexer
node.name: wazuh1.indexer
cluster.initial_master_nodes:
- wazuh1.indexer
- wazuh2.indexer
- wazuh3.indexer
cluster.name: "wazuh-cluster"
discovery.seed_hosts:
- wazuh1.indexer
- wazuh2.indexer
- wazuh3.indexer
node.max_local_storage_nodes: "3"
path.data: /var/lib/wazuh-indexer
path.logs: /var/log/wazuh-indexer
plugins.security.ssl.http.pemcert_filepath: ${OPENSEARCH_PATH_CONF}/certs/wazuh1.indexer.pem
plugins.security.ssl.http.pemkey_filepath: ${OPENSEARCH_PATH_CONF}/certs/wazuh1.indexer.key
plugins.security.ssl.http.pemtrustedcas_filepath: ${OPENSEARCH_PATH_CONF}/certs/root-ca.pem
plugins.security.ssl.transport.pemcert_filepath: ${OPENSEARCH_PATH_CONF}/certs/wazuh1.indexer.pem
plugins.security.ssl.transport.pemkey_filepath: ${OPENSEARCH_PATH_CONF}/certs/wazuh1.indexer.key
plugins.security.ssl.transport.pemtrustedcas_filepath: ${OPENSEARCH_PATH_CONF}/certs/root-ca.pem
plugins.security.ssl.http.enabled: true
plugins.security.ssl.transport.enforce_hostname_verification: false
plugins.security.ssl.transport.resolve_hostname: false
plugins.security.authcz.admin_dn:
- "CN=admin,OU=Wazuh,O=Wazuh,L=California,C=US"
plugins.security.check_snapshot_restore_write_privileges: true
plugins.security.enable_snapshot_restore_privilege: true
plugins.security.nodes_dn:
- "CN=wazuh1.indexer,OU=Wazuh,O=Wazuh,L=California,C=US"
- "CN=wazuh2.indexer,OU=Wazuh,O=Wazuh,L=California,C=US"
- "CN=wazuh3.indexer,OU=Wazuh,O=Wazuh,L=California,C=US"
- "CN=filebeat,OU=Wazuh,O=Wazuh,L=California,C=US"
plugins.security.restapi.roles_enabled:
- "all_access"
- "security_rest_api_access"
plugins.security.allow_default_init_securityindex: true
cluster.routing.allocation.disk.threshold_enabled: false
compatibility.override_main_response_version: true

View File

@@ -1,38 +0,0 @@
network.host: wazuh2.indexer
node.name: wazuh2.indexer
cluster.initial_master_nodes:
- wazuh1.indexer
- wazuh2.indexer
- wazuh3.indexer
cluster.name: "wazuh-cluster"
discovery.seed_hosts:
- wazuh1.indexer
- wazuh2.indexer
- wazuh3.indexer
node.max_local_storage_nodes: "3"
path.data: /var/lib/wazuh-indexer
path.logs: /var/log/wazuh-indexer
plugins.security.ssl.http.pemcert_filepath: ${OPENSEARCH_PATH_CONF}/certs/wazuh2.indexer.pem
plugins.security.ssl.http.pemkey_filepath: ${OPENSEARCH_PATH_CONF}/certs/wazuh2.indexer.key
plugins.security.ssl.http.pemtrustedcas_filepath: ${OPENSEARCH_PATH_CONF}/certs/root-ca.pem
plugins.security.ssl.transport.pemcert_filepath: ${OPENSEARCH_PATH_CONF}/certs/wazuh2.indexer.pem
plugins.security.ssl.transport.pemkey_filepath: ${OPENSEARCH_PATH_CONF}/certs/wazuh2.indexer.key
plugins.security.ssl.transport.pemtrustedcas_filepath: ${OPENSEARCH_PATH_CONF}/certs/root-ca.pem
plugins.security.ssl.http.enabled: true
plugins.security.ssl.transport.enforce_hostname_verification: false
plugins.security.ssl.transport.resolve_hostname: false
plugins.security.authcz.admin_dn:
- "CN=admin,OU=Wazuh,O=Wazuh,L=California,C=US"
plugins.security.check_snapshot_restore_write_privileges: true
plugins.security.enable_snapshot_restore_privilege: true
plugins.security.nodes_dn:
- "CN=wazuh1.indexer,OU=Wazuh,O=Wazuh,L=California,C=US"
- "CN=wazuh2.indexer,OU=Wazuh,O=Wazuh,L=California,C=US"
- "CN=wazuh3.indexer,OU=Wazuh,O=Wazuh,L=California,C=US"
- "CN=filebeat,OU=Wazuh,O=Wazuh,L=California,C=US"
plugins.security.restapi.roles_enabled:
- "all_access"
- "security_rest_api_access"
plugins.security.allow_default_init_securityindex: true
cluster.routing.allocation.disk.threshold_enabled: false
compatibility.override_main_response_version: true

View File

@@ -1,38 +0,0 @@
network.host: wazuh3.indexer
node.name: wazuh3.indexer
cluster.initial_master_nodes:
- wazuh1.indexer
- wazuh2.indexer
- wazuh3.indexer
cluster.name: "wazuh-cluster"
discovery.seed_hosts:
- wazuh1.indexer
- wazuh2.indexer
- wazuh3.indexer
node.max_local_storage_nodes: "3"
path.data: /var/lib/wazuh-indexer
path.logs: /var/log/wazuh-indexer
plugins.security.ssl.http.pemcert_filepath: ${OPENSEARCH_PATH_CONF}/certs/wazuh3.indexer.pem
plugins.security.ssl.http.pemkey_filepath: ${OPENSEARCH_PATH_CONF}/certs/wazuh3.indexer.key
plugins.security.ssl.http.pemtrustedcas_filepath: ${OPENSEARCH_PATH_CONF}/certs/root-ca.pem
plugins.security.ssl.transport.pemcert_filepath: ${OPENSEARCH_PATH_CONF}/certs/wazuh3.indexer.pem
plugins.security.ssl.transport.pemkey_filepath: ${OPENSEARCH_PATH_CONF}/certs/wazuh3.indexer.key
plugins.security.ssl.transport.pemtrustedcas_filepath: ${OPENSEARCH_PATH_CONF}/certs/root-ca.pem
plugins.security.ssl.http.enabled: true
plugins.security.ssl.transport.enforce_hostname_verification: false
plugins.security.ssl.transport.resolve_hostname: false
plugins.security.authcz.admin_dn:
- "CN=admin,OU=Wazuh,O=Wazuh,L=California,C=US"
plugins.security.check_snapshot_restore_write_privileges: true
plugins.security.enable_snapshot_restore_privilege: true
plugins.security.nodes_dn:
- "CN=wazuh1.indexer,OU=Wazuh,O=Wazuh,L=California,C=US"
- "CN=wazuh2.indexer,OU=Wazuh,O=Wazuh,L=California,C=US"
- "CN=wazuh3.indexer,OU=Wazuh,O=Wazuh,L=California,C=US"
- "CN=filebeat,OU=Wazuh,O=Wazuh,L=California,C=US"
plugins.security.restapi.roles_enabled:
- "all_access"
- "security_rest_api_access"
plugins.security.allow_default_init_securityindex: true
cluster.routing.allocation.disk.threshold_enabled: false
compatibility.override_main_response_version: true

View File

@@ -3,7 +3,7 @@ version: '3.7'
services:
wazuh.master:
image: wazuh/wazuh-manager:4.8.0
image: wazuh/wazuh-manager:5.0.0
hostname: wazuh.master
restart: always
ulimits:
@@ -18,15 +18,15 @@ services:
- "514:514/udp"
- "55000:55000"
environment:
- INDEXER_URL=https://wazuh1.indexer:9200
- INDEXER_USERNAME=admin
- INDEXER_PASSWORD=SecretPassword
- FILEBEAT_SSL_VERIFICATION_MODE=full
- SSL_CERTIFICATE_AUTHORITIES=/etc/ssl/root-ca.pem
- SSL_CERTIFICATE=/etc/ssl/filebeat.pem
- SSL_KEY=/etc/ssl/filebeat.key
- API_USERNAME=wazuh-wui
- API_PASSWORD=MyS3cr37P450r.*-
INDEXER_URL: https://wazuh1.indexer:9200
INDEXER_USERNAME: admin
INDEXER_PASSWORD: admin
FILEBEAT_SSL_VERIFICATION_MODE: full
SSL_CERTIFICATE_AUTHORITIES: /etc/ssl/root-ca.pem
SSL_CERTIFICATE: /etc/ssl/filebeat.pem
SSL_KEY: /etc/ssl/filebeat.key
API_USERNAME: wazuh-wui
API_PASSWORD: MyS3cr37P450r.*-
volumes:
- master-wazuh-api-configuration:/var/ossec/api/configuration
- master-wazuh-etc:/var/ossec/etc
@@ -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:5.0.0
hostname: wazuh.worker
restart: always
ulimits:
@@ -56,13 +56,13 @@ services:
soft: 655360
hard: 655360
environment:
- INDEXER_URL=https://wazuh1.indexer:9200
- INDEXER_USERNAME=admin
- INDEXER_PASSWORD=SecretPassword
- FILEBEAT_SSL_VERIFICATION_MODE=full
- SSL_CERTIFICATE_AUTHORITIES=/etc/ssl/root-ca.pem
- SSL_CERTIFICATE=/etc/ssl/filebeat.pem
- SSL_KEY=/etc/ssl/filebeat.key
INDEXER_URL: https://wazuh1.indexer:9200
INDEXER_USERNAME: admin
INDEXER_PASSWORD: admin
FILEBEAT_SSL_VERIFICATION_MODE: full
SSL_CERTIFICATE_AUTHORITIES: /etc/ssl/root-ca.pem
SSL_CERTIFICATE: /etc/ssl/filebeat.pem
SSL_KEY: /etc/ssl/filebeat.key
volumes:
- worker-wazuh-api-configuration:/var/ossec/api/configuration
- worker-wazuh-etc:/var/ossec/etc
@@ -81,14 +81,9 @@ 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:5.0.0
hostname: wazuh1.indexer
restart: always
ports:
- "9200:9200"
environment:
- "OPENSEARCH_JAVA_OPTS=-Xms1g -Xmx1g"
- "bootstrap.memory_lock=true"
ulimits:
memlock:
soft: -1
@@ -96,6 +91,38 @@ services:
nofile:
soft: 65536
hard: 65536
ports:
- "9200:9200"
environment:
OPENSEARCH_JAVA_OPTS: "-Xms1g -Xmx1g"
bootstrap.memory_lock: "true"
NETWORK_HOST: wazuh1.indexer
NODE_NAME: wazuh1.indexer
CLUSTER_INITIAL_MASTER_NODES: '["wazuh1.indexer", "wazuh2.indexer", "wazuh3.indexer"]'
CLUSTER_NAME: "wazuh-cluster"
DISCOVERY_SEED_HOSTS: '["wazuh1.indexer", "wazuh2.indexer", "wazuh3.indexer"]'
NODE_MAX_LOCAL_STORAGE_NODES: "3"
PATH_DATA: /var/lib/wazuh-indexer
PATH_LOGS: /var/log/wazuh-indexer
PLUGINS_SECURITY_SSL_HTTP_PEMCERT_FILEPATH: /usr/share/wazuh-indexer/certs/wazuh1.indexer.pem
PLUGINS_SECURITY_SSL_HTTP_PEMKEY_FILEPATH: /usr/share/wazuh-indexer/certs/wazuh1.indexer.key
PLUGINS_SECURITY_SSL_HTTP_PEMTRUSTEDCAS_FILEPATH: /usr/share/wazuh-indexer/certs/root-ca.pem
PLUGINS_SECURITY_SSL_TRANSPORT_PEMCERT_FILEPATH: /usr/share/wazuh-indexer/certs/wazuh1.indexer.pem
PLUGINS_SECURITY_SSL_TRANSPORT_PEMKEY_FILEPATH: /usr/share/wazuh-indexer/certs/wazuh1.indexer.key
PLUGINS_SECURITY_SSL_TRANSPORT_PEMTRUSTEDCAS_FILEPATH: /usr/share/wazuh-indexer/certs/root-ca.pem
PLUGINS_SECURITY_SSL_HTTP_ENABLED: "true"
PLUGINS_SECURITY_SSL_TRANSPORT_ENFORCE_HOSTNAME_VERIFICATION: "false"
PLUGINS_SECURITY_SSL_TRANSPORT_RESOLVE_HOSTNAME: "false"
PLUGINS_SECURITY_AUTHCZ_ADMIN_DN: "CN=admin,OU=Wazuh,O=Wazuh,L=California,C=US"
PLUGINS_SECURITY_CHECK_SNAPSHOT_RESTORE_WRITE_PRIVILEGES: "true"
PLUGINS_SECURITY_ENABLE_SNAPSHOT_RESTORE_PRIVILEGE: "true"
PLUGINS_SECURITY_NODES_DN: '["CN=wazuh1.indexer,OU=Wazuh,O=Wazuh,L=California,C=US", "CN=wazuh2.indexer,OU=Wazuh,O=Wazuh,L=California,C=US", "CN=wazuh3.indexer,OU=Wazuh,O=Wazuh,L=California,C=US", "CN=filebeat,OU=Wazuh,O=Wazuh,L=California,C=US"]'
PLUGINS_SECURITY_RESTAPI_ROLES_ENABLED: '["all_access", "security_rest_api_access"]'
PLUGINS_SECURITY_SYSTEM_INDICES_ENABLED: "true"
PLUGINS_SECURITY_SYSTEM_INDICES_INDICES: '[".opendistro-alerting-config", ".opendistro-alerting-alert*", ".opendistro-anomaly-results*", ".opendistro-anomaly-detector*", ".opendistro-anomaly-checkpoints", ".opendistro-anomaly-detection-state", ".opendistro-reports-*", ".opendistro-notifications-*", ".opendistro-notebooks", ".opensearch-observability", ".opendistro-asynchronous-search-response*", ".replication-metadata-store"]'
PLUGINS_SECURITY_ALLOW_DEFAULT_INIT_SECURITYINDEX: "true"
CLUSTER_ROUTING_ALLOCATION_DISK_THRESHOLD_ENABLED: "false"
COMPATIBILITY_OVERRIDE_MAIN_RESPONSE_VERSION: "true"
volumes:
- wazuh-indexer-data-1:/var/lib/wazuh-indexer
- ./config/wazuh_indexer_ssl_certs/root-ca.pem:/usr/share/wazuh-indexer/certs/root-ca.pem
@@ -103,16 +130,13 @@ services:
- ./config/wazuh_indexer_ssl_certs/wazuh1.indexer.pem:/usr/share/wazuh-indexer/certs/wazuh1.indexer.pem
- ./config/wazuh_indexer_ssl_certs/admin.pem:/usr/share/wazuh-indexer/certs/admin.pem
- ./config/wazuh_indexer_ssl_certs/admin-key.pem:/usr/share/wazuh-indexer/certs/admin-key.pem
- ./config/wazuh_indexer/wazuh1.indexer.yml:/usr/share/wazuh-indexer/opensearch.yml
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
# if you need mount a custom opensearch.yml, uncomment the next line and delete the environment variables
# - ./config/wazuh_indexer/wazuh1.indexer.yml:/usr/share/wazuh-indexer/opensearch.yml
wazuh2.indexer:
image: wazuh/wazuh-indexer:4.8.0
image: wazuh/wazuh-indexer:5.0.0
hostname: wazuh2.indexer
restart: always
environment:
- "OPENSEARCH_JAVA_OPTS=-Xms1g -Xmx1g"
- "bootstrap.memory_lock=true"
ulimits:
memlock:
soft: -1
@@ -120,21 +144,48 @@ services:
nofile:
soft: 65536
hard: 65536
environment:
OPENSEARCH_JAVA_OPTS: "-Xms1g -Xmx1g"
bootstrap.memory_lock: "true"
NETWORK_HOST: wazuh2.indexer
NODE_NAME: wazuh2.indexer
CLUSTER_INITIAL_MASTER_NODES: '["wazuh1.indexer", "wazuh2.indexer", "wazuh3.indexer"]'
CLUSTER_NAME: "wazuh-cluster"
DISCOVERY_SEED_HOSTS: '["wazuh1.indexer", "wazuh2.indexer", "wazuh3.indexer"]'
NODE_MAX_LOCAL_STORAGE_NODES: "3"
PATH_DATA: /var/lib/wazuh-indexer
PATH_LOGS: /var/log/wazuh-indexer
PLUGINS_SECURITY_SSL_HTTP_PEMCERT_FILEPATH: /usr/share/wazuh-indexer/certs/wazuh2.indexer.pem
PLUGINS_SECURITY_SSL_HTTP_PEMKEY_FILEPATH: /usr/share/wazuh-indexer/certs/wazuh2.indexer.key
PLUGINS_SECURITY_SSL_HTTP_PEMTRUSTEDCAS_FILEPATH: /usr/share/wazuh-indexer/certs/root-ca.pem
PLUGINS_SECURITY_SSL_TRANSPORT_PEMCERT_FILEPATH: /usr/share/wazuh-indexer/certs/wazuh2.indexer.pem
PLUGINS_SECURITY_SSL_TRANSPORT_PEMKEY_FILEPATH: /usr/share/wazuh-indexer/certs/wazuh2.indexer.key
PLUGINS_SECURITY_SSL_TRANSPORT_PEMTRUSTEDCAS_FILEPATH: /usr/share/wazuh-indexer/certs/root-ca.pem
PLUGINS_SECURITY_SSL_HTTP_ENABLED: "true"
PLUGINS_SECURITY_SSL_TRANSPORT_ENFORCE_HOSTNAME_VERIFICATION: "false"
PLUGINS_SECURITY_SSL_TRANSPORT_RESOLVE_HOSTNAME: "false"
PLUGINS_SECURITY_AUTHCZ_ADMIN_DN: "CN=admin,OU=Wazuh,O=Wazuh,L=California,C=US"
PLUGINS_SECURITY_CHECK_SNAPSHOT_RESTORE_WRITE_PRIVILEGES: "true"
PLUGINS_SECURITY_ENABLE_SNAPSHOT_RESTORE_PRIVILEGE: "true"
PLUGINS_SECURITY_NODES_DN: '["CN=wazuh1.indexer,OU=Wazuh,O=Wazuh,L=California,C=US", "CN=wazuh2.indexer,OU=Wazuh,O=Wazuh,L=California,C=US", "CN=wazuh3.indexer,OU=Wazuh,O=Wazuh,L=California,C=US", "CN=filebeat,OU=Wazuh,O=Wazuh,L=California,C=US"]'
PLUGINS_SECURITY_RESTAPI_ROLES_ENABLED: '["all_access", "security_rest_api_access"]'
PLUGINS_SECURITY_SYSTEM_INDICES_ENABLED: "true"
PLUGINS_SECURITY_SYSTEM_INDICES_INDICES: '[".opendistro-alerting-config", ".opendistro-alerting-alert*", ".opendistro-anomaly-results*", ".opendistro-anomaly-detector*", ".opendistro-anomaly-checkpoints", ".opendistro-anomaly-detection-state", ".opendistro-reports-*", ".opendistro-notifications-*", ".opendistro-notebooks", ".opensearch-observability", ".opendistro-asynchronous-search-response*", ".replication-metadata-store"]'
PLUGINS_SECURITY_ALLOW_DEFAULT_INIT_SECURITYINDEX: "true"
CLUSTER_ROUTING_ALLOCATION_DISK_THRESHOLD_ENABLED: "false"
COMPATIBILITY_OVERRIDE_MAIN_RESPONSE_VERSION: "true"
volumes:
- wazuh-indexer-data-2:/var/lib/wazuh-indexer
- ./config/wazuh_indexer_ssl_certs/root-ca.pem:/usr/share/wazuh-indexer/certs/root-ca.pem
- ./config/wazuh_indexer_ssl_certs/wazuh2.indexer-key.pem:/usr/share/wazuh-indexer/certs/wazuh2.indexer.key
- ./config/wazuh_indexer_ssl_certs/wazuh2.indexer.pem:/usr/share/wazuh-indexer/certs/wazuh2.indexer.pem
- ./config/wazuh_indexer/wazuh2.indexer.yml:/usr/share/wazuh-indexer/opensearch.yml
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
# if you need mount a custom opensearch.yml, uncomment the next line and delete the environment variables
# - ./config/wazuh_indexer/wazuh2.indexer.yml:/usr/share/wazuh-indexer/opensearch.yml
wazuh3.indexer:
image: wazuh/wazuh-indexer:4.8.0
image: wazuh/wazuh-indexer:5.0.0
hostname: wazuh3.indexer
restart: always
environment:
- "OPENSEARCH_JAVA_OPTS=-Xms1g -Xmx1g"
- "bootstrap.memory_lock=true"
ulimits:
memlock:
soft: -1
@@ -142,35 +193,84 @@ services:
nofile:
soft: 65536
hard: 65536
environment:
OPENSEARCH_JAVA_OPTS: "-Xms1g -Xmx1g"
bootstrap.memory_lock: "true"
NETWORK_HOST: wazuh3.indexer
NODE_NAME: wazuh3.indexer
CLUSTER_INITIAL_MASTER_NODES: '["wazuh1.indexer", "wazuh2.indexer", "wazuh3.indexer"]'
CLUSTER_NAME: "wazuh-cluster"
DISCOVERY_SEED_HOSTS: '["wazuh1.indexer", "wazuh2.indexer", "wazuh3.indexer"]'
NODE_MAX_LOCAL_STORAGE_NODES: "3"
PATH_DATA: /var/lib/wazuh-indexer
PATH_LOGS: /var/log/wazuh-indexer
PLUGINS_SECURITY_SSL_HTTP_PEMCERT_FILEPATH: /usr/share/wazuh-indexer/certs/wazuh3.indexer.pem
PLUGINS_SECURITY_SSL_HTTP_PEMKEY_FILEPATH: /usr/share/wazuh-indexer/certs/wazuh3.indexer.key
PLUGINS_SECURITY_SSL_HTTP_PEMTRUSTEDCAS_FILEPATH: /usr/share/wazuh-indexer/certs/root-ca.pem
PLUGINS_SECURITY_SSL_TRANSPORT_PEMCERT_FILEPATH: /usr/share/wazuh-indexer/certs/wazuh3.indexer.pem
PLUGINS_SECURITY_SSL_TRANSPORT_PEMKEY_FILEPATH: /usr/share/wazuh-indexer/certs/wazuh3.indexer.key
PLUGINS_SECURITY_SSL_TRANSPORT_PEMTRUSTEDCAS_FILEPATH: /usr/share/wazuh-indexer/certs/root-ca.pem
PLUGINS_SECURITY_SSL_HTTP_ENABLED: "true"
PLUGINS_SECURITY_SSL_TRANSPORT_ENFORCE_HOSTNAME_VERIFICATION: "false"
PLUGINS_SECURITY_SSL_TRANSPORT_RESOLVE_HOSTNAME: "false"
PLUGINS_SECURITY_AUTHCZ_ADMIN_DN: "CN=admin,OU=Wazuh,O=Wazuh,L=California,C=US"
PLUGINS_SECURITY_CHECK_SNAPSHOT_RESTORE_WRITE_PRIVILEGES: "true"
PLUGINS_SECURITY_ENABLE_SNAPSHOT_RESTORE_PRIVILEGE: "true"
PLUGINS_SECURITY_NODES_DN: '["CN=wazuh1.indexer,OU=Wazuh,O=Wazuh,L=California,C=US", "CN=wazuh2.indexer,OU=Wazuh,O=Wazuh,L=California,C=US", "CN=wazuh3.indexer,OU=Wazuh,O=Wazuh,L=California,C=US", "CN=filebeat,OU=Wazuh,O=Wazuh,L=California,C=US"]'
PLUGINS_SECURITY_RESTAPI_ROLES_ENABLED: '["all_access", "security_rest_api_access"]'
PLUGINS_SECURITY_SYSTEM_INDICES_ENABLED: "true"
PLUGINS_SECURITY_SYSTEM_INDICES_INDICES: '[".opendistro-alerting-config", ".opendistro-alerting-alert*", ".opendistro-anomaly-results*", ".opendistro-anomaly-detector*", ".opendistro-anomaly-checkpoints", ".opendistro-anomaly-detection-state", ".opendistro-reports-*", ".opendistro-notifications-*", ".opendistro-notebooks", ".opensearch-observability", ".opendistro-asynchronous-search-response*", ".replication-metadata-store"]'
PLUGINS_SECURITY_ALLOW_DEFAULT_INIT_SECURITYINDEX: "true"
CLUSTER_ROUTING_ALLOCATION_DISK_THRESHOLD_ENABLED: "false"
COMPATIBILITY_OVERRIDE_MAIN_RESPONSE_VERSION: "true"
volumes:
- wazuh-indexer-data-3:/var/lib/wazuh-indexer
- ./config/wazuh_indexer_ssl_certs/root-ca.pem:/usr/share/wazuh-indexer/certs/root-ca.pem
- ./config/wazuh_indexer_ssl_certs/wazuh3.indexer-key.pem:/usr/share/wazuh-indexer/certs/wazuh3.indexer.key
- ./config/wazuh_indexer_ssl_certs/wazuh3.indexer.pem:/usr/share/wazuh-indexer/certs/wazuh3.indexer.pem
- ./config/wazuh_indexer/wazuh3.indexer.yml:/usr/share/wazuh-indexer/opensearch.yml
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
# if you need mount a custom opensearch.yml, uncomment the next line and delete the environment variables
# - ./config/wazuh_indexer/wazuh3.indexer.yml:/usr/share/wazuh-indexer/opensearch.yml
wazuh.dashboard:
image: wazuh/wazuh-dashboard:4.8.0
image: wazuh/wazuh-dashboard:5.0.0
hostname: wazuh.dashboard
restart: always
ulimits:
memlock:
soft: -1
hard: -1
nofile:
soft: 65536
hard: 65536
ports:
- 443:5601
environment:
- OPENSEARCH_HOSTS="https://wazuh1.indexer:9200"
- WAZUH_API_URL="https://wazuh.master"
- API_USERNAME=wazuh-wui
- API_PASSWORD=MyS3cr37P450r.*-
- DASHBOARD_USERNAME=kibanaserver
- DASHBOARD_PASSWORD=kibanaserver
OPENSEARCH_HOSTS: "https://wazuh1.indexer:9200"
WAZUH_API_URL: "https://wazuh.master"
API_USERNAME: wazuh-wui
API_PASSWORD: MyS3cr37P450r.*-
DASHBOARD_USERNAME: kibanaserver
DASHBOARD_PASSWORD: kibanaserver
SERVER_HOST: "0.0.0.0"
SERVER_PORT: "5601"
OPENSEARCH_SSL_VERIFICATIONMODE: certificate
OPENSEARCH_REQUESTHEADERSALLOWLIST: '["securitytenant","Authorization"]'
OPENSEARCH_SECURITY_MULTITENANCY_ENABLED: "false"
SERVER_SSL_ENABLED: "true"
OPENSEARCH_SECURITY_READONLY_MODE_ROLES: '["kibana_read_only"]'
SERVER_SSL_KEY: "/usr/share/wazuh-dashboard/certs/wazuh-dashboard-key.pem"
SERVER_SSL_CERTIFICATE: "/usr/share/wazuh-dashboard/certs/wazuh-dashboard.pem"
OPENSEARCH_SSL_CERTIFICATEAUTHORITIES: '["/usr/share/wazuh-dashboard/certs/root-ca.pem"]'
UISETTINGS_OVERRIDES_DEFAULTROUTE: /app/wz-home
volumes:
- wazuh-dashboard-config:/usr/share/wazuh-dashboard/data/wazuh/config
- wazuh-dashboard-custom:/usr/share/wazuh-dashboard/plugins/wazuh/public/assets/custom
- ./config/wazuh_indexer_ssl_certs/wazuh.dashboard.pem:/usr/share/wazuh-dashboard/certs/wazuh-dashboard.pem
- ./config/wazuh_indexer_ssl_certs/wazuh.dashboard-key.pem:/usr/share/wazuh-dashboard/certs/wazuh-dashboard-key.pem
- ./config/wazuh_indexer_ssl_certs/root-ca.pem:/usr/share/wazuh-dashboard/certs/root-ca.pem
- ./config/wazuh_dashboard/opensearch_dashboards.yml:/usr/share/wazuh-dashboard/config/opensearch_dashboards.yml
- ./config/wazuh_dashboard/wazuh.yml:/usr/share/wazuh-dashboard/data/wazuh/config/wazuh.yml
- wazuh-dashboard-config:/usr/share/wazuh-dashboard/data/wazuh/config
- wazuh-dashboard-custom:/usr/share/wazuh-dashboard/plugins/wazuh/public/assets/custom
# if you need mount a custom opensearch-dashboards.yml, uncomment the next line and delete the environment variables
# - ./config/wazuh_dashboard/opensearch_dashboards.yml:/usr/share/wazuh-dashboard/config/opensearch_dashboards.yml
depends_on:
- wazuh1.indexer
links:

View File

@@ -1,10 +1,9 @@
# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
version: '3'
services:
generator:
image: wazuh/wazuh-certs-generator:0.0.2
hostname: wazuh-certs-generator
image: wazuh/wazuh-cert-tool:5.0.0
hostname: wazuh-cert-tool
container_name: wazuh-cert-tool
volumes:
- ./config/wazuh_indexer_ssl_certs/:/certificates/
- ./config/certs.yml:/config/certs.yml
- ./config/certs.yml:/config/certs.yml

View File

@@ -8,17 +8,17 @@ $ sysctl -w vm.max_map_count=262144
```
2) Run the certificate creation script:
```
$ docker-compose -f generate-indexer-certs.yml run --rm generator
$ docker compose -f generate-certs.yml run --rm generator
```
3) Start the environment with docker-compose:
3) Start the environment with docker compose:
- In the foregroud:
```
$ docker-compose up
$ docker compose up
```
- In the background:
```
$ docker-compose up -d
$ docker compose up -d
```
The environment takes about 1 minute to get up (depending on your Docker host) for the first time since Wazuh Indexer must be started for the first time and the indexes and index patterns must be generated.

View File

@@ -3,7 +3,7 @@ version: '3.7'
services:
wazuh.manager:
image: wazuh/wazuh-manager:4.8.0
image: wazuh/wazuh-manager:5.0.0
hostname: wazuh.manager
restart: always
ulimits:
@@ -19,15 +19,15 @@ services:
- "514:514/udp"
- "55000:55000"
environment:
- INDEXER_URL=https://wazuh.indexer:9200
- INDEXER_USERNAME=admin
- INDEXER_PASSWORD=SecretPassword
- FILEBEAT_SSL_VERIFICATION_MODE=full
- SSL_CERTIFICATE_AUTHORITIES=/etc/ssl/root-ca.pem
- SSL_CERTIFICATE=/etc/ssl/filebeat.pem
- SSL_KEY=/etc/ssl/filebeat.key
- API_USERNAME=wazuh-wui
- API_PASSWORD=MyS3cr37P450r.*-
INDEXER_URL: https://wazuh.indexer:9200
INDEXER_USERNAME: admin
INDEXER_PASSWORD: admin
FILEBEAT_SSL_VERIFICATION_MODE: full
SSL_CERTIFICATE_AUTHORITIES: /etc/ssl/root-ca.pem
SSL_CERTIFICATE: /etc/ssl/filebeat.pem
SSL_KEY: /etc/ssl/filebeat.key
API_USERNAME: wazuh-wui
API_PASSWORD: MyS3cr37P450r.*-
volumes:
- wazuh_api_configuration:/var/ossec/api/configuration
- wazuh_etc:/var/ossec/etc
@@ -46,13 +46,9 @@ 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:5.0.0
hostname: wazuh.indexer
restart: always
ports:
- "9200:9200"
environment:
- "OPENSEARCH_JAVA_OPTS=-Xms1g -Xmx1g"
ulimits:
memlock:
soft: -1
@@ -60,6 +56,37 @@ services:
nofile:
soft: 65536
hard: 65536
ports:
- "9200:9200"
environment:
OPENSEARCH_JAVA_OPTS: "-Xms1g -Xmx1g"
bootstrap.memory_lock: "true"
NODE_NAME: "wazuh.indexer"
CLUSTER_INITIAL_MASTER_NODES: "wazuh.indexer"
CLUSTER_NAME: "wazuh-cluster"
PATH_DATA: /var/lib/wazuh-indexer
PATH_LOGS: /var/log/wazuh-indexer
HTTP_PORT: 9200-9299
TRANSPORT_TCP_PORT: 9300-9399
COMPATIBILITY_OVERRIDE_MAIN_RESPONSE_VERSION: "true"
PLUGINS_SECURITY_SSL_HTTP_PEMCERT_FILEPATH: /usr/share/wazuh-indexer/certs/wazuh.indexer.pem
PLUGINS_SECURITY_SSL_HTTP_PEMKEY_FILEPATH: /usr/share/wazuh-indexer/certs/wazuh.indexer.key
PLUGINS_SECURITY_SSL_HTTP_PEMTRUSTEDCAS_FILEPATH: /usr/share/wazuh-indexer/certs/root-ca.pem
PLUGINS_SECURITY_SSL_TRANSPORT_PEMCERT_FILEPATH: /usr/share/wazuh-indexer/certs/wazuh.indexer.pem
PLUGINS_SECURITY_SSL_TRANSPORT_PEMKEY_FILEPATH: /usr/share/wazuh-indexer/certs/wazuh.indexer.key
PLUGINS_SECURITY_SSL_TRANSPORT_PEMTRUSTEDCAS_FILEPATH: /usr/share/wazuh-indexer/certs/root-ca.pem
PLUGINS_SECURITY_SSL_HTTP_ENABLED: "true"
PLUGINS_SECURITY_SSL_TRANSPORT_ENFORCE_HOSTNAME_VERIFICATION: "false"
PLUGINS_SECURITY_SSL_TRANSPORT_RESOLVE_HOSTNAME: "false"
PLUGINS_SECURITY_AUTHCZ_ADMIN_DN: "CN=admin,OU=Wazuh,O=Wazuh,L=California,C=US"
PLUGINS_SECURITY_CHECK_SNAPSHOT_RESTORE_WRITE_PRIVILEGES: "true"
PLUGINS_SECURITY_ENABLE_SNAPSHOT_RESTORE_PRIVILEGE: "true"
PLUGINS_SECURITY_NODES_DN: "CN=wazuh.indexer,OU=Wazuh,O=Wazuh,L=California,C=US"
PLUGINS_SECURITY_RESTAPI_ROLES_ENABLED: '["all_access", "security_rest_api_access"]'
PLUGINS_SECURITY_SYSTEM_INDICES_ENABLED: "true"
PLUGINS_SECURITY_SYSTEM_INDICES_INDICES: '[".opendistro-alerting-config", ".opendistro-alerting-alert*", ".opendistro-anomaly-results*", ".opendistro-anomaly-detector*", ".opendistro-anomaly-checkpoints", ".opendistro-anomaly-detection-state", ".opendistro-reports-*", ".opendistro-notifications-*", ".opendistro-notebooks", ".opensearch-observability", ".opendistro-asynchronous-search-response*", ".replication-metadata-store"]'
PLUGINS_SECURITY_ALLOW_DEFAULT_INIT_SECURITYINDEX: "true"
CLUSTER_ROUTING_ALLOCATION_DISK_THRESHOLD_ENABLED: "false"
volumes:
- wazuh-indexer-data:/var/lib/wazuh-indexer
- ./config/wazuh_indexer_ssl_certs/root-ca.pem:/usr/share/wazuh-indexer/certs/root-ca.pem
@@ -67,31 +94,49 @@ services:
- ./config/wazuh_indexer_ssl_certs/wazuh.indexer.pem:/usr/share/wazuh-indexer/certs/wazuh.indexer.pem
- ./config/wazuh_indexer_ssl_certs/admin.pem:/usr/share/wazuh-indexer/certs/admin.pem
- ./config/wazuh_indexer_ssl_certs/admin-key.pem:/usr/share/wazuh-indexer/certs/admin-key.pem
- ./config/wazuh_indexer/wazuh.indexer.yml:/usr/share/wazuh-indexer/opensearch.yml
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
# if you need mount a custom opensearch.yml, uncomment the next line and delete the environment variables
# - ./config/wazuh_indexer/wazuh.indexer.yml:/usr/share/wazuh-indexer/opensearch.yml
wazuh.dashboard:
image: wazuh/wazuh-dashboard:4.8.0
image: wazuh/wazuh-dashboard:5.0.0
hostname: wazuh.dashboard
restart: always
ulimits:
memlock:
soft: -1
hard: -1
nofile:
soft: 65536
hard: 65536
ports:
- 443:5601
environment:
- INDEXER_USERNAME=admin
- INDEXER_PASSWORD=SecretPassword
- WAZUH_API_URL=https://wazuh.manager
- DASHBOARD_USERNAME=kibanaserver
- DASHBOARD_PASSWORD=kibanaserver
- API_USERNAME=wazuh-wui
- API_PASSWORD=MyS3cr37P450r.*-
WAZUH_API_URL: https://wazuh.manager
DASHBOARD_USERNAME: kibanaserver
DASHBOARD_PASSWORD: kibanaserver
API_USERNAME: wazuh-wui
API_PASSWORD: MyS3cr37P450r.*-
SERVER_HOST: 0.0.0.0
SERVER_PORT: 5601
OPENSEARCH_HOSTS: https://wazuh.indexer:9200
OPENSEARCH_SSL_VERIFICATIONMODE: certificate
OPENSEARCH_REQUESTHEADERSALLOWLIST: '["securitytenant","Authorization"]'
OPENSEARCH_SECURITY_MULTITENANCY_ENABLED: "false"
SERVER_SSL_ENABLED: "true"
OPENSEARCH_SECURITY_READONLY_MODE_ROLES: '["kibana_read_only"]'
SERVER_SSL_KEY: "/usr/share/wazuh-dashboard/certs/wazuh-dashboard-key.pem"
SERVER_SSL_CERTIFICATE: "/usr/share/wazuh-dashboard/certs/wazuh-dashboard.pem"
OPENSEARCH_SSL_CERTIFICATEAUTHORITIES: '["/usr/share/wazuh-dashboard/certs/root-ca.pem"]'
UISETTINGS_OVERRIDES_DEFAULTROUTE: /app/wz-home
volumes:
- wazuh-dashboard-config:/usr/share/wazuh-dashboard/data/wazuh/config
- wazuh-dashboard-custom:/usr/share/wazuh-dashboard/plugins/wazuh/public/assets/custom
- ./config/wazuh_indexer_ssl_certs/wazuh.dashboard.pem:/usr/share/wazuh-dashboard/certs/wazuh-dashboard.pem
- ./config/wazuh_indexer_ssl_certs/wazuh.dashboard-key.pem:/usr/share/wazuh-dashboard/certs/wazuh-dashboard-key.pem
- ./config/wazuh_indexer_ssl_certs/root-ca.pem:/usr/share/wazuh-dashboard/certs/root-ca.pem
- ./config/wazuh_dashboard/opensearch_dashboards.yml:/usr/share/wazuh-dashboard/config/opensearch_dashboards.yml
- ./config/wazuh_dashboard/wazuh.yml:/usr/share/wazuh-dashboard/data/wazuh/config/wazuh.yml
- wazuh-dashboard-config:/usr/share/wazuh-dashboard/data/wazuh/config
- wazuh-dashboard-custom:/usr/share/wazuh-dashboard/plugins/wazuh/public/assets/custom
- ./config/wazuh_dashboard/wazuh.yml:/wazuh-config-mount/data/wazuh/config/wazuh.yml
# if you need mount a custom opensearch-dashboards.yml, uncomment the next line and delete the environment variables
# - ./config/wazuh_dashboard/opensearch_dashboards.yml:/wazuh-config-mount/config/opensearch_dashboards.yml
depends_on:
- wazuh.indexer
links:

View File

@@ -1,10 +1,10 @@
# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
version: '3'
services:
generator:
image: wazuh/wazuh-certs-generator:0.0.2
hostname: wazuh-certs-generator
image: wazuh/wazuh-cert-tool:5.0.0
hostname: wazuh-cert-tool
container_name: wazuh-cert-tool
volumes:
- ./config/wazuh_indexer_ssl_certs/:/certificates/
- ./config/certs.yml:/config/certs.yml