Compare commits

...

1772 Commits

Author SHA1 Message Date
Wazuh CI
efddce0e3e Merge pull request #2041 from wazuh/enhancement/wqa4467-bump-4.14.0
Bump 4.14.0 branch
2025-10-17 11:07:23 +02:00
wazuhci
b400409314 feat: bump 4.14.0 2025-10-17 09:07:17 +00:00
Carlos Anguita
05fcfd5652 Merge pull request #2034 from wazuh/enhancement/2031-revert-image-tag-for-4.14.0rc1 2025-10-09 12:41:47 +02:00
Enrique Araque
0e1fa7f1c0 Revert docker image tag for 4.14.0-rc1 2025-10-09 12:38:50 +02:00
Wazuh CI
77323aaaee Merge pull request #2033 from wazuh/enhancement/wqa4387-bump-4.14.0
Bump 4.14.0 branch
2025-10-09 11:58:22 +02:00
wazuhci
7334111f1c feat: bump 4.14.0 2025-10-09 09:58:17 +00:00
Gonzalo Acuña
782d2cfa67 Merge pull request #2029 from wazuh/bug/2028-indexer-dir-owner
Change Wazuh indexer directory owner
2025-09-30 08:10:09 -03:00
vcerenu
84e13a51c1 Add changelog 2025-09-29 15:46:48 -03:00
vcerenu
3835b4c6db Change Wazuh indexer directory permissions 2025-09-29 15:14:41 -03:00
Carlos Anguita
44a7f8cedc Merge pull request #2025 from wazuh/enhancement/2023-revert-image-tag-for-4.14.0alpha1 2025-09-26 09:54:38 +02:00
Enrique Araque
57c6ac12d0 Change docker image for 4.14.0-alpha1 2025-09-26 09:51:26 +02:00
Wazuh CI
2b0575b1f9 Merge pull request #2024 from wazuh/enhancement/wqa4084-bump-4.14.0
Bump 4.14.0 branch
2025-09-26 08:49:37 +02:00
wazuhci
ecf80f9122 feat: bump 4.14.0 2025-09-26 06:49:29 +00:00
Gonzalo Acuña
e22d4a9d40 Merge pull request #2020 from wazuh/enhancement/2013-filebeat-install-method
Change filebeat install method
2025-09-25 12:17:21 -03:00
Gonzalo Acuña
3186bc7711 Merge branch '4.14.0' into enhancement/2013-filebeat-install-method 2025-09-25 12:16:55 -03:00
Gonzalo Acuña
a5f0113c75 Merge pull request #2021 from wazuh/change/3118-chat
Remove dashboard chat setting
2025-09-25 08:57:26 -03:00
Gonzalo Acuña
d4371324c9 Changelog update 2025-09-25 08:35:11 -03:00
Gonzalo Acuña
9eb188fc88 Remove dashboard chat setting 2025-09-25 08:32:58 -03:00
vcerenu
8f5aa86dff Add changelog 2025-09-25 08:08:40 -03:00
Gonzalo Acuña
9529953842 Merge pull request #2017 from wazuh/merge-4.13.1-into-4.14.0
Merge 4.13.1 into 4.14.0
2025-09-24 14:20:44 -03:00
vcerenu
9c58a48684 Resolving Conflicts 2025-09-24 14:06:30 -03:00
vcerenu
a42a354c68 Change filebeat install method 2025-09-23 15:41:50 -03:00
Carlos Anguita
7a3dce5014 Merge pull request #2012 from wazuh/enhancement/2009-change-tag-references 2025-09-23 12:44:10 +02:00
vcerenu
2d39e6a06b Change image tag 2025-09-23 07:41:20 -03:00
Wazuh CI
927fcfc3b8 Merge pull request #2010 from wazuh/enhancement/wqa3963-bump-4.13.1
Bump 4.13.1 branch
2025-09-23 11:13:05 +02:00
wazuhci
58f5dadef6 feat: bump 4.13.1 2025-09-23 09:13:01 +00:00
Gonzalo Acuña
75e3eb0b7e Merge pull request #2006 from wazuh/merge-4.13.0-into-4.14.0
Merge 4.13.0 into 4.14.0
2025-09-18 21:53:34 -03:00
Jesus Garcia
0163675682 Merge branch '4.13.0' into 4.14.0 2025-09-18 17:20:22 -05:00
Wazuh CI
6ef7e3acaf Merge pull request #2005 from wazuh/enhancement/wqa3910-bump-4.13.1
Bump 4.13.1 branch
2025-09-18 13:15:04 +02:00
wazuhci
a9c6beaecd feat: bump 4.13.1 2025-09-18 11:15:00 +00:00
Gonzalo Acuña
cccb4da130 Merge pull request #1999 from wazuh/change/idr-3077-dashboard-settings-rollback
Rollback data source setting
2025-09-17 12:51:44 -03:00
Gonzalo Acuña
434f99b182 Changelog update 2025-09-17 12:23:36 -03:00
Gonzalo Acuña
ac64909b22 Rollback data source setting 2025-09-17 12:22:29 -03:00
Gonzalo Acuña
63eec35a3c Merge pull request #1998 from wazuh/change/idr-3056-dashboard-settings
Dashboard settings added
2025-09-15 12:55:53 -03:00
Gonzalo Acuña
ac126173e3 Changelog update 2025-09-15 12:25:42 -03:00
Gonzalo Acuña
5054f26b99 Dashboard settings added 2025-09-15 12:21:12 -03:00
Gonzalo Acuña
3cf3c541d0 Merge pull request #1997 from wazuh/1184-revert-tags
Revert tags 4.13.0-rc5
2025-09-12 07:06:52 -03:00
Gonzalo Acuña
6269a55c9d Revert tags 4.13.0-rc5 2025-09-12 07:05:12 -03:00
Wazuh CI
8943e9ad77 Merge pull request #1996 from wazuh/enhancement/wqa3802-bump-4.13.0
Bump 4.13.0 branch
2025-09-12 10:23:10 +02:00
wazuhci
649a312d3a feat: bump 4.13.0 2025-09-12 08:23:06 +00:00
Gonzalo Acuña
9634a2b4af Merge pull request #1994 from wazuh/change/2612-syscollector
Syscollector configuration change
2025-09-05 11:37:39 -03:00
Gonzalo Acuña
2dd0f3b7d2 Changelog update 2025-09-05 11:28:23 -03:00
Gonzalo Acuña
7bc245ef66 Syscollector configuration change 2025-09-05 11:26:36 -03:00
Carlos Bordon
3748d61d5f Merge pull request #1991 from wazuh/merge-4.13.0-into-4.14.0
Merge 4.13.0 into 4.14.0
2025-09-05 08:40:52 -03:00
vcerenu
b2420a5946 Resolving conflicts 2025-09-05 08:33:11 -03:00
Enrique Araque
7dc5f82bac Merge pull request #1989 from wazuh/enhancement/1987-revert-image-tag-for-4.13.0rc4
Revert docker image tag for 4.13.0 RC4
2025-09-04 13:19:53 +02:00
Enrique Araque
2fdc514bb0 Revert docker image tag for 4.13.0 rc4 2025-09-04 13:14:42 +02:00
Wazuh CI
4ff7c4f5b0 Merge pull request #1988 from wazuh/enhancement/wqa3651-bump-4.13.0
Bump 4.13.0 branch
2025-09-04 12:16:51 +02:00
wazuhci
7a7443b717 feat: bump 4.13.0 2025-09-04 10:16:46 +00:00
Gonzalo Acuña
4ce722291b Merge pull request #1985 from wazuh/enhancement/1984-add-dashboard-parameter
Add opensearch_dashboard.yml parameters
2025-08-29 08:45:23 -03:00
vcerenu
ffe384be91 Add changelog 2025-08-29 08:01:37 -03:00
vcerenu
963ccf7671 Add opensearch_dashboard.yml parameters 2025-08-27 12:34:52 -03:00
Gonzalo Acuña
55f4de8f06 Merge pull request #1981 from wazuh/enhancement/1979-revert-images-tags
Revert images tags
2025-08-22 13:39:53 -03:00
vcerenu
e4ce58c0c9 Revert images tags 2025-08-22 08:23:01 -03:00
Wazuh CI
ebe230fccb Merge pull request #1980 from wazuh/enhancement/wqa3471-bump-4.13.0
Bump 4.13.0 branch
2025-08-22 11:31:13 +02:00
wazuhci
bcb46d0926 feat: bump 4.13.0 2025-08-22 09:31:09 +00:00
Carlos Anguita
c027b3efba Merge pull request #1972 from wazuh/merge-4.13.0-into-4.14.0 2025-08-14 13:16:47 +02:00
vcerenu
7bc871bde9 Resolving conflicts 2025-08-14 08:09:22 -03:00
Gonzalo Acuña
43d8f2b29d Merge pull request #1968 from wazuh/bug/1966-permanent-data-excp-4.13.0
Add wazuh-template.json into permanent data exception
2025-08-13 11:10:46 -03:00
Gonzalo Acuña
bc4d15d1c2 Merge pull request #1953 from wazuh/bug/2511-delete-dockerfile-line
Double the amount of space consumed in Wazuh Indexer
2025-08-13 10:18:06 -03:00
vcerenu
ee599583eb Add changelog 2025-08-13 08:49:50 -03:00
vcerenu
14caf8058d Add wazuh-template.json into permanent data exception 2025-08-13 08:29:40 -03:00
Gonzalo Acuña
b86ea0d6bc Merge pull request #1958 from wazuh/enhancement/1956-revert-changes
Revert rc4 changes
2025-08-07 09:08:50 -03:00
Gonzalo Acuña
d122b702f1 Revert rc4 changes 2025-08-07 08:56:44 -03:00
Gonzalo Acuña
fde6c509d7 Merge pull request #1957 from wazuh/merge-4.13.0-into-4.13.1
Merge 4.13.0 into 4.13.1
2025-08-07 08:41:02 -03:00
vcerenu
fb5b4488de Revert version 2025-08-07 08:38:27 -03:00
vcerenu
8d0f306801 Resolving conflicts 2025-08-07 08:13:22 -03:00
vcerenu
831d759cd9 Bump rc4 stage 2025-08-07 08:09:01 -03:00
vcerenu
2811883877 Bump rc4 stage 2025-08-07 08:06:41 -03:00
vcerenu
82a967c0df Add changelog 2025-08-05 13:37:39 -03:00
vcerenu
29190cce99 Delete Dcokerfile line 2025-08-05 12:50:34 -03:00
Gonzalo Acuña
beef440c3a Merge pull request #1951 from wazuh/bug/2511-security-plugin-perm-errors
Fix config directory for opensearch_security plugin work
2025-08-04 13:49:52 -03:00
vcerenu
3243306b07 Add docker-compose multi node config 2025-08-04 13:18:59 -03:00
vcerenu
81208b9abe rollback certs path 2025-08-01 14:05:37 -03:00
vcerenu
f53f1930aa Add changelog 2025-08-01 13:11:48 -03:00
vcerenu
85709013bc Fix config directory for opensearch_security plugin work 2025-08-01 12:44:43 -03:00
Carlos Anguita
c94263eacd Merge pull request #1950 from wazuh/enhancement/1948-revert-image-tag-for-4.13.0rc3 2025-07-30 10:44:54 +02:00
Enrique Araque
5d5fe18d82 Revert image tag for 4.13.0-rc3 2025-07-30 10:42:50 +02:00
Wazuh CI
339500631d Merge pull request #1949 from wazuh/enhancement/wqa3042-bump-4.13.0
Bump 4.13.0 branch
2025-07-30 09:42:36 +02:00
wazuhci
1057715f3d feat: bump 4.13.0 2025-07-30 07:42:30 +00:00
Gonzalo Acuña
76e3c62b9a Merge pull request #1944 from wazuh/merge-4.13.1-into-4.14.0
Merge 4.13.1 into 4.14.0
2025-07-25 09:58:41 -03:00
vcerenu
5a1daaf4ce Merge branch '4.14.0' of github.com:wazuh/wazuh-docker into merge-4.13.1-into-4.14.0 2025-07-25 09:54:44 -03:00
Gonzalo Acuña
0222bcc9f8 Merge pull request #1943 from wazuh/merge-4.13.0-into-4.13.1
Merge 4.13.0 into 4.13.1
2025-07-25 09:48:04 -03:00
vcerenu
23e8982c45 Fix dev stage example 2025-07-25 09:44:43 -03:00
vcerenu
cb6c3de364 Fix dev stage example 2025-07-25 09:43:41 -03:00
vcerenu
89184e77ab Resolving conflicts 2025-07-25 09:27:03 -03:00
vcerenu
191ef58a9b Resolving conflicts 2025-07-25 09:22:48 -03:00
Carlos Bordon
ac7121e411 Merge pull request #1938 from wazuh/enhancement/1936-revert-image-tag
Revert rc2 stage into 4.13.0 branch
2025-07-18 10:15:52 -03:00
vcerenu
1146acb3a4 Revert rc2 stage into 4.13.0 branch 2025-07-18 10:03:11 -03:00
Wazuh CI
a8582fdd4b Merge pull request #1937 from wazuh/enhancement/wqa2817-bump-4.13.0
Bump 4.13.0 branch
2025-07-18 10:04:11 +02:00
wazuhci
7a13fa72b3 feat: bump 4.13.0 2025-07-18 08:04:06 +00:00
Carlos Anguita
dc74728c42 Merge pull request #1932 from wazuh/enhancement/1930-revert-image-tag-for-4.13.0rc1 2025-07-14 09:58:27 +02:00
Enrique Araque
7fdcb0a320 Change docker image tag for 4.13.0-rc1 2025-07-14 09:50:19 +02:00
Wazuh CI
5c99764d2c Merge pull request #1931 from wazuh/enhancement/wqa2745-bump-4.13.0
Bump 4.13.0 branch
2025-07-14 09:20:03 +02:00
wazuhci
28f7be1f7d feat: bump 4.13.0 2025-07-14 07:19:55 +00:00
Gonzalo Acuña
2d2d3ec7ca Merge pull request #1928 from wazuh/bug/1924-add-copy-indexer-files
Update Dockerfile to copy `opensearch-security` files
2025-07-11 12:55:26 -03:00
fcaffieri
9cc135d05b Update CHANGELOG 2025-07-08 17:30:26 -03:00
fcaffieri
60e43e2737 Update Dockerfile 2025-07-08 16:25:53 -03:00
Gonzalo Acuña
92bbd3395f Merge pull request #1926 from wazuh/bug/1920-set-right-permissions-for-malicious-ioc-list-files
Set right ownership for malicious-ioc files on container start
2025-07-04 15:36:35 -03:00
Jesus Garcia
49594251a6 Set right ownership for malicious-ioc files on container start 2025-07-04 12:52:29 -05:00
Gonzalo Acuña
8cb8437d7f Merge pull request #1925 from wazuh/enhancement/1922-delete-version-statement
Delete services statement in wazuh agent deployment
2025-07-04 13:42:13 -03:00
vcerenu
5bbce9e403 Change docker-compose references 2025-07-04 12:43:41 -03:00
vcerenu
8306a49967 Add Changelog 2025-07-04 12:04:31 -03:00
vcerenu
1ae575d56f Delete services statement in wazuh agent deployment 2025-07-04 11:49:37 -03:00
Carlos Anguita
fb65400657 Merge pull request #1919 from wazuh/enhancement/1917-remove-stage-from-tag 2025-07-02 12:05:20 +02:00
Enrique Araque
283ca123e3 Revert docker image for 4.13.0-beta1 2025-07-02 11:56:58 +02:00
Wazuh CI
16202f2f21 Merge pull request #1918 from wazuh/enhancement/wqa2654-bump-4.13.0
Bump 4.13.0 branch
2025-07-02 10:12:35 +02:00
wazuhci
b99d946282 feat: bump 4.13.0 2025-07-02 08:12:31 +00:00
Gonzalo Acuña
a5eab952aa Merge pull request #1898 from wazuh/bug/1563-filebeatconf-file-is-not-updated-if-file-already-exists-in-etcfilebeatfilebeatyml
Add filebeat config file in the `PERMANENT_DATA_EXCP` list
2025-06-23 14:25:53 -03:00
Enrique Araque
a5d961040a Update changelog 2025-06-20 13:18:05 +02:00
Enrique Araque
bca60dd0b6 add filebeat config file in the exclusion path 2025-06-20 11:43:37 +02:00
Gonzalo Acuña
1bfc4ff4c2 Merge pull request #1894 from wazuh/enhancement/1892-bumper-4.14.0
Bumper propagation to 4.14.0
2025-06-19 11:42:05 -03:00
Gonzalo Acuña
f5473f0004 Merge pull request #1893 from wazuh/enhancement/1892-bumper
Enhancement/1892 bumper
2025-06-19 11:35:49 -03:00
Gonzalo Acuña
1b75ebb67a Merge pull request #1890 from wazuh/enhancement/1882-add-pd-excp
Add permanent_data exceptions
2025-06-17 15:34:33 -03:00
vcerenu
bbe5b5eb09 Add changelog 2025-06-17 15:05:52 -03:00
Carlos Bordon
4a9176b71e Merge pull request #1889 from wazuh/bug/wqa2229-add-admin-privilege-bumper
Added an admin flag to the repository bumper workflow merge action
2025-06-13 11:00:31 -03:00
Raul Del Pozo Moreno
056300b59d fix: added admin privilege to PR merge 2025-06-13 15:38:46 +02:00
Carlos Bordon
ba4e72a2e0 Merge pull request #1887 from wazuh/merge-4.13.1-into-4.14.0
Merge 4.13.1 into 4.14.0
2025-06-13 09:57:17 -03:00
Carlos Anguita López
b374f4ba2e merge 4.13.1 into 4.14.0 2025-06-13 14:52:26 +02:00
vcerenu
126fc81200 Add permanent_data exceptions 2025-06-13 09:22:56 -03:00
Gonzalo Acuña
e211c97f59 Merge pull request #1884 from wazuh/enhancement/1883-bump-4.13.1-version
Bump 4.13.1 version
2025-06-13 08:32:12 -03:00
vcerenu
fb4a062f5a Bump 4.13.1 version 2025-06-13 08:26:34 -03:00
Gonzalo Acuña
e2a2533501 Merge pull request #1880 from wazuh/bug/1780-unable-to-run-wazuh-cert-tool-with-proxy
Change validation of existing certs tool in S3 buckets
2025-06-11 08:55:58 -03:00
Carlos Anguita López
c6369f9463 update changelog 2025-06-11 12:31:24 +02:00
Carlos Anguita
8edaa8ba9c Merge pull request #1879 from wazuh/enhancement/1877-revert-image-tag-for-4.13.0-alpha1 2025-06-11 10:47:07 +02:00
Enrique Araque
edbfb73cde Revert docker image for 4.13.0-alpha1 2025-06-11 10:41:25 +02:00
Carlos Anguita
ef3f76db58 Merge pull request #1878 from wazuh/enhancement/1877-bump-version-for-4.13.0-alpha1 2025-06-11 10:36:25 +02:00
Enrique Araque
0947d4c9a4 Bump revision and change image tag for 4.13.0-alpha1 2025-06-11 10:32:37 +02:00
Carlos Anguita López
d5e4917414 change the output when checking if the cert tool exists 2025-06-10 16:46:57 +02:00
Carlos Bordon
5ef7f7ee00 Merge pull request #1876 from wazuh/bug/wqa2126-fix-secret-reference
Fix repository bumper workflow environment secret
2025-06-10 08:38:14 -03:00
Raul Del Pozo Moreno
8e9390d2e9 chore: abstracted version 2025-06-10 12:28:04 +02:00
Raul Del Pozo Moreno
5604b488c5 fix: fixed env secret 2025-06-10 11:43:13 +02:00
Carlos Bordon
fb910000ff Merge pull request #1863 from wazuh/change/1860-integrate-bumper-script-via-github-action
Integrate bumper script via GitHub action
2025-06-09 13:12:28 -03:00
c-bordon
7f61ed18a4 Updated wildcard for workflow file name 2025-06-09 12:55:24 -03:00
c-bordon
79bc2516b2 Updated bumper script for tag variable 2025-06-09 12:53:25 -03:00
c-bordon
578619c0c1 Added exclude for cert tool image 2025-06-09 12:07:36 -03:00
Carlos Bordon
4833f362ee Merge branch '4.13.0' into change/1860-integrate-bumper-script-via-github-action 2025-06-09 10:26:50 -03:00
c-bordon
513cbda314 Updated PR message in log 2025-06-09 10:25:53 -03:00
c-bordon
75753a9714 Updated GH token 2025-06-09 10:18:44 -03:00
Carlos Bordon
60e57c9ff3 Merge pull request #1870 from wazuh/bug/1869-missing-malicious-ioc-lists-at-ossecconf-ruleset-configuration
Add missing `malicious-ioc` ruleset lists
2025-06-09 10:17:22 -03:00
Enrique Araque
b8bcf7687e Fix changelog 2025-06-09 15:14:17 +02:00
Enrique Araque
6df029fde7 Update changelog 2025-06-09 12:59:07 +02:00
Enrique Araque
1e21b09e62 Add missing malicious-ioc ruleset lists 2025-06-09 11:54:09 +02:00
c-bordon
b2f46deb7d Updated repository branch name 2025-06-05 16:41:55 -03:00
c-bordon
e166d705c3 Fixed tag validation 2025-06-05 16:40:02 -03:00
c-bordon
61dfe53a08 Added tag argument for bumper script 2025-06-05 16:31:42 -03:00
Gonzalo Acuña
52570181ba Merge pull request #1867 from wazuh/merge-4.13.0-into-4.14.0
Merge 4.13.0 into 4.14.0
2025-06-05 16:11:45 -03:00
c-bordon
04f386e050 Merge 4.13.0 into 4.14.0 2025-06-05 16:09:20 -03:00
Gonzalo Acuña
472b990514 Merge pull request #1866 from wazuh/merge-4.12.1-into-4.13.0
Merge 4.12.1 into 4.13.0
2025-06-05 16:03:49 -03:00
c-bordon
beaf93d9ab Moved wazuh-agent.conf file 2025-06-05 15:55:38 -03:00
c-bordon
44aa64c81f Fixes some merge differences 2025-06-05 15:54:04 -03:00
c-bordon
cfa6e9bf81 Merge 4.12.1 into 4.13.0 2025-06-05 15:52:11 -03:00
c-bordon
46edb16dbb Updated changelog 2025-06-05 10:34:09 -03:00
c-bordon
0177c4ab98 Removed push 2025-06-05 10:10:14 -03:00
c-bordon
07ccedacec Updated bumped workflow 2025-06-05 10:09:16 -03:00
Gonzalo Acuña
18ee73b015 Merge pull request #1856 from wazuh/enhancement/1854-revert-image-tag
Revert image tag
2025-05-30 11:05:02 -03:00
vcerenu
0cf60da585 Revert image tag 2025-05-30 10:53:10 -03:00
Gonzalo Acuña
90411d071e Merge pull request #1855 from wazuh/enhancement/1854-bump-revision-and-image-tag
Bump revision and image tag for rc1 stage
2025-05-30 10:46:11 -03:00
vcerenu
b23ae2f4cc Bump revision and image tag for rc1 stage 2025-05-30 10:33:50 -03:00
Gonzalo Acuña
90eb7a5af8 Merge pull request #1853 from wazuh/enhancement/2385-bump-4.14.0-technical-documentation
Bump 4.14.0 technical documentation
2025-05-30 10:10:33 -03:00
vcerenu
aa46ce2079 Bump 4.14.0 technical documentation 2025-05-30 10:05:47 -03:00
Gonzalo Acuña
e83310dd23 Merge pull request #1852 from wazuh/enhancement/2385-bump-4.13.0-technical-documentation
Bump 4.13.0 technical documentation
2025-05-30 09:51:02 -03:00
vcerenu
7ae4167223 Bump wazuh agent 2025-05-30 09:47:37 -03:00
vcerenu
c32fa133e3 Bump 4.13.0 technical documentation 2025-05-30 09:36:37 -03:00
Carlos Bordon
947f87b9ad Merge pull request #1849 from wazuh/enhancement/remove-4.12.2-entries-from-4.14.0-branch
Remove 4.12.2 references from 4.14.0 branch
2025-05-29 09:29:56 -03:00
Carlos Bordon
b5f61d37fa Merge pull request #1848 from wazuh/enhacement/remove-4.12.2-entries-from-4.13.0-branch
Remove 4.12.2 references from 4.13.0 branch
2025-05-29 09:28:46 -03:00
fcaffieri
b326241400 Remove 4.12.2 references from 4.14.0 branch 2025-05-29 09:28:09 -03:00
fcaffieri
08bc37198f Remove 4.12.2 references from 4.13.0 branch 2025-05-29 09:25:52 -03:00
fcaffieri
d13127b5de Remove 4.12.2 references from 4.13.0 branch 2025-05-29 09:23:59 -03:00
fcaffieri
c4f225cb1b Remove 4.12.2 references from 4.13.0 branch 2025-05-29 09:22:27 -03:00
Gonzalo Acuña
3593e5ed8c Merge pull request #1844 from wazuh/merge-4.13.0-into-4.14.0
Merge 4.13.0 into 4.14.0
2025-05-27 15:22:18 -03:00
Gonzalo Acuña
60d1de2c30 Merge pull request #1843 from wazuh/merge-4.12.2-into-4.13.0
Merge 4.12.2 into 4.13.0
2025-05-27 14:23:14 -03:00
vcerenu
3b88bd9852 Resolving conflicts 2025-05-27 14:09:31 -03:00
Gonzalo Acuña
35d7b63a18 Merge pull request #1828 from wazuh/enhancement/1805-migrate-docker-compose-v2
Fix Warning message when migrating Docker compose v2
2025-05-26 16:01:54 -03:00
Gonzalo Acuña
3613aae2ef Merge branch '4.12.2' into enhancement/1805-migrate-docker-compose-v2 2025-05-26 16:01:36 -03:00
Gonzalo Acuña
aac480eeac Merge pull request #1822 from wazuh/enhancement/1808-add-mdbook-documentation
Add technical documentation
2025-05-21 14:07:14 -03:00
vcerenu
b30ac0a2b6 Add wazuh agent description into README.md file 2025-05-21 10:59:50 -03:00
vcerenu
2b61eeb74c Add wazuh agent description into README.md file 2025-05-21 09:17:34 -03:00
vcerenu
54cbbf1485 Add docker compose v2 compatibility 2025-05-21 09:09:47 -03:00
vcerenu
0041c25218 Add changelog 2025-05-21 09:05:55 -03:00
vcerenu
90cc26f037 Modify FILEBEAT_STATUS test 2025-05-20 14:52:12 -03:00
vcerenu
a1514129ff Change filebeat output test for multi node test 2025-05-20 14:36:55 -03:00
vcerenu
91a2566aa2 Change grep filter 2025-05-20 14:22:44 -03:00
vcerenu
3cdebd4275 Change filebeat output test for single node test 2025-05-20 10:15:24 -03:00
vcerenu
6bc6569dc1 Add env vars, tests and upgrade doc 2025-05-19 16:08:01 -03:00
Carlos Bordon
e32f46a6d1 Merge pull request #1832 from wazuh/1831/bump-to-4.14.0
Bump to 4.14.0
2025-05-19 14:39:07 -03:00
Jesus Garcia
393956be6a Bump from 4.13.0 to 4.14.0 2025-05-19 12:37:09 -05:00
vcerenu
ed4674215e Add reference documentation 2025-05-16 14:12:54 -03:00
vcerenu
1eae96ee4d Add reference documentation 2025-05-16 14:09:15 -03:00
vcerenu
b120eff771 Add reference documentation 2025-05-16 14:02:00 -03:00
vcerenu
6861e077b6 Migrate to Docker Compose v2 2025-05-16 09:32:21 -03:00
vcerenu
74c34e87b1 Migrate to Docker Compose v2 2025-05-16 09:25:36 -03:00
vcerenu
f3a74ffff7 Add changelog 2025-05-14 16:10:58 -03:00
vcerenu
027ebadd6e Change directory structure 2025-05-14 16:03:50 -03:00
vcerenu
4bb6cc9a29 Change deploy process 2025-05-14 15:44:12 -03:00
vcerenu
16c6984a8a Add upgrade process 2025-05-14 14:52:21 -03:00
vcerenu
3a69f6aabc Add build and deploy doc 2025-05-14 14:04:44 -03:00
vcerenu
ce480d5c75 Add mdbook documentation 2025-05-13 16:43:59 -03:00
Gonzalo Acuña
81eca8872f Merge pull request #1817 from wazuh/enhancement/1794-add-wazuh-agent-test-and-push
Add wazuh agent test and push
2025-05-12 14:04:47 -03:00
Gonzalo Acuña
f31a80c579 Merge branch '4.12.2' into enhancement/1794-add-wazuh-agent-test-and-push 2025-05-12 14:04:02 -03:00
Gonzalo Acuña
033617591e Merge pull request #1816 from wazuh/enhancement/1792-add-wazuh-image-4.12.1
Add Wazuh agent image build and deploy
2025-05-12 13:39:20 -03:00
vcerenu
4348acbb83 Modify PR number 2025-05-12 12:47:10 -03:00
vcerenu
5e5ea10655 Modify PR number 2025-05-12 12:43:28 -03:00
Gonzalo Acuña
57810d387d Merge pull request #1815 from wazuh/revert-1801-enhancement/1792-add-wazuh-image-4.12.1
Revert "Add Wazuh agent image build and deploy"
2025-05-12 12:08:22 -03:00
Victor Ereñú
6875c81bed Revert "Add Wazuh agent image build and deploy" 2025-05-13 01:04:03 +10:00
Gonzalo Acuña
dd9ebdcba6 Merge pull request #1814 from wazuh/revert-1809-enhancement/1794-add-wazuh-agent-test-and-push
Revert "Add wazuh agent test and push"
2025-05-12 12:03:41 -03:00
Victor Ereñú
2efaf8c8d6 Revert "Add wazuh agent test and push" 2025-05-13 01:01:03 +10:00
Gonzalo Acuña
4a7fb3c095 Merge pull request #1809 from wazuh/enhancement/1794-add-wazuh-agent-test-and-push
Add wazuh agent test and push
2025-05-12 10:56:41 -03:00
vcerenu
c97bef6e67 Change changelog 2025-05-09 16:33:15 -03:00
vcerenu
5c0dc980bd Add changelog 2025-05-09 16:30:50 -03:00
vcerenu
35805df80d Add changelog 2025-05-09 16:28:33 -03:00
vcerenu
208f4231f8 Fix multi node log check 2025-05-09 16:13:00 -03:00
vcerenu
6f42f2a9f7 Add newline in the last line 2025-05-09 16:06:13 -03:00
vcerenu
d291527768 Add Wazuh agent test and push option 2025-05-09 16:02:57 -03:00
Gonzalo Acuña
159bd2b965 Merge pull request #1801 from wazuh/enhancement/1792-add-wazuh-image-4.12.1
Add Wazuh agent image build and deploy
2025-05-08 07:40:16 -03:00
Carlos Anguita
e822b0744e Merge pull request #1804 from wazuh/merge-4.12.2-into-4.13.0 2025-05-08 10:22:11 +02:00
Enrique Araque
c6284f5b2d Merge branch '4.12.2' into merge-4.12.2-into-4.13.0 2025-05-08 10:19:01 +02:00
Carlos Anguita
212bc7d346 Merge pull request #1803 from wazuh/merge-4.12.1-into-4.12.2 2025-05-08 10:13:51 +02:00
Enrique Araque
f0c945b3bd Merge branch '4.12.1' into merge-4.12.1-into-4.12.2 2025-05-08 10:12:01 +02:00
Carlos Anguita
c6bc6cad0b Merge pull request #1802 from wazuh/merge-4.12.0-into-4.12.1 2025-05-08 10:08:54 +02:00
Enrique Araque
4eea59da8b Merge branch '4.12.0' into merge-4.12.0-into-4.12.1 2025-05-08 10:04:07 +02:00
vcerenu
ff94a0db26 Fix changelog, hostanem and agent version 2025-05-08 04:21:35 -03:00
vcerenu
2cf635279c Add changelog 2025-05-07 12:45:12 -03:00
vcerenu
e0bfbe70eb Add changelog 2025-05-07 12:44:19 -03:00
vcerenu
7f51efa287 Add wazuh agent image build and deploy 2025-05-07 12:37:52 -03:00
Gonzalo Acuña
2cf6253985 Merge pull request #1798 from wazuh/enhancement/1797-bump-4.12.2-version
Bump 4.12.2 version
2025-05-06 14:01:13 -03:00
vcerenu
81a41f93ed Bump 4.12.2 version 2025-05-06 13:56:32 -03:00
Carlos Anguita
0f15acb783 Merge pull request #1789 from wazuh/enhancement/1787-revert-image-tag-for-4.12.0-rc1 2025-04-30 11:32:26 +02:00
Enrique Araque
118c7805e3 Revert docker image tag for 4.12.0-rc1 2025-04-30 11:30:05 +02:00
Carlos Anguita
7245dfb0ef Merge pull request #1788 from wazuh/enhancement/1787-bump-revision-for-4.12.0-rc1 2025-04-30 11:26:28 +02:00
Enrique Araque
b82b0efdd8 Bump revision for 4.12.0-rc1 and add a fogotten changelog entry 2025-04-30 11:24:31 +02:00
Carlos Bordon
e9851e5aa7 Merge pull request #1781 from wazuh/change/1778-repository-bumper-script-development
Added repository_bumper script
2025-04-22 15:47:46 -03:00
c-bordon
4b04578cf5 Updated major.minor replacement 2025-04-22 12:08:13 -03:00
Carlos Bordon
8e78fdfeec Merge pull request #1785 from wazuh/enhancement/revert-bump-4.12.0-beta1-image-tag
Revert bump image tag 4.12.0-beta1
2025-04-16 09:23:33 -03:00
Gonzalo Acuña
3fe18c0f53 Revert bump image tag 4.12.0-beta1 2025-04-16 09:20:02 -03:00
Carlos Bordon
34de7307f6 Merge pull request #1784 from wazuh/enhancement/bump-4.12.0-beta1-image-tag
Bump image tag 4.12.0-beta1
2025-04-16 09:16:19 -03:00
Gonzalo Acuña
cea3caee44 Bump image tag 4.12.0-beta1 2025-04-16 09:13:27 -03:00
Carlos Bordon
1e28240ceb Merge pull request #1783 from wazuh/enhancement/bump-4.12.0-beta1
Bump 4.12.0 to beta1
2025-04-16 09:11:06 -03:00
Gonzalo Acuña
c17b22c13b Bump 4.12.0 to beta1 2025-04-16 09:05:42 -03:00
c-bordon
2e22add312 Removed README exception 2025-04-15 16:37:41 -03:00
c-bordon
e161490f4d Updated changelog 2025-04-15 14:37:50 -03:00
c-bordon
1445bdc420 Removed mmp version replacement 2025-04-15 14:21:49 -03:00
c-bordon
9b2f667a8e Added repository_bumper script 2025-04-15 12:05:28 -03:00
Carlos Bordon
b43c9ddc96 Merge pull request #1777 from wazuh/merge-4.12.1-into-4.13.0
Merge 4.12.1 into 4.13.0
2025-04-11 08:45:11 -03:00
Enrique Araque
49b45fb342 Merge branch '4.10.2' into merge-4.10.2-into-4.11.0 2025-04-11 13:42:03 +02:00
Gonzalo Acuña
5d272abb51 Merge pull request #1775 from wazuh/newversion/1774-bump-to-4.12.1
Bump to 4.12.1
2025-04-09 12:38:07 -03:00
Jesus Garcia
a371c28a05 Bump to 4.12.1 2025-04-09 10:24:24 -05:00
Gonzalo Acuña
1da9ce981c Merge pull request #1772 from wazuh/enhancement/1770-revert-stage
Revert tags
2025-04-03 12:49:58 -03:00
Gonzalo Acuña
938a3df846 Revert tags 2025-04-03 12:48:17 -03:00
Gonzalo Acuña
3672c99a31 Merge pull request #1771 from wazuh/enhancement/1770-bump-stage
Bump stage and tags
2025-04-03 12:45:48 -03:00
Gonzalo Acuña
4a9f83ddee Bump stage and tags 2025-04-03 12:43:32 -03:00
Carlos Bordon
dfb3289bd8 Merge pull request #1769 from wazuh/merge-4.12.0-into-4.13.0
Merge 4.12.0 into 4.13.0
2025-04-01 11:55:36 -03:00
Carlos Bordon
65b0d659d0 Merge pull request #1768 from wazuh/merge-4.11.2-into-4.12.0
Merge 4.11.2 into 4.12.0
2025-04-01 11:48:00 -03:00
Gonzalo Acuña
34b3c00596 Conflicts resolution 2025-04-01 11:46:57 -03:00
Gonzalo Acuña
c1fd8e2380 Merge branch '4.12.0' into merge-4.11.2-into-4.12.0 2025-04-01 11:38:17 -03:00
Gonzalo Acuña
cf972d3858 Merge pull request #1761 from wazuh/idr/2137-review-wrong-references-in-devops-workflows
Remove default docker reference version from workflow
2025-03-26 16:44:02 -03:00
Gonzalo Acuña
d306f942f7 Merge pull request #1764 from wazuh/1762-revert-image-tag
Revert image tag
2025-03-26 14:16:04 -03:00
Jesus Garcia
abde776e1b Revert image tag 2025-03-26 12:11:45 -05:00
Gonzalo Acuña
b6f628f3c1 Merge pull request #1763 from wazuh/bump-to-4.11.2-rc2-version
Update images to version 4.11.2-rc2 in multi-node and single-node
2025-03-26 13:57:56 -03:00
Jesus Garcia
06a5ba5297 Bump to 4.11.2-rc2 2025-03-26 10:59:51 -05:00
Jesus Garcia
51d3d7a946 Remove default docker reference version from workflow 2025-03-25 16:21:59 -05:00
Carlos Anguita
85992aea95 Merge pull request #1760 from wazuh/enhancement/1758-revert-tag
Revert image tag
2025-03-20 09:28:02 +01:00
vcerenu
5057d0f083 Revert image tag 2025-03-20 05:24:28 -03:00
Carlos Anguita
562eb60e0f Merge pull request #1759 from wazuh/enhancement/1758-bump-revision
Bump revision
2025-03-20 09:12:55 +01:00
vcerenu
58d6ec2953 Change image tag 2025-03-20 05:10:18 -03:00
vcerenu
300c1bbcdd Bump revision 2025-03-20 05:05:02 -03:00
Gonzalo Acuña
e1bf0a0dc5 Merge pull request #1757 from wazuh/enhancement/1735-remove-stable-branch
Remove 'stable' branch ocurrencies
2025-03-18 14:28:55 -03:00
Jesus Garcia
c1565a5553 Remove 'stable' branch ocurrencies 2025-03-18 11:16:52 -05:00
Gonzalo Acuña
1fe7647b47 Merge pull request #1756 from wazuh/enhancement/1755-bump-4.11.2-version
Bump 4.11.2 version
2025-03-17 13:51:59 -03:00
vcerenu
bd5e95a2b8 Bump 4.11.2 version 2025-03-17 13:12:33 -03:00
Gonzalo Acuña
75fb9a4e4c Merge pull request #1754 from wazuh/merge-4.12.0-into-4.13.0
Merge 4.12.0 into 4.13.0
2025-03-12 14:16:07 -03:00
Gonzalo Acuña
f002f7e7b0 Merge pull request #1753 from wazuh/merge-4.11.1-into-4.12.0
Merge 4.11.1 into 4.12.0
2025-03-12 14:09:45 -03:00
vcerenu
72c0b196d0 Resolving merge conflicts 2025-03-12 14:04:58 -03:00
Gonzalo Acuña
4aaf0a1b8c Merge pull request #1750 from wazuh/enhancement/5142-change-wazuhkeystore-use
Modify wazuh-keystore  use
2025-03-12 09:31:23 -03:00
vcerenu
1186c6f9d6 Modify wazuh-keystore use 2025-03-11 15:31:31 -03:00
vcerenu
87a3ccd3ee Add changelog 2025-03-11 15:08:41 -03:00
vcerenu
7f08f4cbff Modify wazuh-keystore use 2025-03-11 15:07:14 -03:00
Gonzalo Acuña
607b01351e Merge pull request #1749 from wazuh/enhancement/1748-bump-4130-version
Bump 4.13.0 version
2025-03-10 14:03:15 -03:00
vcerenu
b2de3600ce Bump 4.13.0 version 2025-03-10 13:44:19 -03:00
Carlos Anguita
ce53f0f05e Merge pull request #1747 from wazuh/enhancement/1745-revert-image-tag
Revert docker image for 4.11.1-rc2
2025-03-10 10:27:01 +01:00
Enrique Araque
aa69278c44 Revert docker image for 4.11.1-rc2 2025-03-10 10:25:12 +01:00
Carlos Anguita
546f3cef9b Merge pull request #1746 from wazuh/enhancement/1745-bump-revision-and-change-docker-image-for-4.11.1-rc2
Bump revision and change docker image for 4.11.1-rc2
2025-03-10 10:22:23 +01:00
Enrique Araque
754c4b331e Bum revision and change docker image for 4.11.1-rc2 2025-03-10 10:16:10 +01:00
Carlos Anguita
4433476038 Merge pull request #1743 from wazuh/merge-4.11.1-into-4.12.0
Merge 4.11.1 into 4.12.0
2025-03-07 12:22:20 +01:00
Enrique Araque
e60c07a18f Merge 4.11.1 into 4.12.0 2025-03-07 12:18:07 +01:00
Carlos Bordon
fe0f76bd7b Merge pull request #1738 from wazuh/enhancement/1736-revert-bump-4.11.1-rc1
Revert image tag
2025-02-26 16:53:24 -03:00
Jesus Garcia
e4fec103ca Revert image tag 2025-02-26 14:50:55 -05:00
Carlos Bordon
28acd68e6e Merge pull request #1737 from wazuh/enhancement/1736-bump-4.11.1-rc1
Bump 4.11.1-rc1 revision
2025-02-26 16:43:40 -03:00
Jesus Garcia
fc8a8d6869 Bump 4.11.1-rc1 revision 2025-02-26 14:40:25 -05:00
Carlos Anguita
288630a722 Merge pull request #1734 from wazuh/enhancement/1731-merge-4.11.1-into-4.12.0 2025-02-21 12:37:51 +01:00
Enrique Araque
5c1d43c702 merge 4.11.1 into 4.12.0 2025-02-21 12:33:49 +01:00
Carlos Anguita
ff7c511f3b Merge pull request #1733 from wazuh/enhancement/1731-merge-4.11.0-into-4.11.1 2025-02-21 12:25:55 +01:00
Enrique Araque
5f689b8802 merge 4.11.0 into 4.11.1 2025-02-21 12:22:00 +01:00
Carlos Bordon
f73a819ee4 Merge pull request #1728 from wazuh/enhancement/1722-change-VERSION-file-format
Change VERSION file format
2025-02-17 14:55:45 -03:00
vcerenu
ebf8379373 Delete VERSION file reference 2025-02-17 14:44:43 -03:00
vcerenu
d024c37fc5 Change VERSION file format 2025-02-17 14:13:58 -03:00
vcerenu
87f3dccb0f Add newline 2025-02-17 13:36:46 -03:00
vcerenu
29e679363d Add changelog 2025-02-17 13:35:49 -03:00
vcerenu
6195484a82 Change VERSION file format 2025-02-17 13:23:35 -03:00
Carlos Bordon
3d9981d9fa Merge pull request #1725 from wazuh/enhancement/1723-revert-image-tag
Revert docker image for 4.11.0-rc1
2025-02-14 08:51:25 -03:00
Enrique Araque
06821f172f Revert docker image for 4.11.0-rc1 2025-02-14 12:48:50 +01:00
Carlos Bordon
660e472b7c Merge pull request #1724 from wazuh/enhancement/1723-bump-revision-to-41103
Bump revision and change image tag
2025-02-14 08:44:46 -03:00
Enrique Araque
af33c2dd7c Fix revision 2025-02-14 12:40:55 +01:00
Enrique Araque
331fb1969e Bump revision and change image tag 2025-02-14 12:39:18 +01:00
Carlos Bordon
b88d852b9f Merge pull request #1718 from wazuh/enhancement/1716-revert-tags
Revert image tags for beta1
2025-02-06 13:55:19 -03:00
fcaffieri
281cde7292 Revert image tags for beta1 2025-02-06 13:53:46 -03:00
Carlos Bordon
c9bbf912b0 Merge pull request #1717 from wazuh/enhancement/1716-bump-revision
Revision bump
2025-02-06 13:47:06 -03:00
fcaffieri
7a189605eb Image tags changed for beta1 2025-02-06 13:36:38 -03:00
fcaffieri
ae32e0111d Revision bump 2025-02-06 13:29:27 -03:00
fcaffieri
e29dd1195b Revision bump 2025-02-06 13:27:42 -03:00
Carlos Bordon
dafe93039f Merge pull request #1715 from wazuh/enhancement/1714-support-new-version-4.11.1
Support new Wazuh version 4.11.1
2025-02-06 09:16:02 -03:00
Carlos Anguita López
0adf702f70 support new wazuh version 4.11.1 2025-02-06 13:08:58 +01:00
Carlos Bordon
7be457e3ff Merge pull request #1711 from wazuh/merge-4.11.0-into-4.12.0
Merge 4.11.0 into 4.12.0
2025-02-04 09:33:31 -03:00
vcerenu
6e432a133d Resolving merge conflicts 2025-02-04 09:31:51 -03:00
Carlos Bordon
f49bba385c Merge pull request #1710 from wazuh/merge-4.10.2-into-4.11.0
Merge 4.10.2 into 4.11.0
2025-02-04 09:21:48 -03:00
vcerenu
a7bb241f8a Resolving merge conflicts 2025-02-04 09:15:11 -03:00
vcerenu
6e0311a330 Resolving merge conflicts 2025-02-04 09:14:33 -03:00
vcerenu
bc6ab77773 Resolving merge conflicts 2025-02-04 08:57:45 -03:00
vcerenu
e4f782f55d Resolving merge conflicts 2025-02-04 08:47:46 -03:00
Gonzalo Acuña
b29bd6b936 Merge pull request #1706 from wazuh/enhancement/1703-revert-tags
Revert image tags for alpha1
2025-01-24 09:41:01 -03:00
Gonzalo Acuña
2bed6e2d95 Revert image tags for alpha1 2025-01-24 09:38:55 -03:00
Gonzalo Acuña
73253898a2 Merge pull request #1705 from wazuh/enhancement/1703-image-tags
Image tags changed for alpha1
2025-01-24 09:26:54 -03:00
Gonzalo Acuña
2b30318a08 Image tags changed for alpha1 2025-01-24 09:25:01 -03:00
Gonzalo Acuña
49fb35633c Merge pull request #1704 from wazuh/enhancement/1703-bump-revision
Revision bump
2025-01-24 09:23:05 -03:00
Gonzalo Acuña
052bce7ae1 Revision bump 2025-01-24 09:20:23 -03:00
Gonzalo Acuña
5fb9a0b6b1 Merge pull request #1698 from wazuh/enhancement/1697-bump-4.10.2-version
Bump 4.10.2 version
2025-01-17 15:40:32 -03:00
vcerenu
34d25df8ad bump 4.10.2 version 2025-01-17 15:29:56 -03:00
Enrique Araque
c4bef8df3e Merge pull request #1696 from wazuh/merge-4.11.0-into-4.12.0 2025-01-17 11:39:08 +01:00
Enrique Araque
31440d4a54 Merge branch '4.11.0' into merge-4.11.0-into-4.12.0 2025-01-17 11:35:45 +01:00
Enrique Araque
06e259714c Merge pull request #1695 from wazuh/merge-4.10.2-into-4.11.0 2025-01-17 11:34:22 +01:00
Enrique Araque
d2bb16a493 Merge 4.10.2 into 4.11.0 2025-01-17 11:27:24 +01:00
Enrique Araque
a0c1fd8bf5 Merge pull request #1681 from wazuh/enhancement/1678-revert-docker-image 2025-01-15 11:15:12 +01:00
Enrique Araque
c548f3e096 Revert docker image for 4.10.1-rc1 2025-01-15 11:11:51 +01:00
Carlos Anguita
69b4169fd5 Merge pull request #1680 from wazuh/enhancement/1678-change-docker-image 2025-01-15 11:08:32 +01:00
Enrique Araque
1ee604e4b1 Change docker image for 4.10.1-rc1 2025-01-15 11:05:59 +01:00
Carlos Anguita
5b3f46142e Merge pull request #1679 from wazuh/enhancement/1678-bump-revision-to-41011 2025-01-15 11:01:47 +01:00
Enrique Araque
845f7e59ec Bump revision for 4.10.1-rc1 2025-01-15 10:53:58 +01:00
Gonzalo Acuña
633c50bce6 Merge pull request #1674 from wazuh/bug/1673-add-permanent_data_excps
Add exceptions into PERMANENT_DATA script
2025-01-13 11:41:53 -03:00
vcerenu
347187c411 Add exceptions into PERMANENT_DATA script 2025-01-10 16:02:45 -03:00
Carlos Anguita
af11b8cbbb Merge pull request #1672 from wazuh/merge-4.11.0-into-4.12.0 2025-01-10 11:56:57 +01:00
Enrique Araque
77ef56ada7 Update 4.11.0 version to 4.12.0 2025-01-10 11:53:10 +01:00
Enrique Araque
081436be42 Merge 4.11.0 into 4.12.0 2025-01-10 11:50:32 +01:00
Enrique Araque
a7cc8ef16e Merge pull request #1671 from wazuh/merge-4.10.1-into-4.11.0 2025-01-10 11:37:46 +01:00
Enrique Araque
79ead0cf55 Merge 4.10.1 into 4.11.0 2025-01-10 11:29:23 +01:00
Carlos Anguita
7b415dc700 Merge pull request #1670 from wazuh/merge-4.10.0-into-4.10.1 2025-01-10 11:23:43 +01:00
Enrique Araque
f2a5901fd6 Merge 4.10.0 into 4.10.1 2025-01-10 11:18:47 +01:00
Carlos Anguita
2f3f00fc51 Merge pull request #1667 from wazuh/enhancement/1664-revert-docker-image 2025-01-08 10:21:10 +01:00
Enrique Araque
98675f00fc Change docker image for 4.10.0-rc3 2025-01-08 10:16:58 +01:00
Carlos Anguita
26e94102ce Merge pull request #1666 from wazuh/enhancement/1664-change-docker-image 2025-01-08 10:13:02 +01:00
Enrique Araque
fc896872e2 Change docker image for 4.10.0-rc3 2025-01-08 10:10:42 +01:00
Carlos Anguita
e17302f280 Merge pull request #1665 from wazuh/enhancement/1664-bump-revision-41008 2025-01-08 10:07:45 +01:00
Enrique Araque
010642113b Bump revision for 4.10.0-rc3 2025-01-08 10:04:52 +01:00
Gonzalo Acuña
90f1d446c1 Merge pull request #1663 from wazuh/bug/1642-free-disk-step
Change the cleaning disk step
2024-12-23 08:51:47 -03:00
vcerenu
23848dc8bf Add changelog 2024-12-23 08:44:15 -03:00
vcerenu
9e6defa9d1 Change the cleaning disk step 2024-12-23 08:06:55 -03:00
Gonzalo Acuña
6a3b470f3c Merge pull request #1662 from wazuh/change/1644-change-workflow-so-version
Change Ubuntu version used in workflows
2024-12-20 16:18:36 -03:00
vcerenu
91295a4b39 Change Ubuntu version used in workflows 2024-12-20 13:13:02 -03:00
Gonzalo Acuña
8885425b7f Merge pull request #1661 from wazuh/enhancement/1657-bump-4.12.0-version
Bump 4.12.0 version
2024-12-20 10:50:02 -03:00
Gonzalo Acuña
2060e2103b Merge pull request #1660 from wazuh/enhancement/1656-bump-4.11.0-version
Bump 4.11.0 version
2024-12-20 10:45:40 -03:00
vcerenu
39768a397a Bump 4.12.0 version 2024-12-20 10:45:08 -03:00
vcerenu
66a1533425 Bump 4.11.0 version 2024-12-20 10:40:22 -03:00
Gonzalo Acuña
1f7eae1247 Merge pull request #1659 from wazuh/enhancement/1658-bump-4.10.1-version
Bump 4.10.1 version
2024-12-20 10:19:26 -03:00
vcerenu
2c2388ce4a Bump 4.10.1 version 2024-12-20 10:14:29 -03:00
Gonzalo Acuña
be82d2c41d Merge pull request #1651 from wazuh/enhancement/1650-bump-4.10.3-version
Bump 4.10.3 version
2024-12-18 14:46:53 -03:00
vcerenu
ff54368593 Bump new version 2024-12-18 13:58:58 -03:00
Carlos Anguita
7b03b99022 Merge pull request #1649 from wazuh/enhancement/1646-revert-docker-image 2024-12-18 10:52:16 +01:00
Enrique Araque
8a925f010f Revert docker image for 4.10.0-rc2 2024-12-18 10:47:26 +01:00
Carlos Anguita
8468687b0c Merge pull request #1648 from wazuh/enhancement/1646-change-docker-image 2024-12-18 10:45:58 +01:00
Enrique Araque
da64bb47d5 Change docker image for 4.10.0-rc2 2024-12-18 10:44:05 +01:00
Carlos Anguita
f3b4631bb0 Merge pull request #1647 from wazuh/enhancement/1646-bump-revision-to-41007 2024-12-18 10:41:38 +01:00
Enrique Araque
2c6704652c Bump revision for 4.10.0-rc2 2024-12-18 10:38:59 +01:00
Gonzalo Acuña
7cfda0550d Merge pull request #1641 from wazuh/change/1640.artifact-actions-version
Change version for artifact manager actions
2024-12-16 15:30:34 -03:00
vcerenu
77e548485a Change version for artifact manager actions 2024-12-13 14:08:04 -03:00
Gonzalo Acuña
79ad691772 Merge pull request #1639 from wazuh/merge-4.10.1-into-4.10.2
Merge 4.10.1 into 4.10.2
2024-12-13 09:35:02 -03:00
Enrique Araque
0980cf0257 Merge branch '4.10.1' into merge-4.10.1-into-4.10.2 2024-12-13 13:31:28 +01:00
Gonzalo Acuña
d9a2ebf090 Merge pull request #1638 from wazuh/merge-4.10.0-into-4.10.1
Merge 4.10.0 into 4.10.1
2024-12-13 09:25:38 -03:00
Enrique Araque
240f22b19c Merge 4.10.0 into 4.10.1 2024-12-13 13:19:45 +01:00
Carlos Anguita
8022d3a7fc Merge pull request #1636 from wazuh/enhancement/1633-revert-docker-image
Revert docker image for 4.10.0-rc1
2024-12-03 11:00:01 +01:00
Enrique Araque
12fab33f52 Revert docker image for 4.10.0-rc1 2024-12-03 10:58:17 +01:00
Carlos Anguita
71dac1f51b Merge pull request #1635 from wazuh/enhancement/1633-change-docker-image
Change docker image for 4.10.0-rc1
2024-12-03 10:55:50 +01:00
Enrique Araque
d31228306c Change docker image for 4.10.0-rc1 2024-12-03 10:53:48 +01:00
Carlos Anguita
d37474e7c9 Merge pull request #1634 from wazuh/enhancement/1633-bump-revision-41006
Bump revision for 4.10.0-rc1
2024-12-03 10:50:00 +01:00
Enrique Araque
3b91ae3668 Bump revision for 4.10.0-rc1 2024-12-03 10:48:18 +01:00
Carlos Anguita
edf7aef3cc Merge pull request #1628 from wazuh/enhancement/1625-revert-docker-image
Revert docker image for 4.10.0-beta1
2024-11-22 10:09:02 +01:00
Enrique Araque
25e21e71da Revert docker image for 4.10.0-beta1 2024-11-22 10:06:44 +01:00
Carlos Anguita
475d29db39 Merge pull request #1627 from wazuh/enhancement/1625-change-docker-image
Change docker image for 4.10.0-beta1
2024-11-22 09:59:02 +01:00
Enrique Araque
bc102ace7f Change docker image for 4.10.0-beta1 2024-11-22 09:56:53 +01:00
Carlos Anguita
08de09cd08 Merge pull request #1626 from wazuh/enhancement/1625-bump-revision-to-41005
Bump revision for 4.10.0-beta1
2024-11-22 09:54:32 +01:00
Enrique Araque
15995ac5db Bump revision for 4.10.0-beta1 2024-11-22 09:52:42 +01:00
Gonzalo Acuña
63f965d0fd Merge pull request #1619 from wazuh/bug/1618-unset-cap
Add unset capabilities
2024-11-13 09:52:07 -03:00
vcerenu
bfa6dfb3b3 Add Changelog 2024-11-13 08:11:40 -03:00
vcerenu
521711bf63 Add unset capabilities 2024-11-12 12:15:02 -03:00
Carlos Anguita
347132b589 Merge pull request #1617 from wazuh/enhancement/1614-revert-docker-image-tag
Revert docker image tag for 4.10.0-alpha3
2024-11-08 12:51:27 +01:00
Enrique Araque
53275bebb9 Revert docker image tag for 4.10.0-alpha3 2024-11-08 12:48:46 +01:00
Carlos Anguita
7ca2862ad3 Merge pull request #1616 from wazuh/enhancement/1614-change-docker-image-tag
Change docker image tag to 4.10.0-alpha3
2024-11-08 12:44:11 +01:00
Enrique Araque
5a13dd99a7 Change docker image tag to 4.10.0-alpha3 2024-11-08 12:41:10 +01:00
Gonzalo Acuña
a9f2263da8 Merge pull request #1615 from wazuh/enhancement/1614-bump-revision-to-41004
Bump revision to 41004 and update missing changelog entries
2024-11-08 08:36:34 -03:00
Enrique Araque
f6928b62e6 Bump revision to 41004 and update missing changelog entries 2024-11-08 12:34:30 +01:00
Gonzalo Acuña
a13406a029 Merge pull request #1603 from wazuh/bug/1601-permanent_data
Fix permanent data scripts
2024-11-05 14:20:28 -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
vcerenu
22f34ccb40 Add changelog 2024-11-01 11:55:54 -03:00
vcerenu
369560f59f Fix permanent data scripts 2024-11-01 11:45:39 -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
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
cd3e8b8b30 Merge pull request #1518 from wazuh/enhancement/5651-new-workflow-push-docker-images
Add the push_docker_images procedure workflow file
2024-09-09 08:44:19 -03:00
JESUS D. GARCIA
f0253ba984 Add Procedure_push_docker_images.yml workflow file 2024-09-06 19:40:54 -05:00
vcerenu
8e7b2cd390 Add delete of wazuh yum repo 2024-09-05 15:19:32 -03:00
Gonzalo Acuña
d43f85312a Merge pull request #1513 from wazuh/enhancement/1511-merge-4.9.1-into-4.10.0
Merge 4.9.1 into 4.10.0
2024-09-05 14:01:22 -03:00
Gonzalo Acuña
ae9d06ed35 Merge pull request #1512 from wazuh/enhancement/1511-merge-4.9.0-into-4.9.1
Merge 4.9.0 into 4.9.1
2024-09-05 13:46:52 -03:00
vcerenu
b84a49db92 Resolving conflicts 2024-09-05 13:26:41 -03:00
vcerenu
73fffcf52d Modify check repository for image builder 2024-09-05 13:12:47 -03:00
David Correa Rodríguez
999d01f48a Merge pull request #1507 from wazuh/enhancement/1504-revert-image-tag
Reverted image tag for 4.9.0-rc2
2024-08-30 10:18:55 +02:00
David Correa Rodríguez
bd758935e7 Reverted image tag for 4.9.0-rc2 2024-08-30 10:15:05 +02:00
David Correa Rodríguez
0e284a2309 Merge pull request #1506 from wazuh/enhancement/1504-change-image-tag
Changed image tag for 4.9.0-rc2
2024-08-30 10:12:40 +02:00
David Correa Rodríguez
b597e1cecc Changed image tag for 4.9.0-rc2 2024-08-30 10:11:00 +02:00
David Correa Rodríguez
247a6b0375 Merge pull request #1505 from wazuh/enhancement/1504-bump-revision
Bumped revision for 4.9.0-rc2
2024-08-30 10:07:28 +02:00
David Correa Rodríguez
879a10cc9f Bumped revision for 4.9.0-rc2 2024-08-30 10:03:33 +02:00
David Correa Rodríguez
0fef2182eb Merge pull request #1500 from wazuh/enhancement/1497-revert-image-tag
Reverted image tag for 4.9.0-RC1
2024-08-21 13:39:06 +02:00
David Correa Rodríguez
7b00fb8f73 Reverted image tag for 4.9.0-RC1 2024-08-21 13:35:25 +02:00
David Correa Rodríguez
cdbc5485b4 Merge pull request #1499 from wazuh/enhancement/1497-change-image-tag
Changed image tag for 4.9.0-RC1
2024-08-21 13:30:55 +02:00
David Correa Rodríguez
6249cb8f30 Changed image tag for 4.9.0-RC1 2024-08-21 13:29:24 +02:00
David Correa Rodríguez
7fe9ba2e19 Merge pull request #1498 from wazuh/enhancement/1497-bump-revision
Bumped revision for 4.9.0-rc1
2024-08-21 13:25:41 +02:00
David Correa Rodríguez
996c593242 Bumped revision for 4.9.0-rc1 2024-08-21 13:23:04 +02:00
David Correa Rodríguez
6eb3f60684 Merge pull request #1495 from wazuh/merge-4.9.1-into-4.10.0
Merge 4.9.1 into 4.10.0
2024-08-21 12:24:59 +02:00
David Correa Rodríguez
bbc4529088 Merge branch '4.9.1' into merge-4.9.1-into-4.10.0 2024-08-21 12:10:54 +02:00
David Correa Rodríguez
60e5304cd6 Merge pull request #1494 from wazuh/maintenance/1491-add-4.8.2-readme
Added 4.8.2 version to README.md file
2024-08-21 12:08:27 +02:00
David Correa Rodríguez
28f2320c6e Added 4.8.2 version to README.md file 2024-08-21 11:59:47 +02:00
David Correa Rodríguez
819880d1cf Merge pull request #1493 from wazuh/merge-4.9.0-into-4.9.1
Merge 4.9.0 into 4.9.1
2024-08-21 11:52:25 +02:00
David Correa Rodríguez
f08c39ed6d Merge branch '4.9.0' into merge-4.9.0-into-4.9.1 2024-08-21 11:45:09 +02:00
David Correa Rodríguez
1916f4166a Merge pull request #1492 from wazuh/merge-4.8.2-into-4.9.0
Merge 4.8.2 into 4.9.0
2024-08-21 11:41:21 +02:00
David Correa Rodríguez
36bdb5fedb Merge branch '4.8.2' into merge-4.8.2-into-4.9.0 2024-08-21 11:31:29 +02:00
Gonzalo Acuña
15a856dc32 Merge pull request #1489 from wazuh/enhancement/1485-revert-image-tag
Revert image tag
2024-08-19 12:03:40 -03:00
vcerenu
1486b5942c Revert image tag 2024-08-19 11:52:49 -03:00
Gonzalo Acuña
25319ee004 Merge pull request #1488 from wazuh/enhancement/1485-change-image-tag
Change image tag to RC1
2024-08-19 11:46:15 -03:00
vcerenu
f47ca7fbc0 Change image tag 2024-08-19 11:39:03 -03:00
Gonzalo Acuña
5ef94b819c Merge pull request #1487 from wazuh/enhancement/1485-fix-changelog-link
Fix changelog links
2024-08-19 11:29:20 -03:00
vcerenu
e77ceb6ad6 Fix changelog links 2024-08-19 11:16:06 -03:00
Gonzalo Acuña
127e74296a Merge pull request #1486 from wazuh/enhancement/1485-bump-revision
Bump 4.8.2 revision to 40819
2024-08-19 11:05:28 -03:00
vcerenu
0aa63db271 Bump REVISION to 40819 2024-08-19 10:50:11 -03:00
Carlos Bordon
583f75176d Merge pull request #1484 from wazuh/bump-4.8.2-to-4.8.2
Bump 4.8.2 branch to 4.8.2 version
2024-08-16 07:10:47 -03:00
c-bordon
11d2c84203 Fixed goos.yaml file 2024-08-16 07:09:50 -03:00
c-bordon
2e52ebd7b7 Bump 4.8.2 branch to 4.8.2 version 2024-08-16 06:48:46 -03:00
David Correa Rodríguez
4223b44f3f Merge pull request #1482 from wazuh/enhancement/1479-revert-image-tag
Reverted image tag for 4.9.0 beta2
2024-08-09 09:19:12 +02:00
David Correa Rodríguez
3fc48bec11 Reverted image tag for 4.9.0 beta2 2024-08-09 09:17:10 +02:00
David Correa Rodríguez
56750a07f2 Merge pull request #1481 from wazuh/enhancement/1479-change-image-tag
Changed image tag for 4.9.0 beta2
2024-08-09 09:14:29 +02:00
David Correa Rodríguez
b362e0774b Changed image tag for 4.9.0 beta2 2024-08-09 09:12:01 +02:00
David Correa Rodríguez
d11e421cdd Merge pull request #1480 from wazuh/enhancement/1479-bump-revision
Bumped revision for 4.9.0-beta2
2024-08-09 09:06:07 +02:00
David Correa Rodríguez
99c163f4e5 Bumped revision for 4.9.0-beta2 2024-08-09 08:54:44 +02:00
Gonzalo Acuña
acc3c22bed Merge pull request #1476 from wazuh/enhancement/1474-add-azure-wodle-files
Add Azure wodle files to persistence excepction
2024-08-06 14:57:23 -03:00
vcerenu
6eb435a82f Add Azure wodle files to persistence excepction 2024-08-06 09:37:47 -03:00
Gonzalo Acuña
ac760dbb14 Merge pull request #1475 from wazuh/bug/1473-docker-images-build-errors
Error messages building 4.9.0 Docker images
2024-08-06 09:08:06 -03:00
vcerenu
2adb0cc46d Fix docker-compose error during test 2024-08-06 08:17:22 -03:00
vcerenu
ca6cc555f2 Fix docker-compose error during test 2024-08-05 15:24:11 -03:00
vcerenu
eca65a8538 Fix docker-compose error during test 2024-08-05 15:02:52 -03:00
vcerenu
a063b27592 Fix Wazuh indexer and manager build error 2024-08-05 14:14:28 -03:00
vcerenu
bc2a446c17 Fix Wazuh indexer and manager build error 2024-08-05 12:13:20 -03:00
Carlos Bordon
80b7c047ec Merge pull request #1472 from wazuh/maintenance/1469-revert-image-tag
Revert image tag for 4.9.0 Beta1
2024-08-02 06:47:47 -03:00
c-bordon
4b0818bc2c Revert image tag for 4.9.0 Beta1 2024-08-02 06:44:37 -03:00
Carlos Bordon
28c051a05e Merge pull request #1470 from wazuh/enhancement/1469-bump-revision-40904
Bump REVISION to 40904
2024-08-02 06:38:43 -03:00
Carlos Bordon
1f0f98ddaa Merge pull request #1471 from wazuh/maintenance/1469-change-image-tag
Changed image tag for 4.9.0 Beta1
2024-08-02 06:31:18 -03:00
c-bordon
bc35a25b3b Added beta1 tag to docker-compose 2024-08-02 06:26:00 -03:00
Enrique Araque
0399e7b16a Bump REVISION to 40904 2024-08-02 11:01:57 +02:00
David Correa Rodríguez
e8f5fd25f2 Merge pull request #1466 from wazuh/enhancement/1465-new-version-4.9.1
Bump 4.9.1 version
2024-07-23 10:08:23 +02:00
David Correa Rodríguez
125053f6d5 Bump 4.9.1 version 2024-07-23 10:00:08 +02:00
Carlos Bordon
f38bc64415 Merge pull request #1463 from wazuh/bug/758-wazuh-api-error-k8s
Add eazuh.yml file in the Wazuh dashboard image build process
2024-07-19 12:49:15 -03:00
vcerenu
2ee7cfa515 Add eazuh.yml file in the Wazuh dashboard image build process 2024-07-19 12:25:09 -03:00
David Correa Rodríguez
701fdc33bb Merge pull request #1458 from wazuh/merge-4.9.0-into-4.10.0
Merge 4.9.0 into 4.10.0
2024-07-19 12:39:18 +02:00
David Correa Rodríguez
719d4c2b05 Merge branch '4.9.0' into merge-4.9.0-into-4.10.0 2024-07-19 11:32:51 +02:00
David Correa Rodríguez
78cb2fc571 Merge pull request #1456 from wazuh/maintenance/1452-revert-image-tag
Reverted image tag for 4.9.0 Alpha3
2024-07-19 10:35:43 +02:00
David Correa Rodríguez
6f49d17696 Reverted image tag for 4.9.0 Alpha3 2024-07-19 10:33:09 +02:00
David Correa Rodríguez
f0c56d6da2 Merge pull request #1455 from wazuh/maintenance/1452-change-image-tag
Changed image tag for 4.9.0 Alpha3
2024-07-19 10:28:26 +02:00
David Correa Rodríguez
e86fbd6791 Changed image tag for 4.9.0 Alpha3 2024-07-19 10:24:57 +02:00
David Correa Rodríguez
3e120aee77 Merge pull request #1454 from wazuh/maintenance/1452-bump-revision
Bumped revision for 4.9.0 Alpha3
2024-07-19 10:22:40 +02:00
David Correa Rodríguez
e10fd22fcc Bumped revision for 4.9.0 Alpha3 2024-07-19 10:19:37 +02:00
Carlos Bordon
4c3a6696f6 Merge pull request #1449 from wazuh/merge-4.8.1-into-4.9.0
Merge 4.8.1 into 4.9.0
2024-07-18 10:31:53 -03:00
David Correa Rodríguez
5ed2095854 Merge branch '4.8.1' into merge-4.8.1-into-4.9.0 2024-07-18 15:30:25 +02:00
Carlos Bordon
f3474a392e Merge pull request #1448 from wazuh/change/1445-update-readme
Updated files of README.MD
2024-07-18 10:28:57 -03:00
David Correa Rodríguez
62fc011c2c Updated files of README.MD 2024-07-18 15:26:39 +02:00
Carlos Bordon
bdce114251 Merge pull request #1446 from wazuh/merge-4.8.1-into-4.9.0
Merge 4.8.1 into 4.9.0
2024-07-18 09:37:07 -03:00
David Correa Rodríguez
0a440c0433 Removed whitespaces 2024-07-18 14:34:12 +02:00
David Correa Rodríguez
311ffc72d8 Merge branch '4.8.1' into merge-4.8.1-into-4.9.0 2024-07-18 14:28:33 +02:00
David Correa Rodríguez
65fe95472b Merge pull request #1442 from wazuh/enhancement/1439-revert-image-tag
Reverted image tag for 4.8.1 RC4
2024-07-17 12:24:57 +02:00
David Correa Rodríguez
21e1943cab Reverted image tag for 4.8.1 RC4 2024-07-17 12:22:15 +02:00
David Correa Rodríguez
4a2d9b54d3 Merge pull request #1441 from wazuh/enhancement/1439-change-image-tag
Changed image tag for 4.8.1-RC4
2024-07-17 12:17:44 +02:00
David Correa Rodríguez
3f320be95d Changed image tag for 4.8.1-RC4 2024-07-17 12:13:52 +02:00
David Correa Rodríguez
5712d37a7a Merge pull request #1440 from wazuh/enhancement/1439-bump-revision
Bumped revision for 4.8.1 RC4
2024-07-17 12:09:30 +02:00
David Correa Rodríguez
5d5cc9d30a Bumped revision for 4.8.1 RC4 2024-07-17 12:06:16 +02:00
David Correa Rodríguez
956d42e932 Merge pull request #1436 from wazuh/enhancement/1433-revert-image-tag
Reverted image tag for 4.8.1 RC3
2024-07-15 11:32:13 +02:00
David Correa Rodríguez
1e70aad5f8 Reverted image tag for 4.8.1 RC3 2024-07-15 11:30:08 +02:00
David Correa Rodríguez
09841ba9e4 Merge pull request #1435 from wazuh/enhancement/1433-chage-image-tag
Changed image tag for 4.8.1 RC3
2024-07-15 11:26:33 +02:00
David Correa Rodríguez
c014ea77f4 Changed image tag for 4.8.1 RC3 2024-07-15 11:23:03 +02:00
David Correa Rodríguez
12d8e8f122 Merge pull request #1434 from wazuh/enhancement/1433-bump-revision
Bumped revision for 4.8.1 RC3
2024-07-15 11:16:11 +02:00
David Correa Rodríguez
fe327f10a3 Bumped revision for 4.8.1 RC3 2024-07-15 11:10:52 +02:00
David Correa Rodríguez
5063213d39 Merge pull request #1431 from wazuh/enhancement/1430-revert-image-tag
Reverted image tag for `4.9.0-alpha2`
2024-07-12 10:25:49 +02:00
David Correa Rodríguez
dca7f9382e Reverted image tag for 4.9.0-alpha2 2024-07-12 10:22:27 +02:00
David Correa Rodríguez
577e533958 Merge pull request #1429 from wazuh/enhancement/1427-change-image-tag
Changed image tag for `4.9.0-alpha2`
2024-07-12 10:17:42 +02:00
David Correa Rodríguez
98930a6708 Changed image tag for 4.9.0-alpha2 2024-07-12 09:49:35 +02:00
David Correa Rodríguez
f08a3cf64d Merge pull request #1428 from wazuh/enhancement/1427-change-revision
Bumped revision for 4.9.0-alpha2
2024-07-12 09:46:21 +02:00
David Correa Rodríguez
8cf7909bc0 Bumped revision for 4.9.0-alpha2 2024-07-12 09:40:40 +02:00
Gonzalo Acuña
0c57402b94 Merge pull request #1426 from wazuh/revert-1419-enhancement/1414-add-new-keystore
Revert "Add new keystore certificate"
2024-07-11 14:31:04 -03:00
vcerenu
1e261c165e Revert test changes 2024-07-11 14:28:12 -03:00
Victor Ereñú
b60e875962 Revert "Add new keystore certificate" 2024-07-11 23:01:18 +10:00
Victor Ereñú
693b9d9c23 Merge pull request #1424 from wazuh/enhancemment/1418-merge-4.8.1-into-4.9.0
Merge 4.8.1 into 4.9.0
2024-07-08 14:47:11 -03:00
vcerenu
a275a08cfe Upward merge 2024-07-08 11:54:01 -03:00
Gonzalo Acuña
e74db2ad83 Merge pull request #1416 from wazuh/bug/1346-enable-additional-wazuh-modules-via-dashboard-environment-variables
Removed references to module enabling because they are now enabled by default.
2024-07-04 14:57:56 -03:00
Gonzalo Acuña
2709a8e457 Merge pull request #1422 from wazuh/enhancement/1417-rollback-image-version
Rollback image version
2024-07-04 14:48:42 -03:00
vcerenu
0682effeca Rollback image version 2024-07-04 14:43:23 -03:00
Gonzalo Acuña
c248592d39 Merge pull request #1421 from wazuh/enhancement/1417-change-image-version
Change image version por rc2
2024-07-04 14:38:49 -03:00
vcerenu
6049aec381 change image version por rc2 2024-07-04 14:32:07 -03:00
Gonzalo Acuña
ad6a08c2b0 Merge pull request #1420 from wazuh/enhancement/1417-bump-revision-number
Bump revision number
2024-07-04 14:24:01 -03:00
vcerenu
a583069698 Bump revision number 2024-07-04 14:13:07 -03:00
Gonzalo Acuña
a67c407bfe Merge pull request #1419 from wazuh/enhancement/1414-add-new-keystore
Add new keystore certificate
2024-07-04 13:59:36 -03:00
vcerenu
6138516ad9 Fix wazuh documents tests 2024-07-04 13:36:55 -03:00
vcerenu
665f6fd84a Fix goss test 2024-07-04 13:01:22 -03:00
Carlos Anguita López
9c36a8a13b Removed references to modules because they are now enabled by default 2024-07-04 12:53:33 +02:00
vcerenu
2487a5481e Add new keystore generation 2024-07-02 15:01:37 -03:00
David Correa Rodríguez
8cb7da82df Merge pull request #1413 from wazuh/enhancement/1410-revert-image-tag
Reverted image tag for 4.8.1 RC1
2024-07-02 10:29:05 +02:00
David Correa Rodríguez
91513bda93 Reverted image tag for 4.8.1 RC1 2024-07-02 10:24:17 +02:00
David Correa Rodríguez
6b62f1c738 Merge pull request #1412 from wazuh/enhancement/1410-change-image-tag
Changed image tag for 4.8.1 RC1
2024-07-02 10:21:31 +02:00
David Correa Rodríguez
7257ddc0aa Changed image tag for 4.8.1 RC1 2024-07-02 10:09:45 +02:00
David Correa Rodríguez
bdd919fc48 Merge pull request #1411 from wazuh/enhancement/1410-support-4.8.1-rc1-stage
Bumped REVISION to 40814
2024-07-02 10:04:46 +02:00
David Correa Rodríguez
3112eb2bd5 Bumped REVISION to 40814 2024-07-02 09:55:52 +02:00
Gonzalo Acuña
e9ed0d1d31 Merge pull request #1405 from wazuh/enhancement/6639-docker-images-build
Modify Wazuh indexer and dashboard Dockerfles
2024-06-25 13:42:37 -03:00
vcerenu
ed9b2f0d39 change version for goss 2024-06-25 12:21:58 -03:00
vcerenu
24f12a72d7 Modify Wazuh indexer and dashboard Dockerfles 2024-06-25 09:33:41 -03:00
David Correa Rodríguez
faddbe4af4 Merge pull request #1401 from wazuh/maintenance/1398-revert-tag
Reverted image tag from 4.9.0-alpha1
2024-06-20 10:40:21 +02:00
David Correa Rodríguez
f4596dc833 Reverted image tag from 4.9.0-alpha1 2024-06-20 10:35:59 +02:00
David Correa Rodríguez
78006fc5bd Merge pull request #1400 from wazuh/maintenance/1398-change-tag
Changed image tag for 4.9.0-alpha1
2024-06-20 10:32:35 +02:00
David Correa Rodríguez
956be62183 Changed image tag for 4.9.0-alpha1 2024-06-20 10:27:30 +02:00
David Correa Rodríguez
60d6fb8b98 Merge pull request #1399 from wazuh/maintenance/bump-revision-40901
Bumped revision to 40901
2024-06-20 10:23:31 +02:00
David Correa Rodríguez
2b10eff949 Bumped revision to 40901 2024-06-20 10:20:27 +02:00
Carlos Bordon
94b8b655cd Merge pull request #1396 from wazuh/enhancement/1395-bump-4.10.0-version
Bump 4.10.0 version
2024-06-19 10:53:50 -03:00
vcerenu
8019e386bc Bump 4.10.0 version 2024-06-19 10:20:28 -03:00
Gonzalo Acuña
3398c9f2b3 Merge pull request #1391 from wazuh/merge-4.8.1-into-4.9.0
Merge 4.8.1 into 4.9.0
2024-06-12 12:45:19 -03:00
Carlos Bordon
0763499562 Merge branch '4.9.0' into merge-4.8.1-into-4.9.0 2024-06-12 12:40:15 -03:00
Gonzalo Acuña
88842eede8 Merge pull request #1390 from wazuh/merge-4.8.0-into-4.8.1
Merge 4.8.0 into 4.8.1
2024-06-12 12:35:20 -03:00
c-bordon
ef4f28a0c1 Updated revision number 2024-06-12 12:31:22 -03:00
Carlos Bordon
79cdec2032 Merge branch '4.8.1' into merge-4.8.0-into-4.8.1 2024-06-12 12:23:53 -03:00
David Correa Rodríguez
829e43511e Merge pull request #1384 from wazuh/enhancement/revert-image-tag
Reverted image tag for 4.8.0-rc4
2024-06-06 09:36:01 +02:00
David Correa Rodríguez
e759449ca2 Reverted image tag for 4.8.0-rc4 2024-06-06 09:23:18 +02:00
David Correa Rodríguez
86845841c7 Merge pull request #1383 from wazuh/enhancement/change-image-tag
Changed image tag for 4.8.0-rc4
2024-06-06 09:20:19 +02:00
David Correa Rodríguez
b9c6d1b0dc Changed image tag for 4.8.0-rc4 2024-06-06 09:17:46 +02:00
David Correa Rodríguez
7974ed0e04 Merge pull request #1382 from wazuh/enhancement/bump-revision-40812
Bumped revision to 40812
2024-06-06 09:13:30 +02:00
David Correa Rodríguez
d7d12521d2 Bumped revision to 40812 2024-06-06 09:04:49 +02:00
Gonzalo Acuña
ec68bd1049 Merge pull request #1380 from wazuh/maintenance/1378-bump-4.8.1
Bump version and revision
2024-06-04 13:27:19 -03:00
Gonzalo Acuña
0650c53e47 Version bump 2024-06-04 13:02:47 -03:00
Gonzalo Acuña
3dfb3505a2 Merge pull request #1379 from wazuh/maintenance/1378-bump-4.8.1
Bump to 4.8.1
2024-06-04 12:12:14 -03:00
Gonzalo Acuña
f8b2399347 Bump to 4.8.1 2024-06-04 11:43:03 -03:00
Gonzalo Acuña
9d710e182d Merge pull request #1374 from wazuh/1371-merge-4.8.0-into-4.9.0
Merge 4.8.0 into 4.9.0
2024-05-31 11:22:07 -03:00
vcerenu
d59ee1bd35 merge 4.8.0 into 4.9.0 2024-05-31 11:00:50 -03:00
Gonzalo Acuña
53d1ad8e3e Merge pull request #1373 from wazuh/merge-4.7.5-into-4.8.0
Merge 4.7.5 into 4.8.0
2024-05-31 10:34:38 -03:00
vcerenu
f63c34d73b merge 4.7.5 into 4.8.0 2024-05-31 10:08:21 -03:00
Carlos Bordon
e60187803c Merge pull request #1366 from wazuh/1363-rollback-image-version
Rollback image version rc2
2024-05-29 12:30:57 -03:00
vcerenu
842180baa6 rollback image version 2024-05-29 12:22:43 -03:00
Carlos Bordon
f0488805a4 Merge pull request #1365 from wazuh/1363-commit-image-version
Commit image version rc2
2024-05-29 12:15:40 -03:00
vcerenu
ac6d9e576c commit image version 2024-05-29 12:02:50 -03:00
Carlos Bordon
2b44780605 Merge pull request #1364 from wazuh/1363-bump-revision
Bump revision rc2
2024-05-29 11:55:12 -03:00
vcerenu
c6b38e3de9 bump revision 2024-05-29 11:39:04 -03:00
David Correa Rodríguez
cfa0a220d6 Merge pull request #1360 from wazuh/1357-rollback-image-version
Rollback image version rc3
2024-05-24 09:53:14 +02:00
vcerenu
2125b08544 rollback image version 2024-05-24 04:46:12 -03:00
David Correa Rodríguez
98c0431498 Merge pull request #1359 from wazuh/1357-commit-image-version 2024-05-24 09:39:17 +02:00
vcerenu
e95dd33a89 commit image version 2024-05-24 04:36:20 -03:00
David Correa Rodríguez
817e864977 Merge pull request #1358 from wazuh/1357-bump-revision 2024-05-24 09:29:43 +02:00
vcerenu
78048b6a65 bump revision 2024-05-24 04:23:46 -03:00
Carlos Bordon
169d24af64 Merge pull request #1355 from wazuh/merge-4.7.5-into-4.8.0
Merge 4.7.5 into 4.8.0
2024-05-22 15:02:29 -03:00
Gonzalo Acuña
042d0bf075 Merge branch '4.8.0' into merge-4.7.5-into-4.8.0 2024-05-22 14:58:27 -03:00
Carlos Bordon
bac9daa337 Merge pull request #1354 from wazuh/1348-revert-tag
Revert docker image tag
2024-05-22 14:40:41 -03:00
Gonzalo Acuña
2c39ce5303 Revert docker image tag 2024-05-22 14:31:10 -03:00
Carlos Bordon
9487dd592e Merge pull request #1353 from wazuh/1348-change-tag
Change docker image tag
2024-05-22 14:19:29 -03:00
Gonzalo Acuña
a55eb7f14a Change docker image tag 2024-05-22 14:15:51 -03:00
Carlos Bordon
b0d14dca28 Merge pull request #1352 from wazuh/1348-bump-revision
Bump revision
2024-05-22 14:05:38 -03:00
Gonzalo Acuña
f96b340074 Bump revision 2024-05-22 13:57:22 -03:00
Gonzalo Acuña
2b25f362fd Merge pull request #1351 from wazuh/1348-rollback-image-version
Rollback rc1 image version
2024-05-22 12:05:17 -03:00
vcerenu
2e18b6a873 Rollback image version 2024-05-22 11:55:43 -03:00
Gonzalo Acuña
2bd7c0d6f1 Merge pull request #1350 from wazuh/1348-commit-image-version
Commit rc1 image version
2024-05-22 11:50:36 -03:00
vcerenu
ec69c20413 commit image version 2024-05-22 11:44:13 -03:00
Gonzalo Acuña
7df0ee2a22 Merge pull request #1345 from wazuh/bump-4.7.5-version
Bump 4.7.5 version
2024-05-15 07:27:47 -03:00
vcerenu
db89d2154f bump 4.7.5 version 2024-05-15 07:04:04 -03:00
David Correa Rodríguez
824265943f Merge pull request #1342 from wazuh/rollback-image-tag
Rollback image tag
2024-05-14 11:16:20 +02:00
vcerenu
de2f3995ec rollback image tag 2024-05-14 06:09:28 -03:00
David Correa Rodríguez
52eae12790 Merge pull request #1341 from wazuh/commit-image-tag
Commit image tag to rc2
2024-05-14 11:01:15 +02:00
vcerenu
efa179698e commit image tag 2024-05-14 05:57:49 -03:00
David Correa Rodríguez
5963054220 Merge pull request #1340 from wazuh/bump-revision-number
Bump revision number
2024-05-14 10:49:57 +02:00
vcerenu
902b165719 bump revision number 2024-05-14 05:39:47 -03:00
Victor Ereñú
7d2d8fe1c9 Merge pull request #1333 from wazuh/rollback-image-tag
rollback image tag
2024-05-03 05:32:16 -03:00
vcerenu
317643eabf rollback image tag 2024-05-03 05:27:47 -03:00
Victor Ereñú
d57ce6b432 Merge pull request #1332 from wazuh/change-image-tag
Change image tag for rc1
2024-05-03 05:20:40 -03:00
vcerenu
ef98a5dd83 change image tag for rc1 2024-05-03 05:13:12 -03:00
Victor Ereñú
c00960f7b4 Merge pull request #1331 from wazuh/bump-revision
Bump revision
2024-05-03 05:06:23 -03:00
vcerenu
097af398df bump revision 2024-05-03 04:50:08 -03:00
Victor Ereñú
b022f9f5c1 Merge pull request #1325 from wazuh/merge-4.8.0-into-4.9.0
Merge 4.8.0 into 4.9.0
2024-04-30 07:18:11 -03:00
vcerenu
390a71ebea resolving conflicts 2024-04-30 07:03:06 -03:00
Victor Ereñú
7063480f1f Merge pull request #1324 from wazuh/merge-4.7.4-into-4.8.0
Merge 4.7.4 into 4.8.0
2024-04-30 06:57:18 -03:00
vcerenu
4c74ebfc80 resolving conflicts 2024-04-30 05:39:50 -03:00
David Correa Rodríguez
ec76ea8d92 Merge pull request #1318 from wazuh/rollback-image-version 2024-04-25 10:32:50 +02:00
vcerenu
ce0a855c3d rollback image name 2024-04-25 05:25:17 -03:00
David Correa Rodríguez
d10af3b669 Merge pull request #1317 from wazuh/change-image-rc2 2024-04-25 10:19:01 +02:00
vcerenu
b7609311dc change image version 2024-04-25 05:12:59 -03:00
Victor Ereñú
81c42d02b1 Merge pull request #1316 from wazuh/bump-revision-474
Bump revision 40717
2024-04-25 05:09:32 -03:00
vcerenu
ee3159b225 bump revision 2024-04-25 04:58:29 -03:00
David Correa Rodríguez
3bed3a3a31 Merge pull request #1311 from wazuh/revert-tag-4.7.4-rc1
Reverted tag for 4.7.4 RC1
2024-04-23 09:51:10 +02:00
David Correa Rodríguez
9109104af2 Reverted tag for 4.7.4 RC1 2024-04-23 09:46:03 +02:00
David Correa Rodríguez
2efc6c56fa Merge pull request #1310 from wazuh/change-tag-4.7.4-rc1
Updated tag for 4.7.4 RC1
2024-04-23 09:41:01 +02:00
David Correa Rodríguez
daf1e837a1 Updated tag for 4.7.4 RC1 2024-04-23 09:32:02 +02:00
David Correa Rodríguez
9881957f86 Merge pull request #1309 from wazuh/bump-revision-40716
Bumped revision to 40716
2024-04-23 09:24:55 +02:00
David Correa Rodríguez
8c874235bf Bumped revision to 40716 2024-04-23 09:20:23 +02:00
Victor Ereñú
1e7d1c62ec Merge pull request #1305 from wazuh/revert-beta6
Rename docker image for 4.8.0
2024-04-19 05:57:31 -03:00
vcerenu
72421d608a revert beta6 changes 2024-04-19 05:50:57 -03:00
Victor Ereñú
a9efe64d33 Merge pull request #1304 from wazuh/beta6-tag
Rename docker image for beta6
2024-04-19 05:36:15 -03:00
vcerenu
650d2936c4 add beta6 tag 2024-04-19 05:19:41 -03:00
Victor Ereñú
c9cf940a19 Merge pull request #1303 from wazuh/bump-revision-40808
Bumped revision to 40808
2024-04-19 05:16:42 -03:00
David Correa Rodríguez
353ea5976a Bumped revision to 40808 2024-04-19 09:56:27 +02:00
Gonzalo Acuña
d2181f78cd Merge pull request #1300 from wazuh/bump-version-4.7.4
Bumped version to 4.7.4
2024-04-18 10:24:02 -03:00
David Correa Rodríguez
d904595787 Bumped version to 4.7.4 2024-04-18 15:16:32 +02:00
Gonzalo Acuña
b62a1d5c94 Merge pull request #1294 from wazuh/1293-fix-480-beta5-al2023-vulnerabilities
Fix 4.8.0 beta-5 AL2023 Vulnerabilities
2024-04-10 12:04:40 -03:00
Carlos Anguita López
92d6f87091 Changed Docker base image ocurrences from amazonlinux:2023.3.20240304.0 to amazonlinux:2023 2024-04-10 13:18:01 +02:00
David Correa Rodríguez
74e30e89f8 Merge pull request #1288 from wazuh/bump-revision-40807
Bumped revision to 40807
2024-04-05 12:33:43 +02:00
David Correa Rodríguez
cbeb18c13f Bumped revision to 40807 2024-04-05 12:09:39 +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
fc1bc7796a Merge pull request #1279 from wazuh/1253-fix-pr-test-multi
Fix PR test
2024-03-27 16:04:57 -03:00
vcerenu
cbdc152dda clean disk and change way to wait Cluster start 2024-03-27 14:25:31 -03: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
Gonzalo Acuña
e866a8d013 Merge pull request #1271 from wazuh/22511-delete-syslog-and-dpkg-configuration
Delete syslog and dpkg log configuration
2024-03-22 09:42:32 -03:00
vcerenu
e03cfde3bc delete create_user.py script 2024-03-22 08:47:32 -03:00
vcerenu
866ee48871 delete syslog and dpkg log configuration 2024-03-21 07:00:57 -03:00
Gonzalo Acuña
654d1dbf36 Merge pull request #1268 from wazuh/bug/1193-review-version-references-in-the-master-branch
Fixed references to 4.8 version
2024-03-20 12:58:19 -03:00
David Correa Rodríguez
219843dbb8 Fixed references to 4.8 version 2024-03-19 11:32:06 +01:00
Gonzalo Acuña
b1fec6690b Merge pull request #1266 from wazuh/1265-cert-creator-update
Update query about Wazuh manager cont names
2024-03-15 12:39:36 -03:00
vcerenu
a8754c54bc update query about Wazuh manager cont names 2024-03-15 11:29:46 -03:00
Gonzalo Acuña
b0c5fb3559 Merge pull request #1261 from wazuh/update-AL2023-20240304
Update AL2023 20240304
2024-03-14 08:56:51 -03:00
vcerenu
02ee94f312 update al2024 version 2024-03-13 11:58:52 -03:00
David Correa Rodríguez
69f9ab8de2 Merge pull request #1258 from wazuh/bump-version-40806
Bumped version to 40806
2024-03-12 11:06:52 +01:00
David Correa Rodríguez
89f3b0d600 Bumped version to 40806 2024-03-12 11:01:41 +01:00
Gonzalo Acuña
51e17d2dac Merge pull request #1247 from wazuh/1220-modify-uid
Modify uid and gid
2024-03-11 11:26:11 -03:00
vcerenu
031db43568 rollback root-ca filename 2024-03-11 10:17:49 -03:00
vcerenu
387727d496 rollback uid and gid for Wazuh indexer and dashboard owner 2024-03-11 10:05:53 -03:00
Gonzalo Acuña
781fa76384 Merge pull request #1254 from wazuh/814-add-exceptions
Add file exceptions
2024-03-06 09:47:42 -03:00
vcerenu
73650d79b3 add exceptions 2024-03-06 06:24:26 -03:00
vcerenu
b4af946000 delete chmod for upgrade 2024-03-05 11:41:43 -03:00
vcerenu
a733046471 change cert creator version 2024-03-05 10:08:25 -03: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
vcerenu
a826212051 add upgrade functions into entrypoints 2024-03-04 12:14:20 -03:00
vcerenu
6e7e8525bb modify uid and giufor indexer and dashboard user and file permissions 2024-03-04 07:51:00 -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
1564b2d4cd Merge pull request #1241 from wazuh/fix-readme
Fix readme 4.7.3
2024-03-01 14:30:42 -03:00
Gonzalo Acuña
96048c7bf3 Fix readme 4.7.3 2024-03-01 14:25:28 -03:00
Gonzalo Acuña
401673e743 Merge pull request #1239 from wazuh/1237-bump-revision
Bump revision `4.8.0-beta3`
2024-03-01 10:20:26 -03:00
Gonzalo Acuña
d8780f0e37 Revision bump (4.8.0-beta3) 2024-03-01 10:14:50 -03:00
Gonzalo Acuña
520291162f Merge pull request #1238 from wazuh/merge-4.8.0-into-4.8.1
Merge 4.8.0 into 4.8.1
2024-03-01 08:42:44 -03:00
David Correa Rodríguez
63217770f7 Merge branch '4.8.0' into merge-4.8.0-into-4.8.1 2024-03-01 12:32:27 +01:00
Gonzalo Acuña
8c44d566df Merge pull request #1236 from wazuh/merge-4.7.3-into-4.8.0
Merge 4.7.3 into 4.8.0
2024-03-01 08:23:28 -03:00
David Correa Rodríguez
d0b02cf15c Merge branch '4.7.3' into merge-4.7.3-into-4.8.0 2024-03-01 12:14:19 +01:00
Gonzalo Acuña
b274806f60 Merge pull request #1234 from wazuh/596-filebeat-fix
Modify Dockerfile for Pod restart in Kubernetes
2024-02-29 13:43:27 -03:00
vcerenu
2e8c7f99b5 fix goss test 2024-02-29 13:03:50 -03:00
vcerenu
992fa82f6d update base and fix wazuh manager build 2024-02-29 11:11:59 -03:00
David Correa Rodríguez
c88172dc56 Merge pull request #1233 from wazuh/bump-revision-40713
Bump revision to 40713
2024-02-29 11:09:37 +01:00
David Correa Rodríguez
3f8444a71e Bump revision to 40713 2024-02-29 10:47:34 +01:00
Gonzalo Acuña
0de952d1b3 Merge pull request #1230 from wazuh/bump-revision
Bump revision to 40804
2024-02-23 11:58:04 -03:00
David Correa Rodríguez
8a574da9ec Bump revision to 40804 2024-02-23 15:50:57 +01:00
David Correa Rodríguez
6b35c9d4bc Merge pull request #1226 from wazuh/merge-4.7.3-into-4.8.0
Merge 4.7.3 into 4.8.0
2024-02-23 10:58:28 +01:00
David Correa Rodríguez
f7e7a5a5fb Added 4.7.3 to CHANGELOG.md 2024-02-23 10:41:54 +01:00
David Correa Rodríguez
7835e6a678 Merge branch '4.7.3' into merge-4.7.3-into-4.8.0 2024-02-23 10:41:17 +01:00
Gonzalo Acuña
23900dbcc1 Merge pull request #1224 from wazuh/change/1210-change-the-base-image-to-amazon-linux-2023
Changed the base image to Amazon Linux 2023
2024-02-22 16:12:48 -03:00
David Correa Rodríguez
0bb7a00125 Merge branch '4.8.0' into change/1210-change-the-base-image-to-amazon-linux-2023 2024-02-22 17:58:40 +01:00
David Correa Rodríguez
467a405754 Upgraded ownership files for Wazuh files 2024-02-22 17:51:47 +01:00
Gonzalo Acuña
1046a3a13e Merge pull request #1223 from wazuh/1216-aws-data-excp
Review Wazuh docker permanent data exceptions for the AWS wodle
2024-02-22 13:21:51 -03:00
vcerenu
6fef542ee2 add aws wodle files for permanent data excp 2024-02-22 10:12:02 -03:00
David Correa Rodríguez
55f9fe3ded Added procps to Manager dockerfile 2024-02-21 17:51:36 +01:00
Gonzalo Acuña
d538e47eef Merge pull request #1217 from wazuh/770-add-maltiverse-except
Add maltiverse files into permanent exceptions
2024-02-21 13:45:51 -03:00
vcerenu
0d628f20cc move pagerduty exception 2024-02-21 11:57:29 -03:00
vcerenu
53b9d71c23 add maltiverse files into permanent exceptions 2024-02-21 11:43:23 -03:00
Gonzalo Acuña
1b3251852c Merge pull request #1215 from wazuh/1214-rollback-ism-changes
Rollback ISM changes
2024-02-20 14:49:57 -03:00
David Correa Rodríguez
4ba6e124b1 Updated dependencies 2024-02-20 17:37:40 +01:00
vcerenu
33a55344d3 rollback ISM 2024-02-20 12:01:22 -03:00
David Correa Rodríguez
a4a9207dec Added findutils dependency to indexer 2024-02-20 12:23:41 +01:00
David Correa Rodríguez
98037bf25c Commands and dependencies adapted 2024-02-20 10:33:29 +01:00
Gonzalo Acuña
7f09331a95 Merge pull request #1213 from wazuh/bump-revision
Bump 4.7.3 version
2024-02-19 10:48:34 -03:00
Gonzalo Acuña
ec9076261f Merge pull request #1209 from wazuh/21806-dashboard-does-not-displays-alerts-while-alertlog-file-does-in-docker-deployments
Add filebeat parameters to inject wazuh template
2024-02-19 09:16:19 -03:00
vcerenu
5a5fbdd62c bump 4.7.3 version 2024-02-19 06:02:47 -03:00
vcerenu
d6cefe7288 add filebeat parameters for inyect template 2024-02-14 11:52:50 -03:00
Gonzalo Acuña
0296f59f8c Merge pull request #1208 from wazuh/1198-reduce-sizze-of-wazuh-manager
Merge layers into Wazuh manager Dockerfile
2024-02-14 08:28:09 -03:00
vcerenu
057752d7bc merge layers into Wazuh manager Dockerfile 2024-02-14 07:06:40 -03: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
David Correa Rodríguez
db7596ca03 Merge pull request #1200 from wazuh/1199-support-new-stage-beta-1-for-480-in-wazuh-docker-repository
Bump revision
2024-02-05 09:19:01 +01:00
vcerenu
174ae3d14c bump revision 2024-02-05 04:55:41 -03:00
Gonzalo Acuña
52a9479e48 Merge pull request #1196 from wazuh/1195-adapt-vd-to-wazuh-keystore-for-indexer-configuration
VD keystore changes
2024-02-02 08:53:12 -03:00
Gonzalo Acuña
ec63264545 Changed user for username in the wazuh-keystore command 2024-01-31 09:23:50 -03:00
Gonzalo Acuña
114d6edff2 Indexer tag and wazuh-keystore updates 2024-01-29 15:48:48 -03:00
Gonzalo Acuña
eb894d868d Merge pull request #1188 from wazuh/666-pre-install-xz-utils-in-projects-installing-wazuh-manager
Add xz-utils install
2024-01-17 11:30:17 -03:00
vcerenu
adba797c54 add xz-utils install 2024-01-16 12:40:17 -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
d820c63982 Merge pull request #1181 from wazuh/1180-bump-revision
Bump revision for 4.8.0-alpha2
2024-01-09 10:55:45 -03:00
Gonzalo Acuña
b2ef887f66 Bump revision for 4.8.0-alpha2 2024-01-09 10:47:19 -03:00
Gonzalo Acuña
d98ef7a8be Merge pull request #1171 from wazuh/change/1503-update-ISM-script-execution-to4.8.0
Updated indexer-ism-init.sh execution and removed wazuh-template push…
2024-01-05 16:47:55 -03: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
daa122f14b Merge pull request #1174 from wazuh/merge-4.7.2-into-4.8.0
Merge 4.7.2 into 4.8.0
2024-01-04 14:38:03 -03:00
Gonzalo Acuña
297cf50c27 Merge branch '4.8.0' into merge-4.7.2-into-4.8.0 2024-01-04 14:37:22 -03:00
c-bordon
caddf2893a Testing with sleep 2024-01-04 13:02:39 -03:00
c-bordon
892822fe29 Update check test 2024-01-04 12:34:10 -03:00
c-bordon
99e708c1a9 Updated indexer-ism-init.sh execution and removed wazuh-template push from Filebeat 2024-01-04 11:48:27 -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
Victor Ereñú
8814200fb2 Merge pull request #1165 from wazuh/bump-revision
Bump revision
2023-12-22 18:59:26 +10:00
vcerenu
69d61278cf bump revision 2023-12-22 05:46:46 -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
Gonzalo Acuña
d744287776 Merge pull request #1158 from wazuh/540-vd-update
Changed configuration to new VD and indexer config
2023-12-20 15:06:36 -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
Gonzalo Acuña
b2e30894da Merge pull request #1160 from wazuh/merge-4.7.2-into-4.8.0
Merge 4.7.2 into 4.8.0
2023-12-20 14:43:22 -03: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
David Correa Rodríguez
eba8b9172f Merge branch '4.7.2' into merge-4.7.2-into-4.8.0 2023-12-20 18:23:15 +01:00
Gonzalo Acuña
ca8cf4f717 Merge pull request #1159 from wazuh/merge-4.7.1-into-4.7.2
Merge 4.7.1 into 4.7.2
2023-12-20 14:13:11 -03:00
David Correa Rodríguez
2c92c87b02 Merge branch '4.7.1' into merge-4.7.1-into-4.7.2 2023-12-20 17:38:00 +01:00
David Correa Rodríguez
9b1ba35383 Changed Filebeat module version to 0.4 2023-12-20 16:29:00 +01:00
vcerenu
2258605ec2 delete single quotes for configurate vuln detection 2023-12-20 04:28:33 -03:00
Gonzalo Acuña
74546d0cab Merge pull request #1157 from wazuh/change/599-resource-description-adapt-the-devops-repositories-to-use-the-new-filebeat-module-packages-to4.8.0
Updated Filebeat module version
2023-12-19 10:48:54 -03:00
Gonzalo Acuña
09aeb68b14 New VD config update 2023-12-19 10:45:21 -03:00
c-bordon
10008a792b Updated Filebeat module version 2023-12-19 09:27:17 -03:00
Gonzalo Acuña
402c5d6fea Merge pull request #1153 from wazuh/Bump-4.7.1-RC3
Bump 4.7.1 to RC3 revision
2023-12-15 14:05:33 -03:00
c-bordon
81738baf88 Bump 4.7.1 to RC3 revision 2023-12-15 13:45:19 -03:00
Gonzalo Acuña
4210c23a4c Merge pull request #1146 from wazuh/mantainence/Bump-Revision-for4.7.1-rc2
Bumped revision for 4.7.1 rc2
2023-12-07 15:27:22 -03:00
c-bordon
ddf1d781eb Bumped revision for 4.7.1 rc2 2023-12-07 15:25:50 -03:00
Victor Ereñú
3d58ff0049 Merge pull request #1141 from wazuh/bump-revision
Support new Wazuh version 4.7.2 in wazuh-docker repository
2023-11-30 19:21:17 +10:00
vcerenu
d44b87800a bump revision number 2023-11-30 06:11:07 -03: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
86dd284368 Merge pull request #1136 from wazuh/merge-4.7.1-into-4.8.0
Merge 4.7.1 into 4.8.0
2023-11-27 13:46:10 -03:00
David Correa Rodríguez
94c6a1b446 Merge branch '4.7.1' into merge-4.7.1-into-4.8.0 2023-11-27 17:03:09 +01:00
Gonzalo Acuña
375d94d22f Merge pull request #1135 from wazuh/bump_revision_number
bump revision number
2023-11-27 09:47:36 -03:00
vcerenu
eb6eae692c bump revision number 2023-11-27 09:01:25 -03:00
Carlos Bordon
16681104b4 Merge pull request #1131 from wazuh/merge-4.7.0-into-4.7.1
Merge 4.7.0 into 4.7.1
2023-11-24 08:40:32 -03:00
David Correa Rodríguez
794e9a27f4 Merge branch '4.7.0' into merge-4.7.0-into-4.7.1 2023-11-24 10:21:33 +01:00
Victor Ereñú
dcf48426c1 Merge pull request #1129 from wazuh/chenge_revision_number
Change revision number
2023-11-23 07:58:19 -03:00
vcerenu
f8eb0b5f1d change revision number 2023-11-23 07:47:39 -03:00
Gonzalo Acuña
139f7a52f6 Merge pull request #1124 from wazuh/1119-update-filebeat-module-download-url
Update Filebeat module download URL
2023-11-22 09:38:08 -03:00
Gonzalo Acuña
2df37520a7 Merge pull request #1125 from wazuh/change/492-remove-report-dependencies
Removed report dependencies from Wazuh dashboard image
2023-11-22 09:00:13 -03: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
c-bordon
423fc248ef Removed report dependencies from Wazuh dashboard image 2023-11-21 15:05:17 -03:00
vcerenu
12d45d83ad add dheck for filebeat repository 2023-11-21 10:24:37 -03:00
vcerenu
f7f90941ed add dheck for filebeat repository 2023-11-21 09:52:52 -03:00
Carlos Bordon
717a897c11 Merge pull request #1121 from wazuh/change/1099-adapt-process-to-install-multiple-wazuh-dashboards-plugins
Adapted docker build to multiple Wazuh Dashboards plugins
2023-11-16 12:04:16 -03:00
David Correa Rodríguez
37d38ecf92 Fixed identation 2023-11-16 15:59:44 +01:00
David Correa Rodríguez
573090edcb Added variables in validations for different repositories 2023-11-16 15:54:25 +01:00
David Correa Rodríguez
c38a25224c Adapted docker build to multiple Wazuh Dashboards plugins 2023-11-16 13:52:41 +01:00
Carlos Bordon
351c6b319c Merge pull request #1118 from wazuh/1115-ism-rollover-update-the-ism-checksh-script-to-accept-all-parameters
[ISM Rollover] Update the ism-check.sh script to accept all parameters
2023-11-15 12:57:25 -03:00
vcerenu
9f58e6f21f add more optionsfor ism policies deploy 2023-11-15 05:00:31 -03:00
Carlos Bordon
6c50089d53 Merge pull request #1117 from wazuh/change/1116-update-filebeat-module-to-03-version
Updated Filebeat module version to 0.3
2023-11-14 15:11:57 -03:00
c-bordon
56ccf81185 Fixed wrong file 2023-11-14 14:29:46 -03:00
c-bordon
20a3f170d8 Updated Filebeat module version to 0.3 2023-11-14 14:28:35 -03: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ñú
6b910bc636 Merge pull request #1113 from wazuh/test-sign-old-commits
Merge 4.8.0 last commits into 4.8.0 branch
2023-11-14 08:02:13 -03:00
vcerenu
95bd43c7e5 change revision tag 2023-11-14 05:50:13 -03:00
vcerenu
ff5e59982b change hostname from apply ism policy 2023-11-14 05:50:08 -03:00
vcerenu
ed136c994e change apt-key add command 2023-11-14 05:50:02 -03:00
vcerenu
b55cfaa9a0 add ism policies 2023-11-14 05:49:35 -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
25e4c24c87 Merge pull request #1105 from wazuh/change_revision
Support new stage RC 1 for 4.7.0 in wazuh-docker repository
2023-11-13 09:40:15 -03:00
vcerenu
2ccd5dc431 change revision number 2023-11-13 09:33:37 -03:00
Carlos Bordon
a68da465d3 Merge pull request #1098 from wazuh/change/updateIndexerFiles-to4.8.0
Updated security config files
2023-11-09 09:15:01 -03:00
c-bordon
486c41e3f9 Updated security config files 2023-11-09 09:09:08 -03:00
David Jose Iglesias Lopez
504e1f2017 Merge pull request #1091 from wazuh/enhancement/337-change-repo-name
Update links to wazuh-kibana-app repo
2023-11-02 16:30:51 +01:00
Victor Ereñú
15413250e8 Merge pull request #1095 from wazuh/1094-support-new-stage-alpha-2
Bump revision number
2023-11-02 12:22:30 -03:00
vcerenu
fa956c53e7 bump revision number 2023-11-02 12:07:17 -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
Carlos Bordon
4863d54c99 Merge pull request #1092 from wazuh/merge-4.7.1-into-4.8.0
Merge 4.7.1 into 4.8.0
2023-10-31 13:52:40 -03:00
rafabailon
d352019385 Rename Kibana as Dashboard 2023-10-31 10:09:45 +01:00
Gonzalo Acuña
27962e38f1 Merge pull request #1086 from wazuh/maintenance/1332-update-wazuh-kibana-app-references
Updated wazuh-kibana-app reference
2023-10-25 12:40:14 -03:00
David Correa Rodríguez
f1140fc088 Updated wazuh-kibana-app references 2023-10-25 15:56:11 +02:00
Gonzalo Acuña
0ecf533cdc Merge pull request #1085 from wazuh/1079-make-directories-for-docker-composeyml
Make directories for docker-compose.yml
2023-10-25 09:47:02 -03:00
vcerenu
cda712949a add mounted directories into dockerfile 2023-10-25 09:20:33 -03:00
vcerenu
4a95d18b9a add mounted directories into dockerfile 2023-10-25 06:29:09 -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
David Correa Rodríguez
7c814de638 Merge pull request #1082 from wazuh/merge-4.7.1-into-4.8.0
Merge 4.7.1 into 4.8.0
2023-10-24 10:00:25 +02:00
David Correa Rodríguez
1ee77e40ce Merge branch '4.7.1' into merge-4.7.1-into-4.8.0 2023-10-24 09:54:35 +02:00
David Correa Rodríguez
bfae09af52 Merge pull request #1081 from wazuh/merge-4.7.0-into-4.7.1
Merge 4.7.0 into 4.7.1
2023-10-24 09:53:02 +02:00
David Correa Rodríguez
1c0b12deaa Merge branch '4.7.0' into merge-4.7.0-into-4.7.1 2023-10-24 09:48:38 +02:00
David Correa Rodríguez
92b3395abc Merge pull request #1080 from wazuh/merge-4.6.0-into-4.7.0
Merge 4.6.0 into 4.7.0
2023-10-24 09:47:17 +02:00
David Correa Rodríguez
b1d10f879c Merge branch '4.6.0' into merge-4.6.0-into-4.7.0 2023-10-24 09:42:48 +02:00
David Correa Rodríguez
98e96a5260 Merge pull request #1077 from wazuh/merge-4.5.4-into-4.6.0
Merge 4.5.4 into 4.6.0
2023-10-24 09:40:50 +02:00
David Correa Rodríguez
84e57b9c9a Merge branch '4.5.4' into merge-4.5.4-into-4.6.0 2023-10-24 09:25:31 +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
Gonzalo Acuña
2cd1ca79e6 Merge pull request #1074 from wazuh/idr-394-defRoute
Dashboard default route update
2023-10-23 13:53:46 -03:00
Gonzalo Acuña
4c2582952f Dashboard default route update 2023-10-23 13:28:22 -03:00
Victor Ereñú
e13cfcf454 Merge pull request #1073 from wazuh/bump-revision-4.6.0
Bump revision 40603
2023-10-23 12:33:32 -03:00
vcerenu
e48255641f bump revision 2023-10-23 12:21:49 -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
Victor Ereñú
40618586a9 Merge pull request #1068 from wazuh/merge-4.7.1-into-4.8.0
Merge 4.7.1 into 4.8.0
2023-10-23 05:43:06 -03:00
vcerenu
274c0bc692 resolving conflicts 2023-10-23 05:39:31 -03:00
Victor Ereñú
c4d6a254cc Merge pull request #1067 from wazuh/merge-4.7.0-into-4.7.1
Merge 4.7.0 into 4.7.1
2023-10-23 05:37:06 -03:00
vcerenu
d45e2d984e resolving conflicts 2023-10-23 05:27:21 -03:00
vcerenu
781e6a4082 resolving conflicts 2023-10-23 05:25:42 -03:00
Victor Ereñú
0c7d298eea Merge pull request #1066 from wazuh/merge-4.6.0-into-4.7.0
Merge 4.6.0 into 4.7.0
2023-10-23 05:21:47 -03:00
Victor Ereñú
05ef9b899b Merge pull request #1065 from wazuh/merge-4.5.4-into-4.6.0
Bump 4.5.4 version
2023-10-23 05:14:00 -03:00
vcerenu
c46b1c0d82 resolving conflicts 2023-10-23 05:02:02 -03:00
David Correa Rodríguez
3a3218f0d4 Merge pull request #1061 from wazuh/bump-revision-40510
Bump revision to 40510
2023-10-19 12:00:04 +02:00
David Correa Rodríguez
dd86d1b707 Bump revision to 40510 2023-10-19 11:46:24 +02:00
Gonzalo Acuña
60563720f3 Merge pull request #1059 from wazuh/bug/1054-remove-filebeat-template-value
Removed value of Filebeat template variable
2023-10-17 11:05:17 -03:00
David Correa Rodríguez
0cd98767c8 Removed value of Filebeat template variable 2023-10-17 15:23:37 +02:00
Gonzalo Acuña
8aad8651d7 Merge pull request #1058 from wazuh/bump-version-4.5.4
Bump 4.5.4 version
2023-10-17 09:03:27 -03:00
vcerenu
3c073ab5ea bump 4.5.4 version 2023-10-17 09:01:18 -03:00
Gonzalo Acuña
b8ff013b36 Merge pull request #1056 from wazuh/bug/1054-the-images-build-fails-due-to-filebeat-template-branch
Fixed Filebeat template bug in image generation
2023-10-17 08:33:09 -03:00
vcerenu
5106715b0c bump 4.5.4 version 2023-10-17 05:55:15 -03:00
David Correa Rodríguez
523a28b20d Fixed Filebeat template bug in image generation 2023-10-16 16:09:05 +02: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
David Correa Rodríguez
0f1cc4b955 Merge pull request #1053 from wazuh/bump-revision-40701
Bump revision to 40701
2023-10-13 11:42:21 +02:00
David Correa Rodríguez
aee83a1a2d Bump revision to 40701 2023-10-13 10:25:38 +02:00
Victor Ereñú
7474e836b6 Merge pull request #1048 from wazuh/merge-4.7.1-into-master
Merge 4.7.1 into master
2023-10-11 06:00:37 -03:00
vcerenu
acb3688346 resolving conflicts 2023-10-11 05:47:56 -03:00
vcerenu
4d153f6705 bump new builder script 2023-10-11 05:44:48 -03:00
Victor Ereñú
85ba8cb9b0 Merge pull request #1036 from wazuh/merge-4.7.1-into-master
Merge 4.7.1 into master
2023-10-09 06:52:26 -03:00
vcerenu
5aaeb0d944 Updated version in new builder script 2023-10-09 11:45:24 +02:00
Victor Ereñú
aa88dad36a Merge pull request #1038 from wazuh/merge-4.7.0-into-4.7.1
Merge 4.7.0 into 4.7.1
2023-10-09 06:37:00 -03:00
vcerenu
a424c683ae bump new builder script 2023-10-09 06:34:35 -03:00
Victor Ereñú
0555e4956b Merge pull request #1037 from wazuh/bump-4.7.0
Bump new builder script
2023-10-09 06:31:28 -03:00
vcerenu
dee2c3c8dc bump new builder script 2023-10-09 06:28:03 -03:00
David Correa Rodríguez
6b89644918 Merge branch '4.7.1' into merge-4.7.1-into-master 2023-10-09 11:07:47 +02:00
Victor Ereñú
1e29e8fcfc Merge pull request #1035 from wazuh/merge-4.7.0-into-4.7.1
Merge 4.7.0 into 4.7.1
2023-10-09 06:04:29 -03:00
David Correa Rodríguez
25be906860 Merge branch '4.7.0' into merge-4.7.0-into-4.7.1 2023-10-09 10:50:11 +02:00
Victor Ereñú
c18a1eca56 Merge pull request #1034 from wazuh/merge-4.6.0-into-4.7.0
Merge 4.6.0 into 4.7.0
2023-10-09 05:33:57 -03:00
David Correa Rodríguez
14dcc8b6a6 Merge 4.6.0 into 4.7.0 2023-10-09 09:41:25 +02:00
Gonzalo Acuña
89e0fc9604 Merge pull request #1033 from wazuh/bump-revision-4.6.0
Bump revision to 40602
2023-10-06 09:15:14 -03:00
David Correa Rodríguez
64f083631d Bump revision to 40602 2023-10-06 14:11:05 +02:00
David Correa Rodríguez
fa2f2b2a31 Merge pull request #1031 from wazuh/merge-4.5.3-into-4.6.0
Merge 4.5.3 into 4.6.0
2023-10-06 10:48:10 +02:00
David Correa Rodríguez
8d1c239a3c Merge branch '4.5.3' into merge-4.5.3-into-4.6.0 2023-10-06 10:23:04 +02:00
Gonzalo Acuña
ded91b2f0a Merge pull request #1029 from wazuh/bump-4.5.3-revision
Bump 4.5.3 revision
2023-10-05 11:48:22 -03:00
Gonzalo Acuña
d7e051af19 Bump 4.5.3 revision 2023-10-05 11:44:40 -03:00
Gonzalo Acuña
b4db7f16cc Merge pull request #1026 from wazuh/bug/change-validation-order-for-wazuh-branch-to4.6.0
Changed validation order for wazuh branch
2023-10-04 15:42:36 -03:00
c-bordon
61bfe58491 Changed validation order for wazuh branch 2023-10-04 15:38:39 -03:00
Gonzalo Acuña
9d3701fa60 Merge pull request #1025 from wazuh/enhancement/1016-allow-branch-parameters-on-build-imagessh-to4.6.0
Updated build-images.sh script to support build parameters
2023-10-04 13:49:42 -03:00
c-bordon
c550c1a852 Added validation for version in master branch 2023-10-04 12:29:15 -03:00
c-bordon
1b41068618 Updated README file 2023-10-04 11:55:39 -03:00
c-bordon
8ac3ea1e8a Added final space 2023-10-04 11:44:00 -03:00
c-bordon
893796c4a2 Restore .env file 2023-10-04 11:41:22 -03:00
Gonzalo Acuña
d6a72c6fb1 Merge pull request #1024 from wazuh/bug/1017-warning-opensearchsecurityplugin-wazuh-indexer-has-insecure-file-permissions-should-be-0600-to4.6.0
Updated file permissions to have the same permissions as in package installation in Wazuh indexer
2023-10-04 11:22:44 -03:00
c-bordon
7172c818c7 Update order of variables 2023-10-04 11:16:04 -03:00
c-bordon
a2ee29bfd3 Updated file permissions to have the same permissions as in package installation in Wazuh indexer 2023-10-04 09:36:08 -03:00
c-bordon
e205c87d37 .env file updated 2023-10-04 08:35:45 -03:00
c-bordon
545ef6851b Fixed validation 2023-10-03 16:59:08 -03:00
c-bordon
36c06dc4c8 Added validation for dev branch 2023-10-03 16:54:43 -03:00
c-bordon
3fd3f42389 Added check for wazuh/wazuh branch 2023-10-03 16:43:30 -03:00
c-bordon
b22fa235c7 Updated build image script 2023-10-03 15:52:25 -03:00
c-bordon
c3c8ea3d02 Changing files permissions 2023-10-03 12:20:17 -03:00
c-bordon
905b4de859 Testing change permissions in entrypoint 2023-10-02 08:49:17 -03:00
c-bordon
23d34f6a89 Fixed OpenSearch security plugin warnings 2023-10-02 08:27:49 -03:00
c-bordon
8fa20abbbd Fixed sed command 2023-09-28 14:29:53 -03:00
c-bordon
d9b053caf4 Testing with another dir for opensearch security policy 2023-09-28 12:48:38 -03:00
c-bordon
d5dc67e9c3 Fixing Wazuh indexer files permissions 2023-09-28 10:37:08 -03:00
Gonzalo Acuña
93c53a712d Merge pull request #1021 from wazuh/change/1020-bump-revision-4.5.3-rc2
Bump revision to 40507
2023-09-28 08:24:43 -03:00
David Correa Rodríguez
5f3a0481ba Bump revision to 40507 2023-09-28 12:14:34 +02:00
Gonzalo Acuña
958e466682 Merge pull request #1013 from wazuh/bump-4.6.0-revision
Revision Bump
2023-09-22 14:49:59 -03:00
Gonzalo Acuña
7d5b1c4f85 Revision Bump 2023-09-22 14:37:02 -03:00
Gonzalo Acuña
69868c0c70 Merge pull request #1011 from wazuh/merge-4.7.1-into-master
Merge 4.7.1 into master
2023-09-22 07:48:54 -03:00
David Correa Rodríguez
d8f7fd6767 Merge remote-tracking branch 'origin/4.7.1' into merge-4.7.1-into-master 2023-09-22 12:47:11 +02:00
Gonzalo Acuña
a98e57bb6c Merge pull request #1010 from wazuh/merge-4.7.0-into-4.7.1
Merge 4.7.0 into 4.7.1
2023-09-22 07:32:20 -03:00
David Correa Rodríguez
b3441a6b07 Updated TEMPLATE_VERSION variable 2023-09-22 12:23:37 +02:00
David Correa Rodríguez
a3e2a2d88b Merge remote-tracking branch 'origin/4.7.0' into merge-4.7.0-into-4.7.1 2023-09-22 12:22:38 +02:00
Gonzalo Acuña
6407325761 Merge pull request #1009 from wazuh/merge-4.6.0-into-4.7.0
Merge 4.6.0 into 4.7.0
2023-09-22 07:09:17 -03:00
David Correa Rodríguez
7312f86235 Merge remote-tracking branch 'origin/4.6.0' into merge-4.6.0-into-4.7.0 2023-09-22 12:07:13 +02:00
Gonzalo Acuña
d6b73cb3dc Merge pull request #1008 from wazuh/merge-4.5.3-into-4.6.0
Merge 4.5.3 into 4.6.0
2023-09-22 06:36:48 -03:00
David Correa Rodríguez
62627e32fd Merge remote-tracking branch 'origin/4.5.3' into merge-4.5.3-into-4.6.0 2023-09-22 11:11:45 +02:00
Gonzalo Acuña
149df5e492 Merge pull request #973 from wazuh/17617-vdt-alas2023-support
Add Amazon Linux 2023 VDT default configuration
2023-09-21 11:03:11 -03:00
Gonzalo Acuña
8fbda5afd3 Merge pull request #1005 from wazuh/idr-263-security-policy
Create SECURITY.md
2023-09-20 08:43:39 -03:00
Gonzalo Acuña
b40e90d19c Create SECURITY.md
Wazuh security policy added.
2023-09-20 08:29:53 -03:00
Gonzalo Acuña
a6c22d9618 Merge pull request #1003 from wazuh/bump-version-4.7.1
Bump version to 4.7.1
2023-09-20 08:14:05 -03:00
David Correa Rodríguez
d449ae7f76 Bump version to 4.7.1 2023-09-20 11:01:19 +02:00
Leonardo Quiceno
8cc5c8b0bb Add Amazon Linux 2023 VDT support 2023-09-18 12:55:54 -05:00
Gonzalo Acuña
536dd51aa7 Merge pull request #1000 from wazuh/18966-error-in-wazuh-docker-startup
Error in Wazuh Docker startup
2023-09-18 14:37:34 -03:00
Gonzalo Acuña
088b855f73 Merge pull request #997 from wazuh/990-persist-logo
Persist the custom logo in the Wazuh dashboard
2023-09-18 14:14:30 -03:00
vcerenu
5769159cf9 change RBAC database procedure 2023-09-18 12:05:29 -03:00
Gonzalo Acuña
41515e9c49 Merge pull request #998 from wazuh/258-shuffle-permanent-data
Check the permanent_data.env file and include any missing files
2023-09-15 14:44:27 -03:00
vcerenu
0fbbf5aee2 add shuffle scripts into permanent data 2023-09-15 13:31:00 -03:00
vcerenu
37f565bb8a add custom directory and persistence 2023-09-15 12:49:32 -03:00
vcerenu
2ac53b9b3d add custom directory and persistence 2023-09-15 12:41:05 -03:00
Gonzalo Acuña
d1c252c6c0 Merge pull request #996 from wazuh/979-remove-goss-from-manager-image
Remove goss install
2023-09-14 16:14:58 -03:00
vcerenu
e9f689dbfc remove goss directory 2023-09-14 15:17:13 -03:00
vcerenu
be19c70082 remove goss install 2023-09-14 12:25:57 -03:00
Gonzalo Acuña
0c6077c3e0 Merge pull request #992 from wazuh/984-build-imagessh-script-is-not-capable-of-using-repos-majorminorpatch-branches
Change wazuh template origin
2023-09-13 11:09:44 -03:00
vcerenu
de7754364d change wazuh template origin 2023-09-12 15:49:31 -03:00
Gonzalo Acuña
73ada94ed6 Merge pull request #988 from wazuh/987-add-support-to-define-the-default-value-of-extensionsgithub-and-extensionsoffice-in-the-wazuh-dashboard-docker-image
Add extensions into wazuh.yml
2023-09-08 14:13:00 -03:00
vcerenu
63817dfd55 add extensions for wazuh.yml 2023-09-07 12:15:25 -03:00
Gonzalo Acuña
dcef9834b4 Merge pull request #986 from wazuh/merge-4.7.0-into-master
Merge `4.7.0` into `master`
2023-09-07 11:28:04 -03:00
David Correa Rodríguez
9253127ce8 Merge branch '4.7.0' into merge-4.7.0-into-master 2023-09-07 16:21:42 +02:00
Gonzalo Acuña
17029c5510 Merge pull request #985 from wazuh/merge-4.6.0-into-4.7.0
Merge `4.6.0` into `4.7.0`
2023-09-07 10:43:35 -03:00
David Correa Rodríguez
2234517218 Merge branch '4.6.0' into merge-4.6.0-into-4.7.0 2023-09-07 14:41:11 +02:00
Gonzalo Acuña
637110c278 Merge pull request #983 from wazuh/merge-4.5.3-into-4.6.0
Merge `4.5.3` into `4.6.0`
2023-09-07 09:01:40 -03:00
David Correa Rodríguez
b18c068650 Added empty line to changelog 2023-09-07 13:58:32 +02:00
David Correa Rodríguez
9a871dbbcb Merge branch '4.5.3' into merge-4.5.3-into-4.6.0 2023-09-07 13:39:58 +02:00
Gonzalo Acuña
1fae0d3452 Merge pull request #982 from wazuh/merge-4.5.2-into-4.5.3
Merge `4.5.2` into `4.5.3`
2023-09-07 08:12:25 -03:00
David Correa Rodríguez
0a4c057492 Merge branch '4.5.2' into merge-4.5.2-into-4.5.3 2023-09-07 10:29:02 +02:00
David Jose Iglesias Lopez
2902a0ce0b Merge pull request #977 from wazuh/bump-revision-40505
Bump revision to 40505
2023-09-04 11:49:42 +02:00
David Correa Rodríguez
c0fb4172f3 Bump revision to 40505 2023-09-04 11:11:37 +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
Gonzalo Acuña
8886e2347e Merge pull request #968 from wazuh/951-fix-wazuh-dashboard-modules-persist
Fixed Wazuh dashboard modules persistency
2023-08-30 15:06:24 -03:00
Gonzalo Acuña
f1d8565989 Merge pull request #971 from wazuh/bump-4.5.3
Bump to `4.5.3`
2023-08-29 08:28:50 -03:00
David Correa Rodríguez
e5abd5d24e Bump to 4.5.3 2023-08-29 11:29:26 +02:00
David Correa Rodríguez
902b0d8e52 Fixed Wazuh dashboard modules persistency 2023-08-28 13:11:25 +02:00
Gonzalo Acuña
b377a0f6eb Merge pull request #966 from wazuh/18542-vdt-bookworm-support
Add Debian Bookworm to VDT default configuration
2023-08-25 13:17:17 -03:00
Mateo Cervilla
44e9bebed0 Add Debian Bookworm VDT support 2023-08-25 12:24:01 -03:00
Gonzalo Acuña
3434070c06 Merge pull request #948 from wazuh/modify_scan_version
Change repository checkout
2023-08-24 15:38:41 -03:00
Gonzalo Acuña
8169e95107 Merge pull request #963 from wazuh/merge-4.7.0-into-master
Merge 4.7.0 into master
2023-08-24 13:34:29 -03:00
Gonzalo Acuña
2de4a28098 Merge pull request #962 from wazuh/merge-4.6.0-into-4.7.0
Merge 4.6.0 into 4.7.0
2023-08-24 13:14:32 -03:00
Gonzalo Acuña
760fc8ccbf Merge pull request #961 from wazuh/merge-4.5.2-into-4.6.0
Merge 4.5.2 into 4.6.0
2023-08-24 13:10:01 -03:00
vcerenu
44303d3701 resolving conflicts 2023-08-24 12:45:02 -03:00
Gonzalo Acuña
c0d97893a4 Merge pull request #960 from wazuh/merge-4.5.1-into-4.5.2
Merge 4.5.1 into 4.5.2
2023-08-24 12:31:06 -03:00
vcerenu
0826f2c176 change revision 2023-08-24 12:23:15 -03:00
vcerenu
d531b8dd72 Resolving conflicts 2023-08-24 12:06:35 -03:00
vcerenu
1d8332725f add fetch 2023-08-18 15:23:12 -03:00
vcerenu
a2f50192b6 add new step 2023-08-18 15:21:07 -03:00
vcerenu
bd513e80cc add new step 2023-08-18 15:18:56 -03:00
vcerenu
6a4dc3c3eb change repository checkout 2023-08-18 15:11:21 -03:00
Gonzalo Acuña
41267d4ddf Merge pull request #946 from wazuh/944-bump-revision-2
Revision update
2023-08-17 12:20:42 -03:00
Gonzalo Acuña
67f34fb8fe Revision update 2023-08-17 12:17:12 -03:00
Gonzalo Acuña
865f7625f4 Merge pull request #945 from wazuh/944-bump-revision
Revision update
2023-08-17 09:02:13 -03:00
Gonzalo Acuña
c56952eaa0 Revision update 2023-08-17 08:56:16 -03:00
Gonzalo Acuña
8b8a28167e Merge pull request #942 from wazuh/904-docker-base-image-update-to-jammy
Docker base image update to Jammy
2023-08-15 13:51:04 -03:00
Gonzalo Acuña
cb7d8785c6 Merge pull request #930 from wazuh/926-update-the-vulnerability-detector-default-configuration-block-with-missing-providers
Update the vulnerability detector default configuration block with missing providers
2023-08-14 15:19:54 -03:00
vcerenu
f1001c2f25 add jammy version into VD 2023-08-11 15:45:26 -03:00
vcerenu
d0eaae482c modify base for Wazuh Docker images 2023-08-11 12:15:28 -03:00
Gonzalo Acuña
e67b7eae70 Merge pull request #938 from wazuh/merge-4.7.0-into-master
Merge `4.7.0` into `master`
2023-08-11 08:37:34 -03:00
Gonzalo Acuña
17ed766228 Merge pull request #937 from wazuh/merge-4.6.0-into-4.7.0
Merge `4.6.0` into `4.7.0`
2023-08-11 08:14:30 -03:00
David Correa Rodríguez
6c91bac96d Merge pull request #936 from wazuh/merge-4.5.2-into-4.6.0
Merge `4.5.2` into `4.6.0`
2023-08-11 12:39:39 +02:00
David Correa Rodríguez
216b5a6818 Merge pull request #935 from wazuh/merge-4.5.1-into-4.5.2
Merge `4.5.1` into `4.5.2`
2023-08-11 12:25:04 +02:00
David Correa Rodríguez
e19fa14013 Merge pull request #934 from wazuh/merge-4.5-into-4.5.1
Merge `4.5` into `4.5.1`
2023-08-11 11:58:49 +02:00
vcerenu
57c7eaa5af remove stretch and add rhel 9 into VD 2023-08-10 16:46:21 -03:00
vcerenu
fbe073612c add suse vd options 2023-08-10 09:19:59 -03:00
Gonzalo Acuña
1dec665a97 Merge pull request #925 from wazuh/10774-alma-support
Updating vulnerability detector default configuration with AlmaLinux support
2023-08-09 09:46:28 -03:00
pereyra-m
757e5dbf05 Updating ossec.conf file with the AlmaLinux support in the vulnerability detector section 2023-08-07 17:32:03 -03:00
Gonzalo Acuña
32b1d88e36 Merge pull request #919 from wazuh/917-fix-conditional-block-in-build-imagesh-script
Fixed conditional block in images building
2023-08-03 10:02:24 -03:00
David Correa Rodríguez
94be842afc Restored IMAGE_VERSION variable 2023-08-03 11:51:01 +02:00
David Correa Rodríguez
d20bbe247c Fixed conditional block in images building 2023-08-03 11:45:56 +02:00
Gonzalo Acuña
e01d39e138 Merge pull request #915 from wazuh/911-typos-in-the-script
Typos in the script in charge of create Wazuh indexer's certificates
2023-08-01 13:50:24 -03:00
vcerenu
1eeca6267b fix typos in cert generator image 2023-08-01 13:07:04 -03:00
Gonzalo Acuña
d755ffbac8 Merge pull request #914 from wazuh/6282-add-notes-about
Modify ulimit
2023-08-01 12:01:13 -03:00
vcerenu
221c3ccd24 add ulimit parameter to wazuh manager deploy 2023-07-31 13:19:13 -03:00
vcerenu
1ff589ccaf add ulimit parameter to wazuh manager deploy 2023-07-31 13:16:15 -03:00
Victor Ereñú
d4c98491fc Merge pull request #910 from wazuh/909-deprecate-update_from_year-to-use-nvd-api-20-feeds
Delete update_from_year parameter
2023-07-26 13:55:52 -03:00
vcerenu
673c28b637 delete update_from_year parameter 2023-07-26 13:40:54 -03:00
Gonzalo Acuña
2cd9262bab Merge pull request #901 from wazuh/bump-trivy-scan
Bump branch for trivy scan
2023-07-21 15:27:57 -03:00
vcerenu
7db3d0d278 Bump branch for trivy scan 2023-07-21 15:22:22 -03:00
Gonzalo Acuña
fc4cef1072 Merge pull request #900 from wazuh/merge-4.7.0-into-master
Merge `4.7.0` into `master`
2023-07-21 10:23:53 -03:00
Gonzalo Acuña
7d3bea67f7 Merge pull request #899 from wazuh/merge-4.6.0-into-4.7.0
Merge `4.6.0` into `4.7.0`
2023-07-21 10:07:45 -03:00
Gonzalo Acuña
3953986652 Merge pull request #898 from wazuh/merge-4.5.2-into-4.6.0
Merge `4.5.2` into `4.6.0`
2023-07-21 08:27:24 -03:00
Gonzalo Acuña
f2dab81387 Merge branch '4.6.0' into merge-4.5.2-into-4.6.0 2023-07-21 08:15:57 -03:00
Gonzalo Acuña
da82008a75 Merge pull request #894 from wazuh/bump-4.5.2
Bump to 4.5.2
2023-07-19 08:55:24 -03:00
vcerenu
54975ab099 Bump to 4.5.2 2023-07-19 08:43:17 -03:00
Gonzalo Acuña
5b23d48e46 Merge pull request #890 from wazuh/bump-master-to-4.8.0
Bump master to 4.8.0
2023-07-17 08:59:41 -03:00
vcerenu
919500bd74 bump master to 4.8.0 2023-07-14 16:22:52 -03:00
Victor Ereñú
a9d505b316 Merge pull request #887 from wazuh/merge-4.6.0-into-master
Merge 4.6.0 into master
2023-07-11 12:20:01 -03:00
vcerenu
a0899a8358 resolving merge conflicts 2023-07-11 12:17:06 -03:00
Carlos Bordon
b27d991f0c Merge pull request #886 from wazuh/merge-4.5.1-into-4.6.0
Merge 4.5.1 into 4.6.0
2023-07-11 12:04:34 -03:00
vcerenu
4d0aa57ed2 resolving merge conflicts 2023-07-11 11:49:32 -03:00
Carlos Bordon
1a75d4eb77 Merge pull request #885 from wazuh/merge-4.5.0-into-4.5.1
Merge 4.5.0 into 4.5.1
2023-07-11 11:34:52 -03:00
vcerenu
247555b1b6 resolving merge conflicts 2023-07-11 11:21:00 -03:00
Carlos Bordon
442d457933 Merge pull request #884 from wazuh/merge-4.4-into-4.5.0
Merge 4.4 into 4.5.0
2023-07-11 10:42:52 -03:00
vcerenu
0f65448718 resolving merge conflicts 2023-07-11 09:41:16 -03:00
Victor Ereñú
a9533264d6 Merge pull request #883 from wazuh/merge-4.4.5-into-4.4
Merge 4.4.5 into 4.4
2023-07-11 09:26:12 -03:00
Carlos Bordon
ce8dd29425 Merge pull request #879 from wazuh/4.4.5-bump-revision
Bump revision
2023-07-10 09:00:24 -03:00
vcerenu
a433989865 bump revision 2023-07-10 08:42:14 -03:00
Gonzalo Acuña
ff1e5f991a Merge pull request #878 from wazuh/bump-4.4.5
Bump to 4.4.5
2023-07-07 08:48:54 -03:00
Gonzalo Acuña
55ee49aff5 Bumped to 4.4.5 2023-07-07 08:39:57 -03:00
Gonzalo Acuña
75f92308a1 Merge pull request #877 from wazuh/merge-4.4.4-into-4.4
Merge `4.4.4` into `4.4`
2023-07-07 08:32:11 -03:00
Victor Ereñú
61c37a78de Merge pull request #874 from wazuh/bump-4-5-1
Bump version 4.5.1
2023-06-26 14:07:42 -03:00
vcerenu
39208c513c bump version 4.5.1 2023-06-26 13:35:29 -03:00
vcerenu
3650feeb0e bump version 4.5.0 2023-06-26 09:40:14 -03:00
Victor Ereñú
f4f99f17b7 Merge pull request #872 from wazuh/bump-4-6
Bump 4.6 version
2023-06-23 12:36:30 -03:00
David Jose Iglesias Lopez
3c9b5ac717 Merge pull request #871 from wazuh/bump-4-7
Bump 4.7 version
2023-06-23 16:29:44 +02:00
vcerenu
8e3b8aada8 bump 4.6 version 2023-06-23 10:33:35 -03:00
vcerenu
6a98b87b8e bump 4.7 version 2023-06-22 17:26:55 -03:00
Gonzalo Acuña
56dbf052c9 Merge pull request #867 from wazuh/merge-4.5-into-master
Merge `4.5` into `master`
2023-06-14 16:36:31 -03:00
Gonzalo Acuña
7abaea9b4c Merge pull request #866 from wazuh/merge-4.4.5-into-4.5
Merge `4.4.5` into `4.5`
2023-06-14 15:48:43 -03:00
Gonzalo Acuña
303b64c7ae Merge branch '4.5' into merge-4.4.5-into-4.5 2023-06-14 15:16:14 -03:00
Gonzalo Acuña
2340db4079 Merge pull request #865 from wazuh/merge-4.4-into-4.4.5
Merge `4.4` into `4.4.5`
2023-06-14 14:50:59 -03:00
Gonzalo Acuña
9159eda943 Merge branch '4.4.5' into merge-4.4-into-4.4.5 2023-06-14 14:07:23 -03:00
Gonzalo Acuña
d278782134 Merge pull request #858 from wazuh/merge-4-4-4-to-4-4
Bump `4.4` to `4.4.4`
2023-06-13 15:58:51 -03:00
Gonzalo Acuña
77725b7eb2 Revision bump 2023-06-13 13:19:35 -03:00
Gonzalo Acuña
4e7c2cf72a Revision bump 2023-06-12 09:38:35 -03:00
Gonzalo Acuña
41196a5529 Bump to 4.4.5 2023-06-05 11:44:32 -03:00
Gonzalo Acuña
8ce1f36f10 Revision update 2023-06-05 11:42:10 -03:00
Gonzalo Acuña
e2e95a5c57 Bump to 4.4.4 2023-06-05 11:38:58 -03:00
Raul Del Pozo Moreno
1238820b6c Merge pull request #854 from wazuh/master-merge-4.5
Merge `4.5` into `master`
2023-05-29 18:09:23 +02:00
Raul Del Pozo Moreno
f168bd62fe Merge remote-tracking branch 'origin/4.5' into master-merge-4.5 2023-05-29 16:36:14 +02:00
Raul Del Pozo Moreno
2058734154 Merge pull request #853 from wazuh/4.5-merge-4.4
Merge `4.4` into `4.5`
2023-05-29 16:34:48 +02:00
Raul Del Pozo Moreno
4e34f1f7b7 Merge remote-tracking branch 'origin/4.4' into 4.5-merge-4.4 2023-05-26 18:51:03 +02:00
Raul Del Pozo Moreno
b259665fc6 Merge pull request #851 from wazuh/bump-4.4.3
Bump `4.4` to `4.4.3`
2023-05-26 14:13:58 +02:00
Raul Del Pozo Moreno
820079f1d0 Bump to 4.4.3 2023-05-25 20:03:26 +02:00
Gonzalo Acuña
efc8ab88df Merge pull request #848 from wazuh/merge-4.5-master
Merge 4.5 into master
2023-05-22 09:56:01 -03:00
Raul Del Pozo Moreno
f71616939e Merge remote-tracking branch 'origin/4.5' into merge-4.5-master 2023-05-18 22:43:04 +02:00
Raul Del Pozo Moreno
9a9fac6243 Merge pull request #847 from wazuh/merge-4.4-4.5
Merge `4.4` into `4.5`
2023-05-18 22:38:07 +02:00
Raul Del Pozo Moreno
11d15670f4 Merge remote-tracking branch 'origin/4.4' into merge-4.4-4.5 2023-05-18 22:27:31 +02:00
Raul Del Pozo Moreno
7427eff847 Added missing config 2023-05-18 22:14:26 +02:00
Jesse Roland
5abe95a0f1 Add DASHBOARD_USERNAME and DASHBOARD_PASSWORD environment variables to
the dashboard container.

Resolves https://github.com/wazuh/wazuh-docker/issues/823
2023-05-18 22:06:26 +02:00
vcerenu
fed4302744 change filename 2023-05-18 22:06:25 +02:00
vcerenu
750aa90b91 change cron schedule 2023-05-18 22:06:24 +02:00
vcerenu
aec90c2f3d change schedule 2023-05-18 22:06:24 +02:00
vcerenu
84a40b9eea fix wazuh manager test name 2023-05-18 22:06:23 +02:00
vcerenu
57c63bc60e add vuln scans 2023-05-18 22:06:22 +02:00
vcerenu
dd46f8a2c1 bump 4.6 version 2023-05-18 22:06:21 +02:00
vcerenu
76a38f68b5 bump 4.3 into master 2023-05-18 22:05:55 +02:00
vcerenu
4caf18f12c bump 4.3 into master 2023-05-18 22:05:38 +02:00
fcaffieri
ea11d66f42 Add fix to avoid GLIBC crash, fix identation 2023-05-18 22:05:14 +02:00
fcaffieri
02a75a7678 Add fix to avoid GLIBC crash 2023-05-18 22:05:13 +02:00
fcaffieri
7e0311e99a disable filebeat metrics 2023-05-18 22:05:12 +02:00
vcerenu
e939010507 bump release 4.5.0 2023-05-18 22:05:00 +02:00
vcerenu
b7bce45e82 bump release 4.5.0 2023-05-18 22:04:56 +02:00
vcerenu
697b7538cc bump release 4.5.0 2023-05-18 22:04:56 +02:00
vcerenu
2cbf64dafa change revision 2023-05-18 22:04:21 +02:00
vcerenu
638d548d74 bump 4.4.1 version 2023-05-18 22:04:21 +02:00
vcerenu
d6f19cebf5 disable cluster option 2023-05-18 22:04:20 +02:00
Gonzalo Acuña
944c6aa4c8 Revert "Bump 4.4 to 4.4.1" 2023-05-18 22:04:19 +02:00
vcerenu
5e3676e125 bump 4.4.1 version 2023-05-18 22:04:18 +02:00
vcerenu
fd9c09a7e5 change dashboard and indexer base repository 2023-05-18 22:03:47 +02:00
vcerenu
395b769b6a change revision number 2023-05-18 22:03:47 +02:00
vcerenu
ee46520701 update docs count 2023-05-18 22:03:46 +02:00
vcerenu
b838023509 modify base path 2023-05-18 22:03:45 +02:00
vcerenu
be9019a065 fix index alerts test 2023-05-18 22:03:42 +02:00
vcerenu
42193f4cfa fix index alerts test 2023-05-18 22:03:42 +02:00
vcerenu
6e7b1c2899 change indexer and manager configuration for 4.4 version 2023-05-18 22:03:41 +02:00
vcerenu
06a1efc094 add revision into versions parameter 2023-05-18 22:03:40 +02:00
vcerenu
e9764b0a6a add 4.4 version 2023-05-18 22:03:39 +02:00
vcerenu
6398b66e10 add 4.4 version 2023-05-18 22:03:38 +02:00
vcerenu
70938d52d2 add 4.4 version 2023-05-18 22:03:38 +02:00
fcaffieri
d5932ac4a1 Add fix to avoid GLIBC crash, fix identation 2023-05-18 22:03:27 +02:00
fcaffieri
4b621466a0 Add fix to avoid GLIBC crash 2023-05-18 22:03:25 +02:00
fcaffieri
e24d17f730 disable filebeat metrics 2023-05-18 22:03:24 +02:00
vcerenu
b33aea9ef8 fix whitelist 2023-05-18 22:03:14 +02:00
Alberto R
3525003ef7 Bumped to 4.4.0 2023-05-18 22:03:03 +02:00
Gonzalo Acuña
00a94ce5b0 Bump to 4.2.6 2023-05-18 22:02:33 +02:00
Raul Del Pozo Moreno
e826236a28 Added missing config 2023-05-18 21:30:38 +02:00
vcerenu
137989ddd1 bump 4.3 into master 2023-05-18 21:26:28 +02:00
vcerenu
0d76a85ded bump 4.3 into master 2023-05-18 21:26:08 +02:00
fcaffieri
e95455a12b Add fix to avoid GLIBC crash, fix identation 2023-05-18 21:25:37 +02:00
fcaffieri
887293d474 Add fix to avoid GLIBC crash 2023-05-18 21:25:36 +02:00
fcaffieri
ae20f302c0 disable filebeat metrics 2023-05-18 21:25:36 +02:00
vcerenu
08314f9e2e bump release 4.5.0 2023-05-18 21:25:07 +02:00
vcerenu
c6f1f31d57 bump release 4.5.0 2023-05-18 21:25:00 +02:00
vcerenu
312466704d bump release 4.5.0 2023-05-18 21:25:00 +02:00
Gonzalo Acuña
d00fc0ccf6 Revision update 2023-05-18 21:24:16 +02:00
vcerenu
42ea26b3bd bump 4.4.2 version 2023-05-18 21:24:15 +02:00
Jesse Roland
fe75f8fb4e Add DASHBOARD_USERNAME and DASHBOARD_PASSWORD environment variables to
the dashboard container.

Resolves https://github.com/wazuh/wazuh-docker/issues/823
2023-05-18 21:23:36 +02:00
vcerenu
8b1ed497ab change revision number 2023-05-18 21:23:35 +02:00
vcerenu
195b34c259 bump 4.3.11 version 2023-05-18 21:23:34 +02:00
vcerenu
08c9b95455 change revision 2023-05-18 21:22:46 +02:00
Gonzalo Acuña
028b5f6034 Revision update 2023-05-18 21:05:42 +02:00
vcerenu
cd7dc4c7cf bump 4.4.2 version 2023-05-18 21:05:41 +02:00
Jesse Roland
40faad148d Add DASHBOARD_USERNAME and DASHBOARD_PASSWORD environment variables to
the dashboard container.

Resolves https://github.com/wazuh/wazuh-docker/issues/823
2023-05-18 21:04:33 +02:00
vcerenu
02aaf45e9d change revision number 2023-05-18 21:04:32 +02:00
vcerenu
cd9f211eb3 bump 4.3.11 version 2023-05-18 21:04:31 +02:00
vcerenu
20c8000fec change revision 2023-05-18 21:02:52 +02:00
Gonzalo Acuña
095d878b04 Merge pull request #825 from wazuh/bump-4-3-11
Bump 4.3 to 4.3.11
2023-04-24 10:56:52 -03:00
vcerenu
53903126cf change revision number 2023-04-24 09:17:02 -03:00
vcerenu
63ceab20b0 bump 4.3.11 version 2023-04-19 16:59:53 -03:00
vcerenu
8ada4445b0 bump 4.4.1 version 2023-04-10 10:20:48 -03:00
Gonzalo Acuña
1c69a38bd8 Merge pull request #813 from wazuh/807-docker-update-from-4310-to-440
Disable cluster option
2023-04-05 14:52:28 -03:00
vcerenu
615d6df29c disable cluster option 2023-04-05 13:55:24 -03:00
Gonzalo Acuña
949a465855 Merge pull request #811 from wazuh/revert-799-bump-4-4-1
Revert "Bump `4.4` to `4.4.1`"
2023-04-05 13:49:23 -03:00
Gonzalo Acuña
f7bbac5a08 Revert "Bump 4.4 to 4.4.1" 2023-04-05 13:46:20 -03:00
Gonzalo Acuña
11820b01e9 Merge pull request #799 from wazuh/bump-4-4-1
Bump `4.4` to `4.4.1`
2023-03-31 11:02:25 -03:00
vcerenu
a8de452002 bump 4.4.1 version 2023-03-31 10:27:58 -03:00
Victor Ereñú
c76681b3b9 Merge pull request #794 from wazuh/modify-base-dashboard
Change dashboard and indexer base repository
2023-03-28 17:09:15 -03:00
vcerenu
e25635cb25 change dashboard and indexer base repository 2023-03-28 16:59:49 -03:00
Gonzalo Acuña
304eedcb51 Merge pull request #793 from wazuh/bump_4-4
Change revision number
2023-03-28 10:03:41 -03:00
vcerenu
6123ab994c change revision number 2023-03-28 09:07:24 -03:00
Gonzalo Acuña
2f58da59de Merge pull request #776 from wazuh/change_password
Update indexer password
2023-02-01 10:59:11 -03:00
vcerenu
3279931813 update docs count 2023-02-01 10:33:26 -03:00
vcerenu
b039567e1c update indexer password 2023-02-01 10:02:35 -03:00
Gonzalo Acuña
3190c4246e Merge pull request #766 from wazuh/765-change-wazuh-dashboard-and-indexer-base-path
Modify base path
2022-12-27 08:11:21 -03:00
vcerenu
271f421cd4 modify base path 2022-12-26 11:12:16 -03:00
Gonzalo Acuña
5fb369f9e8 Merge pull request #764 from wazuh/756-indexer-password
Indexer password updated in README.md
2022-12-19 16:03:14 -03:00
Gonzalo Acuña
6ddaecd7b5 Indexer password updated in README.md 2022-12-19 14:59:35 -03:00
Alberto Rodríguez
910e28956b Merge pull request #760 from wazuh/merge-4.4
Version check fix
2022-12-02 17:19:02 +01:00
vcerenu
dcf8bb8060 fix index alerts test 2022-12-02 12:42:01 -03:00
vcerenu
be9f3d1b90 fix index alerts test 2022-12-02 11:36:35 -03:00
vcerenu
91625f412c change indexer and manager configuration for 4.4 version 2022-12-01 19:35:35 -03:00
vcerenu
4c7dcb2ebf add revision into versions parameter 2022-12-01 13:32:43 -03:00
vcerenu
8febf33d58 add 4.4 version 2022-12-01 13:02:13 -03:00
Alberto Rodríguez
3d19774d7e Merge pull request #758 from wazuh/merge-4.4
Merge 4.3 in 4.4 branch
2022-12-01 16:23:05 +01:00
vcerenu
e11e7a10b8 add 4.4 version 2022-12-01 11:58:21 -03:00
vcerenu
7f73635651 add 4.4 version 2022-11-30 15:35:16 -03:00
vcerenu
e9a0be25ce resolving conflicts in 4.3 merge 2022-11-30 15:27:48 -03:00
Alberto Rodríguez
c87580cfb5 Merge pull request #754 from wazuh/753-opensearch_java_opts-duplicate-parameters
Remove Xms and Xmx parameter into jvm.options
2022-11-29 15:45:36 +01:00
Alberto Rodríguez
e0cd80c105 Update build-docker-images/wazuh-indexer/config/config.sh 2022-11-29 15:44:36 +01:00
vcerenu
796751aec9 remove Xms and Xmx parameter into jvm.options 2022-11-28 17:24:13 -03:00
Alberto Rodríguez
15205ada03 Merge pull request #742 from wazuh/bump-4-3-10
Bump 4.3 to 4.3.10
2022-11-11 16:20:58 +01:00
vcerenu
c1bfc450ba bump 4.3.10 version 2022-11-11 11:34:09 -03:00
Gonzalo Acuña
b08fd3e384 Merge pull request #726 from wazuh/bump-4-3-9
Bump 4.3 to 4.3.9
2022-10-11 09:47:12 -03:00
vcerenu
fd08279f32 bump 4.3.9 version 2022-10-06 14:25:56 -03:00
Gonzalo Acuña
f42b30b71d Merge pull request #720 from wazuh/bump-4-3-8
Bump 4.3 to 4.3.8
2022-09-14 12:15:09 -03:00
vcerenu
7555453d55 bump 4.3.8 version 2022-09-14 10:39:31 -03:00
vcerenu
22b77749fa bump 4.3.8 version 2022-09-12 15:37:47 -03:00
José Fernández Aguilera
6c094d07a6 Merge pull request #719 from wazuh/4.4-add-double-quote
Add Double Quote on password
2022-09-12 17:04:35 +02:00
vcerenu
b6959c8b15 doble quote for password 2022-09-09 15:29:07 -03:00
José Fernández Aguilera
28e21b0282 Merge pull request #717 from wazuh/714-modify-password
Add Double Quote on password
2022-09-09 08:52:18 +02:00
vcerenu
b83dcc087e doble quote for password 2022-09-08 12:17:45 -03:00
vcerenu
19c23456ec readme 2022-08-24 11:45:55 -03:00
José Fernández Aguilera
f99721e98b Merge pull request #708 from wazuh/bump-4-3-7
Bump 4.3 to 4.3.7
2022-08-17 08:23:32 +02:00
vcerenu
38271d7797 bump 4.3.7 version 2022-08-12 12:44:20 -03:00
vcerenu
c278f6a503 bump 4.3.7 version 2022-08-12 12:02:04 -03:00
vcerenu
d6ba8c3661 Merge pull request #707 from wazuh/695-change-indexer-username
Filebeat parameters
2022-08-12 10:39:19 -03:00
vcerenu
1db718ffc8 fix replace filebeat parameters 2022-08-10 16:15:17 -03:00
vcerenu
cf137c6703 Merge pull request #706 from wazuh/MigrationTo43-WazuhManagerNew
Fix permissions/ownership issue for Wazuh manager migration (4.2 -> 4.3)
2022-08-09 11:41:16 -03:00
Elwali karkoub
6f966cb01a Update 0-wazuh-init 2022-08-09 07:42:12 +02:00
José Fernández Aguilera
8bc11c48d9 Merge pull request #698 from wazuh/change-readme
Update Readme
2022-07-27 12:39:00 +02:00
vcerenu
be1bc64e0f update api and dashboard user 2022-07-26 09:27:01 -03:00
José Fernández Aguilera
80e8057f79 Merge pull request #694 from wazuh/bump-4-3-6
Bump 4.3 to 4.3.6
2022-07-19 12:49:07 +02:00
vcerenu
296de14886 bump 4.3.6 version 2022-07-18 10:25:01 -03:00
José Fernández Aguilera
0245a7e0d8 Merge pull request #692 from wazuh/fix-key-generator
Fix certificate generator
2022-07-08 09:06:54 +02:00
vcerenu
a9ea60b951 fix uid and gid for wazuh manager keys 2022-07-07 11:40:15 -03:00
José Fernández Aguilera
b98d32d4ca Merge pull request #691 from wazuh/1665-Fix-filebeat-crash-due-to-glibc-to4.4
Add fix to avoid GLIBC crash
2022-07-07 09:00:19 +02:00
José Fernández Aguilera
23cb7417bc Merge pull request #689 from wazuh/1665-Fix-filebeat-crash-due-to-glibc-to4.3
Add fix to avoid GLIBC crash
2022-07-07 08:59:47 +02:00
fcaffieri
4c710e6c20 Add fix to avoid GLIBC crash, fix identation 2022-07-06 18:01:53 -03:00
fcaffieri
adf95cd132 Add fix to avoid GLIBC crash, fix identation 2022-07-06 18:01:13 -03:00
fcaffieri
f97a719304 Add fix to avoid GLIBC crash 2022-07-06 17:35:20 -03:00
fcaffieri
b6aa782730 Add fix to avoid GLIBC crash 2022-07-06 17:34:56 -03:00
José Fernández Aguilera
bf534b4143 Merge pull request #687 from wazuh/1667-disable-filebeat-metrics-to4.4
Disable filebeat metrics
2022-07-04 16:02:24 +02:00
José Fernández Aguilera
1d8d594a44 Merge pull request #685 from wazuh/1667-disable-filebeat-metrics-to4.3
Disable filebeat metrics
2022-07-04 15:59:55 +02:00
fcaffieri
a82cc9ec39 disable filebeat metrics 2022-07-04 09:18:11 -03:00
fcaffieri
265dfd39bf disable filebeat metrics 2022-07-04 09:16:57 -03:00
fcaffieri
8d9ad6152a disable filebeat metrics 2022-07-01 17:45:23 -03:00
fcaffieri
28641accc2 disable filebeat metrics 2022-07-01 17:41:19 -03:00
Gonzalo Acuña
5774b93977 Merge pull request #684 from wazuh/fix-keystore-create
Add option to recreate keystore in entrypoint
2022-07-01 12:16:43 -03:00
vcerenu
9c0676014c add option to recreate keystore in entrypoint 2022-07-01 11:37:44 -03:00
vcerenu
f933733a85 add option to recreate keystore in entrypoint 2022-07-01 10:59:52 -03:00
José Fernández Aguilera
2f2b8bc1f5 Merge pull request #682 from wazuh/bump-4-3-5
Change readme note from Docker images build
2022-06-30 11:54:24 +02:00
vcerenu
868424cdd2 Change readme note for build docker images process 2022-06-29 13:17:59 -03:00
vcerenu
84c4aab03d Change readme note for build docker images process 2022-06-29 12:35:24 -03:00
Alberto Rodríguez
3d4521c7d8 Merge pull request #678 from wazuh/bump-4-3-5
Bump 4.3 to 4.3.5
2022-06-24 09:53:14 +02:00
vcerenu
46ec0bd67f Add tag revision for Wazuh indexer and dashboard 2022-06-23 18:27:24 -03:00
vcerenu
61791c1984 Bump 4.3.5 2022-06-23 15:36:27 -03:00
Alberto Rodríguez
2fe1eaea8f Merge pull request #676 from wazuh/fix_ck_conf
Modify variables
2022-06-22 15:32:29 +02:00
vcerenu
dc7691808b modify variable 2022-06-21 12:20:44 -03:00
vcerenu
c3375e0141 modify variable 2022-06-21 11:46:25 -03:00
Alberto Rodríguez
5d98c157f8 Merge pull request #669 from wazuh/fix-test-ci
CI Docker
2022-06-20 15:42:22 +02:00
vcerenu
0f2b153123 Test CI 2022-06-14 13:21:07 -03:00
vcerenu
a84ff7b1ff Test CI 2022-06-14 12:50:21 -03:00
vcerenu
672d1fc67a Test CI 2022-06-13 15:27:23 -03:00
vcerenu
ecef793c7f Test CI 2022-06-10 17:12:38 -03:00
vcerenu
8fb1b51d08 Test CI 2022-06-10 16:53:45 -03:00
vcerenu
9b9c422dea Test CI 2022-06-10 16:37:34 -03:00
vcerenu
3059de4c9f Test CI 2022-06-10 16:20:06 -03:00
vcerenu
d6557165da Test CI 2022-06-10 16:19:12 -03:00
vcerenu
174cf64b9b Test CI 2022-06-10 16:17:48 -03:00
vcerenu
d3954c9f8d Test CI 2022-06-10 15:34:15 -03:00
vcerenu
6dbfc1bbbf Test CI 2022-06-10 15:33:42 -03:00
vcerenu
20d065cce3 Test CI 2022-06-10 10:53:31 -03:00
vcerenu
de41cd08c9 Test CI 2022-06-10 10:23:56 -03:00
vcerenu
1c80201dc9 Test CI 2022-06-10 09:19:06 -03:00
vcerenu
f5ba9370ea Test CI 2022-06-09 16:41:50 -03:00
vcerenu
94f62d25d3 Test CI 2022-06-09 16:23:58 -03:00
vcerenu
0384112385 Test CI 2022-06-09 15:38:58 -03:00
vcerenu
8d4c6c4170 Test CI 2022-06-09 15:37:03 -03:00
vcerenu
919eab0c84 Test CI 2022-06-09 15:28:44 -03:00
vcerenu
01e616ce76 Test CI 2022-06-09 15:19:02 -03:00
vcerenu
46740f306a Test CI 2022-06-09 15:16:59 -03:00
vcerenu
b718d753de Test CI 2022-06-09 15:15:21 -03:00
vcerenu
731d3c3622 Test CI 2022-06-09 15:14:39 -03:00
vcerenu
c17cc9a15b Test CI 2022-06-09 12:32:29 -03:00
vcerenu
8976d2f5b6 Test CI 2022-06-09 12:19:22 -03:00
vcerenu
03764ea251 Test CI 2022-06-09 12:18:37 -03:00
Volm, David
7c642638ff Allow other Exceptions to bubble up a stack trace instead of silently failing in create_user.py 2022-06-09 16:24:43 +02:00
vcerenu
6591e9ae68 Test CI 2022-06-09 10:36:10 -03:00
vcerenu
961b8bad21 Test CI 2022-06-09 09:24:57 -03:00
vcerenu
ddc03699e5 Test CI 2022-06-08 18:36:09 -03:00
vcerenu
b28ae3b3ab Test CI 2022-06-08 18:25:19 -03:00
vcerenu
67dc3e6e36 Test CI 2022-06-08 18:17:10 -03:00
vcerenu
a34e0af547 Test CI 2022-06-08 18:14:12 -03:00
vcerenu
42c2ea5dba Test CI 2022-06-08 18:07:40 -03:00
vcerenu
b95e02d41d Test CI 2022-06-08 18:00:25 -03:00
vcerenu
8e8b53e6e1 Test CI 2022-06-08 17:49:46 -03:00
vcerenu
40f55cfb53 Test CI 2022-06-08 17:26:35 -03:00
vcerenu
a626216643 Test CI 2022-06-08 17:16:38 -03:00
vcerenu
0d7d4694fd Test CI 2022-06-08 17:11:13 -03:00
vcerenu
8ae1cd3f9d Test CI 2022-06-08 17:08:28 -03:00
vcerenu
f06a7ec961 Test CI 2022-06-08 17:02:53 -03:00
vcerenu
3656850b56 Test CI 2022-06-08 17:00:01 -03:00
vcerenu
426670017f Test CI 2022-06-08 16:55:56 -03:00
vcerenu
22958aaf5e Test CI 2022-06-08 16:52:10 -03:00
vcerenu
35dfd86837 Test CI 2022-06-08 16:47:02 -03:00
vcerenu
d4b0d60a54 Test CI 2022-06-08 16:41:56 -03:00
vcerenu
19a5a37bdf Test CI 2022-06-08 16:38:41 -03:00
vcerenu
0e2d942666 Test CI 2022-06-08 16:34:29 -03:00
vcerenu
0c2cb412fb Test CI 2022-06-08 16:29:57 -03:00
vcerenu
8748cd1ae2 Test CI 2022-06-08 16:26:57 -03:00
vcerenu
604232960b Test CI 2022-06-08 16:23:39 -03:00
vcerenu
5e211d2b13 Test CI 2022-06-08 16:20:25 -03:00
vcerenu
1a60522c27 Test CI 2022-06-08 16:11:00 -03:00
vcerenu
e9c2f59c94 Test CI 2022-06-08 16:07:24 -03:00
vcerenu
451e91e407 Test CI 2022-06-08 15:57:13 -03:00
vcerenu
439a3fe252 Test CI 2022-06-08 15:45:48 -03:00
vcerenu
17389682a4 Test CI 2022-06-08 13:01:30 -03:00
vcerenu
719dc7dd16 Test CI 2022-06-08 12:55:37 -03:00
vcerenu
131c44ba63 Test CI 2022-06-08 12:40:44 -03:00
vcerenu
27a7479774 Test CI 2022-06-08 12:28:22 -03:00
vcerenu
fea54b3ca7 Test CI 2022-06-08 12:24:11 -03:00
vcerenu
f711968c2f Test CI 2022-06-08 11:53:32 -03:00
vcerenu
adfaab647d Test CI 2022-06-08 11:50:15 -03:00
vcerenu
237b180ff5 Test CI 2022-06-08 11:49:18 -03:00
Alberto R
01a0e3dabd Fixed typo defining variable 2022-06-08 15:37:50 +02:00
Alberto R
b3d576623e Added UI revision 2022-06-08 15:11:54 +02:00
Alberto R
0520a771fe Bumped version 2022-06-08 10:10:23 +02:00
vcerenu
d5550caa26 Test CI 2022-06-07 16:58:38 -03:00
vcerenu
637d5ccae1 Test CI 2022-06-07 16:55:06 -03:00
vcerenu
95207b0777 Test CI 2022-06-07 16:50:44 -03:00
vcerenu
a40c510bba Test CI 2022-06-07 16:39:25 -03:00
vcerenu
7fdb1a91e5 Test CI 2022-06-07 16:36:07 -03:00
vcerenu
3b740e5dce Test CI 2022-06-07 12:22:44 -03:00
vcerenu
281f74582a Test CI 2022-06-07 12:04:47 -03:00
vcerenu
5418494f95 Test CI 2022-06-07 11:57:22 -03:00
vcerenu
c6314893f2 Test CI 2022-06-07 11:50:28 -03:00
vcerenu
5d5f01ab45 Test CI 2022-06-07 11:44:41 -03:00
vcerenu
4b1c420fdd Test CI 2022-06-07 11:40:01 -03:00
vcerenu
3d4a7073ef Test CI 2022-06-07 11:37:31 -03:00
vcerenu
c1ca498617 Test CI 2022-06-07 11:13:05 -03:00
vcerenu
ac92c2f1c0 Test CI 2022-06-06 17:03:17 -03:00
vcerenu
ec16fdf24c Test CI 2022-06-06 16:29:41 -03:00
vcerenu
525bb0ca2c Test CI 2022-06-06 16:06:49 -03:00
vcerenu
a8bd7cba31 Test CI 2022-06-06 11:44:46 -03:00
vcerenu
9fb941f3e5 Test CI 2022-06-06 11:33:39 -03:00
vcerenu
f67f8d1d3b Test CI 2022-06-06 11:15:35 -03:00
vcerenu
1645f8bac2 Test CI 2022-06-06 11:03:34 -03:00
vcerenu
7d394698a7 Test CI 2022-06-03 17:00:32 -03:00
vcerenu
73c25e86d6 Test CI 2022-06-03 16:42:19 -03:00
vcerenu
add81b07e4 Test CI 2022-06-03 16:27:21 -03:00
vcerenu
8f6d24de77 Test CI 2022-06-03 16:24:26 -03:00
vcerenu
2fdb06d824 Test CI 2022-06-03 15:51:18 -03:00
vcerenu
d578dfbd39 Test CI 2022-06-03 15:44:55 -03:00
vcerenu
d7e937d2f8 Test CI 2022-06-02 16:41:22 -03:00
vcerenu
0313563a0c Test CI 2022-06-02 16:21:30 -03:00
vcerenu
0f2fd84173 Test CI 2022-06-02 15:47:59 -03:00
vcerenu
437fbe63d1 Test CI 2022-06-02 15:24:28 -03:00
Gonzalo Acuña
fb66a358c8 Merge pull request #667 from wazuh/bump_4_3_3
Bump 4.3.3 into 4.3
2022-06-02 10:53:25 -03:00
vcerenu
83400ba1e5 bump 4.3.3 2022-06-02 10:31:20 -03:00
José Fernández Aguilera
5555c1dd06 Merge pull request #666 from wazuh/merge_4_4
Merge 4.3.3 into 4.4
2022-06-01 18:40:02 +02:00
vcerenu
0dd044de68 Merge 4.3.3 into 4.4 2022-06-01 12:29:05 -03:00
Alberto Rodríguez
8889c1237d Merge pull request #663 from wazuh/bump_4_3_3
Bump 4.3.3 to 4.3 Branch
2022-05-31 23:12:53 +02:00
vcerenu
f220927849 bump 4.3.3 version 2022-05-31 15:57:14 -03:00
vcerenu
480f0b7bef bump 4.3.3 version 2022-05-31 15:46:04 -03:00
vcerenu
af8627b992 bump 4.3.3 version 2022-05-31 10:55:09 -03:00
vcerenu
384ed07584 bump 4.3.3 version 2022-05-31 10:44:06 -03:00
Alberto Rodríguez
946e3d6c5c Merge pull request #657 from wazuh/update-filebeat-module
Update filebeat module version
2022-05-30 20:13:53 +02:00
José Fernández Aguilera
259f18f96d Merge pull request #659 from wazuh/bump_4_3_2
Bump 4.3.2 to 4.3 Branch
2022-05-30 15:59:16 +02:00
vcerenu
c22330761e bump 4.3.2 version 2022-05-30 10:29:46 -03:00
vcerenu
a453502e9b bump 4.3.2 version 2022-05-30 07:00:22 -03:00
vcerenu
de28f0babc test CI 2022-05-27 19:13:15 -03:00
vcerenu
8795763cd2 test CI 2022-05-27 18:50:10 -03:00
vcerenu
de1e435e26 test CI 2022-05-27 18:27:50 -03:00
vcerenu
5591833d2f test CI 2022-05-27 18:21:37 -03:00
vcerenu
8b2f64a3f8 test CI 2022-05-27 18:03:25 -03:00
vcerenu
290affdaa3 test CI 2022-05-27 17:58:19 -03:00
vcerenu
d1499136f6 test CI 2022-05-27 17:52:25 -03:00
vcerenu
613dc9fbb7 test CI 2022-05-27 17:44:02 -03:00
vcerenu
77520d56ea test CI 2022-05-27 17:35:42 -03:00
vcerenu
111f04fb0b test CI 2022-05-27 17:30:28 -03:00
vcerenu
30ed0e6bb4 test CI 2022-05-27 17:24:12 -03:00
vcerenu
3ab210f8c0 test CI 2022-05-27 16:58:21 -03:00
vcerenu
19fdf93942 test CI 2022-05-27 16:42:37 -03:00
vcerenu
9ef724b46c test CI 2022-05-27 16:37:02 -03:00
vcerenu
2e0a7b7c3d test CI 2022-05-27 16:31:17 -03:00
vcerenu
66dda69a91 test CI 2022-05-27 16:20:39 -03:00
vcerenu
cacc8fc3d3 test CI 2022-05-27 14:01:47 -03:00
vcerenu
11b3160aa4 test CI 2022-05-27 13:55:14 -03:00
vcerenu
bb7723d6be test CI 2022-05-27 13:42:32 -03:00
vcerenu
54756054bc test CI 2022-05-27 13:36:35 -03:00
vcerenu
e0c7194444 test CI 2022-05-27 13:31:08 -03:00
vcerenu
ba3409acee test CI 2022-05-27 13:20:44 -03:00
vcerenu
19e5c24a2e test CI 2022-05-27 12:25:00 -03:00
vcerenu
b7a55ab174 test CI 2022-05-27 12:17:16 -03:00
vcerenu
111cfca50c test CI 2022-05-27 11:57:47 -03:00
vcerenu
704b183002 test CI 2022-05-27 11:44:22 -03:00
vcerenu
579fa10551 test CI 2022-05-27 11:33:26 -03:00
dfolcha
1bc73fb1c4 Update filebeat module version 2022-05-27 15:29:35 +02:00
vcerenu
dfa11c08a4 test CI 2022-05-26 17:22:26 -03:00
vcerenu
ceb920e87a test CI 2022-05-26 17:13:29 -03:00
vcerenu
330763bcb0 test CI 2022-05-26 16:13:04 -03:00
vcerenu
571fad7a08 test CI 2022-05-26 16:04:03 -03:00
vcerenu
ccc781023d test CI 2022-05-26 16:03:09 -03:00
vcerenu
7e26034e22 test CI 2022-05-26 16:01:52 -03:00
vcerenu
182029155e test CI 2022-05-26 15:59:21 -03:00
vcerenu
872c121ba9 test CI 2022-05-26 15:41:25 -03:00
vcerenu
7e8055f128 test CI 2022-05-26 15:09:26 -03:00
vcerenu
469f7db61a test CI 2022-05-26 15:02:49 -03:00
vcerenu
ec6bfa962d test CI 2022-05-26 14:27:59 -03:00
vcerenu
5f063fc445 test CI 2022-05-26 14:22:32 -03:00
vcerenu
9fdf342fa3 test CI 2022-05-26 13:15:56 -03:00
vcerenu
b10a00cade test CI 2022-05-26 13:03:41 -03:00
vcerenu
3d3a3d1274 test CI 2022-05-26 12:36:30 -03:00
vcerenu
3a87d83deb test CI 2022-05-26 12:26:15 -03:00
vcerenu
d22547b9c5 test CI 2022-05-26 11:24:38 -03:00
vcerenu
bb11f13e86 test CI 2022-05-26 11:18:06 -03:00
vcerenu
79ac17ddbd test CI 2022-05-26 11:07:42 -03:00
vcerenu
59ad1b171c test CI 2022-05-26 10:58:42 -03:00
vcerenu
894ba9df12 test CI 2022-05-26 10:45:41 -03:00
vcerenu
5211401620 test CI 2022-05-24 15:38:28 -03:00
vcerenu
65f499c042 test CI 2022-05-24 15:30:49 -03:00
vcerenu
db3d37aef6 test CI 2022-05-24 13:00:10 -03:00
vcerenu
b1e13d3b72 test CI 2022-05-24 12:58:52 -03:00
vcerenu
baa24a7614 test CI 2022-05-24 12:36:01 -03:00
vcerenu
4e975f8dd1 test CI 2022-05-24 12:24:20 -03:00
Alberto Rodríguez
dc34688b04 Merge pull request #653 from wazuh/change-copyright-format
Changed copyright format
2022-05-24 14:28:49 +02:00
Alberto R
f3ae530bfa Fixed company name 2022-05-24 14:14:50 +02:00
Alberto R
ae558612df Changed copyright format 2022-05-24 14:13:16 +02:00
vcerenu
e1fc82af79 test CI 2022-05-23 17:00:54 -03:00
vcerenu
5b03281631 test CI 2022-05-23 16:53:35 -03:00
vcerenu
fe104c7ffb test CI 2022-05-23 12:55:57 -03:00
vcerenu
2d77063934 test CI 2022-05-23 12:28:45 -03:00
vcerenu
bbeb831ceb change path for env file 2022-05-23 12:16:07 -03:00
Alberto Rodríguez
0576fcaf52 Merge pull request #652 from wazuh/fix_whitelist_4_3
Fix whitelist in 4.3
2022-05-23 16:10:00 +02:00
Alberto Rodríguez
5d88983066 Merge pull request #651 from wazuh/fix_whitelist_4_4
Fix whitelist in 4.4
2022-05-23 16:09:43 +02:00
vcerenu
95565df2f5 fix whitelist 2022-05-23 10:58:04 -03:00
vcerenu
70c3a2929e fix whitelist 2022-05-23 10:54:57 -03:00
Alberto Rodríguez
ed5c5d70ba Merge pull request #649 from wazuh/master
Merge master into 4.4
2022-05-23 14:21:52 +02:00
Alberto Rodríguez
97f5a6bf04 Merge pull request #648 from wazuh/merge_master
Merge 4.3 into master
2022-05-23 14:15:22 +02:00
vcerenu
b21c3769d3 Merge 4.3 into master 2022-05-20 15:57:34 -03:00
Alberto Rodríguez
04389ad2ae Merge pull request #641 from wazuh/640-kibana_user_parameter
Modify Dashboard user parameter
2022-05-18 10:06:35 +02:00
Gonzalo Acuña
bfeb4b007a Dashboard entrypoint update 2022-05-17 19:45:53 -03:00
vcerenu
7d06cb56ef Modify Dashboard user parameter 2022-05-17 17:58:22 -03:00
vcerenu
f678aaf1e0 Modify Dashboard user parameter 2022-05-17 17:34:24 -03:00
vcerenu
020031c81d Modify Dashboard user parameter 2022-05-17 15:49:38 -03:00
vcerenu
a40c870e78 test ci actions 2022-05-17 12:52:47 -03:00
vcerenu
8746063177 test ci actions 2022-05-17 12:44:33 -03:00
vcerenu
e39f5a9ab5 test ci actions 2022-05-17 12:35:25 -03:00
vcerenu
316db4f384 test ci actions 2022-05-17 12:24:48 -03:00
vcerenu
8b39bff31d test ci actions 2022-05-17 12:23:55 -03:00
vcerenu
e99476a99b test ci actions 2022-05-17 12:22:32 -03:00
vcerenu
c2712a3929 test ci actions 2022-05-17 11:59:07 -03:00
vcerenu
cb06e15a74 bump develope to 4.3.1 2022-05-17 11:35:52 -03:00
Gonzalo Acuña
cb0bccc9b5 Merge pull request #639 from wazuh/bump_4_3_1
Wazuh Docker 4.3.1
2022-05-17 09:31:37 -03:00
vcerenu
65fd592d52 Bump 4.3.1 version 2022-05-16 12:37:48 -03:00
vcerenu
86fbf77aa9 Bump 4.3.1 version 2022-05-13 12:16:42 -03:00
Gonzalo Acuña
8598da8100 Merge pull request #637 from wazuh/628-change.port-yml
Change dashboard port
2022-05-12 13:35:33 -03:00
vcerenu
80bfc148d0 Change dashboard port 2022-05-12 13:28:13 -03:00
Gonzalo Acuña
eed0cd6930 Merge pull request #635 from wazuh/634-change-docker-compose
Change doc migration
2022-05-12 11:43:00 -03:00
vcerenu
3adb7809dd change doc migration 2022-05-12 11:23:46 -03:00
Gonzalo Acuña
1505d063f5 Merge pull request #633 from wazuh/632-remove-acme-user
Change acme-user
2022-05-11 15:36:41 -03:00
vcerenu
446ecd86e6 change Wazuh API user 2022-05-11 14:05:44 -03:00
vcerenu
ddcad44468 change Wazuh API user 2022-05-11 13:40:46 -03:00
Alberto Rodríguez
2c848fb3e1 Merge pull request #631 from wazuh/reports-dashboard-fix
Add dependencies for Wazuh dashboard
2022-05-06 15:06:55 +02:00
vcerenu
3be8078248 add dependencies for Wazuh dashboard 2022-05-06 10:03:32 -03:00
José Fernández Aguilera
4478021f28 Merge pull request #630 from wazuh/reports-dashboard-fix
Add dependencies for Wazuh dashboard
2022-05-06 14:53:46 +02:00
vcerenu
8d8b9e1336 add dependencies for Wazuh dashboard 2022-05-06 09:32:14 -03:00
Alberto R
e1ed44d847 Changed artifacts dev URLs 2022-05-06 08:36:59 +02:00
José Fernández Aguilera
73018f87ac Merge pull request #627 from wazuh/change-dash-repo
Change dashboard repository
2022-05-05 18:43:35 +02:00
vcerenu
56c0acd1bf change dashboard repository 2022-05-05 13:38:14 -03:00
vcerenu
43d86dd5c8 add variables from wazuh version 2022-05-03 15:51:38 -03:00
Alberto Rodríguez
33c9758fd8 Merge pull request #625 from wazuh/622-ErrorInCP-to4.3
Error while copying multigroups files during second Docker deployment
2022-05-03 08:41:00 +02:00
vcerenu
8afc88a163 permanent data mount fix 2022-05-02 12:30:03 -03:00
c-bordon
35c66186da New validation of empty dir 2022-04-29 17:51:10 -03:00
Gonzalo Acuña
f534642f75 Merge pull request #624 from wazuh/621-permission-warnings
Change config file permissions
2022-04-29 10:36:04 -03:00
vcerenu
40ce99e8aa change config file permissions 2022-04-29 10:31:53 -03:00
Alberto Rodríguez
62f2324bf7 Merge pull request #623 from wazuh/621-permission-warnings
Change config file permissions
2022-04-28 17:04:14 +02:00
vcerenu
45011c1b68 change config file permissions 2022-04-28 10:47:07 -03:00
Alberto Rodríguez
c4e2cc54c5 Merge pull request #620 from wazuh/move-certs-yml
Fix certs.yml Path
2022-04-26 19:34:10 +02:00
vcerenu
16ac5b9103 fix certs.yml path 2022-04-26 12:11:52 -03:00
Alberto Rodríguez
a16d9ab969 Create .gitignore 2022-04-26 16:29:32 +02:00
José Fernández Aguilera
4c00ffdc16 Merge pull request #618 from wazuh/fix-key
Fix packages-dev key in Dockerfile
2022-04-21 18:06:35 +02:00
vcerenu
3b372e6f0f key url fix 2022-04-21 12:32:50 -03:00
José Fernández Aguilera
e039a15c67 Merge pull request #616 from wazuh/1470-disable-multitenancy
Disable multitenancy
2022-04-21 16:33:50 +02:00
José Fernández Aguilera
87f61a56c6 Merge pull request #617 from wazuh/1469-remove-plugin
Remove plugin from opensearch.yml
2022-04-21 09:48:22 +02:00
vcerenu
b160dba420 Remove plugin in opensearch.yml 2022-04-20 15:38:11 -03:00
vcerenu
e5331bf5ac disable multitenancy 2022-04-20 11:09:05 -03:00
Alberto Rodríguez
d11627bf89 Merge pull request #615 from wazuh/510-wazuh-manager-ubuntu
Base Change for Wazuh Manager Docker Image
2022-04-13 19:05:21 +02:00
vcerenu
ee1aae8f78 change apt-key add options 2022-04-13 13:55:02 -03:00
vcerenu
76966875ed change template_version parameter 2022-04-13 10:47:32 -03:00
vcerenu
072bffd454 Change base from Wazuh manager Dockerfile 2022-04-12 15:41:23 -03:00
Alberto Rodríguez
23179bf155 Merge pull request #614 from wazuh/613-fix-indexer-certs-creator-to-parse-correctly-certsyml
Fix parse cert.yml according to wazuh_cert_tools modifications
2022-04-12 18:11:54 +02:00
vcerenu
f965c4f93d Change base from Wazuh manager Dockerfile 2022-04-12 13:04:33 -03:00
fcaffieri
ffcd5f5cdc Fix parse cert.yml according to wazuh_cert_tools modifications 2022-04-12 12:58:23 -03:00
Alberto Rodríguez
5464bf4b91 Merge pull request #611 from wazuh/608-misc-fixes
Test rework of Docker repository
2022-04-11 18:07:42 +02:00
Alberto R
28cbfa5dd6 Merge branch '4.3' into 608-misc-fixes 2022-04-11 17:46:44 +02:00
vcerenu
67d2444a84 duplicate option in wazuh.indexer.yml 2022-04-11 11:27:09 -03:00
vcerenu
a4bd34e202 Remove admin_privileges option 2022-04-08 16:17:10 -03:00
Alberto Rodríguez
5f078b6d29 Update README.md 2022-04-08 19:49:10 +02:00
Alberto Rodríguez
ce8908bcd8 Merge pull request #610 from wazuh/609-change-config
Changed config.yml format
2022-04-08 19:34:47 +02:00
vcerenu
11a12e3ec1 Resolving git conflicts 2022-04-08 11:21:38 -03:00
José Fernández
b5b1f96a9e Changed config.yml format 2022-04-08 14:12:41 +02:00
Alberto Rodríguez
b89382b2bf Merge pull request #604 from wazuh/602-certificate_permissions-to4.3
Fix permission in certificates
2022-04-07 22:04:48 +02:00
Alberto Rodríguez
9dca2f589a Update entrypoint.sh 2022-04-07 22:00:48 +02:00
Alberto Rodríguez
6f053fece2 Update entrypoint.sh 2022-04-07 22:00:09 +02:00
vcerenu
1e79861fec Change readme for wazuh docker images builder 2022-04-07 16:56:08 -03:00
vcerenu
3dd41620ca Fix opensearch.yml for single-node deploy 2022-04-07 16:43:26 -03:00
vcerenu
928bf657e9 fix entrypoint for certs builder 2022-04-07 15:20:47 -03:00
vcerenu
9674d022e1 Miscelanious fixes 2022-04-06 17:16:50 -03:00
fcaffieri
ea9e03485c Modify to use source funtion cert_parseYaml of wazuh_cert_tools.sh 2022-04-06 12:50:42 -03:00
vcerenu
119eddd220 Misc fixes 2022-04-05 17:18:51 -03:00
fcaffieri
d9276985c3 Move certificates to certs directory for dashboard 2022-04-05 11:31:02 -03:00
fcaffieri
1f1d8626ef Set permission to 1000:1000 2022-04-04 17:33:56 -03:00
fcaffieri
c8d8a51d6a Fix permision problem for manager and worker, setting uid correctly 2022-04-04 16:35:04 -03:00
Alberto Rodríguez
4defd499d4 Merge pull request #607 from wazuh/599-dashboard-fix
Fix dashboard
2022-04-01 13:56:04 +02:00
vcerenu
ecb6e322aa Fix dashbaord 2022-04-01 08:53:10 -03:00
Alberto R
20e5315042 Merge remote-tracking branch 'origin/4.3' into 602-certificate_permissions-to4.3 2022-04-01 13:09:06 +02:00
Alberto Rodríguez
5076bcc949 Update README.md 2022-04-01 11:56:57 +02:00
Alberto Rodríguez
8b66ae464c Update README.md 2022-04-01 11:56:47 +02:00
Alberto Rodríguez
8bb6650b2d Update README.md 2022-04-01 11:55:47 +02:00
Alberto Rodríguez
afb0d19a12 Update README.md 2022-04-01 11:53:39 +02:00
Alberto Rodríguez
139065a87c Update Migration-to-Wazuh-4.3.md 2022-04-01 11:39:56 +02:00
Alberto Rodríguez
42df77d89c Update README.md 2022-04-01 11:34:52 +02:00
Alberto Rodríguez
6cde5f5c60 Update README.md 2022-04-01 11:23:30 +02:00
Alberto Rodríguez
b0e2b5aca0 Merge pull request #605 from wazuh/4.3-inprovements
4.3.0 improvements
2022-04-01 11:13:48 +02:00
Alberto Rodríguez
0ff309d1fc Merge pull request #603 from wazuh/change-directories
Change directories structure
2022-04-01 11:10:55 +02:00
fcaffieri
621095329e Fix permission in certificates 2022-03-31 18:40:44 -03:00
vcerenu
2f4b127787 Wazuh master name fix 2022-03-31 17:10:19 -03:00
Alberto Rodríguez
9887b103c3 Update README.md 2022-03-31 21:10:09 +02:00
vcerenu
50cb61443e Add persistence in single node 2022-03-31 14:35:41 -03:00
vcerenu
3914ea7639 Add persistence in single node 2022-03-31 13:59:49 -03:00
vcerenu
dd179c82dc Add persistence in single node 2022-03-31 13:39:53 -03:00
vcerenu
a3e39bd5c0 Add persistence in single node 2022-03-31 13:21:01 -03:00
vcerenu
45e12a29fe Add persistence in single node 2022-03-31 13:18:39 -03:00
vcerenu
06bfdde34e Corrections in Readme 2022-03-31 09:12:20 -03:00
vcerenu
7b6a6afee2 Corrections in Readme 2022-03-31 09:08:39 -03:00
vcerenu
2f03ec22e3 Change directories structure 2022-03-30 14:23:51 -03:00
vcerenu
2b4607fed8 Change directories structure 2022-03-30 14:20:31 -03:00
vcerenu
77e20bfb5b Change directories structure 2022-03-30 14:19:53 -03:00
vcerenu
dbb46a913e Change directories structure 2022-03-30 14:07:52 -03:00
Gonzalo Acuña
73901f9753 Merge pull request #600 from wazuh/adapt-name-and-volumes
Replace Service name and volumes
2022-03-29 15:35:29 -03:00
Alberto Rodríguez
6f82cea54b Merge pull request #601 from wazuh/remove-https-nginx
Remove https nginx configuration
2022-03-29 20:09:24 +02:00
vcerenu
3d0c356be9 Remove https nginx configuration 2022-03-29 14:25:15 -03:00
vcerenu
8b7747302e Change Indexer service name and volumes 2022-03-29 12:59:01 -03:00
vcerenu
48c42bf88f Change Indexer service name and volumes 2022-03-29 12:55:25 -03:00
vcerenu
3e923d7630 Change Indexer service name and volumes 2022-03-29 12:50:52 -03:00
vcerenu
2d6449641a Repository Correction 2022-03-29 09:08:02 -03:00
vcerenu
ff34f68b93 Change Indexer service name and volumes 2022-03-28 13:06:30 -03:00
vcerenu
ce083743d0 Change Indexer service name and volumes 2022-03-28 13:02:54 -03:00
Alberto Rodríguez
9cd399c2df Merge pull request #598 from wazuh/4.2-merge_master
Merge 4.2 into master
2022-03-28 16:58:01 +02:00
Gonzalo Acuña
3e54eeb62f Merge branch 'master' into 4.2-merge_master 2022-03-28 11:34:55 -03:00
Alberto Rodríguez
a4be008028 Merge pull request #596 from wazuh/595-bump_426
Bump to 4.2.6
2022-03-28 15:49:25 +02:00
Alberto Rodríguez
e7065fc52b Merge pull request #593 from wazuh/wp_1334-remove-demo-certificates-4.3
Remove demo certificates from demo deployment
2022-03-28 14:06:16 +02:00
Raul Del Pozo Moreno
862b35881c Change base file to packages-dev 2022-03-25 19:41:31 +01:00
Raul Del Pozo Moreno
066231198c Change packages bucket for base tar file 2022-03-25 15:09:59 +01:00
Gonzalo Acuña
85e62cfd0e Bump to 4.2.6 2022-03-25 10:28:14 -03:00
Raul Del Pozo Moreno
a01d921cae Set urls to production 2022-03-24 20:50:16 +01:00
Raul Del Pozo Moreno
95d92d968d Restore certificate node name 2022-03-24 20:14:13 +01:00
Raul Del Pozo Moreno
d5191b8f4b Change certs copy 2022-03-24 20:00:39 +01:00
Raul Del Pozo Moreno
8765678aaa Added custom images 2022-03-24 19:28:06 +01:00
Raul Del Pozo Moreno
b91c1602a6 Added custom images 2022-03-24 19:26:29 +01:00
Raul Del Pozo Moreno
2a9a9dce52 Remove download of demo certificates 2022-03-24 18:59:53 +01:00
Alberto Rodríguez
2ebb32dc8d Merge pull request #591 from wazuh/cert_tool
Cert tool updates
2022-03-23 15:20:46 +01:00
Gonzalo Acuña
0c1409e5c9 Certs directory name updated 2022-03-23 10:15:19 -03:00
Gonzalo Acuña
a5e74bf916 Cert tool command update 2022-03-23 09:28:52 -03:00
Alberto Rodríguez
f3ebc642dd Merge pull request #590 from wazuh/docker-migration
Docker migration procedure
2022-03-22 18:36:54 +01:00
Gonzalo Acuña
610c62b866 Migration document added 2022-03-22 12:47:57 -03:00
Gonzalo Acuña
1c76d93b17 Migration document added 2022-03-22 12:47:15 -03:00
Gonzalo Acuña
d46c763939 set_rids_owner call added 2022-03-22 11:57:37 -03:00
Gonzalo Acuña
0b24a51147 Manager wazuh-init updated (rids owner) 2022-03-22 11:02:27 -03:00
Alberto Rodríguez
1d6757bbba Merge pull request #588 from wazuh/4.3-wazuhapp
Wazuh app options restore.
2022-03-18 16:12:53 +01:00
Gonzalo Acuña
3df1d95ec7 wazuh.yml update 2022-03-18 10:52:01 -03:00
Gonzalo Acuña
0b1659c60b Wazuh app options config updated 2022-03-18 10:43:34 -03:00
Gonzalo Acuña
b3b638a83c Wazuh app options added 2022-03-18 10:20:08 -03:00
Gonzalo Acuña
6eb2e37f41 Dashboard variables restored 2022-03-18 10:17:47 -03:00
Gonzalo Acuña
9ba1692e98 README format update 2022-03-18 09:55:16 -03:00
Gonzalo Acuña
2c2c32e8b7 README update 2022-03-18 09:52:40 -03:00
Alberto Rodríguez
370826d560 Update Dockerfile 2022-03-17 17:24:30 +01:00
Alberto Rodríguez
06d7eb1528 Update Dockerfile 2022-03-17 17:23:50 +01:00
Alberto Rodríguez
45e9218c60 Updated base URL 2022-03-17 17:21:45 +01:00
Alberto Rodríguez
553a84f5a9 Merge pull request #577 from wazuh/new-packages-release
Wazuh indexer and dashboard release
2022-03-17 17:15:24 +01:00
Alberto R
42f1d8d3e3 Removed comments 2022-03-17 17:14:18 +01:00
Alberto R
f9ea4ae8ab Removed X-Pack support from readme 2022-03-17 17:11:11 +01:00
Alberto Rodríguez
6ed22a1323 Merge pull request #586 from wazuh/new-packages-release-dashboard
Wazuh dashboard image updates
2022-03-17 17:07:18 +01:00
Gonzalo Acuña
f0fd00bd7f Repositories URLs updated to packages bucket 2022-03-17 13:04:38 -03:00
Alberto Rodríguez
aed910737d Merge pull request #585 from wazuh/new-packages-release-elastic
Elastic and kibana files cleanup
2022-03-17 16:47:59 +01:00
Gonzalo Acuña
08329c6aa4 Conflicts resolved 2022-03-17 11:31:32 -03:00
Gonzalo Acuña
036f515116 Elastic and kibana files removed 2022-03-17 10:59:01 -03:00
Gonzalo Acuña
16d2aa1c7a Production deployment update 2022-03-17 10:45:17 -03:00
Gonzalo Acuña
f8cf7b134f Wazuh dashboard image changes 2022-03-17 09:55:49 -03:00
Alberto R
c6ce62e38f Fixed wazuh-certs-tool.sh and wazuh-passwords-tool.sh URLs 2022-03-17 11:09:57 +01:00
Gonzalo Acuña
923c47c4e1 Readme corrected 2022-03-16 09:11:45 -03:00
Gonzalo Acuña
7102d73244 Indexer and dashboard user and workdir update 2022-03-15 18:04:41 -03:00
Gonzalo Acuña
a31d5c7c1a Workdir and User updated for docker images 2022-03-15 16:17:10 -03:00
Alberto Rodríguez
31b44f3627 Merge pull request #584 from wazuh/new-packages-release-tool
Tools download logic updated
2022-03-15 17:51:14 +01:00
Gonzalo Acuña
c66cdea256 Tools download logic updated 2022-03-15 11:13:36 -03:00
Gonzalo Acuña
19ad1520c8 Cert tool URL updates 2022-03-14 14:53:48 -03:00
vcerenu
ad678638ad change production key and repository 2022-03-04 18:52:59 -03:00
vcerenu
0c9563ce94 Change Dockerfile from Wazuh dashboard with multistage build 2022-03-04 18:49:49 -03:00
vcerenu
9f1dec3338 Update config and certs path 2022-03-04 18:20:15 -03:00
Alberto R
8e42f30b19 Minor fix 2022-03-04 17:56:20 +01:00
vcerenu
01ce184cd0 Fix wazuh.yml persistence 2022-03-03 14:15:20 -03:00
vcerenu
24de834599 update dashboard.yml and indexer ports 2022-03-02 16:30:07 -03:00
vcerenu
0b6e2b1035 Fix PR 2022-02-24 14:04:26 -03:00
vcerenu
e3e8cb49b8 Fix PR 2022-02-22 13:34:21 -03:00
vcerenu
8fd4e1dc18 Fix PR 2022-02-22 13:13:23 -03:00
vcerenu
bfff9d1390 Fix PR 2022-02-22 12:21:33 -03:00
vcerenu
f65c993cb6 Fix PR 2022-02-22 11:14:33 -03:00
vcerenu
485ccfcb05 Fix PR 2022-02-22 10:59:19 -03:00
vcerenu
14b3979268 Fix PR 2022-02-22 10:51:47 -03:00
vcerenu
80da713937 fix various issues into PR 2022-02-18 17:02:36 -03:00
vcerenu
0c1654e01c fix various issues into PR 2022-02-18 17:01:58 -03:00
vcerenu
1d0f4aa4a9 remove tini 2022-02-17 13:09:49 -03:00
vcerenu
5bd612a769 Merge branch '4.3' into new-packages-release 2022-02-17 11:48:19 -03:00
vcerenu
be152cf6b3 fix in wazuh-indexer demo certificates 2022-02-17 11:34:49 -03:00
vcerenu
75cbf4561a fix in wazuh-indexer demo certificates 2022-02-17 11:32:11 -03:00
vcerenu
16d37e6ecd fix in wazuh-indexer demo certificates 2022-02-16 16:42:21 -03:00
vcerenu
e5a6ffef8f clean Dockerfile and docker-compose start script 2022-02-15 17:43:04 -03:00
vcerenu
463589c2ac clean Dockerfile and docker-compose start script 2022-02-15 16:42:10 -03:00
vcerenu
ec4b9f7ee1 clean Dockerfile and docker-compose start script 2022-02-15 16:40:21 -03:00
vcerenu
73f000f721 clean Dockerfile and docker-compose start script 2022-02-15 16:37:34 -03:00
vcerenu
01869e4617 clean Dockerfile and docker-compose start script 2022-02-15 12:50:45 -03:00
vcerenu
82325914b3 clean Dockerfile and docker-compose start script 2022-02-15 12:39:27 -03:00
vcerenu
b07bc5625e clean Dockerfile and docker-compose start script 2022-02-15 12:21:19 -03:00
vcerenu
1db1ab4514 clean Dockerfile and docker-compose start script 2022-02-15 12:16:29 -03:00
vcerenu
2c24e12b4e clean Dockerfile and docker-compose start script 2022-02-15 11:37:23 -03:00
vcerenu
5bc8693bbc clean Dockerfile and docker-compose start script 2022-02-15 11:13:48 -03:00
vcerenu
803c9b7062 docker-compose.yml configuration fixes 2022-02-14 17:46:32 -03:00
vcerenu
b81c99be46 docker-compose.yml configuration fixes 2022-02-14 17:21:43 -03:00
vcerenu
55dd203067 docker-compose.yml configuration fixes 2022-02-14 17:04:11 -03:00
vcerenu
1140e67c99 docker-compose.yml configuration fixes 2022-02-14 16:58:57 -03:00
vcerenu
166b660322 docker-compose.yml configuration fixes 2022-02-14 12:33:04 -03:00
vcerenu
ac86b6652e fix securityadmin.sh for wazuh-indexer 2022-02-11 16:50:33 -03:00
Alberto Rodríguez
1897579314 Merge pull request #575 from wazuh/fix/574-update-create_user-script
Update `create_user.py` script to create the RBAC database before trying to read
2022-02-09 11:54:19 +01:00
Manuel
e140acd282 Update create_user script to create the RBAC database 2022-02-09 11:02:34 +01:00
vcerenu
d5bda0896a Change services names and build certs generator 2022-02-07 17:48:26 -03:00
vcerenu
efed32f997 Add Wazuh indexer cluster configuration 2022-02-04 17:37:58 -03:00
vcerenu
d0476d3f35 Add new Dockerfile for Wazuh indexer 2022-02-02 18:06:20 -03:00
vcerenu
09f87ef233 Add Wazuh indexer cluster configuration 2022-01-26 17:15:08 -03:00
vcerenu
d294ff5cd0 Add Wazuh indexer cluster configuration 2022-01-25 12:29:04 -03:00
vcerenu
8327d5bed2 Add Wazuh indexer cluster configuration 2022-01-24 17:35:44 -03:00
vcerenu
b7b87cb06e Fixes in Dockerfiles and entrypoints 2022-01-21 15:28:56 -03:00
vcerenu
4435658edf Add wazuh-dashboard Dockerfile 2022-01-20 18:51:47 -03:00
vcerenu
ca5bbd0ca3 Add wazuh-dashboard Dockerfile 2022-01-20 18:48:43 -03:00
vcerenu
3170ac81c0 Add wazuh-dashboard Dockerfile 2022-01-20 18:45:15 -03:00
vcerenu
3de9c0b173 Add wazuh-dashboard Dockerfile 2022-01-20 09:25:11 -03:00
vcerenu
b94bad1bd0 Add wazuh-dashboard Dockerfile 2022-01-19 17:20:46 -03:00
vcerenu
ec59357d59 Dockerfile for wazuh-indexer image 2022-01-18 17:18:36 -03:00
Gonzalo Acuña
bf319d3d4b Merge pull request #494 from krzee/master
In bash if already tests exit status is 0 or not
2021-12-16 14:34:16 -03:00
Alberto Rodríguez
dfd55cb73d Merge pull request #561 from wazuh/restart-worker-container
Add log4j workaround
2021-12-15 15:13:43 +01:00
vcerenu
f769c53716 log4j workaround 2021-12-15 11:03:50 -03:00
vcerenu
da2f257f00 log4j workaround 2021-12-15 10:08:27 -03:00
vcerenu
e3ee599f83 log4j workaround 2021-12-14 12:24:12 -03:00
vcerenu
b395bcab40 log4j workaround 2021-12-14 12:18:07 -03:00
vcerenu
c1120c1995 log4j workaround 2021-12-14 09:23:36 -03:00
Alberto Rodríguez
c48bb6dade Merge pull request #549 from NullOranje/add-wazuh.monitoring.creation-variable
Add environment variable to customize wazuh.monitoring.creation interval
2021-11-25 15:07:22 +01:00
Alberto R
84fe19e868 Bumped to 4.4.0 2021-11-24 17:01:09 +01:00
Gonzalo Acuña
eebbdae82e Merge pull request #555 from wazuh/4.2.5-into-master
Merge 4.2.5 into master
2021-11-16 16:23:58 -03:00
vcerenu
970658f81c Resolving conflicts in merge 2021-11-16 12:54:49 -03:00
José Fernández Aguilera
5cabaa4700 Merge pull request #553 from wazuh/10842-release-4.2.5
Update release 4.2.5
2021-11-15 20:12:48 +01:00
vcerenu
603e48237b Bump release 4.2.5 2021-11-15 11:48:03 -03:00
vcerenu
71628e1575 Bump release 4.2.5 2021-11-15 11:47:20 -03:00
vcerenu
a5d13c9fc6 Bump release 4.2.5 2021-11-15 10:35:40 -03:00
Nick McKinney
a87676a03d Add environment variable to customize wazuh.monitoring.creation interval 2021-11-08 14:09:24 -05:00
Gonzalo Acuña
a9442d7345 Merge pull request #544 from wazuh/507-permanent-folder
Fix directory problem in permanent_data
2021-11-05 08:28:08 -03:00
vcerenu
f02697786c fix directory problem in permanent_data 2021-11-04 16:00:09 -03:00
Gonzalo Acuña
d530faa8f3 Merge pull request #543 from wazuh/507-permanent-folder
Add /var/ossec/logs/archives to permanent_data
2021-11-04 12:16:05 -03:00
vcerenu
898f699d85 507 - add /var/ossec/logs/archives to permanent_data 2021-11-04 11:05:04 -03:00
Gonzalo Acuña
6008492dd7 Merge pull request #539 from wazuh/merge-4.2.4-into-master
Merge 4.2 into master
2021-10-20 17:30:57 -03:00
vcerenu
abe145c4e4 Update Release 4.2.4 2021-10-20 13:34:07 -03:00
Gonzalo Acuña
4ebeaba873 Merge pull request #538 from wazuh/535-release-4.2.4
Update release 4.2.4
2021-10-20 10:09:52 -03:00
vcerenu
aa59a302c3 Update release 4.2.4 2021-10-19 16:37:13 -03:00
Gonzalo Acuña
67d92fc992 Merge pull request #537 from wazuh/535-release-4.2.4
Release v4.2.4
2021-10-18 15:28:34 -03:00
vcerenu
fbe7a0a571 update release 4.2.4 2021-10-14 16:39:41 -03:00
vcerenu
ffffe5539a update release 4.2.4 2021-10-14 16:23:43 -03:00
José Fernández Aguilera
f17afc438e Merge pull request #534 from wazuh/503-merge-master
Merge 4.2 in master
2021-10-13 09:34:24 +02:00
vcerenu
515f0daff4 Merge 4.2.3 into master 2021-10-12 12:34:39 -03:00
José Fernández Aguilera
d46ce7aee3 Merge pull request #530 from wazuh/529-release-423
Release v4.2.3
2021-10-07 15:54:45 +02:00
vcerenu
4d0b06b91e bump release 4.2.3 2021-10-06 08:38:25 -03:00
vcerenu
391b5d237c bump release 4.2.3 2021-10-05 12:57:25 -03:00
Alberto Rodríguez
2a297bab38 Merge pull request #527 from wazuh/merge-42-into-master
Merge 4.2 in master
2021-10-04 15:42:01 +02:00
vcerenu
1588bc26ff Merge 4.2 into master 2021-09-30 18:09:31 -03:00
vcerenu
c33cb0d274 Merge 4.2 into master 2021-09-30 16:54:29 -03:00
vcerenu
503db33dde Merge 4.2 into master 2021-09-30 16:50:34 -03:00
vcerenu
61b44c37cc Merge 4.2 into master 2021-09-30 16:33:20 -03:00
Alberto Rodríguez
f34b7d0465 Merge pull request #522 from wazuh/512-make-utils-persistent
Make utils.py file persistent when using volumes
2021-09-29 10:27:50 +02:00
fhielpos
96dfa2a8d8 Add utils.py to persistent_data 2021-09-24 11:39:56 -03:00
Alberto Rodríguez
e99ba259e0 Added util.py to permanent data 2021-09-23 20:00:03 +02:00
vcerenu
c46b8c5cd3 Merge pull request #519 from wazuh/Fix-log-rotation
Change tail argument to prevent log rotation issues
2021-09-23 13:00:48 -03:00
fhielpos
3aad1aecd5 Change tail argument to prevent log rotation issues 2021-09-23 11:40:46 -03:00
Alberto Rodríguez
f00245007d Merge pull request #516 from wazuh/4.2.2
Release v4.2.2
2021-09-15 16:50:12 +02:00
vcerenu
084407f9c9 Update 4.2.2 2021-09-15 10:55:43 -03:00
vcerenu
f0ebabad89 Update 4.2.2 2021-09-15 10:51:19 -03:00
Alberto Rodríguez
afd70ff5f9 Merge pull request #513 from wazuh/4.2.1
Release v4.2.1
2021-09-14 15:12:06 +02:00
vcerenu
61f3e080a3 Update 4.2.1 2021-09-14 10:08:48 -03:00
vcerenu
2dd9fdfa99 Update 4.2.1 2021-09-14 10:03:16 -03:00
vcerenu
daaac09c9c Update 4.2.1 2021-09-13 15:21:53 -03:00
vcerenu
8d0dd5baeb Update 4.2.1 2021-09-09 11:13:04 -03:00
vcerenu
9e9de07322 Update 4.2.1 2021-09-09 09:23:36 -03:00
José Fernández Aguilera
6ed79996af Merge pull request #509 from wazuh/fix-4.2-upgrade
Fix 4.2 upgrade
2021-09-03 11:37:17 +02:00
dfolcha
413dd71d44 Remove -r flag 2021-09-03 09:16:20 +02:00
dfolcha
68bc08f78f Add function to rename files and directories 2021-09-02 17:05:23 +02:00
dfolcha
6da1b19698 Exclude queue/ossec from volume 2021-09-02 15:12:33 +02:00
José Fernández Aguilera
750fe5ffe8 Merge pull request #504 from wazuh/update-4.2
Update AR files
2021-08-27 12:18:23 +02:00
dfolcha
137f0ba88f Update goss tests 2021-08-27 12:11:00 +02:00
dfolcha
25cb1fa872 Fix wrong OD version 2021-08-27 12:01:58 +02:00
dfolcha
8a01495968 Update AR files 2021-08-27 10:47:45 +02:00
Alberto Rodríguez
1ed0bc8e01 Merge pull request #503 from wazuh/update-4.2
Update 4.2
2021-08-26 16:17:13 +02:00
dfolcha
0699c8fe21 Add admin key pair to production development 2021-08-26 15:08:18 +02:00
krzee
93d12d2143 in bash if already tests exit status is 0 or not
The other way works too, but it seems pointless to go through extra steps when the if command already does exactly this
2021-08-11 15:11:43 -07:00
Alberto R
64c61bcdbf Fixed mode Kibana settings 2021-06-28 23:35:30 +02:00
Alberto Rodríguez
4b75a6679b Merge pull request #483 from wazuh/orsifacundo-production_cluster-changes
Add admin keypair to production deployment
2021-06-10 08:06:35 +02:00
CuFa
3f3a688d4a Update elasticsearch-node3.yml 2021-06-09 16:41:32 -03:00
CuFa
64bac44507 Update elasticsearch-node2.yml 2021-06-09 16:41:19 -03:00
CuFa
4ae07e1d77 Update elasticsearch-node1.yml 2021-06-09 16:41:09 -03:00
CuFa
04309afada Update production-cluster.yml 2021-06-09 16:40:39 -03:00
CuFa
b947487325 Update certs.yml 2021-06-09 16:39:39 -03:00
Alberto Rodríguez
5074eb0b44 Merge pull request #479 from wazuh/476-update-4.2
Bump ODFE 3.13.2 on Wazuh 4.2.0
2021-05-24 14:03:33 +02:00
José Fernández
c8b8e8b134 Bump to ODFE 1.13.2 2021-05-24 13:01:47 +02:00
Alberto Rodríguez
7b56e2425b Merge pull request #478 from wazuh/476-update-master
Bump to ODFE 1.13.2
2021-05-24 12:56:32 +02:00
José Fernández
0e0160121b Bump to ODFE 1.13.2 2021-05-24 12:53:06 +02:00
José Fernández
fc54288a0d Update README 2021-05-24 11:45:07 +02:00
José Fernández
c0d243471e Update README 2021-05-24 11:44:35 +02:00
Alberto Rodríguez
5f84a7eac2 Merge pull request #467 from wazuh/4.3
Merge 4.3 in master
2021-05-24 09:34:27 +02:00
José Fernández
6869fbacfc Merge conflicts with master branch 2021-05-24 09:31:30 +02:00
Alberto Rodríguez
09731ec148 Merge pull request #473 from wazuh/457-nginx-conf-readme-4.2
457: Broken link fix and removed deprecated information at README
2021-04-29 14:35:31 +02:00
jcruzlp
2b9e1a6f89 Removed unussed basic auth 2021-04-27 13:39:14 +02:00
jcruzlp
5550edb4ae Fixed broken link 2021-04-27 13:39:13 +02:00
VictorMorenoJimenez
45e08437fc Change ossec-control to wazuh-control 2021-04-15 15:57:48 +02:00
Alberto Rodríguez
be3ecc1f80 Merge pull request #463 from wazuh/448-rename-users-groups
Rename users and group according to Wazuh standard
2021-04-14 15:09:26 +02:00
Victor Moreno Jimenez
2c5014a150 448. Rename users and groups according to new Wazuh naming standard 2021-04-14 09:02:48 +02:00
VictorMorenoJimenez
f346a51c0f Bump to v4.3.0 2021-04-14 08:59:10 +02:00
Alberto Rodríguez
1cf4376e3b Merge pull request #461 from wazuh/feature-name-change
Feature name change
2021-04-13 17:27:20 +02:00
VictorMorenoJimenez
3c1175b0a0 Bump to v4.2.0 2021-04-13 16:44:28 +02:00
Victor Moreno Jimenez
1dad6eb83e Bump to v4.1.4 2021-04-13 16:44:28 +02:00
Victor Moreno Jimenez
10a02f88fa Bump to 4.1.3 2021-04-13 16:44:27 +02:00
Manuel Gutierrez
67fd91da9b Bump to 4.1.1 2021-04-13 16:44:27 +02:00
Manuel Gutierrez
c146068138 Add xpack-from-sources 2021-04-13 16:44:27 +02:00
Manuel Gutierrez
5fa1d1eeb6 Update kibana xpack paths 2021-04-13 16:44:26 +02:00
Manuel Gutierrez
8a93c8fe3a Fix curl ssl check 2021-04-13 16:44:26 +02:00
Manuel Gutierrez
ed5f8c0816 Fix elastic version 2021-04-13 16:44:26 +02:00
Manuel Gutierrez
02965be924 Fix changelog 2021-04-13 16:44:25 +02:00
Manuel Gutierrez
ad9aa18966 Bump images on prod cluster 2021-04-13 16:44:25 +02:00
Manuel Gutierrez
21f37d6765 Update changelog 2021-04-13 16:44:25 +02:00
Manuel Gutierrez
01f8dfc46e Update xpack compose 2021-04-13 16:44:24 +02:00
Manuel Gutierrez
c0a65c4ba6 Update Goss tests 2021-04-13 16:44:24 +02:00
Manuel Gutierrez
63a32590b0 Bump odfe images 2021-04-13 16:44:24 +02:00
Manuel Gutierrez
b76adb084d Bump xpack images 2021-04-13 16:44:23 +02:00
Manuel Gutierrez
f23f7fafab Update paths 2021-04-13 16:44:23 +02:00
Manuel Gutierrez
fceb9f0e07 Bump versions and update path 2021-04-13 16:44:23 +02:00
Manuel Gutierrez
7ddc4daed1 Bump versions 2021-04-13 16:44:22 +02:00
Manuel Gutierrez
574a0147ea Update compatibility matrix 2021-04-13 16:44:22 +02:00
Manuel Gutierrez
2f683e43c6 Bump odfe version 2021-04-13 16:44:22 +02:00
Manuel Gutierrez
6b2780e221 Update version 2021-04-13 16:44:21 +02:00
Manuel Gutierrez
4cc0eeea2e Add goss binary for health checks 2021-04-13 16:44:21 +02:00
Manuel Gutierrez
249c1adb8c Remove dev tag from version 2021-04-13 16:44:21 +02:00
Manuel Gutierrez
a4646f388a Rename cert generator container name 2021-04-13 16:44:20 +02:00
Manuel Gutierrez
6d231cea90 Add generate-elasticsearch-certs.yml and instances.yml 2021-04-13 16:44:20 +02:00
Manuel Gutierrez
b45f09fff5 Update xpack-compose 2021-04-13 16:44:20 +02:00
Manuel Gutierrez
15d65820ae Remove kibana_ip 2021-04-13 16:44:19 +02:00
Manuel Gutierrez
5d43a0acf8 Use kibana_proto 2021-04-13 16:44:19 +02:00
Manuel Gutierrez
75034895ce Fix curl auth params 2021-04-13 16:44:18 +02:00
Manuel Gutierrez
f848aa9600 Bump copyright 2021-04-13 16:44:18 +02:00
Manuel Gutierrez
09153da593 Bump to 4.0.4 2021-04-13 16:44:18 +02:00
Manuel Gutierrez
3428f982f3 Add sample compose for xpack variant 2021-04-13 16:44:17 +02:00
Manuel Gutierrez
c53a0f86f6 Remove duplicated xpack_config exec 2021-04-13 16:44:17 +02:00
Manuel Gutierrez
ffb4395da0 Set Wazuh app as default route 2021-04-13 16:44:17 +02:00
Manuel Gutierrez
31dbb7fc20 Remove useless ARG 2021-04-13 16:44:16 +02:00
Manuel Gutierrez
24b2c4bc4b Backport kibana-xpack image to v4 2021-04-13 16:44:16 +02:00
Manuel Gutierrez
59ccbbee8e Use an ARG to select filebeat channel 2021-04-13 16:44:16 +02:00
Manuel Gutierrez
cdf31d7a08 Re-enable entrypoint scripts 2021-04-13 16:44:15 +02:00
Manuel Gutierrez
bb8cbc6d15 Bump s6-overlay version 2021-04-13 16:44:15 +02:00
Manuel Gutierrez
9656c348a2 Add link to changelog 2021-04-13 16:44:15 +02:00
Manuel Gutierrez
2b5c950c48 Bump goss test 2021-04-13 16:44:14 +02:00
Manuel Gutierrez
504d5b8cc4 Bump year 2021-04-13 16:44:14 +02:00
Manuel Gutierrez
1eb94b82ee Bump versions 2021-04-13 16:44:14 +02:00
Manuel Gutierrez
6228d3077d Add tests for Kibana customizations 2021-04-13 16:44:13 +02:00
Manuel Gutierrez
01563af39a Execute tests for kibana image 2021-04-13 16:44:13 +02:00
Manuel Gutierrez
1441e570a8 Add Goss tests for Kibana image 2021-04-13 16:44:13 +02:00
Manuel Gutierrez
20ebf9b467 Port all tests from Ansible repo 2021-04-13 16:44:12 +02:00
Manuel Gutierrez
1460c07b92 Include GOSS_SLEEP 2021-04-13 16:44:12 +02:00
Manuel Gutierrez
ae1611e07c Fix yaml syntax 2021-04-13 16:44:12 +02:00
Manuel Gutierrez
5109a35e6a Add Goss Actions 2021-04-13 16:44:11 +02:00
Manuel Gutierrez
94c0307f00 Add goss verifications 2021-04-13 16:44:11 +02:00
VictorMorenoJimenez
102d6ced90 Bump to v4.2.0 2021-04-13 16:39:14 +02:00
Manuel Gutierrez
eed5b2a454 Merge pull request #422 from wazuh/feature-tools-rename
Adopt Wazuh standard on tool names
2020-12-15 19:14:44 +01:00
Manuel Gutierrez
0da4a86f07 Update references to authd 2020-12-15 15:21:34 +01:00
Manuel Gutierrez
bb85a9aef2 Update script name 2020-12-15 13:23:34 +01:00
146 changed files with 6736 additions and 6832 deletions

6
.env Executable file
View File

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

View File

@@ -6,7 +6,7 @@ file:
group: root
filetype: file
contains: []
/var/ossec/bin/ossec-control:
/var/ossec/bin/wazuh-control:
exists: true
mode: "0750"
owner: root
@@ -16,22 +16,22 @@ file:
/var/ossec/etc/lists/audit-keys:
exists: true
mode: "0660"
owner: ossec
group: ossec
owner: wazuh
group: wazuh
filetype: file
contains: []
/var/ossec/etc/ossec.conf:
exists: true
mode: "0660"
owner: root
group: ossec
group: wazuh
filetype: file
contains: []
/var/ossec/etc/rules/local_rules.xml:
exists: true
mode: "0660"
owner: ossec
group: ossec
owner: wazuh
group: wazuh
filetype: file
contains: []
/var/ossec/etc/sslmanager.cert:
@@ -52,11 +52,11 @@ package:
filebeat:
installed: true
versions:
- 7.10.0
- 7.10.2
wazuh-manager:
installed: true
versions:
- 4.1.5
- 4.14.0
port:
tcp:1514:
listening: true
@@ -70,42 +70,20 @@ port:
listening: true
ip:
- 0.0.0.0
user:
ossec:
exists: true
groups:
- ossec
home: /var/ossec
shell: /sbin/nologin
ossecm:
exists: true
groups:
- ossec
home: /var/ossec
shell: /sbin/nologin
ossecr:
exists: true
groups:
- ossec
home: /var/ossec
shell: /sbin/nologin
group:
ossec:
exists: true
process:
filebeat:
running: true
ossec-analysisd:
wazuh-analysisd:
running: true
ossec-authd:
wazuh-authd:
running: true
ossec-execd:
wazuh-execd:
running: true
ossec-monitord:
wazuh-monitord:
running: true
ossec-remoted:
wazuh-remoted:
running: true
ossec-syscheckd:
wazuh-syscheckd:
running: true
s6-supervise:
running: true
@@ -113,3 +91,13 @@ process:
running: true
wazuh-modulesd:
running: true
user:
wazuh:
exists: true
groups:
- wazuh
home: /var/ossec
shell: /sbin/nologin
group:
wazuh:
exists: true

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

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

39
.github/multi-node-filebeat-check.sh vendored Executable file
View File

@@ -0,0 +1,39 @@
COMMAND_TO_EXECUTE="filebeat test output"
MASTER_CONTAINERS=$(docker ps --format '{{.Names}}' | grep -E 'master')
if [ -z "$MASTER_CONTAINERS" ]; then
echo "No containers were found with 'master' in their name."
else
for MASTER_CONTAINERS in $MASTER_CONTAINERS; do
FILEBEAT_OUTPUT=$(docker exec "$MASTER_CONTAINERS" $COMMAND_TO_EXECUTE)
FILEBEAT_STATUS=$(echo "${FILEBEAT_OUTPUT}" | grep -c OK)
if [[ $FILEBEAT_STATUS -eq 7 ]]; then
echo "No errors in filebeat"
echo "${FILEBEAT_OUTPUT}"
else
echo "Errors in filebeat"
echo "${FILEBEAT_OUTPUT}"
exit 1
fi
done
fi
MASTER_CONTAINERS=$(docker ps --format '{{.Names}}' | grep -E 'worker')
if [ -z "$MASTER_CONTAINERS" ]; then
echo "No containers were found with 'worker' in their name."
else
for MASTER_CONTAINERS in $MASTER_CONTAINERS; do
FILEBEAT_OUTPUT=$(docker exec "$MASTER_CONTAINERS" $COMMAND_TO_EXECUTE)
FILEBEAT_STATUS=$(echo "${FILEBEAT_OUTPUT}" | grep -c OK)
if [[ $FILEBEAT_STATUS -eq 7 ]]; then
echo "No errors in filebeat"
echo "${FILEBEAT_OUTPUT}"
else
echo "Errors in filebeat"
echo "${FILEBEAT_OUTPUT}"
exit 1
fi
done
fi

16
.github/multi-node-log-check.sh vendored Executable file
View File

@@ -0,0 +1,16 @@
log1=$(docker exec multi-node_wazuh.master_1 sh -c 'cat /var/ossec/logs/ossec.log' | grep -P "ERR|WARN|CRIT")
if [[ -z "$log1" ]]; then
echo "No errors in master ossec.log"
else
echo "Errors in master ossec.log:"
echo "${log1}"
exit 1
fi
log2=$(docker exec multi-node_wazuh.worker_1 sh -c 'cat /var/ossec/logs/ossec.log' | grep -P "ERR|WARN|CRIT")
if [[ -z "${log2}" ]]; then
echo "No errors in worker ossec.log"
else
echo "Errors in worker ossec.log:"
echo "${log2}"
exit 1
fi

20
.github/single-node-filebeat-check.sh vendored Executable file
View File

@@ -0,0 +1,20 @@
COMMAND_TO_EXECUTE="filebeat test output"
MASTER_CONTAINERS=$(docker ps --format '{{.Names}}' | grep -E 'manager')
if [ -z "$MASTER_CONTAINERS" ]; then
echo "No containers were found with 'manager' in their name."
else
for MASTER_CONTAINERS in $MASTER_CONTAINERS; do
FILEBEAT_OUTPUT=$(docker exec "$MASTER_CONTAINERS" $COMMAND_TO_EXECUTE)
FILEBEAT_STATUS=$(echo "${FILEBEAT_OUTPUT}" | grep -c OK)
if [[ $FILEBEAT_STATUS -eq 7 ]]; then
echo "No errors in filebeat"
echo "${FILEBEAT_OUTPUT}"
else
echo "Errors in filebeat"
echo "${FILEBEAT_OUTPUT}"
exit 1
fi
done
fi

8
.github/single-node-log-check.sh vendored Executable file
View File

@@ -0,0 +1,8 @@
log=$(docker exec single-node_wazuh.manager_1 sh -c 'cat /var/ossec/logs/ossec.log' | grep -P "ERR|WARN|CRIT")
if [[ -z "$log" ]]; then
echo "No errors in ossec.log"
else
echo "Errors in ossec.log:"
echo "${log}"
exit 1
fi

View File

@@ -0,0 +1,142 @@
name: Repository bumper
run-name: Bump ${{ github.ref_name }} (${{ inputs.id }})
on:
workflow_dispatch:
inputs:
version:
description: 'Target version (e.g. 1.2.3)'
default: ''
required: false
type: string
stage:
description: 'Version stage (e.g. alpha0)'
default: ''
required: false
type: string
tag:
description: 'Change branches references to tag-like references (e.g. v4.12.0-alpha7)'
default: false
required: false
type: boolean
issue-link:
description: 'Issue link in format https://github.com/wazuh/<REPO>/issues/<ISSUE-NUMBER>'
required: true
type: string
id:
description: 'Optional identifier for the run'
required: false
type: string
jobs:
bump:
name: Repository bumper
runs-on: ubuntu-22.04
permissions:
contents: write
pull-requests: write
env:
CI_COMMIT_AUTHOR: wazuhci
CI_COMMIT_EMAIL: 22834044+wazuhci@users.noreply.github.com
CI_GPG_PRIVATE_KEY: ${{ secrets.CI_WAZUHCI_GPG_PRIVATE }}
GH_TOKEN: ${{ secrets.CI_WAZUHCI_BUMPER_TOKEN }}
BUMP_SCRIPT_PATH: tools/repository_bumper.sh
BUMP_LOG_PATH: tools
steps:
- name: Dump event payload
run: |
cat $GITHUB_EVENT_PATH | jq '.inputs'
- name: Set up GPG key
id: signing_setup
run: |
echo "${{ env.CI_GPG_PRIVATE_KEY }}" | gpg --batch --import
KEY_ID=$(gpg --list-secret-keys --with-colons | awk -F: '/^sec/ {print $5; exit}')
echo "gpg_key_id=$KEY_ID" >> $GITHUB_OUTPUT
- name: Set up git
run: |
git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}"
git config --global user.email "${{ env.CI_COMMIT_EMAIL }}"
git config --global commit.gpgsign true
git config --global user.signingkey "${{ steps.signing_setup.outputs.gpg_key_id }}"
echo "use-agent" >> ~/.gnupg/gpg.conf
echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf
echo "allow-loopback-pinentry" >> ~/.gnupg/gpg-agent.conf
echo RELOADAGENT | gpg-connect-agent
export DEBIAN_FRONTEND=noninteractive
export GPG_TTY=$(tty)
- name: Checkout repository
uses: actions/checkout@v4
with:
# Using workflow-specific GITHUB_TOKEN because currently CI_WAZUHCI_BUMPER_TOKEN
# doesn't have all the necessary permissions
token: ${{ env.GH_TOKEN }}
- name: Determine branch name
id: vars
env:
VERSION: ${{ inputs.version }}
STAGE: ${{ inputs.stage }}
TAG: ${{ inputs.tag }}
run: |
script_params=""
version=${{ env.VERSION }}
stage=${{ env.STAGE }}
tag=${{ env.TAG }}
# Both version and stage provided
if [[ -n "$version" && -n "$stage" && "$tag" != "true" ]]; then
script_params="--version ${version} --stage ${stage}"
elif [[ -n "$version" && -n "$stage" && "$tag" == "true" ]]; then
script_params="--version ${version} --stage ${stage} --tag ${tag}"
fi
issue_number=$(echo "${{ inputs.issue-link }}" | awk -F'/' '{print $NF}')
BRANCH_NAME="enhancement/wqa${issue_number}-bump-${{ github.ref_name }}"
echo "branch_name=$BRANCH_NAME" >> $GITHUB_OUTPUT
echo "script_params=${script_params}" >> $GITHUB_OUTPUT
- name: Create and switch to bump branch
run: |
git checkout -b ${{ steps.vars.outputs.branch_name }}
- name: Make version bump changes
run: |
echo "Running bump script"
bash ${{ env.BUMP_SCRIPT_PATH }} ${{ steps.vars.outputs.script_params }}
- name: Commit and push changes
run: |
git add .
git commit -m "feat: bump ${{ github.ref_name }}"
git push origin ${{ steps.vars.outputs.branch_name }}
- name: Create pull request
id: create_pr
run: |
gh auth setup-git
PR_URL=$(gh pr create \
--title "Bump ${{ github.ref_name }} branch" \
--body "Issue: ${{ inputs.issue-link }}" \
--base ${{ github.ref_name }} \
--head ${{ steps.vars.outputs.branch_name }})
echo "Pull request created: ${PR_URL}"
echo "pull_request_url=${PR_URL}" >> $GITHUB_OUTPUT
- name: Merge pull request
run: |
# Any checks for the PR are bypassed since the branch is expected to be functional (i.e. the bump process does not introduce any bugs)
gh pr merge "${{ steps.create_pr.outputs.pull_request_url }}" --merge --admin
- name: Show logs
run: |
echo "Bump complete."
echo "Branch: ${{ steps.vars.outputs.branch_name }}"
echo "PR: ${{ steps.create_pr.outputs.pull_request_url }}"
echo "Bumper scripts logs:"
cat ${BUMP_LOG_PATH}/repository_bumper*log

View File

@@ -0,0 +1,159 @@
run-name: Launch Push Docker Images - ${{ inputs.id }}
name: Push Docker Images
on:
workflow_dispatch:
inputs:
image_tag:
description: 'Docker image tag'
default: '4.14.0'
required: true
docker_reference:
description: 'wazuh-docker reference'
required: true
products:
description: 'Comma-separated list of the image names to build and push'
default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer,wazuh-agent'
required: true
filebeat_module_version:
description: 'Filebeat module version'
default: '0.4'
required: true
revision:
description: 'Package revision'
default: '1'
required: true
push_images:
description: 'Push images'
type: boolean
default: true
required: true
id:
description: "ID used to identify the workflow uniquely."
type: string
required: false
dev:
description: "Add tag suffix '-dev' to the image tag ?"
type: boolean
default: true
required: false
workflow_call:
inputs:
image_tag:
description: 'Docker image tag'
default: '4.14.0'
required: true
type: string
docker_reference:
description: 'wazuh-docker reference'
required: false
type: string
products:
description: 'Comma-separated list of the image names to build and push'
default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer,wazuh-agent'
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-22.04
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

@@ -1,36 +1,368 @@
name: Wazuh Docker pipeline
on: [push]
on: [pull_request]
jobs:
build-stack:
runs-on: ubuntu-latest
build-docker-images:
runs-on: ubuntu-22.04
steps:
- name: Check out code
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Build the docker-compose stack
run: docker-compose -f build-from-sources.yml up -d --build
- name: Build Wazuh images
run: build-docker-images/build-images.sh
- name: Check running containers
run: docker ps -a
- name: Create enviroment variables
run: cat .env > $GITHUB_ENV
- name: Shutdown the stack
run: docker-compose -f build-from-sources.yml kill
- name: Create backup Docker images
run: |
mkdir -p /home/runner/work/wazuh-docker/wazuh-docker/docker-images/
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-agent:${{env.WAZUH_IMAGE_VERSION}} -o /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-agent.tar
- name: Temporarily save Wazuh manager Docker image
uses: actions/upload-artifact@v4
with:
name: docker-artifact-manager
path: /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-manager.tar
retention-days: 1
- name: Temporarily save Wazuh indexer Docker image
uses: actions/upload-artifact@v4
with:
name: docker-artifact-indexer
path: /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-indexer.tar
retention-days: 1
- name: Temporarily save Wazuh dashboard Docker image
uses: actions/upload-artifact@v4
with:
name: docker-artifact-dashboard
path: /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-dashboard.tar
retention-days: 1
- name: Temporarily save Wazuh agent Docker image
uses: actions/upload-artifact@v4
with:
name: docker-artifact-agent
path: /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-agent.tar
retention-days: 1
- name: Install Goss
uses: e1himself/goss-installation-action@v1.0.3
with:
version: v0.3.16
- name: Execute Goss tests (wazuh-odfe)
run: dgoss run wazuh/wazuh-odfe:dev-version
- name: Execute Goss tests (wazuh-manager)
run: dgoss run wazuh/wazuh-manager:${{env.WAZUH_IMAGE_VERSION}}
env:
GOSS_SLEEP: 30
GOSS_FILE: .goss.yaml
GOSS_FILE: .github/.goss.yaml
- name: Execute Goss tests (wazuh-kibana-odfe)
run: dgoss run wazuh/wazuh-kibana-odfe:dev-version
check-single-node:
runs-on: ubuntu-22.04
needs: build-docker-images
steps:
- name: Check out code
uses: actions/checkout@v4
- name: Create enviroment variables
run: cat .env > $GITHUB_ENV
- name: Retrieve saved Wazuh indexer Docker image
uses: actions/download-artifact@v4
with:
name: docker-artifact-indexer
- name: Retrieve saved Wazuh manager Docker image
uses: actions/download-artifact@v4
with:
name: docker-artifact-manager
- name: Retrieve saved Wazuh dashboard Docker image
uses: actions/download-artifact@v4
with:
name: docker-artifact-dashboard
- name: Retrieve saved Wazuh agent Docker image
uses: actions/download-artifact@v4
with:
name: docker-artifact-agent
- 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-agent.tar
- name: Create single node certficates
run: docker compose -f single-node/generate-indexer-certs.yml run --rm generator
- name: Start single node stack
run: docker compose -f single-node/docker-compose.yml up -d
- name: Check Wazuh indexer start
run: |
sleep 60
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
curl -XGET "https://0.0.0.0:9200/_cluster/health" -u admin:SecretPassword -k -s
else
curl -XGET "https://0.0.0.0:9200/_cluster/health" -u admin:SecretPassword -k -s
exit 1
fi
status_index="`curl -XGET "https://0.0.0.0:9200/_cat/indices" -u admin:SecretPassword -k -s | wc -l`"
status_index_green="`curl -XGET "https://0.0.0.0:9200/_cat/indices" -u admin:SecretPassword -k -s | grep "green" | wc -l`"
if [[ $status_index_green -eq $status_index ]]; then
curl -XGET "https://0.0.0.0:9200/_cat/indices" -u admin:SecretPassword -k -s
else
curl -XGET "https://0.0.0.0:9200/_cat/indices" -u admin:SecretPassword -k -s
exit 1
fi
- name: Check Wazuh indexer nodes
run: |
nodes="`curl -XGET "https://0.0.0.0:9200/_cat/nodes" -u admin:SecretPassword -k -s | grep -E "indexer" | wc -l`"
if [[ $nodes -eq 1 ]]; then
echo "Wazuh indexer nodes: ${nodes}"
else
echo "Wazuh indexer nodes: ${nodes}"
exit 1
fi
- name: Check documents into wazuh-alerts index
run: |
sleep 120
docs="`curl -XGET "https://0.0.0.0:9200/wazuh-alerts*/_count" -u admin:SecretPassword -k -s | jq -r ".count"`"
if [[ $docs -gt 0 ]]; then
echo "wazuh-alerts index documents: ${docs}"
else
echo "wazuh-alerts index documents: ${docs}"
exit 1
fi
- name: Check Wazuh templates
run: |
qty_templates="`curl -XGET "https://0.0.0.0:9200/_cat/templates" -u admin:SecretPassword -k -s | grep -P "wazuh|wazuh-agent|wazuh-statistics" | wc -l`"
templates="`curl -XGET "https://0.0.0.0:9200/_cat/templates" -u admin:SecretPassword -k -s | grep -P "wazuh|wazuh-agent|wazuh-statistics"`"
if [[ $qty_templates -gt 3 ]]; then
echo "wazuh templates:"
echo "${templates}"
else
echo "wazuh templates:"
echo "${templates}"
exit 1
fi
- name: Check Wazuh manager start
run: |
services="`curl -k -s -X GET "https://0.0.0.0:55000/manager/status?pretty=true" -H "Authorization: Bearer ${{env.TOKEN}}" | jq -r .data.affected_items | grep running | wc -l`"
if [[ $services -gt 9 ]]; then
echo "Wazuh Manager Services: ${services}"
echo "OK"
else
echo "Wazuh indexer nodes: ${nodes}"
curl -k -X GET "https://0.0.0.0:55000/manager/status?pretty=true" -H "Authorization: Bearer ${{env.TOKEN}}" | jq -r .data.affected_items
exit 1
fi
env:
GOSS_FILE: .goss.kibana.yaml
TOKEN: $(curl -s -u wazuh-wui:MyS3cr37P450r.*- -k -X GET "https://0.0.0.0:55000/security/user/authenticate?raw=true")
- name: Check filebeat output
run: ./.github/single-node-filebeat-check.sh
- name: Check Wazuh dashboard service URL
run: |
status=$(curl -XGET --silent https://0.0.0.0:443/app/status -k -u admin:SecretPassword -I -s | grep -E "^HTTP" | awk '{print $2}')
if [[ $status -eq 200 ]]; then
echo "Wazuh dashboard status: ${status}"
else
echo "Wazuh dashboard status: ${status}"
exit 1
fi
- name: Modify Docker endpoint into Wazuh agent docker-compose.yml file
run: sed -i "s/<WAZUH_MANAGER_IP>/$(ip addr show docker0 | grep 'inet ' | awk '{print $2}' | cut -d'/' -f1)/g" wazuh-agent/docker-compose.yml
- name: Start Wazuh agent
run: docker compose -f wazuh-agent/docker-compose.yml up -d
- name: Check Wazuh agent enrollment
run: |
sleep 20
curl -k -s -X GET "https://localhost:55000/agents?pretty=true" -H "Authorization: Bearer ${{env.TOKEN}}"
env:
TOKEN: $(curl -s -u wazuh-wui:MyS3cr37P450r.*- -k -X GET "https://0.0.0.0:55000/security/user/authenticate?raw=true")
- name: Check errors in ossec.log for Wazuh manager
run: ./.github/single-node-log-check.sh
check-multi-node:
runs-on: ubuntu-22.04
needs: build-docker-images
steps:
- name: Check out code
uses: actions/checkout@v4
- name: Create enviroment variables
run: cat .env > $GITHUB_ENV
- name: free disk space
uses: ./.github/free-disk-space
- name: Retrieve saved Wazuh dashboard Docker image
uses: actions/download-artifact@v4
with:
name: docker-artifact-dashboard
- name: Retrieve saved Wazuh manager Docker image
uses: actions/download-artifact@v4
with:
name: docker-artifact-manager
- name: Retrieve saved Wazuh indexer Docker image
uses: actions/download-artifact@v4
with:
name: docker-artifact-indexer
- name: Retrieve saved Wazuh agent Docker image
uses: actions/download-artifact@v4
with:
name: docker-artifact-agent
- name: Docker load
run: |
docker load --input ./wazuh-manager.tar
docker load --input ./wazuh-indexer.tar
docker load --input ./wazuh-dashboard.tar
docker load --input ./wazuh-agent.tar
rm -rf wazuh-manager.tar wazuh-indexer.tar wazuh-dashboard.tar wazuh-agent.tar
- name: Create multi node certficates
run: docker compose -f multi-node/generate-indexer-certs.yml run --rm generator
- name: Start multi node stack
run: docker compose -f multi-node/docker-compose.yml up -d
- name: Check Wazuh indexer start
run: |
until [[ `curl -XGET "https://0.0.0.0:9200/_cluster/health" -u admin:SecretPassword -k -s | grep green | wc -l` -eq 1 ]]
do
echo 'Waiting for Wazuh indexer start'
free -m
df -h
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
curl -XGET "https://0.0.0.0:9200/_cluster/health" -u admin:SecretPassword -k -s
else
curl -XGET "https://0.0.0.0:9200/_cluster/health" -u admin:SecretPassword -k -s
exit 1
fi
status_index="`curl -XGET "https://0.0.0.0:9200/_cat/indices" -u admin:SecretPassword -k -s | wc -l`"
status_index_green="`curl -XGET "https://0.0.0.0:9200/_cat/indices" -u admin:SecretPassword -k -s | grep -E "green" | wc -l`"
if [[ $status_index_green -eq $status_index ]]; then
curl -XGET "https://0.0.0.0:9200/_cat/indices" -u admin:SecretPassword -k -s
else
curl -XGET "https://0.0.0.0:9200/_cat/indices" -u admin:SecretPassword -k -s
exit 1
fi
- name: Check Wazuh indexer nodes
run: |
nodes="`curl -XGET "https://0.0.0.0:9200/_cat/nodes" -u admin:SecretPassword -k -s | grep -E "indexer" | wc -l`"
if [[ $nodes -eq 3 ]]; then
echo "Wazuh indexer nodes: ${nodes}"
else
echo "Wazuh indexer nodes: ${nodes}"
exit 1
fi
- name: Check documents into wazuh-alerts index
run: |
until [[ $(``curl -XGET "https://0.0.0.0:9200/wazuh-alerts*/_count" -u admin:SecretPassword -k -s | jq -r ".count"``) -gt 0 ]]
do
echo 'Waiting for Wazuh indexer events'
free -m
df -h
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 0 ]]; then
echo "wazuh-alerts index documents: ${docs}"
else
echo "wazuh-alerts index documents: ${docs}"
exit 1
fi
- name: Check Wazuh templates
run: |
qty_templates="`curl -XGET "https://0.0.0.0:9200/_cat/templates" -u admin:SecretPassword -k -s | grep "wazuh" | wc -l`"
templates="`curl -XGET "https://0.0.0.0:9200/_cat/templates" -u admin:SecretPassword -k -s | grep "wazuh"`"
if [[ $qty_templates -gt 3 ]]; then
echo "wazuh templates:"
echo "${templates}"
else
echo "wazuh templates:"
echo "${templates}"
exit 1
fi
- name: Check Wazuh manager start
run: |
services="`curl -k -s -X GET "https://0.0.0.0:55000/manager/status?pretty=true" -H "Authorization: Bearer ${{env.TOKEN}}" | jq -r .data.affected_items | grep running | wc -l`"
if [[ $services -gt 10 ]]; then
echo "Wazuh Manager Services: ${services}"
echo "OK"
else
echo "Wazuh indexer nodes: ${nodes}"
curl -k -s -X GET "https://0.0.0.0:55000/manager/status?pretty=true" -H "Authorization: Bearer ${{env.TOKEN}}" | jq -r .data.affected_items
exit 1
fi
nodes=$(curl -k -s -X GET "https://0.0.0.0:55000/cluster/nodes" -H "Authorization: Bearer ${{env.TOKEN}}" | jq -r ".data.affected_items[].name" | wc -l)
if [[ $nodes -eq 2 ]]; then
echo "Wazuh manager nodes: ${nodes}"
else
echo "Wazuh manager nodes: ${nodes}"
exit 1
fi
env:
TOKEN: $(curl -s -u wazuh-wui:MyS3cr37P450r.*- -k -X GET "https://0.0.0.0:55000/security/user/authenticate?raw=true")
- name: Check filebeat output
run: ./.github/multi-node-filebeat-check.sh
- name: Check Wazuh dashboard service URL
run: |
status=$(curl -XGET --silent https://0.0.0.0:443/app/status -k -u admin:SecretPassword -I | grep -E "^HTTP" | awk '{print $2}')
if [[ $status -eq 200 ]]; then
echo "Wazuh dashboard status: ${status}"
else
echo "Wazuh dashboard status: ${status}"
exit 1
fi
- name: Modify Docker endpoint into Wazuh agent docker-compose.yml file
run: sed -i "s/<WAZUH_MANAGER_IP>/$(ip addr show docker0 | grep 'inet ' | awk '{print $2}' | cut -d'/' -f1)/g" wazuh-agent/docker-compose.yml
- name: Start Wazuh agent
run: docker compose -f wazuh-agent/docker-compose.yml up -d
- name: Check Wazuh agent enrollment
run: |
sleep 20
curl -k -s -X GET "https://localhost:55000/agents?pretty=true" -H "Authorization: Bearer ${{env.TOKEN}}"
env:
TOKEN: $(curl -s -u wazuh-wui:MyS3cr37P450r.*- -k -X GET "https://0.0.0.0:55000/security/user/authenticate?raw=true")
- name: Check errors in ossec.log for Wazuh manager
run: ./.github/multi-node-log-check.sh

76
.github/workflows/trivy-dashboard.yml vendored Normal file
View File

@@ -0,0 +1,76 @@
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.
name: Trivy scan Wazuh dashboard
on:
release:
types:
- published
pull_request:
branches:
- main
schedule:
- cron: '34 2 * * 1'
workflow_dispatch:
permissions:
contents: read
jobs:
build:
permissions:
contents: read # for actions/checkout to fetch code
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
name: Build images and upload Trivy results
runs-on: "ubuntu-22.04"
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Installing dependencies
run: |
sudo apt-get update
sudo apt-get install -y jq
- name: Checkout latest tag
run: |
latest=$(curl -s "https://api.github.com/repos/wazuh/wazuh-docker/releases/latest" | jq -r '.tag_name')
git fetch origin
git checkout $latest
- name: Build Wazuh images
run: build-docker-images/build-images.sh
- name: Create enviroment variables
run: |
cat .env > $GITHUB_ENV
echo "GITHUB_REF_NAME="${GITHUB_REF_NAME%/*} >> $GITHUB_ENV
- name: Run Trivy vulnerability scanner for Wazuh dashboard
uses: aquasecurity/trivy-action@2a2157eb22c08c9a1fac99263430307b8d1bc7a2
with:
image-ref: 'wazuh/wazuh-dashboard:${{env.WAZUH_IMAGE_VERSION}}'
format: 'template'
template: '@/contrib/sarif.tpl'
output: 'trivy-results-dashboard.sarif'
severity: 'LOW,MEDIUM,CRITICAL,HIGH'
- name: Upload Trivy scan results to GitHub Security tab
uses: github/codeql-action/upload-sarif@v2
with:
sarif_file: 'trivy-results-dashboard.sarif'
- name: Slack notification
uses: rtCamp/action-slack-notify@v2
env:
SLACK_CHANNEL: cicd-monitoring
SLACK_COLOR: ${{ job.status }} # or a specific color like 'good' or '#ff00ff'
#SLACK_ICON: https://github.com/rtCamp.png?size=48
SLACK_MESSAGE: "Check the results: https://github.com/wazuh/wazuh-docker/security/code-scanning?query=is%3Aopen+branch%3A${{ env.GITHUB_REF_NAME }}"
SLACK_TITLE: Wazuh docker Trivy vulnerability scan finished.
SLACK_USERNAME: github_actions
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}

76
.github/workflows/trivy-indexer.yml vendored Normal file
View File

@@ -0,0 +1,76 @@
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.
name: Trivy scan Wazuh indexer
on:
release:
types:
- published
pull_request:
branches:
- main
schedule:
- cron: '34 2 * * 1'
workflow_dispatch:
permissions:
contents: read
jobs:
build:
permissions:
contents: read # for actions/checkout to fetch code
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
name: Build images and upload Trivy results
runs-on: "ubuntu-22.04"
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Installing dependencies
run: |
sudo apt-get update
sudo apt-get install -y jq
- name: Checkout latest tag
run: |
latest=$(curl -s "https://api.github.com/repos/wazuh/wazuh-docker/releases/latest" | jq -r '.tag_name')
git fetch origin
git checkout $latest
- name: Build Wazuh images
run: build-docker-images/build-images.sh
- name: Create enviroment variables
run: |
cat .env > $GITHUB_ENV
echo "GITHUB_REF_NAME="${GITHUB_REF_NAME%/*} >> $GITHUB_ENV
- name: Run Trivy vulnerability scanner for Wazuh indexer
uses: aquasecurity/trivy-action@2a2157eb22c08c9a1fac99263430307b8d1bc7a2
with:
image-ref: 'wazuh/wazuh-indexer:${{env.WAZUH_IMAGE_VERSION}}'
format: 'template'
template: '@/contrib/sarif.tpl'
output: 'trivy-results-indexer.sarif'
severity: 'LOW,MEDIUM,CRITICAL,HIGH'
- name: Upload Trivy scan results to GitHub Security tab
uses: github/codeql-action/upload-sarif@v2
with:
sarif_file: 'trivy-results-indexer.sarif'
- name: Slack notification
uses: rtCamp/action-slack-notify@v2
env:
SLACK_CHANNEL: cicd-monitoring
SLACK_COLOR: ${{ job.status }} # or a specific color like 'good' or '#ff00ff'
#SLACK_ICON: https://github.com/rtCamp.png?size=48
SLACK_MESSAGE: "Check the results: https://github.com/wazuh/wazuh-docker/security/code-scanning?query=is%3Aopen+branch%3A${{ env.GITHUB_REF_NAME }}"
SLACK_TITLE: Wazuh docker Trivy vulnerability scan finished.
SLACK_USERNAME: github_actions
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}

76
.github/workflows/trivy-manager.yml vendored Normal file
View File

@@ -0,0 +1,76 @@
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.
name: Trivy scan Wazuh manager
on:
release:
types:
- published
pull_request:
branches:
- main
schedule:
- cron: '34 2 * * 1'
workflow_dispatch:
permissions:
contents: read
jobs:
build:
permissions:
contents: read # for actions/checkout to fetch code
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
name: Build images and upload Trivy results
runs-on: "ubuntu-22.04"
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Installing dependencies
run: |
sudo apt-get update
sudo apt-get install -y jq
- name: Checkout latest tag
run: |
latest=$(curl -s "https://api.github.com/repos/wazuh/wazuh-docker/releases/latest" | jq -r '.tag_name')
git fetch origin
git checkout $latest
- name: Build Wazuh images
run: build-docker-images/build-images.sh
- name: Create enviroment variables
run: |
cat .env > $GITHUB_ENV
echo "GITHUB_REF_NAME="${GITHUB_REF_NAME%/*} >> $GITHUB_ENV
- name: Run Trivy vulnerability scanner for Wazuh manager
uses: aquasecurity/trivy-action@2a2157eb22c08c9a1fac99263430307b8d1bc7a2
with:
image-ref: 'wazuh/wazuh-manager:${{env.WAZUH_IMAGE_VERSION}}'
format: 'template'
template: '@/contrib/sarif.tpl'
output: 'trivy-results-manager.sarif'
severity: 'LOW,MEDIUM,CRITICAL,HIGH'
- name: Upload Trivy scan results to GitHub Security tab
uses: github/codeql-action/upload-sarif@v2
with:
sarif_file: 'trivy-results-manager.sarif'
- name: Slack notification
uses: rtCamp/action-slack-notify@v2
env:
SLACK_CHANNEL: cicd-monitoring
SLACK_COLOR: ${{ job.status }} # or a specific color like 'good' or '#ff00ff'
#SLACK_ICON: https://github.com/rtCamp.png?size=48
SLACK_MESSAGE: "Check the results: https://github.com/wazuh/wazuh-docker/security/code-scanning?query=is%3Aopen+branch%3A${{ env.GITHUB_REF_NAME }}"
SLACK_TITLE: Wazuh docker Trivy vulnerability scan finished.
SLACK_USERNAME: github_actions
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}

5
.gitignore vendored Normal file
View File

@@ -0,0 +1,5 @@
single-node/config/wazuh_indexer_ssl_certs/*.pem
single-node/config/wazuh_indexer_ssl_certs/*.key
multi-node/config/wazuh_indexer_ssl_certs/*.pem
multi-node/config/wazuh_indexer_ssl_certs/*.key
*.log

View File

@@ -1,53 +0,0 @@
file:
/usr/share/kibana/config/kibana.yml:
exists: true
mode: "0664"
owner: kibana
group: root
filetype: file
contains: []
/usr/share/kibana/src/core/server/core_app/assets/legacy_light_theme.css:
exists: true
mode: "0664"
owner: kibana
group: root
filetype: file
contains: []
/usr/share/kibana/src/core/server/core_app/assets/wazuh_logo_circle.svg:
exists: true
mode: "0644"
owner: kibana
group: root
filetype: file
contains: []
/usr/share/kibana/src/core/server/core_app/assets/wazuh_wazuh_bg.svg:
exists: true
mode: "0644"
owner: kibana
group: root
filetype: file
contains: []
/usr/share/kibana/data/wazuh/config/wazuh.yml:
exists: true
mode: "0644"
owner: kibana
group: kibana
filetype: file
contains: []
/usr/share/kibana/src/legacy/ui/ui_render/bootstrap/template.js.hbs:
exists: true
mode: "0664"
owner: kibana
group: root
filetype: file
contains: []
user:
kibana:
exists: true
groups:
- kibana
home: /usr/share/kibana
shell: /bin/bash
group:
kibana:
exists: true

View File

@@ -1,10 +1,433 @@
# Change Log
All notable changes to this project will be documented in this file.
## [4.14.0]
### Added
- None
### Changed
- Change filebeat install method ([#2020](https://github.com/wazuh/wazuh-docker/pull/2020))
- Remove dashboard chat setting ([#2021](https://github.com/wazuh/wazuh-docker/pull/2021))
- Rollback data source setting ([#1999](https://github.com/wazuh/wazuh-docker/pull/1999))
- Dashboard settings added ([#1998](https://github.com/wazuh/wazuh-docker/pull/1998))
- Add filebeat config file in the PERMANENT_DATA_EXCP list ([#1898](https://github.com/wazuh/wazuh-docker/pull/1898))
- Change validation of existing certs tool in S3 buckets ([#1880](https://github.com/wazuh/wazuh-docker/pull/1880))
### Fixed
- Change Wazuh indexer directory owner ([#2029](https://github.com/wazuh/wazuh-docker/pull/2029))
- Double the amount of space consumed in Wazuh Indexer ([#1953](https://github.com/wazuh/wazuh-docker/pull/1953))
- Fix config directory for opensearch_security plugin work ([#1951](https://github.com/wazuh/wazuh-docker/pull/1951))
- Update Dockerfile to copy opensearch-security files ([#1928](https://github.com/wazuh/wazuh-docker/pull/1928))
### Deleted
- None
## [4.13.1]
### Added
- None
### Changed
- None
### Fixed
- None
### Deleted
- None
## [4.13.0]
### Added
- Add opensearch_dashboard.yml parameters. ([#1985](https://github.com/wazuh/wazuh-docker/pull/1985))
- Set right ownership for malicious-ioc files on container start ([#1926](https://github.com/wazuh/wazuh-docker/pull/1926))
- Delete services statement in wazuh agent deployment. ([#1925](https://github.com/wazuh/wazuh-docker/pull/1925))
- Add permanent_data exceptions. ([#1890](https://github.com/wazuh/wazuh-docker/pull/1890))
- Integrate bumper script via GitHub action. ([#1863](https://github.com/wazuh/wazuh-docker/pull/1863))
- Add missing malicious-ioc ruleset lists ([#1870](https://github.com/wazuh/wazuh-docker/pull/1870))
- Added repository_bumper script. ([#1781](https://github.com/wazuh/wazuh-docker/pull/1781))
- Fix Warning message when migrating Docker compose v2 ([#1828](https://github.com/wazuh/wazuh-docker/pull/1828))
- Add technical documentation ([#1822](https://github.com/wazuh/wazuh-docker/pull/1822))
- Add wazuh agent test and push ([#1817](https://github.com/wazuh/wazuh-docker/pull/1817))
- Add Wazuh agent image build and deploy ([#1816](https://github.com/wazuh/wazuh-docker/pull/1816))
### Changed
- Syscollector configuration change ([#1994](https://github.com/wazuh/wazuh-docker/pull/1994))
- Modify wazuh-keystore use ([#1750](https://github.com/wazuh/wazuh-docker/pull/1750)) \- (wazuh-keystore)
### Fixed
- Add wazuh-template.json into permanent data exception ([#1968](https://github.com/wazuh/wazuh-docker/pull/1968))
### Deleted
- Remove default docker reference version from workflow ([#1761](https://github.com/wazuh/wazuh-docker/pull/1761))
- Remove 'stable' branch ocurrencies ([#1757](https://github.com/wazuh/wazuh-docker/pull/1757))
## [4.12.0]
### Added
- None
### Changed
- Change VERSION file format ([#1728](https://github.com/wazuh/wazuh-docker/pull/1728)) \- (VERSION file)
- Change Ubuntu version used in workflows ([#1662](https://github.com/wazuh/wazuh-docker/pull/1662)) \- (Docker workflows)
### Fixed
- Fix permanent data scripts ([#1603](https://github.com/wazuh/wazuh-docker/pull/1603))
### Deleted
- None
## [4.11.2]
### Added
- None
### Changed
- None
### Fixed
- None
### Deleted
- None
## [4.11.1]
### Added
- None
### Changed
- None
### Fixed
- None
### Deleted
- None
## [4.11.0]
### Added
- None
### Changed
- None
### Fixed
- Change the cleaning disk step ([#1663](https://github.com/wazuh/wazuh-docker/pull/1663))
### Deleted
- None
## [4.10.1]
### Added
- None
### Changed
- None
### Fixed
- None
### Deleted
- None
## [4.10.0]
### Added
- Improve the push docker images workflow ([#1551](https://github.com/wazuh/wazuh-docker/pull/1551))
- Update the Procedure push docker images workflow file ([#1524](https://github.com/wazuh/wazuh-docker/pull/1524))
- Add the push_docker_images procedure workflow file ([#1518](https://github.com/wazuh/wazuh-docker/pull/1518))
### Changed
- None
### Fixed
- Add unset capabilities. ([#1619](https://github.com/wazuh/wazuh-docker/pull/1619))
- Removed references to module enabling because they are now enabled by default. ([#1416](https://github.com/wazuh/wazuh-docker/pull/1416))
### Deleted
- None
## [4.9.2]
### Added
- Update Wazuh to version [4.9.2](https://github.com/wazuh/wazuh/blob/v4.9.2/CHANGELOG.md#v492)
## [4.9.1]
### Added
- None
### Changed
- None
### Fixed
- Fix typos into Wazuh manager entrypoint ([#1569](https://github.com/wazuh/wazuh-docker/pull/1569))
### Deleted
- None
## Wazuh Docker v4.9.0
### Added
- Update Wazuh to version [4.9.0](https://github.com/wazuh/wazuh/blob/v4.9.0/CHANGELOG.md#v490)
## Wazuh Docker v4.8.2
### Added
- Update Wazuh to version [4.8.2](https://github.com/wazuh/wazuh/blob/v4.8.2/CHANGELOG.md#v482)
## Wazuh Docker v4.8.1
### Added
- Update Wazuh to version [4.8.1](https://github.com/wazuh/wazuh/blob/v4.8.1/CHANGELOG.md#v481)
## Wazuh Docker v4.8.0
### Added
- Update Wazuh to version [4.8.0](https://github.com/wazuh/wazuh/blob/v4.8.0/CHANGELOG.md#v480)
## Wazuh Docker v4.7.5
### Added
- Update Wazuh to version [4.7.5](https://github.com/wazuh/wazuh/blob/v4.7.5/CHANGELOG.md#v475)
## Wazuh Docker v4.7.4
### Added
- Update Wazuh to version [4.7.4](https://github.com/wazuh/wazuh/blob/v4.7.4/CHANGELOG.md#v474)
## Wazuh Docker v4.7.3
### Added
- Update Wazuh to version [4.7.3](https://github.com/wazuh/wazuh/blob/v4.7.3/CHANGELOG.md#v473)
## Wazuh Docker v4.7.2
### Added
- Update Wazuh to version [4.7.2](https://github.com/wazuh/wazuh/blob/v4.7.2/CHANGELOG.md#v472)
## Wazuh Docker v4.7.1
### Added
- Update Wazuh to version [4.7.1](https://github.com/wazuh/wazuh/blob/v4.7.1/CHANGELOG.md#v471)
## Wazuh Docker v4.7.0
### Added
- Update Wazuh to version [4.7.0](https://github.com/wazuh/wazuh/blob/v4.7.0/CHANGELOG.md#v470)
## Wazuh Docker v4.6.0
### Added
- Update Wazuh to version [4.6.0](https://github.com/wazuh/wazuh/blob/v4.6.0/CHANGELOG.md#v460)
## Wazuh Docker v4.5.4
### Added
- Update Wazuh to version [4.5.4](https://github.com/wazuh/wazuh/blob/v4.5.4/CHANGELOG.md#v454)
## Wazuh Docker v4.5.3
### Added
- Update Wazuh to version [4.5.3](https://github.com/wazuh/wazuh/blob/v4.5.3/CHANGELOG.md#v453)
## Wazuh Docker v4.5.2
### Added
- Update Wazuh to version [4.5.2](https://github.com/wazuh/wazuh/blob/v4.5.2/CHANGELOG.md#v452)
## Wazuh Docker v4.5.1
### Added
- Update Wazuh to version [4.5.1](https://github.com/wazuh/wazuh/blob/v4.5.1/CHANGELOG.md#v451)
## Wazuh Docker v4.5.0
### Added
- Update Wazuh to version [4.5.0](https://github.com/wazuh/wazuh/blob/v4.5.0/CHANGELOG.md#v450)
## Wazuh Docker v4.4.5
### Added
- Update Wazuh to version [4.4.5](https://github.com/wazuh/wazuh/blob/v4.4.5/CHANGELOG.md#v445)
## Wazuh Docker v4.4.4
### Added
- Update Wazuh to version [4.4.4](https://github.com/wazuh/wazuh/blob/v4.4.4/CHANGELOG.md#v444)
## Wazuh Docker v4.4.3
### Added
- Update Wazuh to version [4.4.3](https://github.com/wazuh/wazuh/blob/v4.4.3/CHANGELOG.md#v443)
## Wazuh Docker v4.4.2
### Added
- Update Wazuh to version [4.4.2](https://github.com/wazuh/wazuh/blob/v4.4.2/CHANGELOG.md#v442)
## Wazuh Docker v4.4.1
### Added
- Update Wazuh to version [4.4.1](https://github.com/wazuh/wazuh/blob/v4.4.1/CHANGELOG.md#v441)
## Wazuh Docker v4.4.0
### Added
- Update Wazuh to version [4.4.0](https://github.com/wazuh/wazuh/blob/v4.4.0/CHANGELOG.md#v440)
## Wazuh Docker v4.3.11
### Added
- Update Wazuh to version [4.3.11](https://github.com/wazuh/wazuh/blob/v4.3.11/CHANGELOG.md#v4311)
## Wazuh Docker v4.3.10
### Added
- Update Wazuh to version [4.3.10](https://github.com/wazuh/wazuh/blob/v4.3.10/CHANGELOG.md#v4310)
## Wazuh Docker v4.3.9
### Added
- Update Wazuh to version [4.3.9](https://github.com/wazuh/wazuh/blob/v4.3.9/CHANGELOG.md#v439)
## Wazuh Docker v4.3.8
### Added
- Update Wazuh to version [4.3.8](https://github.com/wazuh/wazuh/blob/v4.3.8/CHANGELOG.md#v438)
## Wazuh Docker v4.3.7
### Added
- Update Wazuh to version [4.3.7](https://github.com/wazuh/wazuh/blob/v4.3.7/CHANGELOG.md#v437)
## Wazuh Docker v4.3.6
### Added
- Update Wazuh to version [4.3.6](https://github.com/wazuh/wazuh/blob/v4.3.6/CHANGELOG.md#v436)
## Wazuh Docker v4.3.5
### Added
- Update Wazuh to version [4.3.5](https://github.com/wazuh/wazuh/blob/v4.3.5/CHANGELOG.md#v435)
## Wazuh Docker v4.3.4
### Added
- Update Wazuh to version [4.3.4](https://github.com/wazuh/wazuh/blob/v4.3.4/CHANGELOG.md#v434)
## Wazuh Docker v4.3.3
### Added
- Update Wazuh to version [4.3.3](https://github.com/wazuh/wazuh/blob/v4.3.3/CHANGELOG.md#v433)
## Wazuh Docker v4.3.2
### Added
- Update Wazuh to version [4.3.2](https://github.com/wazuh/wazuh/blob/v4.3.2/CHANGELOG.md#v432)
## Wazuh Docker v4.3.1
### Added
- Update Wazuh to version [4.3.1](https://github.com/wazuh/wazuh/blob/v4.3.1/CHANGELOG.md#v431)
## Wazuh Docker v4.3.0
### Added
- Update Wazuh to version [4.3.0](https://github.com/wazuh/wazuh/blob/v4.3.0/CHANGELOG.md#v430)
## Wazuh Docker v4.2.7
### Added
- Update Wazuh to version [4.2.7](https://github.com/wazuh/wazuh/blob/v4.2.7/CHANGELOG.md#v427)
## Wazuh Docker v4.2.6
### Added
- Update Wazuh to version [4.2.6](https://github.com/wazuh/wazuh/blob/v4.2.6/CHANGELOG.md#v426)
## Wazuh Docker v4.2.5
### Added
- Update Wazuh to version [4.2.5](https://github.com/wazuh/wazuh/blob/v4.2.5/CHANGELOG.md#v425)
## Wazuh Docker v4.2.4
### Added
- Update Wazuh to version [4.2.4](https://github.com/wazuh/wazuh/blob/v4.2.4/CHANGELOG.md#v424)
## Wazuh Docker v4.2.3
### Added
- Update Wazuh to version [4.2.3](https://github.com/wazuh/wazuh/blob/v4.2.3/CHANGELOG.md#v423)
## Wazuh Docker v4.2.2
### Added
- Update Wazuh to version [4.2.2](https://github.com/wazuh/wazuh/blob/v4.2.2/CHANGELOG.md#v422)
## Wazuh Docker v4.2.1
### Added
- Update Wazuh to version [4.2.1](https://github.com/wazuh/wazuh/blob/v4.2.1/CHANGELOG.md#v421)
## Wazuh Docker v4.2.0
### Added
- Update Wazuh to version [4.2.0](https://github.com/wazuh/wazuh/blob/v4.2.0/CHANGELOG.md#v420)
## Wazuh Docker v4.1.5
### Added
- Update Wazuh to version [4.1.5](https://github.com/wazuh/wazuh/blob/v4.1.5/CHANGELOG.md#v415)
- Update ODFE compatibility to version 1.13.2
## Wazuh Docker v4.1.4
### Added

View File

@@ -1,5 +1,5 @@
Portions Copyright (C) 2021 Wazuh, Inc.
Portions Copyright (C) 2017, Wazuh Inc.
Based on work Copyright (C) 2003 - 2013 Trend Micro, Inc.
This program is a free software; you can redistribute it and/or modify

193
README.md
View File

@@ -2,191 +2,56 @@
[![Slack](https://img.shields.io/badge/slack-join-blue.svg)](https://wazuh.com/community/join-us-on-slack/)
[![Email](https://img.shields.io/badge/email-join-blue.svg)](https://groups.google.com/forum/#!forum/wazuh)
[![Documentation](https://img.shields.io/badge/docs-view-green.svg)](https://documentation.wazuh.com)
[![Documentation](https://img.shields.io/badge/web-view-green.svg)](https://wazuh.com)
In this repository you will find the containers to run:
## Description
* wazuh-opendistro: It runs the Wazuh manager, Wazuh API and Filebeat OSS (for integration with ODFE)
* wazuh-kibana-opendistro: Provides a web user interface to browse through alerts data. It includes Wazuh plugin for Kibana, that allows you to visualize agents configuration and status.
* opendistro-for-elasticsearch: An Elasticsearch (ODFE) container (working as a single-node cluster) using ODFE Docker images. **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 `wazuh/wazuh-docker` repository provides resources to deploy the Wazuh cybersecurity platform using Docker containers. This setup enables easy installation and orchestration of the full Wazuh stack, including the Wazuh server, dashboard (based on OpenSearch Dashboards), and OpenSearch for indexing and search.
In addition, a docker-compose file is provided to launch the containers mentioned above.
## Capabilities
* Elasticsearch cluster. In the Elasticsearch Dockerfile we can visualize variables to configure an Elasticsearch Cluster. These variables are used in the file *config_cluster.sh* to set them in the *elasticsearch.yml* configuration file. You can see the meaning of the node variables [here](https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-node.html) and other cluster settings [here](https://github.com/elastic/elasticsearch/blob/master/distribution/src/config/elasticsearch.yml).
- Full deployment of the Wazuh stack using Docker.
- `docker compose` support for orchestration.
- Scalable architecture with multi-node support.
- Data persistence through configurable volumes.
- Ready-to-use configurations for production or testing environments.
## Branch Convention
- `main`: Developing and testing of new features.
- `X.Y.Z`: Version-specific branches (e.g., `4.14.0`, `4.13.0`, etc.).
## 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)
Official documentation is available at:
[https://documentation.wazuh.com/current/deployment-options/docker/index.html](https://documentation.wazuh.com/current/deployment-options/docker/index.html)
### Setup SSL certificate and Basic Authentication
You can also explore internal documentation in the [`docs`](https://github.com/wazuh/wazuh-docker/tree/main/docs) folder of this repository.
Before starting the environment it is required to provide an SSL certificate (or just generate one self-signed) and setup the basic auth.
## Get Involved
Documentation on how to provide these two can be found at [nginx_conf/README.md](nginx_conf/README.md).
- **Fork the repository** and create your own branches to add features or fix bugs.
- **Open issues** to report bugs or request features.
- **Submit pull requests** following the contributing guidelines.
- Participate in [discussions](https://github.com/wazuh/wazuh-docker/discussions) if available.
## Environment Variables
Default values are included when available.
### Wazuh
```
API_USERNAME="wazuh" # Wazuh API username
API_PASSWORD="wazuh" # Wazuh API password - Must comply with requirements
# (8+ length, uppercase, lowercase, specials chars)
ELASTICSEARCH_URL=https://elasticsearch:9200 # Elasticsearch URL
ELASTIC_USERNAME=admin # Elasticsearch Username
ELASTIC_PASSWORD=admin # Elasticsearch Password
FILEBEAT_SSL_VERIFICATION_MODE=full # Filebeat SSL Verification mode (full or none)
SSL_CERTIFICATE_AUTHORITIES="" # Path of Filebeat SSL CA
SSL_CERTIFICATE="" # Path of Filebeat SSL Certificate
SSL_KEY="" # Path of Filebeat SSL Key
```
### Kibana
```
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_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
IP_SELECTOR=true # Defines if the user is allowed to change the selected index pattern directly from the Wazuh app top menu
IP_IGNORE="[]" # List of index patterns to be ignored
WAZUH_MONITORING_ENABLED=true # Custom settings to enable/disable wazuh-monitoring indices
WAZUH_MONITORING_FREQUENCY=900 # Custom setting to set the frequency for wazuh-monitoring indices cron task
WAZUH_MONITORING_SHARDS=2 # Configure wazuh-monitoring-* indices shards and replicas
WAZUH_MONITORING_REPLICAS=0 #
ADMIN_PRIVILEGES=true # App privileges
```
## Directory structure
├── CHANGELOG.md
├── docker-compose.yml
├── generate-opendistro-certs.yml
├── kibana-odfe
│   ├── config
│   │   ├── custom_welcome
│   │   │   ├── light_theme.style.css
│   │   │   ├── template.js.hbs
│   │   │   ├── wazuh_logo_circle.svg
│   │   │   └── wazuh_wazuh_bg.svg
│   │   ├── entrypoint.sh
│   │   ├── kibana_settings.sh
│   │   ├── wazuh_app_config.sh
│   │   ├── wazuh.yml
│   │   └── welcome_wazuh.sh
│   └── Dockerfile
├── LICENSE
├── production_cluster
│   ├── elastic_opendistro
│   │   ├── elasticsearch-node1.yml
│   │   ├── elasticsearch-node2.yml
│   │   ├── elasticsearch-node3.yml
│   │   └── internal_users.yml
│   ├── kibana_ssl
│   │   └── generate-self-signed-cert.sh
│   ├── nginx
│   │   ├── nginx.conf
│   │   └── ssl
│   │   └── generate-self-signed-cert.sh
│   ├── ssl_certs
│   │   └── certs.yml
│   └── wazuh_cluster
│   ├── wazuh_manager.conf
│   └── wazuh_worker.conf
├── production-cluster.yml
├── README.md
├── VERSION
└── wazuh-odfe
├── config
│   ├── create_user.py
│   ├── etc
│   │   ├── cont-init.d
│   │   │   ├── 0-wazuh-init
│   │   │   ├── 1-config-filebeat
│   │   │   └── 2-manager
│   │   └── services.d
│   │   └── filebeat
│   │   ├── finish
│   │   └── run
│   ├── filebeat.yml
│   ├── permanent_data.env
│   ├── permanent_data.sh
│   └── wazuh.repo
└── Dockerfile
## Branches
* `4.0` branch on correspond to the latest Wazuh-Docker stable version.
* `master` branch contains the latest code, be aware of possible bugs on this branch.
* `Wazuh.Version` (for example 3.13.1_7.8.0 or 4.1.0) branch. This branch contains the current release referenced in Docker Hub. The container images are installed under the current version of this branch.
## Compatibility Matrix
| Wazuh version | ODFE | XPACK |
|---------------|---------|--------|
| v4.1.4 | 1.12.0 | 7.10.2 |
|---------------|---------|--------|
| v4.1.3 | 1.12.0 | 7.10.2 |
|---------------|---------|--------|
| v4.1.2 | 1.12.0 | 7.10.2 |
|---------------|---------|--------|
| v4.1.1 | 1.12.0 | 7.10.2 |
|---------------|---------|--------|
| v4.1.0 | 1.12.0 | 7.10.2 |
|---------------|---------|--------|
| v4.0.4 | 1.11.0 | |
|---------------|---------|--------|
| v4.0.3 | 1.11.0 | |
|---------------|---------|--------|
| v4.0.2 | 1.11.0 | |
|---------------|---------|--------|
| v4.0.1 | 1.11.0 | |
|---------------|---------|--------|
| v4.0.0 | 1.10.1 | |
## Credits and Thank you
## Authors / Maintainers
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.
This project is maintained by the [Wazuh](https://wazuh.com) team, with active contributions from the community.
See the full list of contributors at:
[https://github.com/wazuh/wazuh-docker/graphs/contributors](https://github.com/wazuh/wazuh-docker/graphs/contributors)
We thank them and everyone else who has contributed to this project.
## License and copyright
Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
## Web references

45
SECURITY.md Normal file
View File

@@ -0,0 +1,45 @@
# Wazuh Open Source Project Security Policy
Version: 2023-06-12
## Introduction
This document outlines the Security Policy for Wazuh's open source projects. It emphasizes our commitment to maintain a secure environment for our users and contributors, and reflects our belief in the power of collaboration to identify and resolve security vulnerabilities.
## Scope
This policy applies to all open source projects developed, maintained, or hosted by Wazuh.
## Reporting Security Vulnerabilities
If you believe you've discovered a potential security vulnerability in one of our open source projects, we strongly encourage you to report it to us responsibly.
Please submit your findings as security advisories under the "Security" tab in the relevant GitHub repository. Alternatively, you may send the details of your findings to [security@wazuh.com](mailto:security@wazuh.com).
## 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:
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.
## Automatic Scanning
We leverage GitHub Actions to perform automated scans of our supply chain. These scans assist us in identifying vulnerabilities and outdated dependencies in a proactive and timely manner.
## Credit
We believe in giving credit where credit is due. If you report a security vulnerability to us, and we determine that it is a valid vulnerability, we will publicly credit you for the discovery when we disclose the vulnerability. If you wish to remain anonymous, please indicate so in your initial report.
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.
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.
We ask that all users and contributors respect this policy and the security of our community's users by disclosing vulnerabilities to us in accordance with this policy.
## 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)

View File

@@ -1,2 +0,0 @@
WAZUH-DOCKER_VERSION="4.1.5"
REVISION="40114"

4
VERSION.json Normal file
View File

@@ -0,0 +1,4 @@
{
"version": "4.14.0",
"stage": "rc2"
}

View File

@@ -0,0 +1,32 @@
# Wazuh Docker Image Builder
The creation of the images for the Wazuh stack deployment in Docker is done with the build-images.yml script
To execute the process, the following must be executed in the root of the wazuh-docker repository:
```
$ build-docker-images/build-images.sh
```
This script initializes the environment variables needed to build each of the images.
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.14.0
```
To get all the available script options use the -h or --help option:
```
$ build-docker-images/build-images.sh -h
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.14.0.
-h, --help Show this help.
```

View File

@@ -0,0 +1,139 @@
WAZUH_IMAGE_VERSION=4.14.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')
IMAGE_VERSION=${WAZUH_IMAGE_VERSION}
# Wazuh package generator
# Copyright (C) 2023, Wazuh Inc.
#
# This program is a free software; you can redistribute it
# and/or modify it under the terms of the GNU General Public
# License (version 2) as published by the FSF - Free Software
# Foundation.
WAZUH_IMAGE_VERSION="4.14.0"
WAZUH_TAG_REVISION="1"
WAZUH_DEV_STAGE=""
FILEBEAT_MODULE_VERSION="0.4"
# -----------------------------------------------------------------------------
trap ctrl_c INT
clean() {
exit_code=$1
exit ${exit_code}
}
ctrl_c() {
clean 1
}
# -----------------------------------------------------------------------------
build() {
WAZUH_VERSION="$(echo $WAZUH_IMAGE_VERSION | sed -e 's/\.//g')"
FILEBEAT_TEMPLATE_BRANCH="${WAZUH_IMAGE_VERSION}"
WAZUH_FILEBEAT_MODULE="wazuh-filebeat-${FILEBEAT_MODULE_VERSION}.tar.gz"
WAZUH_UI_REVISION="${WAZUH_TAG_REVISION}"
if [ "${WAZUH_DEV_STAGE}" ];then
FILEBEAT_TEMPLATE_BRANCH="v${FILEBEAT_TEMPLATE_BRANCH}-${WAZUH_DEV_STAGE,,}"
if ! curl --output /dev/null --silent --head --fail "https://github.com/wazuh/wazuh/tree/${FILEBEAT_TEMPLATE_BRANCH}"; then
echo "The indicated branch does not exist in the wazuh/wazuh repository: ${FILEBEAT_TEMPLATE_BRANCH}"
clean 1
fi
else
if curl --output /dev/null --silent --head --fail "https://github.com/wazuh/wazuh/tree/v${FILEBEAT_TEMPLATE_BRANCH}"; then
FILEBEAT_TEMPLATE_BRANCH="v${FILEBEAT_TEMPLATE_BRANCH}"
elif curl --output /dev/null --silent --head --fail "https://github.com/wazuh/wazuh/tree/${FILEBEAT_TEMPLATE_BRANCH}"; then
FILEBEAT_TEMPLATE_BRANCH="${FILEBEAT_TEMPLATE_BRANCH}"
else
echo "The indicated branch does not exist in the wazuh/wazuh repository: ${FILEBEAT_TEMPLATE_BRANCH}"
clean 1
fi
fi
echo WAZUH_VERSION=$WAZUH_IMAGE_VERSION > .env
echo WAZUH_IMAGE_VERSION=$WAZUH_IMAGE_VERSION >> .env
echo WAZUH_TAG_REVISION=$WAZUH_TAG_REVISION >> .env
echo FILEBEAT_TEMPLATE_BRANCH=$FILEBEAT_TEMPLATE_BRANCH >> .env
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 || clean 1
return 0
}
# -----------------------------------------------------------------------------
help() {
echo
echo "Usage: $0 [OPTIONS]"
echo
echo " -d, --dev <ref> [Optional] Set the development stage you want to build, example rc2 or beta1, not used by default."
echo " -f, --filebeat-module <ref> [Optional] Set Filebeat module version. By default ${FILEBEAT_MODULE_VERSION}."
echo " -r, --revision <rev> [Optional] Package revision. By default ${WAZUH_TAG_REVISION}"
echo " -v, --version <ver> [Optional] Set the Wazuh version should be builded. By default, ${WAZUH_IMAGE_VERSION}."
echo " -h, --help Show this help."
echo
exit $1
}
# -----------------------------------------------------------------------------
main() {
while [ -n "${1}" ]
do
case "${1}" in
"-h"|"--help")
help 0
;;
"-d"|"--dev")
if [ -n "${2}" ]; then
WAZUH_DEV_STAGE="${2}"
shift 2
else
help 1
fi
;;
"-f"|"--filebeat-module")
if [ -n "${2}" ]; then
FILEBEAT_MODULE_VERSION="${2}"
shift 2
else
help 1
fi
;;
"-r"|"--revision")
if [ -n "${2}" ]; then
WAZUH_TAG_REVISION="${2}"
shift 2
else
help 1
fi
;;
"-v"|"--version")
if [ -n "$2" ]; then
WAZUH_IMAGE_VERSION="$2"
shift 2
else
help 1
fi
;;
*)
help 1
esac
done
build || clean 1
clean 0
}
main "$@"

View File

@@ -0,0 +1,102 @@
# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
services:
wazuh.manager:
build:
context: wazuh-manager/
args:
WAZUH_VERSION: ${WAZUH_VERSION}
WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION}
FILEBEAT_TEMPLATE_BRANCH: ${FILEBEAT_TEMPLATE_BRANCH}
WAZUH_FILEBEAT_MODULE: ${WAZUH_FILEBEAT_MODULE}
image: wazuh/wazuh-manager:${WAZUH_IMAGE_VERSION}
hostname: wazuh.manager
restart: always
ports:
- "1514:1514"
- "1515:1515"
- "514:514/udp"
- "55000:55000"
environment:
- INDEXER_URL=https://wazuh.indexer:9200
- INDEXER_USERNAME=admin
- INDEXER_PASSWORD=admin
- FILEBEAT_SSL_VERIFICATION_MODE=none
volumes:
- wazuh_api_configuration:/var/ossec/api/configuration
- wazuh_etc:/var/ossec/etc
- wazuh_logs:/var/ossec/logs
- wazuh_queue:/var/ossec/queue
- wazuh_var_multigroups:/var/ossec/var/multigroups
- wazuh_integrations:/var/ossec/integrations
- wazuh_active_response:/var/ossec/active-response/bin
- wazuh_agentless:/var/ossec/agentless
- wazuh_wodles:/var/ossec/wodles
- filebeat_etc:/etc/filebeat
- filebeat_var:/var/lib/filebeat
wazuh.agent:
build:
context: wazuh-agent/
args:
WAZUH_VERSION: ${WAZUH_VERSION}
WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION}
image: wazuh/wazuh-agent:${WAZUH_IMAGE_VERSION}
hostname: wazuh.agent
restart: always
wazuh.indexer:
build:
context: wazuh-indexer/
args:
WAZUH_VERSION: ${WAZUH_VERSION}
WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION}
image: wazuh/wazuh-indexer:${WAZUH_IMAGE_VERSION}
hostname: wazuh.indexer
restart: always
ports:
- "9200:9200"
environment:
- "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m"
ulimits:
memlock:
soft: -1
hard: -1
nofile:
soft: 65536
hard: 65536
wazuh.dashboard:
build:
context: wazuh-dashboard/
args:
WAZUH_VERSION: ${WAZUH_VERSION}
WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION}
WAZUH_UI_REVISION: ${WAZUH_UI_REVISION}
image: wazuh/wazuh-dashboard:${WAZUH_IMAGE_VERSION}
hostname: wazuh.dashboard
restart: always
ports:
- 443:443
environment:
- INDEXER_USERNAME=admin
- INDEXER_PASSWORD=admin
- SERVER_SSL_ENABLED=false
- WAZUH_API_URL=https://wazuh.manager
depends_on:
- wazuh.indexer
links:
- wazuh.indexer:wazuh.indexer
- wazuh.manager:wazuh.manager
volumes:
wazuh_api_configuration:
wazuh_etc:
wazuh_logs:
wazuh_queue:
wazuh_var_multigroups:
wazuh_integrations:
wazuh_active_response:
wazuh_agentless:
wazuh_wodles:
filebeat_etc:
filebeat_var:

View File

@@ -0,0 +1,36 @@
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
FROM amazonlinux:2023
RUN rm /bin/sh && ln -s /bin/bash /bin/sh
ARG WAZUH_VERSION
ARG WAZUH_TAG_REVISION
ARG S6_VERSION="v2.2.0.3"
ARG WAZUH_MANAGER='CHANGE_MANAGER_IP'
ARG WAZUH_MANAGER_PORT='CHANGE_MANAGER_PORT'
ARG WAZUH_REGISTRATION_SERVER='CHANGE_ENROLL_IP'
ARG WAZUH_REGISTRATION_PORT='CHANGE_ENROLL_PORT'
ARG WAZUH_AGENT_NAME='CHANGEE_AGENT_NAME'
COPY config/check_repository.sh /
RUN yum install curl-minimal tar gzip procps -y &&\
yum clean all
RUN chmod 775 /check_repository.sh
RUN source /check_repository.sh
RUN yum install wazuh-agent-${WAZUH_VERSION}-${WAZUH_TAG_REVISION} -y && \
yum clean all && \
sed -i '/<authorization_pass_path>/d' /var/ossec/etc/ossec.conf && \
curl --fail --silent -L https://github.com/just-containers/s6-overlay/releases/download/${S6_VERSION}/s6-overlay-amd64.tar.gz \
-o /tmp/s6-overlay-amd64.tar.gz && \
tar xzf /tmp/s6-overlay-amd64.tar.gz -C / --exclude="./bin" && \
tar xzf /tmp/s6-overlay-amd64.tar.gz -C /usr ./bin && \
rm /tmp/s6-overlay-amd64.tar.gz
COPY config/etc/ /etc/
RUN rm /etc/yum.repos.d/wazuh.repo
ENTRYPOINT [ "/init" ]

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

@@ -0,0 +1,90 @@
#!/usr/bin/with-contenv bash
# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
WAZUH_INSTALL_PATH=/var/ossec
WAZUH_CONFIG_MOUNT=/wazuh-config-mount
WAZUH_MANAGER_SERVER=$WAZUH_MANAGER_SERVER
WAZUH_MANAGER_PORT=${WAZUH_MANAGER_PORT:-"1514"}
WAZUH_REGISTRATION_SERVER=${WAZUH_REGISTRATION_SERVER:-$WAZUH_MANAGER_SERVER}
WAZUH_REGISTRATION_PORT=${WAZUH_REGISTRATION_PORT:-"1515"}
WAZUH_REGISTRATION_PASSWORD=$WAZUH_REGISTRATION_PASSWORD
WAZUH_AGENT_NAME=${WAZUH_AGENT_NAME:-"wazuh-agent-$HOSTNAME"}
##############################################################################
# Aux functions
##############################################################################
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"
}
##############################################################################
# Copy all files from $WAZUH_CONFIG_MOUNT to $WAZUH_INSTALL_PATH and respect
# destination files permissions
#
# For example, to mount the file /var/ossec/data/etc/ossec.conf, mount it at
# $WAZUH_CONFIG_MOUNT/etc/ossec.conf in your container and this code will
# replace the ossec.conf file in /var/ossec/data/etc with yours.
##############################################################################
mount_files() {
if [ -e "$WAZUH_CONFIG_MOUNT" ]
then
print "Identified Wazuh configuration files to mount..."
exec_cmd_stdout "cp --verbose -r $WAZUH_CONFIG_MOUNT/* $WAZUH_INSTALL_PATH"
else
print "No Wazuh configuration files to mount..."
fi
}
##############################################################################
# Allow users to set the manager ip and port, enrollment ip and port and
# enroll dynamically on container start.
#
# To use this:
# 1. Create your own ossec.conf file
# 2. In your ossec.conf file, use the <agent> configuration
# 3. Mount your custom ossec.conf file at $WAZUH_CONFIG_MOUNT/etc/ossec.conf
##############################################################################
set_manager_conn() {
echo "ossec.conf configuration"
sed -i "s#<address>CHANGE_MANAGER_IP</address>#<address>$WAZUH_MANAGER_SERVER</address>#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf
sed -i "s#<port>CHANGE_MANAGER_PORT</port>#<port>$WAZUH_MANAGER_PORT</port>#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf
sed -i "s#<manager_address>CHANGE_ENROLL_IP</manager_address>#<manager_address>$WAZUH_REGISTRATION_SERVER</manager_address>#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf
sed -i "s#<port>CHANGE_ENROLL_PORT</port>#<port>$WAZUH_REGISTRATION_PORT</port>#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf
sed -i "s#<agent_name>CHANGEE_AGENT_NAME</agent_name>#<agent_name>$WAZUH_AGENT_NAME</agent_name>#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf
[ -n "$WAZUH_REGISTRATION_PASSWORD" ] && \
echo "$WAZUH_REGISTRATION_PASSWORD" > ${WAZUH_INSTALL_PATH}/etc/authd.pass && \
chown root:wazuh ${WAZUH_INSTALL_PATH}/etc/authd.pass && \
chmod 640 ${WAZUH_INSTALL_PATH}/etc/authd.pass
}
##############################################################################
# Main function
##############################################################################
main() {
# Mount selected files (WAZUH_CONFIG_MOUNT) to container
mount_files
# Configure agent variables
set_manager_conn
}
main

View File

@@ -0,0 +1,44 @@
#!/usr/bin/with-contenv bash
##############################################################################
# Migration sequence
# Detect if there is a mounted volume on /wazuh-migration and copy the data
# to /var/ossec, finally it will create a flag ".migration-completed" inside
# the mounted volume
##############################################################################
function __colortext()
{
echo -e " \e[1;$2m$1\e[0m"
}
function echogreen()
{
echo $(__colortext "$1" "32")
}
function echoyellow()
{
echo $(__colortext "$1" "33")
}
function echored()
{
echo $(__colortext "$1" "31")
}
function_entrypoint_scripts() {
# It will run every .sh script located in entrypoint-scripts folder in lexicographical order
if [ -d "/entrypoint-scripts/" ]
then
for script in `ls /entrypoint-scripts/*.sh | sort -n`; do
bash "$script"
done
fi
}
# run entrypoint scripts
function_entrypoint_scripts
# Start Wazuh
/var/ossec/bin/wazuh-control start

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv sh
# dumping ossec.log to standard output
exec tail -f /var/ossec/logs/ossec.log
exec tail -F /var/ossec/logs/ossec.log

View File

@@ -0,0 +1,97 @@
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
FROM amazonlinux:2023 AS builder
ARG WAZUH_VERSION
ARG WAZUH_TAG_REVISION
ARG WAZUH_UI_REVISION
ARG INSTALL_DIR=/usr/share/wazuh-dashboard
# Update and install dependencies
RUN yum install curl-minimal libcap openssl -y
COPY config/check_repository.sh /
RUN chmod 775 /check_repository.sh && \
source /check_repository.sh
RUN yum install wazuh-dashboard-${WAZUH_VERSION}-${WAZUH_TAG_REVISION} -y && \
yum clean all
# Create and set permissions to data directories
RUN mkdir -p $INSTALL_DIR/data/wazuh && chmod -R 775 $INSTALL_DIR/data/wazuh
RUN mkdir -p $INSTALL_DIR/data/wazuh/config && chmod -R 775 $INSTALL_DIR/data/wazuh/config
RUN mkdir -p $INSTALL_DIR/data/wazuh/logs && chmod -R 775 $INSTALL_DIR/data/wazuh/logs
COPY config/wazuh.yml $INSTALL_DIR/data/wazuh/config/
RUN setcap 'cap_net_bind_service=-ep' /usr/share/wazuh-dashboard/node/bin/node
RUN setcap 'cap_net_bind_service=-ep' /usr/share/wazuh-dashboard/node/fallback/bin/node
# Generate certificates
COPY config/config.sh .
COPY config/config.yml /
RUN bash config.sh
################################################################################
# Build stage 1 (the current Wazuh dashboard image):
#
# Copy wazuh-dashboard from stage 0
# Add entrypoint
# Add wazuh_app_config
################################################################################
FROM amazonlinux:2023
# Set environment variables
ENV USER="wazuh-dashboard" \
GROUP="wazuh-dashboard" \
NAME="wazuh-dashboard" \
INSTALL_DIR="/usr/share/wazuh-dashboard"
# Set Wazuh app variables
ENV PATTERN="" \
CHECKS_PATTERN="" \
CHECKS_TEMPLATE="" \
CHECKS_API="" \
CHECKS_SETUP="" \
APP_TIMEOUT="" \
API_SELECTOR="" \
IP_SELECTOR="" \
IP_IGNORE="" \
WAZUH_MONITORING_ENABLED="" \
WAZUH_MONITORING_FREQUENCY="" \
WAZUH_MONITORING_SHARDS="" \
WAZUH_MONITORING_REPLICAS=""
# Update and install dependencies
RUN yum install shadow-utils -y
# Create wazuh-dashboard user and group
RUN getent group $GROUP || groupadd -r -g 1000 $GROUP
RUN useradd --system \
--uid 1000 \
--no-create-home \
--home-dir $INSTALL_DIR \
--gid $GROUP \
--shell /sbin/nologin \
--comment "$USER user" \
$USER
# Copy and set permissions to scripts
COPY config/entrypoint.sh /
COPY config/wazuh_app_config.sh /
RUN chmod 700 /entrypoint.sh
RUN chmod 700 /wazuh_app_config.sh
RUN chown 1000:1000 /*.sh
# Copy Install dir from builder to current image
COPY --from=builder --chown=1000:1000 $INSTALL_DIR $INSTALL_DIR
# Create custom directory
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 workdir and user
WORKDIR $INSTALL_DIR
USER wazuh-dashboard
# Services ports
EXPOSE 443
ENTRYPOINT [ "/entrypoint.sh" ]

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

@@ -0,0 +1,42 @@
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
# This has to be exported to make some magic below work.
export DH_OPTIONS
export NAME=wazuh-dashboard
export TARGET_DIR=${CURDIR}/debian/${NAME}
export INSTALLATION_DIR=/usr/share/${NAME}
export CONFIG_DIR=${INSTALLATION_DIR}/config
## Variables
CERT_TOOL=wazuh-certs-tool.sh
PACKAGES_URL=https://packages.wazuh.com/4.14/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.14/
## 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}')
CERT_TOOL_PACKAGES_DEV=$(curl --silent -I $PACKAGES_DEV_URL$CERT_TOOL | grep -E "^HTTP" | awk '{print $2}')
## If cert tool exists in some bucket, download it, if not exit 1
if [ "$CERT_TOOL_PACKAGES" = "200" ]; then
curl -o $CERT_TOOL $PACKAGES_URL$CERT_TOOL
echo "Cert tool exists in Packages bucket"
elif [ "$CERT_TOOL_PACKAGES_DEV" = "200" ]; then
curl -o $CERT_TOOL $PACKAGES_DEV_URL$CERT_TOOL
echo "Cert tool exists in Packages-dev bucket"
else
echo "Cert tool does not exist in any bucket"
exit 1
fi
chmod 755 $CERT_TOOL && bash /$CERT_TOOL -A
# Create certs directory
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/root-ca.pem ${CONFIG_DIR}/certs/root-ca.pem
chmod -R 500 ${CONFIG_DIR}/certs
chmod -R 400 ${CONFIG_DIR}/certs/*

View File

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

View File

@@ -0,0 +1,20 @@
#!/bin/bash
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
INSTALL_DIR=/usr/share/wazuh-dashboard
DASHBOARD_USERNAME="${DASHBOARD_USERNAME:-kibanaserver}"
DASHBOARD_PASSWORD="${DASHBOARD_PASSWORD:-kibanaserver}"
# Create and configure Wazuh dashboard keystore
yes | $INSTALL_DIR/bin/opensearch-dashboards-keystore create --allow-root && \
echo $DASHBOARD_USERNAME | $INSTALL_DIR/bin/opensearch-dashboards-keystore add opensearch.username --stdin --allow-root && \
echo $DASHBOARD_PASSWORD | $INSTALL_DIR/bin/opensearch-dashboards-keystore add opensearch.password --stdin --allow-root
##############################################################################
# Start Wazuh dashboard
##############################################################################
/wazuh_app_config.sh $WAZUH_UI_REVISION
/usr/share/wazuh-dashboard/bin/opensearch-dashboards -c /usr/share/wazuh-dashboard/config/opensearch_dashboards.yml

View File

@@ -1,7 +1,7 @@
---
#
# Wazuh app - App configuration file
# Copyright (C) 2015-2021 Wazuh, Inc.
# Copyright (C) 2017, Wazuh Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
# https://documentation.wazuh.com/current/installation-guide/index.html
#
# Also, you can check our repository:
# https://github.com/wazuh/wazuh-kibana-app
# https://github.com/wazuh/wazuh-dashboard-plugins
#
# ------------------------------- Index patterns -------------------------------
#
@@ -77,12 +77,6 @@
# List of index patterns to be ignored
#ip.ignore: []
#
# -------------------------------- X-Pack RBAC ---------------------------------
#
# Custom setting to enable/disable built-in X-Pack RBAC security capabilities.
# Default: enabled
#xpack.rbac.enabled: true
#
# ------------------------------ wazuh-monitoring ------------------------------
#
# Custom setting to enable/disable wazuh-monitoring indices.
@@ -159,4 +153,3 @@
# port: <port>
# username: <username>
# password: <password>

View File

@@ -0,0 +1,52 @@
#!/bin/bash
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
wazuh_url="${WAZUH_API_URL:-https://wazuh}"
wazuh_port="${API_PORT:-55000}"
api_username="${API_USERNAME:-wazuh-wui}"
api_password="${API_PASSWORD:-wazuh-wui}"
api_run_as="${RUN_AS:-false}"
dashboard_config_file="/usr/share/wazuh-dashboard/data/wazuh/config/wazuh.yml"
declare -A CONFIG_MAP=(
[pattern]=$PATTERN
[checks.pattern]=$CHECKS_PATTERN
[checks.template]=$CHECKS_TEMPLATE
[checks.api]=$CHECKS_API
[checks.setup]=$CHECKS_SETUP
[timeout]=$APP_TIMEOUT
[api.selector]=$API_SELECTOR
[ip.selector]=$IP_SELECTOR
[ip.ignore]=$IP_IGNORE
[wazuh.monitoring.enabled]=$WAZUH_MONITORING_ENABLED
[wazuh.monitoring.frequency]=$WAZUH_MONITORING_FREQUENCY
[wazuh.monitoring.shards]=$WAZUH_MONITORING_SHARDS
[wazuh.monitoring.replicas]=$WAZUH_MONITORING_REPLICAS
)
for i in "${!CONFIG_MAP[@]}"
do
if [ "${CONFIG_MAP[$i]}" != "" ]; then
sed -i 's/.*#'"$i"'.*/'"$i"': '"${CONFIG_MAP[$i]}"'/' $dashboard_config_file
fi
done
grep -q 1513629884013 $dashboard_config_file
_config_exists=$?
if [[ $_config_exists -ne 0 ]]; then
cat << EOF >> $dashboard_config_file
hosts:
- 1513629884013:
url: $wazuh_url
port: $wazuh_port
username: $api_username
password: $api_password
run_as: $api_run_as
EOF
else
echo "Wazuh APP already configured"
fi

View File

@@ -0,0 +1,93 @@
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
FROM amazonlinux:2023 AS builder
ARG WAZUH_VERSION
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
################################################################################
# Build stage 1 (the actual Wazuh indexer image):
#
# Copy wazuh-indexer from stage 0
# Add entrypoint
################################################################################
FROM amazonlinux:2023
ENV USER="wazuh-indexer" \
GROUP="wazuh-indexer" \
NAME="wazuh-indexer" \
INSTALL_DIR="/usr/share/wazuh-indexer"
RUN yum install curl-minimal shadow-utils findutils hostname -y
RUN getent group $GROUP || groupadd -r -g 1000 $GROUP
RUN useradd --system \
--uid 1000 \
--no-create-home \
--home-dir $INSTALL_DIR \
--gid $GROUP \
--shell /sbin/nologin \
--comment "$USER user" \
$USER
WORKDIR $INSTALL_DIR
COPY config/entrypoint.sh /
COPY config/securityadmin.sh /
RUN chmod 700 /entrypoint.sh && chmod 700 /securityadmin.sh && \
mkdir -p /usr/share/wazuh-indexer && \
chown 1000:1000 /usr/share/wazuh-indexer && \
chown 1000:1000 /*.sh
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/config
COPY --from=builder --chown=1000:1000 /debian/wazuh-indexer/usr/share/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
RUN mkdir -p /var/lib/wazuh-indexer && chown 1000:1000 /var/lib/wazuh-indexer && \
mkdir -p /usr/share/wazuh-indexer/logs && chown 1000:1000 /usr/share/wazuh-indexer/logs && \
mkdir -p /run/wazuh-indexer && chown 1000:1000 /run/wazuh-indexer && \
mkdir -p /var/log/wazuh-indexer && chown 1000:1000 /var/log/wazuh-indexer && \
chmod 700 /usr/share/wazuh-indexer && \
chmod 700 /usr/share/wazuh-indexer/config && \
chmod 600 /usr/share/wazuh-indexer/config/jvm.options && \
chmod 600 /usr/share/wazuh-indexer/config/opensearch.yml
USER wazuh-indexer
# Services ports
EXPOSE 9200
ENTRYPOINT ["/entrypoint.sh"]
# Dummy overridable parameter parsed by entrypoint
CMD ["opensearchwrapper"]

View File

@@ -0,0 +1,12 @@
---
_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

@@ -0,0 +1,102 @@
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
# This has to be exported to make some magic below work.
export DH_OPTIONS
export NAME=wazuh-indexer
export TARGET_DIR=${CURDIR}/debian/${NAME}
# Package build options
export USER=${NAME}
export GROUP=${NAME}
export VERSION=${WAZUH_VERSION}-${WAZUH_TAG_REVISION}
export LOG_DIR=/var/log/${NAME}
export LIB_DIR=/var/lib/${NAME}
export PID_DIR=/run/${NAME}
export INSTALLATION_DIR=/usr/share/${NAME}
export CONFIG_DIR=${INSTALLATION_DIR}/config
export BASE_DIR=${NAME}-*
export INDEXER_FILE=wazuh-indexer-base.tar.xz
export BASE_FILE=wazuh-indexer-base-${VERSION}-linux-x64.tar.xz
export REPO_DIR=/unattended_installer
## Variables
CERT_TOOL=wazuh-certs-tool.sh
PASSWORD_TOOL=wazuh-passwords-tool.sh
PACKAGES_URL=https://packages.wazuh.com/4.14/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.14/
## 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}')
CERT_TOOL_PACKAGES_DEV=$(curl --silent -I $PACKAGES_DEV_URL$CERT_TOOL | grep -E "^HTTP" | awk '{print $2}')
## If cert tool exists in some bucket, download it, if not exit 1
if [ "$CERT_TOOL_PACKAGES" = "200" ]; then
curl -o $CERT_TOOL $PACKAGES_URL$CERT_TOOL
echo "Cert tool exists in Packages bucket"
elif [ "$CERT_TOOL_PACKAGES_DEV" = "200" ]; then
curl -o $CERT_TOOL $PACKAGES_DEV_URL$CERT_TOOL
echo "Cert tool exists in Packages-dev bucket"
else
echo "Cert tool does not exist in any bucket"
exit 1
fi
## Check if the password tool exists in S3 buckets
PASSWORD_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$PASSWORD_TOOL | grep -E "^HTTP" | awk '{print $2}')
PASSWORD_TOOL_PACKAGES_DEV=$(curl --silent -I $PACKAGES_DEV_URL$PASSWORD_TOOL | grep -E "^HTTP" | awk '{print $2}')
## If password tool exists in some bucket, download it, if not exit 1
if [ "$PASSWORD_TOOL_PACKAGES" = "200" ]; then
curl -o $PASSWORD_TOOL $PACKAGES_URL$PASSWORD_TOOL
echo "Password tool exists in Packages bucket"
elif [ "$PASSWORD_TOOL_PACKAGES_DEV" = "200" ]; then
curl -o $PASSWORD_TOOL $PACKAGES_DEV_URL$PASSWORD_TOOL
echo "Password tool exists in Packages-dev bucket"
else
echo "Password tool does not exist in any bucket"
exit 1
fi
chmod 755 $CERT_TOOL && bash /$CERT_TOOL -A
# copy to target
mkdir -p ${TARGET_DIR}${INSTALLATION_DIR}
mkdir -p ${TARGET_DIR}${INSTALLATION_DIR}/opensearch-security/
mkdir -p ${TARGET_DIR}${CONFIG_DIR}
mkdir -p ${TARGET_DIR}${LIB_DIR}
mkdir -p ${TARGET_DIR}${LOG_DIR}
mkdir -p ${TARGET_DIR}/etc/init.d
mkdir -p ${TARGET_DIR}/etc/default
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
# 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/
cp -pr /action_groups.yml ${TARGET_DIR}${INSTALLATION_DIR}/opensearch-security/
cp -pr /internal_users.yml ${TARGET_DIR}${INSTALLATION_DIR}/opensearch-security/
cp -pr /opensearch.yml ${TARGET_DIR}${CONFIG_DIR}
# Copy Wazuh indexer's certificates
cp -pr /wazuh-certificates/demo.indexer.pem ${TARGET_DIR}${CONFIG_DIR}/certs/indexer.pem
cp -pr /wazuh-certificates/demo.indexer-key.pem ${TARGET_DIR}${CONFIG_DIR}/certs/indexer-key.pem
cp -pr /wazuh-certificates/root-ca.key ${TARGET_DIR}${CONFIG_DIR}/certs/root-ca.key
cp -pr /wazuh-certificates/root-ca.pem ${TARGET_DIR}${CONFIG_DIR}/certs/root-ca.pem
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 /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
chmod -R 400 ${TARGET_DIR}${CONFIG_DIR}/certs/*
find ${TARGET_DIR} -type d -exec chmod 750 {} \;
find ${TARGET_DIR} -type f -perm 644 -exec chmod 640 {} \;
find ${TARGET_DIR} -type f -perm 664 -exec chmod 660 {} \;
find ${TARGET_DIR} -type f -perm 755 -exec chmod 750 {} \;
find ${TARGET_DIR} -type f -perm 744 -exec chmod 740 {} \;

View File

@@ -0,0 +1,5 @@
nodes:
# Wazuh indexer server nodes
indexer:
- name: demo.indexer
ip: demo.indexer

View File

@@ -0,0 +1,93 @@
#!/usr/bin/env bash
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
set -e
umask 0002
export USER=wazuh-indexer
export INSTALLATION_DIR=/usr/share/wazuh-indexer
export OPENSEARCH_PATH_CONF=${INSTALLATION_DIR}/config
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"
run_as_other_user_if_needed() {
if [[ "$(id -u)" == "0" ]]; then
# If running as root, drop to specified UID and run command
exec chroot --userspec=1000:0 / "${@}"
else
# Either we are running in Openshift with random uid and are a member of the root group
# or with a custom --user
exec "${@}"
fi
}
# 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
if [[ "$1" != "opensearchwrapper" ]]; then
if [[ "$(id -u)" == "0" && $(basename "$1") == "opensearch" ]]; then
# Rewrite CMD args to replace $1 with `opensearch` explicitly,
# Without this, user could specify `opensearch -E x.y=z` but
# `bin/opensearch -E x.y=z` would not work.
set -- "opensearch" "${@:2}"
# Use chroot to switch to UID 1000 / GID 0
exec chroot --userspec=1000:0 / "$@"
else
# User probably wants to run something else, like /bin/bash, with another uid forced (Openshift?)
exec "$@"
fi
fi
# Allow environment variables to be set by creating a file with the
# contents, and setting an environment variable with the suffix _FILE to
# point to it. This can be used to provide secrets to a container, without
# the values being specified explicitly when running the container.
#
# This is also sourced in opensearch-env, and is only needed here
# as well because we use INDEXER_PASSWORD below. Sourcing this script
# is idempotent.
source /usr/share/wazuh-indexer/bin/opensearch-env-from-file
if [[ -f bin/opensearch-users ]]; then
# Check for the INDEXER_PASSWORD environment variable to set the
# bootstrap password for Security.
#
# This is only required for the first node in a cluster with Security
# enabled, but we have no way of knowing which node we are yet. We'll just
# honor the variable if it's present.
if [[ -n "$INDEXER_PASSWORD" ]]; then
[[ -f /usr/share/wazuh-indexer/opensearch.keystore ]] || (run_as_other_user_if_needed opensearch-keystore create)
if ! (run_as_other_user_if_needed opensearch-keystore has-passwd --silent) ; then
# keystore is unencrypted
if ! (run_as_other_user_if_needed opensearch-keystore list | grep -q '^bootstrap.password$'); then
(run_as_other_user_if_needed echo "$INDEXER_PASSWORD" | opensearch-keystore add -x 'bootstrap.password')
fi
else
# keystore requires password
if ! (run_as_other_user_if_needed echo "$KEYSTORE_PASSWORD" \
| opensearch-keystore list | grep -q '^bootstrap.password$') ; then
COMMANDS="$(printf "%s\n%s" "$KEYSTORE_PASSWORD" "$INDEXER_PASSWORD")"
(run_as_other_user_if_needed echo "$COMMANDS" | opensearch-keystore add -x 'bootstrap.password')
fi
fi
fi
fi
if [[ "$(id -u)" == "0" ]]; then
# If requested and running as root, mutate the ownership of bind-mounts
if [[ -n "$TAKE_FILE_OWNERSHIP" ]]; then
chown -R 1000:0 /usr/share/wazuh-indexer/{data,logs}
fi
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

@@ -0,0 +1,74 @@
---
# 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

@@ -0,0 +1,27 @@
network.host: "0.0.0.0"
node.name: "wazuh.indexer"
cluster.name: "wazuh-cluster"
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/config/certs/indexer.pem
plugins.security.ssl.http.pemkey_filepath: /usr/share/wazuh-indexer/config/certs/indexer-key.pem
plugins.security.ssl.http.pemtrustedcas_filepath: /usr/share/wazuh-indexer/config/certs/root-ca.pem
plugins.security.ssl.transport.pemcert_filepath: /usr/share/wazuh-indexer/config/certs/indexer.pem
plugins.security.ssl.transport.pemkey_filepath: /usr/share/wazuh-indexer/config/certs/indexer-key.pem
plugins.security.ssl.transport.pemtrustedcas_filepath: /usr/share/wazuh-indexer/config/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

@@ -0,0 +1,171 @@
_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

@@ -0,0 +1,78 @@
---
# 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

@@ -0,0 +1,3 @@
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
sleep 30
bash /usr/share/wazuh-indexer/plugins/opensearch-security/tools/securityadmin.sh -cd /usr/share/wazuh-indexer/opensearch-security/ -nhnv -cacert $CACERT -cert $CERT -key $KEY -p 9200 -icl

View File

@@ -0,0 +1,69 @@
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
FROM amazonlinux:2023
RUN rm /bin/sh && ln -s /bin/bash /bin/sh
ARG WAZUH_VERSION
ARG WAZUH_TAG_REVISION
ARG FILEBEAT_TEMPLATE_BRANCH
ARG FILEBEAT_CHANNEL=filebeat-oss
ARG FILEBEAT_VERSION=7.10.2
ARG FILEBEAT_REVISION=2
ARG WAZUH_FILEBEAT_MODULE
ARG S6_VERSION="v2.2.0.3"
RUN yum install curl-minimal xz gnupg tar gzip openssl findutils procps -y &&\
yum clean all
COPY config/check_repository.sh /
COPY config/filebeat_module.sh /
COPY config/permanent_data.env config/permanent_data.sh /
RUN chmod 775 /check_repository.sh
RUN source /check_repository.sh
RUN yum install wazuh-manager-${WAZUH_VERSION}-${WAZUH_TAG_REVISION} -y && \
yum clean all && \
chmod 775 /filebeat_module.sh && \
source /filebeat_module.sh && \
rm /filebeat_module.sh && \
curl --fail --silent -L https://github.com/just-containers/s6-overlay/releases/download/${S6_VERSION}/s6-overlay-amd64.tar.gz \
-o /tmp/s6-overlay-amd64.tar.gz && \
tar xzf /tmp/s6-overlay-amd64.tar.gz -C / --exclude="./bin" && \
tar xzf /tmp/s6-overlay-amd64.tar.gz -C /usr ./bin && \
rm /tmp/s6-overlay-amd64.tar.gz
COPY config/etc/ /etc/
COPY --chown=root:wazuh config/create_user.py /var/ossec/framework/scripts/create_user.py
COPY config/filebeat.yml /etc/filebeat/
RUN chmod go-w /etc/filebeat/filebeat.yml
ADD https://raw.githubusercontent.com/wazuh/wazuh/$FILEBEAT_TEMPLATE_BRANCH/extensions/elasticsearch/7.x/wazuh-template.json /etc/filebeat
RUN chmod go-w /etc/filebeat/wazuh-template.json
# Prepare permanent data
# Sync calls are due to https://github.com/docker/docker/issues/9547
#Make mount directories for keep permissions
RUN mkdir -p /var/ossec/var/multigroups && \
chown root:wazuh /var/ossec/var/multigroups && \
chmod 770 /var/ossec/var/multigroups && \
mkdir -p /var/ossec/agentless && \
chown root:wazuh /var/ossec/agentless && \
chmod 770 /var/ossec/agentless && \
mkdir -p /var/ossec/active-response/bin && \
chown root:wazuh /var/ossec/active-response/bin && \
chmod 770 /var/ossec/active-response/bin && \
chmod 755 /permanent_data.sh && \
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
ENTRYPOINT [ "/init" ]

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

@@ -13,6 +13,7 @@ SPECIAL_CHARS = "@$!%*?&-_"
try:
from wazuh.rbac.orm import check_database_integrity
from wazuh.security import (
create_user,
get_users,
@@ -20,7 +21,7 @@ try:
set_user_role,
update_user,
)
except Exception as e:
except ModuleNotFoundError as e:
logging.error("No module 'wazuh' found.")
sys.exit(1)
@@ -66,6 +67,10 @@ if __name__ == "__main__":
# abort if no user file detected
sys.exit(0)
username, password = read_user_file()
# create RBAC database
check_database_integrity()
initial_users = db_users()
if username not in initial_users:
# create a new user

View File

@@ -1,5 +1,5 @@
#!/usr/bin/with-contenv bash
# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2)
# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
# Variables
source /permanent_data.env
@@ -41,12 +41,14 @@ exec_cmd_stdout() {
mount_permanent_data() {
for permanent_dir in "${PERMANENT_DATA[@]}"; do
data_tmp="${WAZUH_INSTALL_PATH}/data_tmp/permanent${permanent_dir}/"
print ${data_tmp}
# Check if the path is not empty
if find ${permanent_dir} -mindepth 1 | read; then
print "The path ${permanent_dir} is already mounted"
else
print "Installing ${permanent_dir}"
exec_cmd "cp -a ${WAZUH_INSTALL_PATH}/data_tmp/permanent${permanent_dir}/. ${permanent_dir}"
print "Installing ${permanent_dir}"
exec_cmd "cp -ar ${data_tmp}. ${permanent_dir}"
fi
done
}
@@ -74,6 +76,23 @@ apply_exclusion_data() {
done
}
##############################################################################
# This function will rename in the permanent data volume every file
# contained in PERMANENT_DATA_MOVE
##############################################################################
move_data_files() {
for mov_file in "${PERMANENT_DATA_MOVE[@]}"; do
file_split=( $mov_file )
if [ -e ${file_split[0]} ]
then
print "moving ${mov_file}"
exec_cmd "mv -f ${mov_file}"
fi
done
}
##############################################################################
# This function will delete from the permanent data volume every file
# contained in PERMANENT_DATA_DEL
@@ -84,7 +103,7 @@ remove_data_files() {
if [ -e ${del_file} ]
then
print "Removing ${del_file}"
exec_cmd "rm ${del_file}"
exec_cmd "rm -f ${del_file}"
fi
done
}
@@ -94,7 +113,7 @@ remove_data_files() {
##############################################################################
create_ossec_key_cert() {
print "Creating ossec-authd key and cert"
print "Creating wazuh-authd key and cert"
exec_cmd "openssl genrsa -out ${WAZUH_INSTALL_PATH}/etc/sslmanager.key 4096"
exec_cmd "openssl req -new -x509 -key ${WAZUH_INSTALL_PATH}/etc/sslmanager.key -out ${WAZUH_INSTALL_PATH}/etc/sslmanager.cert -days 3650 -subj /CN=${HOSTNAME}/"
}
@@ -147,6 +166,26 @@ set_custom_cluster_key() {
sed -i 's/<key>to_be_replaced_by_cluster_key<\/key>/<key>'"${WAZUH_CLUSTER_KEY}"'<\/key>/g' ${WAZUH_INSTALL_PATH}/etc/ossec.conf
}
##############################################################################
# Set correct ownership for Wazuh related directories
# on container start.
##############################################################################
configure_permissions() {
chown -R wazuh:wazuh /var/ossec/queue/rids
chown -R wazuh:wazuh /var/ossec/etc/lists
}
##############################################################################
# Change any ossec user/group to wazuh user/group
##############################################################################
set_correct_permOwner() {
find / -group 997 -exec chown :999 {} +;
find / -group 101 -exec chown :999 {} +;
find / -user 101 -exec chown 999 {} +;
}
##############################################################################
# Main function
##############################################################################
@@ -158,10 +197,16 @@ 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
# Rename files stored in permanent data (i.e. queue/ossec)
move_data_files
# Remove some files in permanent_data (i.e. .template.db)
remove_data_files
# Generate ossec-authd certs if AUTO_ENROLLMENT_ENABLED is true and does not exist
# Generate wazuh-authd certs if AUTO_ENROLLMENT_ENABLED is true and does not exist
if [ $AUTO_ENROLLMENT_ENABLED == true ]
then
if [ ! -e ${WAZUH_INSTALL_PATH}/etc/sslmanager.key ]
@@ -182,6 +227,8 @@ main() {
# Delete temporary data folder
rm -rf ${WAZUH_INSTALL_PATH}/data_tmp
# Set correct ownership for Wazuh related directories
configure_permissions
}
main

View File

@@ -0,0 +1,51 @@
#!/usr/bin/with-contenv bash
# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
set -e
if [ "$INDEXER_URL" != "" ]; then
>&2 echo "Customize Elasticsearch output IP"
sed -i "s|hosts:.*|hosts: ['$INDEXER_URL']|g" /etc/filebeat/filebeat.yml
fi
# Configure filebeat.yml security settings
if [ "$INDEXER_USERNAME" != "" ]; then
>&2 echo "Configuring username."
sed -i "s|#username:.*|username:|g" /etc/filebeat/filebeat.yml
sed -i "s|username:.*|username: '$INDEXER_USERNAME'|g" /etc/filebeat/filebeat.yml
fi
if [ "$INDEXER_PASSWORD" != "" ]; then
>&2 echo "Configuring password."
sed -i "s|#password:.*|password:|g" /etc/filebeat/filebeat.yml
sed -i "s|password:.*|password: '$INDEXER_PASSWORD'|g" /etc/filebeat/filebeat.yml
fi
if [ "$FILEBEAT_SSL_VERIFICATION_MODE" != "" ]; then
>&2 echo "Configuring SSL verification mode."
sed -i "s|#ssl.verification_mode:.*|ssl.verification_mode:|g" /etc/filebeat/filebeat.yml
sed -i "s|ssl.verification_mode:.*|ssl.verification_mode: '$FILEBEAT_SSL_VERIFICATION_MODE'|g" /etc/filebeat/filebeat.yml
fi
if [ "$SSL_CERTIFICATE_AUTHORITIES" != "" ]; then
>&2 echo "Configuring Certificate Authorities."
sed -i "s|#ssl.certificate_authorities:.*|ssl.certificate_authorities:|g" /etc/filebeat/filebeat.yml
sed -i "s|ssl.certificate_authorities:.*|ssl.certificate_authorities: ['$SSL_CERTIFICATE_AUTHORITIES']|g" /etc/filebeat/filebeat.yml
fi
if [ "$SSL_CERTIFICATE" != "" ]; then
>&2 echo "Configuring SSL Certificate."
sed -i "s|#ssl.certificate:.*|ssl.certificate:|g" /etc/filebeat/filebeat.yml
sed -i "s|ssl.certificate:.*|ssl.certificate: '$SSL_CERTIFICATE'|g" /etc/filebeat/filebeat.yml
fi
if [ "$SSL_KEY" != "" ]; then
>&2 echo "Configuring SSL Key."
sed -i "s|#ssl.key:.*|ssl.key:|g" /etc/filebeat/filebeat.yml
sed -i "s|ssl.key:.*|ssl.key: '$SSL_KEY'|g" /etc/filebeat/filebeat.yml
fi
chmod go-w /etc/filebeat/filebeat.yml || true
chown root: /etc/filebeat/filebeat.yml || true

View File

@@ -36,11 +36,11 @@ function_wazuh_migration(){
fi
\cp -f /wazuh-migration/data/etc/ossec.conf /var/ossec/etc/ossec.conf
chown root:ossec /var/ossec/etc/ossec.conf
chown root:wazuh /var/ossec/etc/ossec.conf
chmod 640 /var/ossec/etc/ossec.conf
\cp -f /wazuh-migration/data/etc/client.keys /var/ossec/etc/client.keys
chown ossec:ossec /var/ossec/etc/client.keys
chown wazuh:wazuh /var/ossec/etc/client.keys
chmod 640 /var/ossec/etc/client.keys
\cp -f /wazuh-migration/data/etc/sslmanager.cert /var/ossec/etc/sslmanager.cert
@@ -49,25 +49,25 @@ function_wazuh_migration(){
chmod 640 /var/ossec/etc/sslmanager.cert /var/ossec/etc/sslmanager.key
\cp -f /wazuh-migration/data/etc/shared/default/agent.conf /var/ossec/etc/shared/default/agent.conf
chown ossec:ossec /var/ossec/etc/shared/default/agent.conf
chown wazuh:wazuh /var/ossec/etc/shared/default/agent.conf
chmod 660 /var/ossec/etc/shared/default/agent.conf
\cp -f /wazuh-migration/data/etc/decoders/* /var/ossec/etc/decoders/
chown ossec:ossec /var/ossec/etc/decoders/*
chown wazuh:wazuh /var/ossec/etc/decoders/*
chmod 660 /var/ossec/etc/decoders/*
\cp -f /wazuh-migration/data/etc/rules/* /var/ossec/etc/rules/
chown ossec:ossec /var/ossec/etc/rules/*
chown wazuh:wazuh /var/ossec/etc/rules/*
chmod 660 /var/ossec/etc/rules/*
if [ -e /wazuh-migration/data/agentless/.passlist ]; then
\cp -f /wazuh-migration/data/agentless/.passlist /var/ossec/agentless/.passlist
chown root:ossec /var/ossec/agentless/.passlist
chown root:wazuh /var/ossec/agentless/.passlist
chmod 640 /var/ossec/agentless/.passlist
fi
\cp -f /wazuh-migration/global.db /var/ossec/queue/db/global.db
chown ossec:ossec /var/ossec/queue/db/global.db
chown wazuh:wazuh /var/ossec/queue/db/global.db
chmod 640 /var/ossec/queue/db/global.db
# mark volume as migrated
@@ -112,6 +112,13 @@ function_entrypoint_scripts() {
fi
}
function_configure_vulnerability_detection() {
if [ "$INDEXER_PASSWORD" != "" ]; then
>&2 echo "Configuring password."
echo "$INDEXER_USERNAME" | /var/ossec/bin/wazuh-keystore -f indexer -k username
echo "$INDEXER_PASSWORD" | /var/ossec/bin/wazuh-keystore -f indexer -k password
fi
}
# Migrate data from /wazuh-migration volume
function_wazuh_migration
@@ -119,8 +126,11 @@ function_wazuh_migration
# create API custom user
function_create_custom_user
# configure Vulnerabilty detection
function_configure_vulnerability_detection
# run entrypoint scripts
function_entrypoint_scripts
# Start Wazuh
/var/ossec/bin/ossec-control start
/var/ossec/bin/wazuh-control start

View File

@@ -0,0 +1,4 @@
#!/usr/bin/with-contenv sh
# dumping ossec.log to standard output
exec tail -F /var/ossec/logs/ossec.log

View File

@@ -8,15 +8,24 @@ filebeat.modules:
enabled: false
setup.template.json.enabled: true
setup.template.overwrite: true
setup.template.json.path: '/etc/filebeat/wazuh-template.json'
setup.template.json.name: 'wazuh'
setup.template.overwrite: true
setup.ilm.enabled: false
output.elasticsearch:
hosts: ['https://elasticsearch:9200']
hosts: ['https://wazuh.indexer:9200']
#username:
#password:
#ssl.verification_mode:
#ssl.certificate_authorities:
#ssl.certificate:
#ssl.key:
logging.metrics.enabled: false
seccomp:
default_action: allow
syscalls:
- action: allow
names:
- rseq

View File

@@ -0,0 +1,11 @@
## 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 tag to use the correct repository
if [[ -n "${WAZUH_TAG}" ]]; then
REPOSITORY="packages.wazuh.com/4.x"
fi
yum install filebeat-${FILEBEAT_VERSION}-${FILEBEAT_REVISION} -y && \
curl -s https://${REPOSITORY}/filebeat/${WAZUH_FILEBEAT_MODULE} | tar -xvz -C /usr/share/filebeat/module

View File

@@ -0,0 +1,115 @@
# Permanent data mounted in volumes
i=0
PERMANENT_DATA[((i++))]="/var/ossec/api/configuration"
PERMANENT_DATA[((i++))]="/var/ossec/etc"
PERMANENT_DATA[((i++))]="/var/ossec/logs"
PERMANENT_DATA[((i++))]="/var/ossec/queue"
PERMANENT_DATA[((i++))]="/var/ossec/agentless"
PERMANENT_DATA[((i++))]="/var/ossec/var/multigroups"
PERMANENT_DATA[((i++))]="/var/ossec/integrations"
PERMANENT_DATA[((i++))]="/var/ossec/active-response/bin"
PERMANENT_DATA[((i++))]="/var/ossec/wodles"
PERMANENT_DATA[((i++))]="/etc/filebeat"
export PERMANENT_DATA
# Files mounted in a volume that should not be permanent
i=0
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/etc/internal_options.conf"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/integrations/slack"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/integrations/slack.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/integrations/virustotal"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/integrations/virustotal.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/integrations/shuffle"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/integrations/shuffle.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/integrations/pagerduty"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/integrations/pagerduty.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/integrations/maltiverse"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/integrations/maltiverse.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/active-response/bin/default-firewall-drop"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/active-response/bin/disable-account"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/active-response/bin/firewalld-drop"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/active-response/bin/firewall-drop"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/active-response/bin/host-deny"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/active-response/bin/ip-customblock"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/active-response/bin/ipfw"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/active-response/bin/kaspersky.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/active-response/bin/kaspersky"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/active-response/bin/npf"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/active-response/bin/wazuh-slack"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/active-response/bin/pf"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/active-response/bin/restart-wazuh"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/active-response/bin/restart.sh"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/active-response/bin/route-null"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/agentless/sshlogin.exp"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/agentless/ssh_pixconfig_diff"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/agentless/ssh_asa-fwsmconfig_diff"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/agentless/ssh_integrity_check_bsd"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/agentless/main.exp"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/agentless/su.exp"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/agentless/ssh_integrity_check_linux"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/agentless/register_host.sh"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/agentless/ssh_generic_diff"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/agentless/ssh_foundry_diff"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/agentless/ssh_nopass.exp"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/agentless/ssh.exp"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/utils.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/aws-s3"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/aws-s3.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/__init__.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/aws_tools.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/wazuh_integration.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/buckets_s3/__init__.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/buckets_s3/aws_bucket.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/buckets_s3/cloudtrail.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/buckets_s3/config.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/buckets_s3/guardduty.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/buckets_s3/load_balancers.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/buckets_s3/server_access.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/buckets_s3/umbrella.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/buckets_s3/vpcflow.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/buckets_s3/waf.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/services/__init__.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/services/aws_service.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/services/cloudwatchlogs.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/services/inspector.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/subscribers/__init__.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/subscribers/s3_log_handler.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/subscribers/sqs_message_processor.py"
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/db/orm.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/db/utils.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/db/__init__.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/azure_utils.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/azure_services/__init__.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/azure_services/analytics.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/azure_services/graph.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/azure_services/storage.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/docker/DockerListener"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/docker/DockerListener.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/gcloud"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/gcloud.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/integration.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/tools.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/exceptions.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/buckets/bucket.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/buckets/access_logs.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/pubsub/subscriber.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/etc/lists/malicious-ioc/malicious-ip"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/etc/lists/malicious-ioc/malicious-domains"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/etc/lists/malicious-ioc/malware-hashes"
PERMANENT_DATA_EXCP[((i++))]="/etc/filebeat/wazuh-template.json"
PERMANENT_DATA_EXCP[((i++))]="/etc/filebeat/filebeat.yml"
export PERMANENT_DATA_EXCP
# Files mounted in a volume that should be deleted
i=0
PERMANENT_DATA_DEL[((i++))]="/var/ossec/queue/db/.template.db"
export PERMANENT_DATA_DEL
i=0
PERMANENT_DATA_MOVE[((i++))]="/var/ossec/logs/ossec /var/ossec/logs/wazuh"
PERMANENT_DATA_MOVE[((i++))]="/var/ossec/queue/ossec /var/ossec/queue/sockets"
export PERMANENT_DATA_MOVE

View File

@@ -1,5 +1,5 @@
#!/bin/bash
# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2)
# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
# Variables
source /permanent_data.env
@@ -30,11 +30,7 @@ mkdir ${PERMANENT_PATH}
for permanent_dir in "${PERMANENT_DATA[@]}"; do
# Create the directory for the permanent file if it does not exist
DIR=$(dirname "${permanent_dir}")
if [ ! -e ${PERMANENT_PATH}${DIR} ]
then
mkdir -p ${PERMANENT_PATH}${DIR}
fi
mv ${permanent_dir} ${PERMANENT_PATH}${permanent_dir}
mkdir -p ${PERMANENT_PATH}${DIR}
cp -ar ${permanent_dir} ${PERMANENT_PATH}${DIR}
done

View File

@@ -1,84 +0,0 @@
# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2)
version: '3.7'
services:
wazuh:
build: wazuh-odfe/
image: wazuh/wazuh-odfe:dev-version
hostname: wazuh-manager
restart: always
ports:
- "1514:1514"
- "1515:1515"
- "514:514/udp"
- "55000:55000"
environment:
- ELASTICSEARCH_URL=https://elasticsearch:9200
- ELASTIC_USERNAME=admin
- ELASTIC_PASSWORD=admin
- FILEBEAT_SSL_VERIFICATION_MODE=none
volumes:
- ossec_api_configuration:/var/ossec/api/configuration
- ossec_etc:/var/ossec/etc
- ossec_logs:/var/ossec/logs
- ossec_queue:/var/ossec/queue
- ossec_var_multigroups:/var/ossec/var/multigroups
- ossec_integrations:/var/ossec/integrations
- ossec_active_response:/var/ossec/active-response/bin
- ossec_agentless:/var/ossec/agentless
- ossec_wodles:/var/ossec/wodles
- filebeat_etc:/etc/filebeat
- filebeat_var:/var/lib/filebeat
elasticsearch:
image: amazon/opendistro-for-elasticsearch:1.12.0
hostname: elasticsearch
restart: always
ports:
- "9200:9200"
environment:
- discovery.type=single-node
- cluster.name=wazuh-cluster
- network.host=0.0.0.0
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
- bootstrap.memory_lock=true
ulimits:
memlock:
soft: -1
hard: -1
nofile:
soft: 65536
hard: 65536
kibana:
build: kibana-odfe/
image: wazuh/wazuh-kibana-odfe:dev-version
hostname: kibana
restart: always
ports:
- 443:5601
environment:
- ELASTICSEARCH_USERNAME=admin
- ELASTICSEARCH_PASSWORD=admin
- SERVER_SSL_ENABLED=true
- SERVER_SSL_CERTIFICATE=/usr/share/kibana/config/opendistroforelasticsearch.example.org.cert
- SERVER_SSL_KEY=/usr/share/kibana/config/opendistroforelasticsearch.example.org.key
depends_on:
- elasticsearch
links:
- elasticsearch:elasticsearch
- wazuh:wazuh
volumes:
ossec_api_configuration:
ossec_etc:
ossec_logs:
ossec_queue:
ossec_var_multigroups:
ossec_integrations:
ossec_active_response:
ossec_agentless:
ossec_wodles:
filebeat_etc:
filebeat_var:

View File

@@ -1,82 +0,0 @@
# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2)
version: '3.7'
services:
wazuh:
image: wazuh/wazuh-odfe:4.1.5
hostname: wazuh-manager
restart: always
ports:
- "1514:1514"
- "1515:1515"
- "514:514/udp"
- "55000:55000"
environment:
- ELASTICSEARCH_URL=https://elasticsearch:9200
- ELASTIC_USERNAME=admin
- ELASTIC_PASSWORD=admin
- FILEBEAT_SSL_VERIFICATION_MODE=none
volumes:
- ossec_api_configuration:/var/ossec/api/configuration
- ossec_etc:/var/ossec/etc
- ossec_logs:/var/ossec/logs
- ossec_queue:/var/ossec/queue
- ossec_var_multigroups:/var/ossec/var/multigroups
- ossec_integrations:/var/ossec/integrations
- ossec_active_response:/var/ossec/active-response/bin
- ossec_agentless:/var/ossec/agentless
- ossec_wodles:/var/ossec/wodles
- filebeat_etc:/etc/filebeat
- filebeat_var:/var/lib/filebeat
elasticsearch:
image: amazon/opendistro-for-elasticsearch:1.12.0
hostname: elasticsearch
restart: always
ports:
- "9200:9200"
environment:
- discovery.type=single-node
- cluster.name=wazuh-cluster
- network.host=0.0.0.0
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
- bootstrap.memory_lock=true
ulimits:
memlock:
soft: -1
hard: -1
nofile:
soft: 65536
hard: 65536
kibana:
image: wazuh/wazuh-kibana-odfe:4.1.5
hostname: kibana
restart: always
ports:
- 443:5601
environment:
- ELASTICSEARCH_USERNAME=admin
- ELASTICSEARCH_PASSWORD=admin
- SERVER_SSL_ENABLED=true
- SERVER_SSL_CERTIFICATE=/usr/share/kibana/config/opendistroforelasticsearch.example.org.cert
- SERVER_SSL_KEY=/usr/share/kibana/config/opendistroforelasticsearch.example.org.key
depends_on:
- elasticsearch
links:
- elasticsearch:elasticsearch
- wazuh:wazuh
volumes:
ossec_api_configuration:
ossec_etc:
ossec_logs:
ossec_queue:
ossec_var_multigroups:
ossec_integrations:
ossec_active_response:
ossec_agentless:
ossec_wodles:
filebeat_etc:
filebeat_var:

1
docs/.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
book

212
docs/README.md Normal file
View File

@@ -0,0 +1,212 @@
# Wazuh containers for Docker
[![Slack](https://img.shields.io/badge/slack-join-blue.svg)](https://wazuh.com/community/join-us-on-slack/)
[![Email](https://img.shields.io/badge/email-join-blue.svg)](https://groups.google.com/forum/#!forum/wazuh)
[![Documentation](https://img.shields.io/badge/docs-view-green.svg)](https://documentation.wazuh.com)
[![Documentation](https://img.shields.io/badge/web-view-green.svg)](https://wazuh.com)
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 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).**
* Wazuh agent: This container contains the Wazuh agent services. Current functionality is limited.
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 indexers, and one Wazuh dashboard.
The folder `wazuh-agent` contains a README explaining how to run a container with Wazuh agent.
## 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)
## Directory structure
├── build-docker-images
│   ├── build-images.sh
│   ├── build-images.yml
│   ├── README.md
│   ├── wazuh-agent
│   │   ├── config
│   │   │   ├── check_repository.sh
│   │   │   └── etc
│   │   │   ├── cont-init.d
│   │   │   │   ├── 0-wazuh-init
│   │   │   │   └── 1-agent
│   │   │   └── services.d
│   │   │   └── ossec-logs
│   │   │   └── run
│   │   └── Dockerfile
│   ├── wazuh-dashboard
│   │   ├── config
│   │   │   ├── check_repository.sh
│   │   │   ├── config.sh
│   │   │   ├── config.yml
│   │   │   ├── entrypoint.sh
│   │   │   ├── wazuh_app_config.sh
│   │   │   └── wazuh.yml
│   │   └── Dockerfile
│   ├── wazuh-indexer
│   │   ├── config
│   │   │   ├── action_groups.yml
│   │   │   ├── check_repository.sh
│   │   │   ├── config.sh
│   │   │   ├── config.yml
│   │   │   ├── entrypoint.sh
│   │   │   ├── internal_users.yml
│   │   │   ├── opensearch.yml
│   │   │   ├── roles_mapping.yml
│   │   │   ├── roles.yml
│   │   │   └── securityadmin.sh
│   │   └── Dockerfile
│   └── wazuh-manager
│   ├── config
│   │   ├── check_repository.sh
│   │   ├── create_user.py
│   │   ├── etc
│   │   │   ├── cont-init.d
│   │   │   │   ├── 0-wazuh-init
│   │   │   │   ├── 1-config-filebeat
│   │   │   │   └── 2-manager
│   │   │   └── services.d
│   │   │   ├── filebeat
│   │   │   │   ├── finish
│   │   │   │   └── run
│   │   │   └── ossec-logs
│   │   │   └── run
│   │   ├── filebeat_module.sh
│   │   ├── filebeat.yml
│   │   ├── permanent_data.env
│   │   └── permanent_data.sh
│   └── Dockerfile
├── CHANGELOG.md
├── docs
│   ├── book.toml
│   ├── build.sh
│   ├── dev
│   │   ├── build-image.md
│   │   ├── README.md
│   │   ├── run-tests.md
│   │   └── setup.md
│   ├── README.md
│   ├── ref
│   │   ├── configuration
│   │   │   ├── configuration-files.md
│   │   │   ├── environment-variables.md
│   │   │   └── README.md
│   │   ├── getting-started
│   │   │   ├── deployment
│   │   │   │   ├── multi-node.md
│   │   │   │   ├── README.md
│   │   │   │   ├── single-node.md
│   │   │   │   └── wazuh-agent.md
│   │   │   ├── README.md
│   │   │   └── requirements.md
│   │   ├── glossary.md
│   │   ├── Introduction
│   │   │   ├── compatibility.md
│   │   │   ├── description.md
│   │   │   └── README.md
│   │   ├── README.md
│   │   └── upgrade.md
│   ├── server.sh
│   └── SUMMARY.md
├── indexer-certs-creator
│   ├── config
│   │   └── entrypoint.sh
│   ├── Dockerfile
│   └── README.md
├── LICENSE
├── multi-node
│   ├── config
│   │   ├── certs.yml
│   │   ├── nginx
│   │   │   └── nginx.conf
│   │   ├── wazuh_cluster
│   │   │   ├── wazuh_manager.conf
│   │   │   └── wazuh_worker.conf
│   │   ├── wazuh_dashboard
│   │   │   ├── opensearch_dashboards.yml
│   │   │   └── wazuh.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.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 [error opening dir]
│   ├── docker-compose.yml
│   ├── generate-indexer-certs.yml
│   └── README.md
├── VERSION.json
└── wazuh-agent
├── config
│   └── wazuh-agent-conf
└── docker-compose.yml
## Branches
* `main` branch contains the latest code, be aware of possible bugs on this branch.
## Compatibility Matrix
| Wazuh version | ODFE | XPACK |
|---------------|---------|--------|
| v4.3.0+ | | |
| v4.2.7 | 1.13.2 | 7.11.2 |
| v4.2.6 | 1.13.2 | 7.11.2 |
| v4.2.5 | 1.13.2 | 7.11.2 |
| v4.2.4 | 1.13.2 | 7.11.2 |
| v4.2.3 | 1.13.2 | 7.11.2 |
| v4.2.2 | 1.13.2 | 7.11.2 |
| v4.2.1 | 1.13.2 | 7.11.2 |
| v4.2.0 | 1.13.2 | 7.10.2 |
| v4.1.5 | 1.13.2 | 7.10.2 |
| v4.1.4 | 1.12.0 | 7.10.2 |
| v4.1.3 | 1.12.0 | 7.10.2 |
| v4.1.2 | 1.12.0 | 7.10.2 |
| v4.1.1 | 1.12.0 | 7.10.2 |
| v4.1.0 | 1.12.0 | 7.10.2 |
| v4.0.4 | 1.11.0 | |
| v4.0.3 | 1.11.0 | |
| v4.0.2 | 1.11.0 | |
| v4.0.1 | 1.11.0 | |
| v4.0.0 | 1.10.1 | |
## Credits and Thank you
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 them and everyone else who has contributed to this project.
## License and copyright
Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
## Web references
[Wazuh website](http://wazuh.com)

26
docs/SUMMARY.md Normal file
View File

@@ -0,0 +1,26 @@
# Summary
- [Introduction](README.md)
# Development Guide
- [Introduction](dev/introduction.md)
- [Setup Environment](dev/setup.md)
- [Build Image](dev/build-image.md)
- [Run Tests](dev/run-tests.md)
# Reference Manual
- [Introduction](ref/Introduction/introduction.md)
- [Description](ref/Introduction/description.md)
- [Getting Started](ref/getting-started/getting-started.md)
- [Requirements](ref/getting-started/requirements.md)
- [Deployment](ref/getting-started/deployment/deployment.md)
- [Single Node Wazuh Stack](ref/getting-started/deployment/single-node.md)
- [Multi Node Wazuh Stack](ref/getting-started/deployment/multi-node.md)
- [Wazuh Agent](ref/getting-started/deployment/wazuh-agent.md)
- [Configuration](ref/configuration/configuration.md)
- [Environment Variabless](ref/configuration/environment-variables.md)
- [Configuration files](ref/configuration/configuration-files.md)
- [Upgrade](ref/upgrade.md)
- [Glossary](ref/glossary.md)

7
docs/book.toml Normal file
View File

@@ -0,0 +1,7 @@
[book]
title = "Wazuh Docker Documentation"
description = "Technical documentation for Wazuh Docker deployment."
authors = ["Victor Erenu"]
multilingual = false
src = "."
language = "en"

3
docs/build.sh Executable file
View File

@@ -0,0 +1,3 @@
#! /bin/sh
mdbook build

32
docs/dev/build-image.md Normal file
View File

@@ -0,0 +1,32 @@
# Wazuh Docker Image Builder
The creation of the images for the Wazuh stack deployment in Docker is done with the build-images.yml script
To execute the process, the following must be executed in the root of the wazuh-docker repository:
```
$ build-docker-images/build-images.sh
```
This script initializes the environment variables needed to build each of the images.
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.14.0
```
To get all the available script options use the -h or --help option:
```
$ build-docker-images/build-images.sh -h
Usage: build-docker-images/build-images.sh [OPTIONS]
-d, --dev <ref> [Optional] Set the development stage you want to build, example rc2 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.14.0.
-h, --help Show this help.
```

40
docs/dev/introduction.md Normal file
View File

@@ -0,0 +1,40 @@
# Development Guide - Introduction
Welcome to the Development Guide for Wazuh-docker version 4.14.0. This guide is intended for developers, contributors, and advanced users who wish to understand the development aspects of the Wazuh-Docker project, build custom Docker images, or contribute to its development.
## Purpose of This Guide
The primary goals of this guide are:
- To provide a clear understanding of the development environment setup.
- To outline the process for building Wazuh Docker images from source.
- To explain how to run tests to ensure the integrity and functionality of the images.
- To offer insights into the project structure and contribution guidelines (though detailed contribution guidelines are typically found in `CONTRIBUTING.md` in the repository).
## Who Should Use This Guide?
This guide is for you if you want to:
- Modify existing Wazuh Docker images.
- Build Wazuh Docker images for a specific Wazuh version or with custom configurations.
- Understand the build process and scripts used in this project.
- Contribute code, features, or bug fixes to the Wazuh-Docker repository.
## What This Guide Covers
This guide is organized into the following sections:
- **[Setup Environment](setup.md)**: Instructions on how to prepare your local machine for Wazuh-Docker development, including necessary tools and dependencies.
- **[Build Image](build-image.md)**: Step-by-step procedures for building the various Wazuh Docker images (Wazuh manager, Wazuh indexer, Wazuh dashboard).
- **[Run Tests](run-tests.md)**: Information on how to execute automated tests to validate the built images and configurations.
## Prerequisites
Before you begin, it's assumed that you have a basic understanding of:
- Docker and Docker Compose.
- Linux command-line interface.
- Version control systems like Git.
- The Wazuh platform and its components.
We encourage you to explore the Wazuh-Docker repository and familiarize yourself with its structure. If you plan to contribute, please also review the project's contribution guidelines.

28
docs/dev/run-tests.md Normal file
View File

@@ -0,0 +1,28 @@
# Pull Request Test Execution
This repository includes automated tests designed to validate the correct deployment of Wazuh using Docker. These tests are executed on every pull request (PR) to ensure the integrity and stability of the system when changes are introduced.
## Purpose
The main objective of the tests is to verify that the Wazuh Docker environment can be successfully deployed and that all its core components (Wazuh Manager, Indexer, Dashboard, and Agents) operate as expected after any modification in the codebase.
## When Tests Run
- Tests are automatically triggered on every pull request (PR) opened against the repository.
- They also run when changes are pushed to an existing PR.
## What Is Tested
The tests aim to ensure:
- Successful build and startup of all Docker containers.
- Proper communication between components (e.g., Manager ↔ Indexer, Dashboard ↔ API).
- No critical errors appear in the logs.
- Key services are healthy and accessible.
## Benefits
- Reduces the risk of breaking the deployment flow.
- Ensures system consistency during feature development and refactoring.
- Provides early feedback on integration issues before merging.
---

55
docs/dev/setup.md Normal file
View File

@@ -0,0 +1,55 @@
# Development Guide - Setup Environment
This section outlines the steps required to set up your local development environment for working with the Wazuh-Docker project (version 4.14.0). A proper setup is crucial for building images, running tests, and contributing effectively.
## Prerequisites
Before you begin, ensure your system meets the following requirements:
1. **Operating System**:
* A Linux-based distribution is recommended (e.g., Ubuntu, RedHat).
* macOS or Windows with WSL 2 can also be used, but some scripts might require adjustments.
2. **Docker and Docker Compose**:
* **Docker Engine**: Install the latest stable version of Docker Engine. Refer to the [official Docker documentation](https://docs.docker.com/engine/install/) for installation instructions specific to your OS.
3. **Git**:
* Install Git for cloning the repository and managing versions. Most systems have Git pre-installed. If not, visit [https://git-scm.com/downloads](https://git-scm.com/downloads).
5. **Sufficient System Resources**:
* **RAM**: At least 8GB of RAM is recommended, especially if you plan to run multiple Wazuh components locally. 16GB or more is ideal.
* **CPU**: A multi-core processor (2+ cores) is recommended.
* **Disk Space**: Ensure you have sufficient disk space (at least 20-30GB) for Docker images, containers, and Wazuh data.
## Setting Up the Environment
Follow these steps to prepare your development environment:
1. **Clone the Repository**:
Clone the `wazuh-docker` repository from GitHub. It's important to check out the specific branch you intend to work with, in this case, `4.14.0`.
```bash
git clone [https://github.com/wazuh/wazuh-docker.git](https://github.com/wazuh/wazuh-docker.git)
cd wazuh-docker
git checkout v4.14.0
```
2. **Verify Docker Installation**:
Ensure Docker is running and accessible by your user (you might need to add your user to the `docker` group or use `sudo`).
```bash
docker --version
docker info
```
These commands should output the versions of Docker and information about your Docker setup without errors.
3. **Review Project Structure**:
Familiarize yourself with the directory structure of the cloned repository. Key directories often include:
* `build-docker-images/wazuh-manager/`: Dockerfile and related files for the Wazuh manager.
* `build-docker-images/wazuh-indexer/`: Dockerfile and related files for the Wazuh indexer.
* `build-docker-images/wazuh-dashboard/`: Dockerfile and related files for the Wazuh dashboard.
* `build-docker-images/wazuh-agent/` : Dockerfile and related files for Wazuh agents.
* `single-node/` : Compose and configuration files for Wazuh deployment with 1 container of each Wazuh component.
* `multi-node/` : Compose and configuration files for Wazuh deployment with 1 container of Wazuh dashboardm 2 containers of Wazuh manager (1 master and 1 worker) and 3 containers of Wazuh indexer.
* `wazuh-agent/` : Compose and configuration files for Wazuh agent deployment.

View File

@@ -0,0 +1,45 @@
# Reference Manual - Description
This section provides a detailed description of Wazuh-docker (version 4.14.0), its components, and its architecture when deployed using Docker containers. Understanding these aspects is key to effectively deploying and managing your Wazuh environment.
## What is Wazuh?
Wazuh is a free, open-source, and enterprise-ready security monitoring solution for threat detection, integrity monitoring, incident response, and compliance. It consists of several key components that work together to provide comprehensive security visibility.
## What is Wazuh-docker?
Wazuh-docker is a project that provides Docker images and `docker compose` configurations to simplify the deployment and management of the Wazuh platform. By containerizing Wazuh components, Wazuh-docker offers:
- **Rapid Deployment**: Quickly set up a full Wazuh environment.
- **Consistency**: Ensures that Wazuh runs the same way across different environments.
- **Scalability**: Easier to scale components as needed (especially with orchestrators like Kubernetes, though this documentation primarily focuses on Docker Compose).
- **Isolation**: Components run in isolated containers, reducing conflicts.
- **Portability**: Run Wazuh on Linux system that supports Docker.
## Core Components in Wazuh-Docker
The Wazuh-Docker project typically provides images for the following core Wazuh components, adapted for version 4.14.0:
1. **Wazuh Manager**:
- The central component that collects and analyzes data from deployed Wazuh agents.
- It performs log analysis, file integrity checking, rootkit detection, real-time alerting, and active response.
- In a Docker deployment, the Wazuh manager runs in its own container. It exposes ports for agent communication and API access.
2. **Wazuh Indexer**:
- A highly scalable, full-text search and analytics engine.
- Based on OpenSearch (or historically Elasticsearch), it stores and indexes alerts and monitoring data generated by the Wazuh manager.
- The Wazuh indexer container provides the data persistence layer for Wazuh alerts and events. For version 4.14.0, this is typically an OpenSearch-based component.
3. **Wazuh Dashboard**:
- A flexible visualization tool based on OpenSearch Dashboards (or historically Kibana).
- It provides a web interface for querying, visualizing, and analyzing Wazuh data stored in the Wazuh indexer.
- Users can explore security events, manage agent configurations (via the Wazuh plugin), and generate reports.
## Key Features of Wazuh-Docker Deployments
- **Docker Compose**: Most deployments are orchestrated using `docker-compose.yml` files, which define the services, networks, volumes, and configurations for the Wazuh stack.
- **Persistent Data**: Docker volumes are used to persist critical data, such as Wazuh manager configurations, agent keys, Wazuh indexer data, and Wazuh dashboard settings, even if containers are stopped or recreated.
- **Networking**: Docker networks are configured to allow communication between the Wazuh components.
- **Environment Variables**: Configuration of containers is often managed through environment variables passed at runtime.
Understanding this architecture and the role of each component is fundamental for successful deployment, troubleshooting, and scaling of your Wazuh environment using Wazuh-Docker.

View File

@@ -0,0 +1,47 @@
# Reference Manual - Introduction
Welcome to the Reference Manual for Wazuh-Docker, version 4.14.0. This manual provides comprehensive information about deploying, configuring, and managing your Wazuh environment using Docker.
## Purpose of This Manual
This Reference Manual is designed to be your go-to resource for understanding the intricacies of Wazuh-Docker. It aims to cover:
- The core concepts and architecture of Wazuh when deployed with Docker.
- Step-by-step guidance for getting started, from requirements to various deployment scenarios.
- Detailed explanations of configuration options, including environment variables and persistent data management.
- Procedures for common operational tasks like upgrading your deployment.
- A glossary of terms to help you understand Wazuh and Docker-specific terminology.
## Who Should Use This Manual?
This manual is intended for:
- **System Administrators** responsible for deploying and maintaining Wazuh.
- **Security Analysts** who use Wazuh and need to understand its Dockerized deployment.
- **DevOps Engineers** integrating Wazuh into their CI/CD pipelines or containerized infrastructure.
- Anyone seeking detailed technical information about Wazuh-Docker.
## How This Manual is Organized
This manual is structured to help you find information efficiently:
- **[Description](description.md)**: Provides a detailed overview of Wazuh-Docker, its components, and how they work together in a containerized setup.
- **[Getting Started](getting-started/getting-started.md)**: Guides you through the initial setup, from prerequisites to deploying your first Wazuh stack.
- **[Requirements](getting-started/requirements.md)**: Lists the necessary hardware and software.
- **[Deployment](getting-started/deployment/README.md)**: Offers instructions for different deployment models:
- [Single Node Wazuh Stack](getting-started/deployment/single-node.md)
- [Multi Node Wazuh Stack](getting-started/deployment/multi-node.md)
- [Wazuh Agent](getting-started/deployment/wazuh-agent.md)
- **[Configuration](configuration/configuration.md)**: Explains how to customize your Wazuh-Docker deployment.
- [Environment Variables](configuration/environment-variables.md)
- [Configuration Files](configuration/configuration-files.md)
- **[Upgrade](upgrade.md)**: Provides instructions for upgrading your Wazuh-Docker deployment to a newer version.
- **[Glossary](glossary.md)**: Defines key terms and concepts.
## Using This Manual
- If you are new to Wazuh-docker, we recommend starting with the [Description](description.md) and then proceeding to the [Getting Started](getting-started/getting-started.md) section.
- If you need to customize your deployment, refer to the [Configuration](configuration/configuration.md) section.
- For specific terms or concepts, consult the [Glossary](glossary.md).
This manual refers to version 4.14.0 of Wazuh-Docker. Ensure you are using the documentation that corresponds to your deployed version.

View File

@@ -0,0 +1,32 @@
# Configuration files
### 1. Wazuh Manager Configuration
* **`ossec.conf`**: The main configuration file for the Wazuh manager. It controls rules, decoders, agent enrollment, active responses, integrations, clustering, and more.
* **Customization**: Mount a custom `ossec.conf` or specific configuration snippets (e.g., local rules in `local_rules.xml`) into the manager container at `/wazuh-mount-point/`, which will be copied to the path `/var/ossec` (e.g., the file `/var/ossec/etc/ossec.conf` must be mounted at `/wazuh-mount-point/etc/ossec.conf`) .
### 2. Wazuh Indexer Configuration
* **`opensearch.yml`**: The primary configuration file for OpenSearch. Controls cluster settings, network binding, path settings, discovery, memory allocation, etc.
* **Customization**: Mount a custom `opensearch.yml` into the indexer container(s) at `/usr/share/wazuh-indexer/config/opensearch.yml`.
* **JVM Settings (`jvm.options`)**: Manages Java Virtual Machine settings, especially heap size (`-Xms`, `-Xmx`). Critical for performance and stability.
* **Customization**: Mount a custom `jvm.options` file or set `OPENSEARCH_JAVA_OPTS` environment variable.
### 3. Wazuh Dashboard (OpenSearch Dashboards) Configuration
* **`opensearch_dashboards.yml`**: The main configuration file for OpenSearch Dashboards. Controls server host/port, OpenSearch connection URL, SSL settings, and Wazuh plugin settings.
* **Customization**: Mount a custom `opensearch_dashboards.yml` into the dashboard container at `/usr/share/wazuh-dashboard/config/opensearch_dashboards.yml` and custom `wazuh.yml` into the dashboard container at `/usr/share/wazuh-dashboard/data/wazuh/config/wazuh.yml` .
* **Wazuh Plugin Settings**: The Wazuh plugin for the dashboard has its own configuration, often within `opensearch_dashboards.yml` or managed through environment variables, specifying the Wazuh API URL and credentials.
## Applying Configuration Changes
1. **Modify `docker-compose.yml`**:
* For changes to environment variables, port mappings, or volume mounts.
* After changes, you typically need to stop and restart the containers:
```bash
docker compose down
docker compose up -d
```
Consult the official Wazuh documentation for version 4.14.0 for detailed information on all possible configuration parameters for each component.

View File

@@ -0,0 +1,28 @@
# Reference Manual - Configuration
This section details how to configure your Wazuh-Docker deployment (version 4.14.0). Proper configuration is key to tailoring the Wazuh stack to your specific needs, managing data persistence, and integrating with your environment.
## Overview of Configuration Methods
Configuring Wazuh components within a Docker environment typically involves several methods:
1. **[Environment Variables](environment-variables.md)**:
* Many container settings are controlled by passing environment variables at runtime (e.g., via the `docker-compose.yml` file or `docker run` commands).
* These are often used for setting up initial passwords, component versions, cluster names, or basic operational parameters.
2. **[Configuration Files](configuration-files.md)**:
* Core Wazuh components (manager, indexer, dashboard) rely on their traditional configuration files (e.g., `ossec.conf`, `opensearch.yml`, `opensearch_dashboards.yml`).
* To customize these, you typically mount your custom configuration files into the containers, replacing or supplementing the defaults. This is managed using Docker volumes in your `docker-compose.yml`.
3. **Docker Compose File (`docker-compose.yml`)**:
* The `docker-compose.yml` file itself is a primary configuration tool. It defines:
* Which services (containers) to run.
* The Docker images to use.
* Port mappings.
* Volume mounts for persistent data and custom configurations.
* Network configurations.
* Resource limits (CPU, memory).
* Dependencies between services.
4. **Persistent Data Volumes**:
* Configuration related to data storage (e.g., paths for Wazuh Indexer data, Wazuh manager logs and agent keys) is managed through Docker volumes. Persisting these volumes ensures your data and critical configurations survive container restarts or recreations.

View File

@@ -0,0 +1,116 @@
# Environment Variables in Wazuh Docker Deployment
This document outlines the environment variables applicable to the Wazuh Docker deployment, covering the Wazuh Manager, Indexer, Dashboard, and Agent components. It also explains how to override configuration settings using environment variables.
## Table of Contents
- [Wazuh Manager](#wazuh-manager)
- [Wazuh Indexer](#wazuh-indexer)
- [Wazuh Dashboard](#wazuh-dashboard)
- [Wazuh Agent](#wazuh-agent)
- [Overriding Configuration Files with Environment Variables](#overriding-configuration-files-with-environment-variables)
---
## Wazuh Manager
The Wazuh Manager container accepts the following environment variables, which can be set in the `docker-compose.yml` file under the `environment` section:
```yaml
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.*-
```
**Variable Descriptions:**
- `INDEXER_USERNAME` / `INDEXER_PASSWORD`: Credentials for accessing the Wazuh Indexer with `admin` user or a user with the same permissions.
- `WAZUH_API_URL`: URL of the Wazuh API, used by other services for communication.
- `DASHBOARD_USERNAME` / `DASHBOARD_PASSWORD`: Credentials for the Wazuh Dashboard to authenticate with the Indexer.
- `API_USERNAME` / `API_PASSWORD`: Credentials for the Wazuh API user, utilized by the Dashboard for API interactions.
---
## Wazuh Indexer
The Wazuh Indexer services (`single-node` and `multi-node`) use the following environment variable:
```yaml
environment:
- "OPENSEARCH_JAVA_OPTS=-Xms1g -Xmx1g"
```
**Variable Descriptions:**
- `OPENSEARCH_JAVA_OPTS`: Sets JVM heap size and other Java options.
---
## Wazuh Dashboard
The Wazuh Dashboard container accepts the following environment variables, which should be set in the `docker-compose.yml` file:
```yaml
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.*-
```
**Variable Descriptions:**
- `INDEXER_USERNAME` / `INDEXER_PASSWORD`: Credentials used by the Dashboard to authenticate with the Wazuh Indexer.
- `WAZUH_API_URL`: Base URL of the Wazuh API, used for querying and visualizing security data.
- `DASHBOARD_USERNAME` / `DASHBOARD_PASSWORD`: User credentials for the Dashboard interface.
- `API_USERNAME` / `API_PASSWORD`: API user credentials for authenticating Wazuh API requests initiated by the Dashboard.
These variables are critical for enabling communication between the Wazuh Dashboard, the Wazuh Indexer, and the Wazuh API.
---
## Wazuh Agent
The Wazuh Agent container uses the following environment variables to dynamically update the `ossec.conf` configuration file at runtime:
```yaml
environment:
- WAZUH_MANAGER_SERVER=wazuh.manager
- WAZUH_MANAGER_PORT=1514
- WAZUH_REGISTRATION_SERVER=wazuh.manager
- WAZUH_REGISTRATION_PORT=1515
- WAZUH_AGENT_NAME=my-agent
- WAZUH_REGISTRATION_PASSWORD=StrongPassword
```
These variables are used by the `set_manager_conn()` function in the entrypoint script to replace placeholder values in `ossec.conf` and set the enrollment password.
---
## Overriding Configuration Files with Environment Variables
To override configuration values from files such as `opensearch.yml` and `opensearch_dashboards.yml` using environment variables:
1. Convert the configuration key to uppercase.
2. Replace any dots (`.`) in the key with underscores (`_`).
3. Assign the corresponding value.
### Examples:
| YAML Key | Environment Variable |
|-----------------------------------------|--------------------------------------------|
| `discovery.type: single-node` | `DISCOVERY_TYPE=single-node` |
| `opensearch.hosts: https://url:9200` | `OPENSEARCH_HOSTS=https://url:9200` |
| `server.port: 5601` | `SERVER_PORT=5601` |
This approach allows you to configure the services dynamically via Docker without modifying internal files.
---

View File

@@ -0,0 +1,46 @@
# Reference Manual - Deployment
This section provides detailed instructions for deploying Wazuh-Docker (version 4.14.0) in various configurations. Choose the deployment model that best suits your needs, from simple single-node setups for testing to more robust multi-node configurations for production environments.
## Overview of Deployment Options
Wazuh-Docker offers flexibility in how you can deploy the Wazuh stack. The primary methods covered in this documentation are:
1. **[Single Node Wazuh Stack](single-node.md)**:
* **Description**: Deploys all core Wazuh components (Wazuh manager, Wazuh indexer, Wazuh dashboard) as Docker containers on a single host machine.
* **Use Cases**: Ideal for development, testing, demonstrations, proof-of-concepts, and small-scale production environments where simplicity is prioritized and high availability is not a critical concern.
* **Pros**: Easiest and quickest to set up.
* **Cons**: Single point of failure; limited scalability compared to multi-node.
2. **[Multi Node Wazuh Stack](multi-node.md)**:
* **Description**: This typically refers to deploying a Wazuh Indexer cluster and potentially multiple Wazuh managers for improved scalability and resilience. While true multi-host orchestration often uses tools like Kubernetes, this section may cover configurations achievable with Docker Compose, possibly across multiple Docker hosts or with clustered services on a single powerful host.
* **Use Cases**: Production environments requiring higher availability, data redundancy (for Wazuh Indexer), and the ability to handle a larger number of agents.
* **Pros**: Improved fault tolerance (for clustered components like the Indexer), better performance distribution.
* **Cons**: More complex to set up and manage than a single-node deployment.
## Before You Begin Deployment
Ensure you have:
- Met all the [System Requirements](ref/getting-started/requirements.md).
- Installed Docker and Docker Compose on your host(s).
- Cloned the `wazuh-docker` repository (version `4.14.0`) or downloaded the necessary deployment files.
```bash
git clone [https://github.com/wazuh/wazuh-docker.git](https://github.com/wazuh/wazuh-docker.git)
cd wazuh-docker
git checkout v4.14.0
```
- Made a backup of any existing Wazuh data if you are migrating or upgrading.
## Choosing the Right Deployment
Consider the following factors when choosing a deployment model:
- **Scale**: How many agents do you plan to connect?
- **Availability**: What are your uptime requirements?
- **Resources**: What hardware resources (CPU, RAM, disk) are available?
- **Complexity**: What is your team's familiarity with Docker and distributed systems?
For most new users, starting with the [Single Node Wazuh Stack](single-node.md) is recommended to familiarize themselves with Wazuh-Docker. You can then explore more complex setups as your needs grow.
Navigate to the specific deployment guide linked above for detailed, step-by-step instructions.

View File

@@ -0,0 +1,34 @@
# Wazuh Docker Deployment
## Deploying Wazuh Docker in a Multi-Node Configuration
This deployment utilizes the `multi-node/docker-compose.yml` file, which defines a cluster setup with two Wazuh manager containers, three Wazuh indexer containers, and one Wazuh dashboard container. Follow these steps to deploy this configuration:
1. Navigate to the `multi-node` directory within your repository:
```bash
cd multi-node
```
2. Increase `vm.max_map_count` on each Docker host that will run a Wazuh Indexer container (Linux). This setting is crucial for Wazuh Indexer to operate correctly. This command requires root permissions:
```bash
sudo sysctl -w vm.max_map_count=262144
```
**Note:** This change is temporary and will revert upon reboot. To make it permanent on each relevant host, you'll need to edit the `/etc/sysctl.conf` file, add `vm.max_map_count=262144`, and then apply the change with `sudo sysctl -p`.
3. Run the script to generate the necessary certificates for the Wazuh Stack. This ensures secure communication between the nodes:
```bash
docker compose -f generate-indexer-certs.yml run --rm generator
```
4. Start the Wazuh environment using `docker compose`:
* To run in the foreground (logs will be displayed in your current terminal; press `Ctrl+C` to stop):
```bash
docker compose up
```
* To run in the background (detached mode, allowing the containers to run independently of your terminal):
```bash
docker compose up -d
```
Please allow some time for the environment to initialize, especially on the first run. A multi-node setup can take a few minutes (depending on your host resources and network) as the Wazuh Indexer cluster forms, and the necessary indexes and index patterns are generated.

View File

@@ -0,0 +1,35 @@
# Wazuh Docker Deployment
## Deploying Wazuh Docker in a Single-Node Configuration
This deployment uses the `single-node/docker-compose.yml` file, which defines a setup with one Wazuh manager container, one Wazuh indexer container, and one Wazuh dashboard container. Follow these steps to deploy it:
1. Navigate to the `single-node` directory within your repository:
```bash
cd single-node
```
2. Increase `vm.max_map_count` on each Docker host that will run a Wazuh Indexer container (Linux). This setting is crucial for Wazuh Indexer to operate correctly. This command requires root permissions:
```bash
sudo sysctl -w vm.max_map_count=262144
```
**Note:** This change is temporary and will revert upon reboot. To make it permanent, you'll need to edit the `/etc/sysctl.conf` file and add `vm.max_map_count=262144`, then apply with `sudo sysctl -p`.
3. Run the script to generate the necessary certificates for the Wazuh Stack. This ensures secure communication between the nodes:
```bash
docker compose -f generate-indexer-certs.yml run --rm generator
```
4. Start the Wazuh environment using `docker compose`:
* To run in the foreground (logs will be displayed in your current terminal; press `Ctrl+C` to stop):
```bash
docker compose up
```
* To run in the background (detached mode, allowing the containers to run independently of your terminal):
```bash
docker compose up -d
```
Please allow some time for the environment to initialize, especially on the first run. It can take approximately a minute or two (depending on your host's resources) as the Wazuh Indexer starts up and generates the necessary indexes and index patterns.

View File

@@ -0,0 +1,36 @@
# Wazuh Docker Deployment
## Deploying the Wazuh Agent
Follow these steps to deploy the Wazuh agent using Docker.
1. Navigate to the `wazuh-agent` directory within your repository:
```bash
cd wazuh-agent
```
2. Edit the `docker-compose.yml` file. You need to update the `WAZUH_MANAGER_SERVER` environment variable with the IP address or hostname of your Wazuh manager.
Locate the `environment` section for the agent service and update it as follows:
```yaml
# Inside your docker-compose.yml file
# services:
# wazuh-agent:
# ...
environment:
- WAZUH_MANAGER_SERVER=<YOUR_WAZUH_MANAGER_IP_OR_HOSTNAME>
# ...
```
**Note:** Replace `<YOUR_WAZUH_MANAGER_IP_OR_HOSTNAME>` with the actual IP address or hostname of your Wazuh manager.
3. Start the environment using `docker compose`:
* To run in the foreground (logs will be displayed in your current terminal, and you can stop it with `Ctrl+C`):
```bash
docker compose up
```
* To run in the background (detached mode, allowing the container to run independently of your terminal):
```bash
docker compose up -d
```

View File

@@ -0,0 +1,58 @@
# Reference Manual - Getting Started
This section guides you through the initial steps to get your Wazuh-docker (version 4.14.0) environment up and running. We will cover the prerequisites and point you to the deployment instructions.
## Overview
Getting started with Wazuh-Docker involves the following general steps:
1. **Understanding Requirements**: Ensuring your system meets the necessary hardware and software prerequisites.
2. **Choosing a Deployment Type**: Deciding whether a single-node or multi-node deployment is suitable for your needs.
3. **Setting up Docker**: Installing Docker and Docker Compose if you haven't already.
4. **Obtaining Wazuh-Docker Files**: Cloning the `wazuh-docker` repository or downloading the necessary `docker-compose.yml` and configuration files.
5. **Deploying the Stack**: Running `docker compose up` to launch the Wazuh components.
6. **Initial Configuration & Verification**: Performing any initial setup steps and verifying that all components are working correctly.
7. **Deploying Wazuh Agents**: Installing and configuring Wazuh agents on the endpoints you want to monitor and connecting them to your Wazuh manager.
## Before You Begin
Before diving into the deployment, please ensure you have reviewed:
- The [Description](ref/Introduction/description.md) of Wazuh-docker to understand the components and architecture.
- The [Requirements](ref/getting-started/requirements.md) to confirm your environment is suitable.
## Steps to Get Started
1. **Meet the [Requirements](requirements.md)**:
Verify that your host system has sufficient RAM, CPU, and disk space. Ensure Docker and Docker Compose are installed and functioning correctly.
2. **Obtain Wazuh-docker Configuration**:
You'll need the Docker Compose files and any associated configuration files from the `wazuh-docker` repository for version 4.14.0.
```bash
git clone [https://github.com/wazuh/wazuh-docker.git](https://github.com/wazuh/wazuh-docker.git)
cd wazuh-docker
git checkout v4.14.0
# Navigate to the specific docker-compose directory, e.g., single-node or multi-node
# cd docker-compose/single-node/ (example path)
```
Alternatively, you might download specific `docker-compose.yml` files if provided as part of a release package.
3. **Choose Your [Deployment Strategy](deployment/deployment.md)**:
Wazuh-docker supports different deployment models. Select the one that best fits your use case:
* **[Single Node Wazuh Stack](deployment/single-node.md)**: Ideal for testing, small environments, or proof-of-concept deployments. All main components (Wazuh manager, Wazuh indexer, Wazuh dashboard) run on a single Docker host.
* **[Multi Node Wazuh Stack](deployment/multi-node.md)**: Suitable for production environments requiring high availability and scalability. Components might be distributed across multiple hosts or configured in a clustered mode. (Note: True multi-host orchestration often involves Kubernetes, but multi-node within Docker Compose typically refers to clustered Wazuh Indexer/Manager setups on one or more Docker hosts managed carefully).
* **[Wazuh Agent Deployment](deployment/wazuh-agent.md)**: Instructions for deploying Wazuh agents on your endpoints and connecting them to the Wazuh manager running in Docker.
4. **Follow Deployment Instructions**:
Once you've chosen a deployment strategy, follow the detailed instructions provided in the respective sections linked above. This will typically involve:
* Configuring environment variables (if necessary).
* Initializing persistent volumes.
* Starting the services.
5. **Post-Deployment**:
After the stack is running:
* Access the Wazuh Dashboard via your web browser.
* Verify that all services are healthy.
* Begin enrolling Wazuh agents.
This Getting Started guide provides a high-level overview. For detailed, step-by-step instructions, please refer to the specific pages linked within this section.

View File

@@ -0,0 +1,73 @@
# Reference Manual - Requirements
Before deploying Wazuh-Docker (version 4.14.0), it's essential to ensure your environment meets the necessary hardware and software requirements. Meeting these prerequisites will help ensure a stable and performant Wazuh deployment.
## Host System Requirements
These are general recommendations. Actual needs may vary based on the number of agents, data volume, and usage patterns.
### Hardware:
* **CPU**:
* **Minimum**: 2 CPU cores.
* **Recommended**: 4 CPU cores or more, especially for production environments or deployments with a significant number of agents.
* **RAM**:
* **Minimum (Single-Node Test/Small Environment)**: 4 GB RAM. This is a tight minimum; 6 GB is safer.
* Wazuh Indexer (OpenSearch): Typically requires at least 1 GB RAM allocated to its JVM heap.
* Wazuh Manager: Resource usage depends on the number of agents.
* Wazuh Dashboard (OpenSearch Dashboards): Also consumes memory.
* **Recommended (Production/Multiple Agents)**: 8 GB RAM or more.
* **Disk Space**:
* **Minimum**: 50 GB of free disk space.
* **Recommended**: 100 GB or more, particularly for the Wazuh Indexer data. Disk space requirements will grow over time as more data is collected and indexed.
* **Disk Type**: SSDs (Solid State Drives) are highly recommended for the Wazuh Indexer data volumes for optimal performance.
* **Network**:
* A stable network connection with sufficient bandwidth, especially if agents are reporting from remote locations.
### Software:
* **Operating System**:
* A 64-bit Linux distribution is preferred (e.g., Ubuntu, CentOS, RHEL, Debian).
* **Docker Engine**:
* Version `20.10.0` or newer.
* Install Docker by following the official instructions: [Install Docker Engine](https://docs.docker.com/engine/install/).
* **Git Client**:
* Required for cloning the `wazuh-docker` repository.
* **Web Browser**:
* A modern web browser (e.g., Chrome, Firefox, Edge, Safari) for accessing the Wazuh Dashboard.
* **`vm.max_map_count` (Linux Hosts for Wazuh Indexer/OpenSearch)**:
* The Wazuh Indexer (OpenSearch) requires a higher `vm.max_map_count` setting than the default on most Linux systems.
* Set it permanently:
1. Edit `/etc/sysctl.conf` and add/modify the line:
```
vm.max_map_count=262144
```
2. Apply the change without rebooting:
```bash
sudo sysctl -p
```
* This is crucial for the stability of the Wazuh Indexer.
## Network Ports
Ensure that the necessary network ports are open and available on the Docker host and any firewalls:
* **Wazuh Manager**:
* `1514/UDP`: For agent communication (syslog).
* `1514/TCP`: For agent communication (if using TCP).
* `1515/TCP`: For agent enrollment.
* `55000/TCP`: For Wazuh API (default).
* **Wazuh Indexer**:
* `9200/TCP`: For HTTP REST API.
* `9300/TCP`: For inter-node communication (if clustered).
* **Wazuh Dashboard**:
* `5601/TCP` (or `443/TCP` if HTTPS is configured via a reverse proxy): For web access.
Port mappings in `docker-compose.yml` will expose these container ports on the host. Adjust host ports if defaults cause conflicts.
## Important Considerations
* **Production Environments**: For production, it's highly recommended to follow best practices for securing Docker and your host system. Consider using a multi-node setup for resilience.
* **Resource Allocation**: Monitor resource usage after deployment and adjust allocations (CPU, RAM for Docker, JVM heap for Wazuh Indexer) as necessary.
Meeting these requirements will pave the way for a smoother deployment and a more stable Wazuh-Docker experience.

89
docs/ref/glossary.md Normal file
View File

@@ -0,0 +1,89 @@
# Reference Manual - Glossary
This glossary defines key terms and concepts related to Wazuh, Docker, and their use together in the Wazuh-Docker project (version 4.14.0).
---
**A**
- **Active Response**: A Wazuh capability that allows automatic actions to be taken on an agent or manager in response to specific triggers or alerts (e.g., blocking an IP address, stopping a process).
- **Agent (Wazuh Agent)**: Software installed on monitored endpoints (servers, workstations, cloud instances) that collects security data (logs, file integrity, configuration assessments, etc.) and forwards it to the Wazuh Manager.
- **Alert**: A notification generated by the Wazuh Manager when an event or a series of events matches a predefined rule, indicating a potential security issue, misconfiguration, or policy violation.
- **API (Wazuh API)**: An application programming interface provided by the Wazuh Manager that allows for programmatic interaction with the Wazuh system, such as managing agents, retrieving alerts, updating rulesets, and checking system health.
**C**
- **CDB List (Constant DataBase List)**: Key-value pair files used by Wazuh rules for fast lookups. Useful for whitelisting, blacklisting, or correlating events with known indicators.
- **Cluster**:
- **Wazuh Indexer Cluster (OpenSearch/Elasticsearch Cluster)**: A group of interconnected Wazuh Indexer nodes that work together to store, index, and search data, providing scalability and high availability.
- **Wazuh Manager Cluster**: A group of Wazuh managers working together to provide load balancing and high availability for agent connections and event processing.
- **Container (Docker Container)**: A lightweight, standalone, executable package of software that includes everything needed to run it: code, runtime, system tools, system libraries, and settings. Wazuh-Docker runs each Wazuh component (manager, indexer, dashboard) in its own container.
- **Containerization**: The process of packaging an application and its dependencies into a container.
**D**
- **Dashboard (Wazuh Dashboard / OpenSearch Dashboards / Kibana)**: A web-based visualization tool used to explore, analyze, and visualize data stored in the Wazuh Indexer. It provides dashboards, visualizations, and a query interface for security events and alerts. For Wazuh 4.14.0, this is typically OpenSearch Dashboards.
- **Decoder**: A component in the Wazuh Manager that parses and extracts relevant information (fields) from raw log messages or event data.
- **Docker**: An open platform for developing, shipping, and running applications inside containers.
- **Docker Compose**: A tool for defining and running multi-container Docker applications. It uses a YAML file (`docker-compose.yml`) to configure the application's services, networks, and volumes.
- **Dockerfile**: A text document that contains all the commands a user could call on the command line to assemble an image. Docker can build images automatically by reading the instructions from a Dockerfile.
- **Docker Hub**: A cloud-based registry service that allows you to link to code repositories, build your images and test them, stores manually pushed images, and links to Docker Cloud so you can deploy images to your hosts. Wazuh Docker images are often hosted here.
- **Docker Image**: A read-only template with instructions for creating a Docker container. Images are used to instantiate containers.
- **Docker Volume**: A mechanism for persisting data generated by and used by Docker containers. Volumes are managed by Docker and are stored on the host filesystem, separate from the container's lifecycle. Essential for storing Wazuh data, configurations, and logs.
**E**
- **Endpoint**: Any device (server, desktop, laptop, virtual machine, cloud instance) that is monitored by a Wazuh agent.
- **Environment Variable**: A variable whose value is set outside the program, typically by the operating system or a container runtime, and can be accessed by the program to modify its behavior. Used extensively in Wazuh-Docker for configuration.
**F**
- **File Integrity Monitoring (FIM)**: A Wazuh capability that monitors files and directories for changes, additions, or deletions, helping to detect unauthorized modifications.
**I**
- **Indexer (Wazuh Indexer / OpenSearch / Elasticsearch)**: The component responsible for storing, indexing, and making searchable the alerts and event data generated by the Wazuh Manager. For Wazuh 4.14.0, this is typically OpenSearch.
**L**
- **Log Analysis**: A core function of the Wazuh Manager, involving the collection, normalization, parsing, and analysis of log data from various sources.
**M**
- **Manager (Wazuh Manager)**: The central component of the Wazuh platform. It collects data from agents, analyzes it using rules and decoders, generates alerts, and manages agents.
**N**
- **Node**:
- **Wazuh Indexer Node**: A single instance of a Wazuh Indexer (OpenSearch/Elasticsearch) process, typically running in a container. Multiple nodes can form a cluster.
- **Wazuh Manager Node**: A single instance of a Wazuh manager, which can operate standalone or as part of a manager cluster.
**O**
- **`ossec.conf`**: The main configuration file for the Wazuh Manager and Wazuh Agent.
**R**
- **Rule**: A set of conditions defined in the Wazuh Manager that, when met by an event or a sequence of events, trigger an alert.
- **Ruleset**: The collection of all rules and decoders used by the Wazuh Manager.
**S**
- **Scalability**: The ability of the system to handle a growing amount of work by adding resources. In Wazuh-Docker, this can refer to scaling the number of agents, or the capacity of the indexer/manager cluster.
- **Security Information and Event Management (SIEM)**: A field of computer security that combines security information management (SIM) and security event management (SEM) to provide real-time analysis of security alerts generated by applications and network hardware. Wazuh is a SIEM solution.
- **Service (Docker Compose Service)**: A definition of a container within a `docker-compose.yml` file, including its image, ports, volumes, environment variables, etc.
**V**
- **Volume (Docker Volume)**: See Docker Volume.
**W**
- **Wazuh**: An open-source security platform that provides threat prevention, detection, and response.
- **Wazuh API**: See API.
- **Wazuh Dashboard**: See Dashboard.
- **Wazuh Indexer**: See Indexer.
- **Wazuh Manager**: See Manager.
---
This glossary provides a starting point. For more detailed definitions or terms not listed here, please refer to the official Wazuh and Docker documentation.

10
docs/ref/upgrade.md Normal file
View File

@@ -0,0 +1,10 @@
# Upgrading Wazuh in Docker
To upgrade your Wazuh deployment when using Docker, we recommend following the official Wazuh documentation. It contains the most accurate and up-to-date information for upgrading from previous versions to the current one.
> 📘 Please refer to the official guide:
> [Upgrading Wazuh Docker](https://documentation.wazuh.com/current/deployment-options/docker/upgrading-wazuh-docker.html)
This external guide provides detailed upgrade instructions that cover multiple scenarios and configurations.
Following the official documentation ensures a smoother and safer upgrade process, with fewer risks of data loss or configuration issues.

3
docs/server.sh Executable file
View File

@@ -0,0 +1,3 @@
#! /bin/sh
mdbook serve

View File

@@ -1,17 +0,0 @@
version: '2.2'
services:
generator:
container_name: generator
image: docker.elastic.co/elasticsearch/elasticsearch:7.10.2
command: >
bash -c '
if [[ ! -f config/certificates/bundle.zip ]]; then
bin/elasticsearch-certutil cert --silent --pem --in config/certificates/instances.yml -out config/certificates/bundle.zip;
unzip config/certificates/bundle.zip -d config/certificates/;
fi;
chown -R 1000:0 /certs
'
user: "0"
working_dir: /usr/share/elasticsearch
volumes: ['./xpack:/usr/share/elasticsearch/config/certificates']

View File

@@ -1,10 +0,0 @@
# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2)
version: '3'
services:
generator:
image: wazuh/opendistro-certs-generator:0.1
hostname: opendistro-certs-generator
volumes:
- ./production_cluster/ssl_certs/certs.yml:/usr/src/config/myconf.yml
- ./production_cluster/ssl_certs/:/usr/src/certs/out/

View File

@@ -0,0 +1,12 @@
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
FROM ubuntu:focal
RUN apt-get update && apt-get install openssl curl -y
WORKDIR /
COPY config/entrypoint.sh /
RUN chmod 700 /entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"]

View File

@@ -0,0 +1,9 @@
# 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.2 .
```

View File

@@ -0,0 +1,62 @@
#!/bin/bash
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
##############################################################################
# Downloading Cert Gen Tool
##############################################################################
## Variables
CERT_TOOL=wazuh-certs-tool.sh
PASSWORD_TOOL=wazuh-passwords-tool.sh
PACKAGES_URL=https://packages.wazuh.com/4.14/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.14/
## Check if the cert tool exists in S3 buckets
CERT_TOOL_PACKAGES=$(curl --silent --head --location --output /dev/null --write-out "%{http_code}" "$PACKAGES_URL$CERT_TOOL")
CERT_TOOL_PACKAGES_DEV=$(curl --silent --head --location --output /dev/null --write-out "%{http_code}" "$PACKAGES_DEV_URL$CERT_TOOL")
## If cert tool exists in some bucket, download it, if not exit 1
if [ "$CERT_TOOL_PACKAGES" = "200" ]; then
curl -o $CERT_TOOL $PACKAGES_URL$CERT_TOOL -s
echo "The tool to create the certificates exists in the in Packages bucket"
elif [ "$CERT_TOOL_PACKAGES_DEV" = "200" ]; then
curl -o $CERT_TOOL $PACKAGES_DEV_URL$CERT_TOOL -s
echo "The tool to create the certificates exists in Packages-dev bucket"
else
echo "The tool to create the certificates does not exist in any bucket"
echo "ERROR: certificates were not created"
exit 1
fi
cp /config/certs.yml /config.yml
chmod 700 /$CERT_TOOL
##############################################################################
# Creating Cluster certificates
##############################################################################
## Execute cert tool and parsin cert.yml to set UID permissions
source /$CERT_TOOL -A
nodes_server=$( cert_parseYaml /config.yml | grep -E "nodes[_]+server[_]+[0-9]+=" | sed -e 's/nodes__server__[0-9]=//' | sed 's/"//g' )
node_names=($nodes_server)
echo "Moving created certificates to the destination directory"
cp /wazuh-certificates/* /certificates/
echo "Changing certificate permissions"
chmod -R 500 /certificates
chmod -R 400 /certificates/*
echo "Setting UID indexer and dashboard"
chown 1000:1000 /certificates/*
echo "Setting UID for wazuh manager and worker"
cp /certificates/root-ca.pem /certificates/root-ca-manager.pem
cp /certificates/root-ca.key /certificates/root-ca-manager.key
chown 999:999 /certificates/root-ca-manager.pem
chown 999:999 /certificates/root-ca-manager.key
for i in ${node_names[@]};
do
chown 999:999 "/certificates/${i}.pem"
chown 999:999 "/certificates/${i}-key.pem"
done

View File

@@ -1,59 +0,0 @@
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
FROM amazon/opendistro-for-elasticsearch-kibana:1.12.0
USER kibana
ARG ELASTIC_VERSION=7.10.0
ARG WAZUH_VERSION=4.1.5
ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}"
WORKDIR /usr/share/kibana
RUN ./bin/kibana-plugin install https://packages.wazuh.com/4.x/ui/kibana/wazuh_kibana-${WAZUH_APP_VERSION}-1.zip
WORKDIR /
USER root
COPY config/entrypoint.sh ./entrypoint.sh
RUN chmod 755 ./entrypoint.sh
ENV PATTERN="" \
CHECKS_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_VIRUSTOTAL="" \
EXTENSIONS_OSQUERY="" \
EXTENSIONS_DOCKER="" \
APP_TIMEOUT="" \
API_SELECTOR="" \
IP_SELECTOR="" \
IP_IGNORE="" \
WAZUH_MONITORING_ENABLED="" \
WAZUH_MONITORING_FREQUENCY="" \
WAZUH_MONITORING_SHARDS="" \
WAZUH_MONITORING_REPLICAS="" \
ADMIN_PRIVILEGES=""
USER kibana
COPY ./config/custom_welcome /tmp/custom_welcome
COPY --chown=kibana:kibana ./config/welcome_wazuh.sh ./
RUN chmod +x ./welcome_wazuh.sh
ARG CHANGE_WELCOME="true"
RUN ./welcome_wazuh.sh
COPY --chown=kibana:kibana ./config/wazuh.yml /usr/share/kibana/data/wazuh/config/wazuh.yml
COPY --chown=kibana:kibana ./config/wazuh_app_config.sh ./
RUN chmod +x ./wazuh_app_config.sh
COPY --chown=kibana:kibana ./config/kibana_settings.sh ./
RUN chmod +x ./kibana_settings.sh
ENTRYPOINT ./entrypoint.sh

File diff suppressed because it is too large Load Diff

View File

@@ -1,112 +0,0 @@
var kbnCsp = JSON.parse(document.querySelector('kbn-csp').getAttribute('data'));
window.__kbnStrictCsp__ = kbnCsp.strictCsp;
window.__kbnThemeTag__ = "{{themeTag}}";
window.__kbnPublicPath__ = {{publicPathMap}};
window.__kbnBundles__ = {{kbnBundlesLoaderSource}}
if (window.__kbnStrictCsp__ && window.__kbnCspNotEnforced__) {
var legacyBrowserError = document.getElementById('kbn_legacy_browser_error');
legacyBrowserError.style.display = 'flex';
} else {
if (!window.__kbnCspNotEnforced__ && window.console) {
window.console.log("^ A single error about an inline script not firing due to content security policy is expected!");
}
var loadingMessage = document.getElementById('kbn_loading_message');
loadingMessage.style.display = 'flex';
window.onload = function () {
//WAZUH
var interval = setInterval(() => {
var title = document.querySelector("#kibana-body > div > div.app-wrapper.hidden-chrome > div > div.application > div > ul > div.euiText.euiText--medium > div")
if (!!title) {
clearInterval(interval);
var content = document.querySelector("#kibana-body > div");
content.classList.add("wz-login")
title.textContent = "Welcome to Wazuh";
var subtitle = document.querySelector("#kibana-body > div > div.app-wrapper.hidden-chrome > div > div.application > div > ul > div.euiText.euiText--small > div")
subtitle.textContent = "The Open Source Security Platform";
var logo = document.querySelector("#kibana-body > div > div.app-wrapper.hidden-chrome > div > div.application > div > ul > figure");
logo.remove();
var logoContainer = document.querySelector("#kibana-body > div > div.app-wrapper.hidden-chrome > div > div.application > div > ul");
$(logoContainer).prepend('<span class="loginWelcome__logo"></span>');
}
})
//
function failure() {
// make subsequent calls to failure() noop
failure = function () {};
var err = document.createElement('h1');
err.style['color'] = 'white';
err.style['font-family'] = 'monospace';
err.style['text-align'] = 'center';
err.style['background'] = '#F44336';
err.style['padding'] = '25px';
err.innerText = document.querySelector('[data-error-message]').dataset.errorMessage;
document.body.innerHTML = err.outerHTML;
}
var stylesheetTarget = document.querySelector('head meta[name="add-styles-here"]')
function loadStyleSheet(url, cb) {
var dom = document.createElement('link');
dom.rel = 'stylesheet';
dom.type = 'text/css';
dom.href = url;
dom.addEventListener('error', failure);
dom.addEventListener('load', cb);
document.head.insertBefore(dom, stylesheetTarget);
}
var scriptsTarget = document.querySelector('head meta[name="add-scripts-here"]')
function loadScript(url, cb) {
var dom = document.createElement('script');
{{!-- NOTE: async = false is used to trigger async-download/ordered-execution as outlined here: https://www.html5rocks.com/en/tutorials/speed/script-loading/ --}}
dom.async = false;
dom.src = url;
dom.addEventListener('error', failure);
dom.addEventListener('load', cb);
document.head.insertBefore(dom, scriptsTarget);
}
function load(urls, cb) {
var pending = urls.length;
urls.forEach(function (url) {
var innerCb = function () {
pending = pending - 1;
if (pending === 0 && typeof cb === 'function') {
cb();
}
}
if (typeof url !== 'string') {
load(url, innerCb);
} else if (url.slice(-4) === '.css') {
loadStyleSheet(url, innerCb);
} else {
loadScript(url, innerCb);
}
});
}
load([
{{#each jsDependencyPaths}}
'{{this}}',
{{/each}}
], function () {
{{#unless legacyBundlePath}}
__kbnBundles__.get('entry/core/public').__kbnBootstrap__();
{{/unless}}
load([
{{#if legacyBundlePath}}
'{{legacyBundlePath}}',
{{/if}}
{{#each styleSheetPaths}}
'{{this}}',
{{/each}}
]);
});
}
}

View File

@@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 84.67 84.67"><defs><style>.a{fill:#fff;}.b{fill:#00a9e5;}</style></defs><title>wazuh_logo_circle</title><circle class="a" cx="42.34" cy="42.34" r="42.34"/><path class="b" d="M58.13,9.2,50,26.32H35.07L26.16,9.2,20,31l-8.53,9.72,19.18,17.6,7.47,17.21h8.53l7-16.91L73.24,40.83l-8.73-9.57ZM48.58,55.13a1.79,1.79,0,0,1-.74.62,2.49,2.49,0,0,1-1,.2,2.52,2.52,0,0,1-1-.2,1.84,1.84,0,0,1-.71-.62l-2.88-4.36-2.9,4.36a1.87,1.87,0,0,1-.72.62,2.48,2.48,0,0,1-.95.2,1.94,1.94,0,0,1-1.7-.82L21.3,41.37h4.09L37.87,52.3l2.49-3.89h3.93L47,52.3,59.63,40.9h3.74Z"/></svg>

Before

Width:  |  Height:  |  Size: 604 B

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 32 KiB

View File

@@ -1,65 +0,0 @@
#!/bin/bash
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
set -e
##############################################################################
# Waiting for elasticsearch
##############################################################################
if [ "x${ELASTICSEARCH_URL}" == "x" ]; then
if [[ ${ENABLED_SECURITY} == "false" ]]; then
export el_url="http://elasticsearch:9200"
else
export el_url="https://elasticsearch:9200"
fi
else
export el_url="${ELASTICSEARCH_URL}"
fi
if [[ ${ENABLED_SECURITY} == "false" || "x${ELASTICSEARCH_USERNAME}" == "x" || "x${ELASTICSEARCH_PASSWORD}" == "x" ]]; then
auth=""
# remove security plugin from kibana if elasticsearch is not using it either
/usr/share/kibana/bin/kibana-plugin remove opendistro_security
else
export auth="--user ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD} -k"
fi
until curl -XGET $el_url ${auth}; do
>&2 echo "Elastic is unavailable - sleeping"
sleep 5
done
sleep 2
>&2 echo "Elasticsearch is up."
##############################################################################
# Waiting for wazuh alerts template
##############################################################################
strlen=0
while [[ $strlen -eq 0 ]]
do
template=$(curl ${auth} $el_url/_cat/templates/wazuh -s)
strlen=${#template}
>&2 echo "Wazuh alerts template not loaded - sleeping."
sleep 2
done
sleep 2
>&2 echo "Wazuh alerts template is loaded."
./wazuh_app_config.sh
sleep 5
./kibana_settings.sh &
sleep 2
/usr/local/bin/kibana-docker

View File

@@ -1,60 +0,0 @@
#!/bin/bash
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
WAZUH_MAJOR=4
##############################################################################
# Wait for the Kibana API to start. It is necessary to do it in this container
# because the others are running Elastic Stack and we can not interrupt them.
#
# The following actions are performed:
#
# Add the wazuh alerts index as default.
# Set the Discover time interval to 24 hours instead of 15 minutes.
# Do not ask user to help providing usage statistics to Elastic.
##############################################################################
##############################################################################
# Customize elasticsearch ip
##############################################################################
sed -i "s|elasticsearch.hosts:.*|elasticsearch.hosts: $el_url|g" /usr/share/kibana/config/kibana.yml
# disable multitenancy
sed -i "s|opendistro_security.multitenancy.enabled:.*|opendistro_security.multitenancy.enabled: false|g" /usr/share/kibana/config/kibana.yml
# If KIBANA_INDEX was set, then change the default index in kibana.yml configuration file. If there was an index, then delete it and recreate.
if [ "$KIBANA_INDEX" != "" ]; then
if grep -q 'kibana.index' /usr/share/kibana/config/kibana.yml; then
sed -i '/kibana.index/d' /usr/share/kibana/config/kibana.yml
fi
echo "kibana.index: $KIBANA_INDEX" >> /usr/share/kibana/config/kibana.yml
fi
while [[ "$(curl -XGET -I -s -o /dev/null -w '%{http_code}' -k https://127.0.0.1:5601/app/login)" != "200" ]]; do
echo "Waiting for Kibana API. Sleeping 5 seconds"
sleep 5
done
# Prepare index selection.
echo "Kibana API is running"
default_index="/tmp/default_index.json"
cat > ${default_index} << EOF
{
"changes": {
"defaultIndex": "wazuh-alerts-${WAZUH_MAJOR}.x-*"
}
}
EOF
sleep 5
# Add the wazuh alerts index as default.
curl ${auth} -POST -k https://127.0.0.1:5601/api/kibana/settings -H "Content-Type: application/json" -H "kbn-xsrf: true" -d@${default_index}
rm -f ${default_index}
sleep 5
# Configuring Kibana TimePicker.
curl ${auth} -POST -k "https://127.0.0.1:5601/api/kibana/settings" -H "Content-Type: application/json" -H "kbn-xsrf: true" -d \
'{"changes":{"timepicker:timeDefaults":"{\n \"from\": \"now-12h\",\n \"to\": \"now\",\n \"mode\": \"quick\"}"}}'
echo "End settings"

View File

@@ -1,64 +0,0 @@
#!/bin/bash
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
wazuh_url="${WAZUH_API_URL:-https://wazuh}"
wazuh_port="${API_PORT:-55000}"
api_username="${API_USERNAME:-wazuh-wui}"
api_password="${API_PASSWORD:-wazuh-wui}"
kibana_config_file="/usr/share/kibana/data/wazuh/config/wazuh.yml"
declare -A CONFIG_MAP=(
[pattern]=$PATTERN
[checks.pattern]=$CHECKS_PATTERN
[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.virustotal]=$EXTENSIONS_VIRUSTOTAL
[extensions.osquery]=$EXTENSIONS_OSQUERY
[extensions.docker]=$EXTENSIONS_DOCKER
[timeout]=$APP_TIMEOUT
[api.selector]=$API_SELECTOR
[ip.selector]=$IP_SELECTOR
[ip.ignore]=$IP_IGNORE
[wazuh.monitoring.enabled]=$WAZUH_MONITORING_ENABLED
[wazuh.monitoring.frequency]=$WAZUH_MONITORING_FREQUENCY
[wazuh.monitoring.shards]=$WAZUH_MONITORING_SHARDS
[wazuh.monitoring.replicas]=$WAZUH_MONITORING_REPLICAS
[admin]=$ADMIN_PRIVILEGES
)
for i in "${!CONFIG_MAP[@]}"
do
if [ "${CONFIG_MAP[$i]}" != "" ]; then
sed -i 's/.*#'"$i"'.*/'"$i"': '"${CONFIG_MAP[$i]}"'/' $kibana_config_file
fi
done
CONFIG_CODE=$(curl ${auth} -s -o /dev/null -w "%{http_code}" -XGET $el_url/.wazuh/_doc/1513629884013)
grep -q 1513629884013 $kibana_config_file
_config_exists=$?
if [[ "x$CONFIG_CODE" != "x200" && $_config_exists -ne 0 ]]; then
cat << EOF >> $kibana_config_file
hosts:
- 1513629884013:
url: $wazuh_url
port: $wazuh_port
username: $api_username
password: $api_password
EOF
else
echo "Wazuh APP already configured"
fi

View File

@@ -1,14 +0,0 @@
#!/bin/bash
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
if [[ $CHANGE_WELCOME == "true" ]]
then
echo "Set Wazuh app as the default landing page"
echo "server.defaultRoute: /app/wazuh" >> /usr/share/kibana/config/kibana.yml
echo "Set custom welcome styles"
cp -f /tmp/custom_welcome/template.js.hbs /usr/share/kibana/src/legacy/ui/ui_render/bootstrap/template.js.hbs
cp -f /tmp/custom_welcome/light_theme.style.css /usr/share/kibana/src/core/server/core_app/assets/legacy_light_theme.css
cp -f /tmp/custom_welcome/*svg /usr/share/kibana/src/core/server/core_app/assets/
fi

View File

@@ -1,64 +0,0 @@
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
FROM docker.elastic.co/kibana/kibana:7.10.2
USER kibana
ARG ELASTIC_VERSION=7.10.2
ARG WAZUH_VERSION=4.1.5
ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}"
WORKDIR /usr/share/kibana
RUN ./bin/kibana-plugin install https://packages.wazuh.com/4.x/ui/kibana/wazuh_kibana-${WAZUH_APP_VERSION}-1.zip
ENV PATTERN="" \
CHECKS_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_VIRUSTOTAL="" \
EXTENSIONS_OSQUERY="" \
EXTENSIONS_DOCKER="" \
APP_TIMEOUT="" \
API_SELECTOR="" \
IP_SELECTOR="" \
IP_IGNORE="" \
WAZUH_MONITORING_ENABLED="" \
WAZUH_MONITORING_FREQUENCY="" \
WAZUH_MONITORING_SHARDS="" \
WAZUH_MONITORING_REPLICAS="" \
ADMIN_PRIVILEGES="" \
XPACK_CANVAS="true" \
XPACK_LOGS="true" \
XPACK_INFRA="true" \
XPACK_ML="true" \
XPACK_DEVTOOLS="true" \
XPACK_MONITORING="true" \
XPACK_APM="true"
WORKDIR /
USER kibana
COPY --chown=kibana:kibana config/entrypoint.sh ./entrypoint.sh
RUN chmod 755 ./entrypoint.sh
RUN printf "\nserver.defaultRoute: /app/wazuh\n" >> /usr/share/kibana/config/kibana.yml
COPY --chown=kibana:kibana ./config/wazuh.yml /usr/share/kibana/data/wazuh/config/wazuh.yml
COPY --chown=kibana:kibana ./config/wazuh_app_config.sh ./
RUN chmod +x ./wazuh_app_config.sh
COPY --chown=kibana:kibana ./config/kibana_settings.sh ./
RUN chmod +x ./kibana_settings.sh
COPY --chown=kibana:kibana ./config/xpack_config.sh ./
RUN chmod +x ./xpack_config.sh
ENTRYPOINT ./entrypoint.sh

Some files were not shown because too many files have changed in this diff Show More