Compare commits

...
1020 Commits
Author SHA1 Message Date
Carlos Anguita 4161af024f Merge pull request #2311 from wazuh/enhancement/2309-change-image-tag-for-4.14.5rc1
Revert docker image tag for 4.14.5 RC1
2026-04-16 11:02:41 +02:00
Enrique Araque 6aa5015a0b Revert docker image tag for 4.14.5 RC1 2026-04-16 10:52:20 +02:00
Wazuh CI 2d1c28ca8a Merge pull request #2310 from wazuh/enhancement/wqa6598-bump-4.14.5
Bump 4.14.5 branch
2026-04-16 10:21:07 +02:00
wazuhci bab0839cea feat: bump 4.14.5 2026-04-16 08:21:00 +00:00
Carlos Bordon f584612eb5 Merge pull request #2290 from wazuh/change/3084-update-workflow-action-versions
Updated GitHub actions version for wazuh-docker workflows
2026-04-08 08:30:34 -03:00
Carlos Bordon ef76f33729 Updated changelog 2026-04-08 08:26:23 -03:00
Carlos Bordon 757be8713e Updated GitHub actions version for wazuh-docker workflows 2026-04-06 16:01:13 -03:00
Gonzalo Acuña c2e09a713a Merge pull request #2262 from wazuh/bug/2257-fix-WAZUH_AGENT_GROUP-variable
Fix WAZUH_AGENT_GROUP variable
2026-03-20 11:32:13 -03:00
Victor Carlos Erenu b88cac5ada Resolving cnoflicts 2026-03-20 19:47:53 +07:00
Carlos Bordon 7f43ac75a4 Merge pull request #2261 from wazuh/bug/3018-improve-bumper-early-exits-to-4.14.5
Fix bumper script
2026-03-19 16:39:44 -03:00
Victor Carlos Erenu 94f88baab2 Add changelog 2026-03-19 17:42:39 +07:00
Victor Carlos Erenu ddd2f89717 Fix CHANGE_AGENT_GROUP parameter 2026-03-19 17:26:01 +07:00
Victor Carlos Erenu 0625d0464e Fix WAZUH_AGENT_GROUP variable 2026-03-19 17:23:36 +07:00
fcaffieri 93bc4a813e Update CHANGELOG 2026-03-18 17:33:12 -03:00
fcaffieri 43c836f4a1 Fix bumper script 2026-03-18 16:41:55 -03:00
Gonzalo Acuña c72666d907 Merge pull request #2248 from wazuh/merge-4.14.4-into-4.14.5
Merge 4.14.4 into 4.14.5
2026-03-13 14:25:05 -03:00
Jesus Garcia aa28804c81 Merge branch '4.14.4' into 4.14.5 2026-03-13 12:21:22 -05:00
Carlos Anguita 7af31ddfb4 Merge pull request #2245 from wazuh/enhancement/2243-change-image-tag-for-4.14.4rc2 2026-03-13 10:19:50 +01:00
Enrique Araque 452f953fe6 revert docker image tag 2026-03-13 10:16:11 +01:00
Wazuh CI 5c18f635b1 Merge pull request #2244 from wazuh/enhancement/wqa5865-bump-4.14.4
Bump 4.14.4 branch
2026-03-13 09:32:17 +01:00
wazuhci adb9f41174 feat: bump 4.14.4 2026-03-13 08:32:13 +00:00
Carlos Anguita e9d3d7a06e Merge pull request #2235 from wazuh/enhancement/2233-revert-images-4.14.4-rc1 2026-03-06 13:05:30 +01:00
Victor Carlos Erenu b4844e89fe Revert images to 4.14.4-rc1 2026-03-06 19:00:35 +07:00
Gonzalo Acuña bafc5a4e45 Merge pull request #2234 from wazuh/enhancement/2233-bump-4.14.4-rc1
Bump images to 4.14.4-rc1
2026-03-06 08:48:30 -03:00
Victor Carlos Erenu a30314eb3d Bump images to 4.14.4-rc1 2026-03-06 18:47:32 +07:00
Victor Carlos Erenu 35ab398833 Bump images to 4.14.4-rc1 2026-03-06 18:43:07 +07:00
Carlos Bordon 3c79627767 Merge pull request #2226 from wazuh/bug/6648-fix-INDEXER_URL-subst
INDEXER_URL substitution fix
2026-02-24 14:13:06 -03:00
Victor Carlos Erenu 5b6c8ec021 Add Changelog 2026-02-24 23:26:36 +07:00
Victor Carlos Erenu 4633e9acdb Fix INDEXER_URL single_node 2026-02-24 23:22:32 +07:00
Victor Carlos Erenu 03febcb005 Fix INDEXER_URL substitution 2026-02-24 23:21:38 +07:00
Wazuh CI ff2c9bac28 Merge pull request #2219 from wazuh/enhancement/wqa5640-bump-4.14.5
Bump 4.14.5 branch
2026-02-13 18:23:37 +01:00
wazuhci 5bbc250263 feat: bump 4.14.5 2026-02-13 17:23:33 +00:00
Gonzalo Acuña 51ab4da8e4 Merge pull request #2204 from wazuh/merge-4.14.3-into-4.14.4
Merge 4.14.3 into 4.14.4
2026-02-06 12:23:31 -03:00
Victor Carlos Erenu 40d7e24b19 Resolving conflicts 2026-02-06 22:21:11 +07:00
Enrique Araque 21e9cb178c revert docker image tag for 4.14.3 rc3 (#2202) 2026-02-06 10:36:38 +01:00
Enrique Araque 1fbc6fafbd update changelog (#2201) 2026-02-06 10:29:54 +01:00
Wazuh CI 2286b87110 Merge pull request #2200 from wazuh/enhancement/wqa5570-bump-4.14.3
Bump 4.14.3 branch
2026-02-06 09:34:53 +01:00
wazuhci 97a59ed3c0 feat: bump 4.14.3 2026-02-06 08:34:44 +00:00
Gonzalo Acuña 2e62b840c4 Merge pull request #2193 from wazuh/merge-4.14.3-into-4.14.4
Merge 4.14.3 into 4.14.4
2026-01-30 13:53:14 -03:00
Gonzalo Acuña a34aa2aff7 Merge branch '4.14.4' into merge-4.14.3-into-4.14.4 2026-01-30 13:50:26 -03:00
Enrique Araque 2c1f8e1a5c remove docker image tags for 4.14.4-rc2 (#2191) 2026-01-29 13:38:11 +01:00
Wazuh CI 68936d1e51 Merge pull request #2190 from wazuh/enhancement/wqa5506-bump-4.14.3
Bump 4.14.3 branch
2026-01-29 12:31:11 +01:00
wazuhci a63e3d6e28 feat: bump 4.14.3 2026-01-29 11:31:05 +00:00
Gonzalo Acuña 65bbc83d0b Merge pull request #2184 from wazuh/enh/2164-Allow_building_separate_targets--4.14.4
Backport from 5.0.0: Allow building separate targets #2177
2026-01-27 15:28:30 -03:00
Jesus Garcia 6565cf9212 Backport from 5.0.0: Allow building separate targets #2177 2026-01-27 09:03:48 -05:00
Gonzalo AcuñaandVictor Carlos Erenu 9a9a2539e5 Merge 4.14.3 into 4.14.4 (#2181)
Co-authored-by: Victor Carlos Erenu <victor.erenu@wazuh.com>
2026-01-23 10:25:16 +01:00
Gonzalo Acuña 149b559687 Merge pull request #2176 from wazuh/enhancement/2175-IMAGE_TAG-stage-reference
Add IMAGE_TAG stage reference
2026-01-20 09:20:10 -03:00
Victor Carlos Erenu efdd97d6ab Add Changelog 2026-01-19 20:16:03 +07:00
Victor Carlos Erenu b400373b2c Add IMAGE_TAG reference 2026-01-19 19:13:36 +07:00
Wazuh CI f69599fcda Merge pull request #2174 from wazuh/enhancement/wqa5435-bump-4.14.4
Bump 4.14.4 branch
2026-01-16 15:17:07 +01:00
wazuhci 57ee45eaae feat: bump 4.14.4 2026-01-16 14:17:01 +00:00
Enrique Araque a1b816abe0 revert docker image tag for 4.14.3-rc1 (#2169) 2026-01-15 12:28:05 +01:00
Wazuh CI 0a03300e13 Merge pull request #2168 from wazuh/enhancement/wqa5413-bump-4.14.3
Bump 4.14.3 branch
2026-01-15 10:49:35 +01:00
wazuhci 9c42711c4c feat: bump 4.14.3 2026-01-15 09:49:30 +00:00
Gonzalo Acuña 8d83e83f23 Merge pull request #2165 from wazuh/merge-4.14.2-into-4.14.3
Merge 4.14.2 into 4.14.3
2026-01-14 15:14:51 -03:00
Victor Carlos Erenu e89fa28f89 Resolving conflicts 2026-01-15 01:11:42 +07:00
Gonzalo Acuña 151b203779 Merge pull request #2157 from wazuh/enhancement/2156-modify_run_as_parameter
Modify run_as parameter value - v4.14.3
2026-01-13 12:21:17 -03:00
Victor Carlos Erenu 65ee71c945 Add changelog 2026-01-13 00:21:35 +07:00
Victor Carlos Erenu 78df3b454a Add changelog 2026-01-13 00:11:38 +07:00
Victor Carlos Erenu 57c1de55b5 Modify run_as parameter value 2026-01-13 00:08:55 +07:00
Carlos Bordon 0de989cb3d Merge pull request #2153 from wazuh/revert-4.14.2-rc4-tags
Revert 4.14.2-rc4 tags
2026-01-08 10:24:33 -03:00
Gonzalo Acuña 607806b4c1 Revert stage tags 2026-01-08 09:59:13 -03:00
Wazuh CI cdab7140d9 Merge pull request #2152 from wazuh/enhancement/wqa5352-bump-4.14.2
Bump 4.14.2 branch
2026-01-08 13:11:14 +01:00
wazuhci 036224fc65 feat: bump 4.14.2 2026-01-08 12:11:06 +00:00
Gonzalo Acuña 0ee58a8b5c Merge pull request #2149 from wazuh/enh/2099-adapt-wazuh-agent-to-multiarch
Adapt Wazuh Agent Dockerfile for multi-architecture support
2026-01-05 11:05:36 -03:00
Jesus Garcia 7623439395 Add changelog 2026-01-05 08:49:32 -05:00
Jesus Garcia 5b2afd1acb Adapt Wazuh agent Dockerfile s6 overlay for multi-architecture support 2026-01-02 08:33:56 -05:00
Carlos Bordon 39758ec2f3 Merge pull request #2144 from wazuh/enhancement/2142-revert-imae-tags
Revert image tags
2025-12-26 08:48:33 -03:00
Victor Carlos Erenu cd5df2b242 Revert image tags 2025-12-26 18:38:14 +07:00
Wazuh CI 5f7253b8cd Merge pull request #2143 from wazuh/enhancement/wqa5235-bump-4.14.2
Bump 4.14.2 branch
2025-12-26 11:03:40 +01:00
wazuhci 198cd3679d feat: bump 4.14.2 2025-12-26 10:03:32 +00:00
Carlos Bordon 30ea265513 Merge pull request #2140 from wazuh/merge-4.14.2-into-4.14.3
Merge 4.14.2 into 4.14.3
2025-12-24 07:41:52 -03:00
Carlos Anguita López 7ae0a4a81c merge 4.14.2-into-4.14.3 2025-12-24 11:25:18 +01:00
Gonzalo Acuña 309f6577ae Merge pull request #2137 from wazuh/enh/2099-improve-docs
Improve documentation for Docker image building process and remove unused parameter
2025-12-22 13:31:41 -03:00
Jesus Garcia 024bb8553a Add working directory to push.yml workflow and add shebang to image build script 2025-12-22 11:03:55 -05:00
Jesus Garcia a5fc8fd88c Improve documentation for Docker image building process and remove unused reference option 2025-12-22 10:17:01 -05:00
Carlos Anguita 95e6f513eb Merge pull request #2135 from wazuh/enhancement/2133-revert-image-tag 2025-12-19 12:03:14 +01:00
Victor Carlos Erenu a95ec0dac9 Revert image tag 2025-12-19 17:58:18 +07:00
Wazuh CI e9d0b14c64 Merge pull request #2134 from wazuh/enhancement/wqa5191-bump-4.14.2
Bump 4.14.2 branch
2025-12-19 10:56:29 +01:00
wazuhci 3a5e30b888 feat: bump 4.14.2 2025-12-19 09:56:23 +00:00
Gonzalo Acuña 8caec1bd38 Merge pull request #2132 from wazuh/enhancement/2097-Docker_ARM_4.x__Adapt_to_multi-architecture_build
Update indexer-certs-gen README.md for clarity on procedure
2025-12-18 12:59:56 -03:00
Jesus Garcia dd165bf3ec Update indexer-certs-gen README.md for clarity on procedure 2025-12-18 10:16:30 -05:00
Gonzalo Acuña 3724f5196a Merge pull request #2130 from wazuh/enhancement/2097-Docker_ARM_4.x__Adapt_to_multi-architecture_build
Update certs generator image version to 0.0.4
2025-12-18 09:03:51 -03:00
Gonzalo Acuña c05e6cf16e Merge branch '4.14.3' into enhancement/2097-Docker_ARM_4.x__Adapt_to_multi-architecture_build 2025-12-18 09:03:32 -03:00
Jesus Garcia 9138f7a9f5 Update certs generator image version to 0.0.4 in multi-node and single-node configurations 2025-12-17 15:27:21 -05:00
Gonzalo Acuña 11261d380a Merge pull request #2127 from wazuh/enhancement/edr-6591-agent-group
Agent group parameter added
2025-12-17 16:45:05 -03:00
Gonzalo Acuña e493c6d113 Merge branch '4.14.3' into enhancement/edr-6591-agent-group 2025-12-17 16:18:58 -03:00
Gonzalo Acuña f7927bf238 Changelog update 2025-12-17 16:13:13 -03:00
Gonzalo Acuña a41a20774c Merge pull request #2120 from wazuh/enhancement/2097-Docker_ARM_4.x__Adapt_to_multi-architecture_build
Adapt to multi architecture build
2025-12-17 14:51:53 -03:00
Jesus Garcia f51fc2e4ae Add check (input.dev must be false) for image validation and GH issue notification in push workflow 2025-12-17 12:10:46 -05:00
Jesus Garcia 089ce24ffc Enhance script execution of build and improve docs clarity 2025-12-17 01:37:49 -05:00
Gonzalo Acuña 424559518e Merge pull request #2126 from wazuh/enh/2097-certsgen-imagebuild
Modify to build certs gen image
2025-12-17 01:37:49 -05:00
Jesus Garcia a509f0f8ea Add changelog 2025-12-17 01:37:49 -05:00
Jesus Garcia c6a427af70 Update documentation of certs-gen procedure 2025-12-17 01:37:49 -05:00
Jesus Garcia 6675465180 Adapt manager Dockerfile for multi-architecture builds 2025-12-17 01:37:49 -05:00
Jesus Garcia 08c7cbda53 Modify to build certs gen image 2025-12-17 01:37:49 -05:00
Victor Carlos Erenu 0fe3103940 Bring changes from PR #2054 2025-12-17 01:37:40 -05:00
Gonzalo Acuña b3fde321bf Agent group parameter added 2025-12-16 15:45:25 -03:00
Carlos Anguita 88c4f238d2 Merge pull request #2124 from wazuh/merge-4.14.2-into-4.14.3 2025-12-12 11:16:36 +01:00
Enrique Araque 65c04aaaeb Merge branch '4.14.2' into merge-4.14.2-into-4.14.3 2025-12-12 11:02:26 +01:00
Carlos Bordon 3df0a1b1b9 Merge pull request #2119 from wazuh/change/revert-4.14.2-rc1-tag
Reverted docker-compose files with v4.14.2-rc1 tag
2025-12-04 12:50:30 -03:00
Carlos Bordon 48893cb485 Reverted docker-compose files with v4.14.2-rc1 tag 2025-12-04 12:48:56 -03:00
Carlos Bordon ce305f8512 Merge pull request #2118 from wazuh/change/update-4.14.2-rc1-tag
Update docker-compose files with RC1 tag
2025-12-04 12:44:29 -03:00
Carlos Bordon 1815ead65f Updated wazuh agent image 2025-12-04 12:42:16 -03:00
Gonzalo Acuña 44ff6d41c4 Merge branch '4.14.2' into change/update-4.14.2-rc1-tag 2025-12-04 12:37:22 -03:00
Carlos Bordon 493ac6bd3a Update docker-compose files with RC2 tag 2025-12-04 12:34:37 -03:00
Gonzalo Acuña 8c7ec2cc77 Merge pull request #2117 from wazuh/change/revert-v4.14.2-rc1-tag
Reverted docker-compose files with v4.14.2-rc1 tag
2025-12-04 12:24:37 -03:00
Carlos Bordon 5a93114962 Reverted docker-compose files with v4.14.2-rc1 tag 2025-12-04 12:20:33 -03:00
Gonzalo Acuña c7703aa6ab Merge pull request #2116 from wazuh/change/update-v4.14.2-rc1-tag
Updated docker-compose files with v4.14.2-rc1 tag
2025-12-04 12:16:43 -03:00
Carlos Bordon c0da5ff7f5 Updated docker-compose files with v4.14.2-rc1 tag 2025-12-04 12:05:41 -03:00
Gonzalo Acuña f520744d9e Merge pull request #2115 from wazuh/change/2114-filebeat-version
Filebeat module version update
2025-12-04 11:25:59 -03:00
Gonzalo Acuña cdf10f8e69 Changelog update 2025-12-04 11:20:31 -03:00
Gonzalo Acuña d5d0229f18 Filebeat module version update 2025-12-04 11:18:59 -03:00
Carlos Anguita 3622621932 Merge pull request #2113 from wazuh/enhancement/2111-revert-image-tag-for-4.14.2-rc1 2025-12-04 11:57:33 +01:00
fcaffieri cb9ecd779e Remove docker image tag for 4.14.2-rc1 2025-12-04 07:33:18 -03:00
Wazuh CI 2444e25e69 Merge pull request #2112 from wazuh/enhancement/wqa5084-bump-4.14.2
Bump 4.14.2 branch
2025-12-04 10:30:04 +01:00
wazuhci b26615e524 feat: bump 4.14.2 2025-12-04 09:29:58 +00:00
Wazuh CI f42ec2ba7c Merge pull request #2110 from wazuh/enhancement/wqa5045-bump-4.14.3
Bump 4.14.3 branch
2025-12-03 12:55:30 +01:00
wazuhci 982d3a649e feat: bump 4.14.3 2025-12-03 11:55:26 +00:00
Gonzalo Acuña 6aa948d4da Merge pull request #2104 from wazuh/mtc/2103-Outdated_Indexer_ports_configuration
Add missing SSL ciphers and protocols and remove outdated ports parameters from opensearch.yml template
2025-12-02 09:50:56 -03:00
Jesus Garcia 81a7e11da4 Update the opensearch.yml template:
* Remove outdated parameters ('http.port' and 'transport.tcp.port')
* Add missing SSL ciphers and protocol parameters.
2025-12-01 19:59:47 -05:00
Carlos Bordon 2dc7717e81 Merge pull request #2094 from wazuh/change/6569-nokia-private-key-hardcoded-in-wazuh-manager-image-4.14.2-update
The location of the remove command for the wazuh-authd certificates has been changed.
2025-11-27 11:59:50 -03:00
Carlos Bordon 0ba67b1adf Updated changelog 2025-11-27 11:19:10 -03:00
Carlos Bordon eecec3db80 The location of the remove command for the wazuh-authd certificates has been changed. 2025-11-27 11:15:32 -03:00
Carlos Bordon f4cc1bd838 Merge pull request #2093 from wazuh/change/6569-nokia-private-key-hardcoded-in-wazuh-manager-image-4.14.2
Removed sslmanager key from the docker manager image to 4.14.2
2025-11-27 08:14:14 -03:00
Carlos Bordon 0602ce076d Updated changelog 2025-11-26 16:55:29 -03:00
Carlos Bordon 2d122e1dc9 Removed sslmanager key from the docker manager image to 4.14.2 2025-11-26 15:22:12 -03:00
Carlos Bordon 47a73bdde6 Merge pull request #2090 from wazuh/bug/2088-improvements-4.14.2
Code improvements for 4.14.2
2025-11-26 11:55:25 -03:00
Victor Carlos Erenu fb6be60afb Add changelog 2025-11-25 21:52:07 +07:00
Victor Carlos Erenu 2d6c920366 Delete opensearch-security directory creation 2025-11-25 20:57:45 +07:00
Victor Carlos Erenu d69f5c0c5d Add new path for Wazun indexer and new function for permanent_data exception 2025-11-25 01:22:11 +07:00
Gonzalo Acuña d52c076e62 Merge pull request #2078 from wazuh/change/3494-docker-notification
Artifactory vulnerabilities notification
2025-11-13 15:45:45 -03:00
Gonzalo Acuña e5d6ba55cc Changelog update 2025-11-13 14:41:53 -03:00
Gonzalo Acuña 415ddd7271 Replace secret variables 2025-11-13 14:06:39 -03:00
Gonzalo Acuña aa98d94f38 Revert test changes 2025-11-13 11:50:18 -03:00
Gonzalo Acuña af2e4589c0 GH project additional variable assignment fix 2025-11-13 11:42:16 -03:00
Gonzalo Acuña 6a8d0d6288 GH project additional variable assignment 2025-11-13 11:35:03 -03:00
Gonzalo Acuña 11b066ef25 GH project variable assignment 2025-11-13 11:24:48 -03:00
Gonzalo Acuña 11c0ae9161 GH issue creation command fix 2025-11-13 10:01:08 -03:00
Gonzalo Acuña ecb486f625 GH issue creation commands 2025-11-12 16:52:27 -03:00
Gonzalo Acuña 16de0735a9 GH notification identation fix 2025-11-12 16:21:17 -03:00
Gonzalo Acuña 5103da8dab GH notification test change 2025-11-12 14:32:45 -03:00
Gonzalo Acuña 91cda37b1f GH notification changes for image publication 2025-11-12 12:15:37 -03:00
Wazuh CI aed6d3eea2 Merge pull request #2071 from wazuh/enhancement/wqa4626-bump-4.14.2
Bump 4.14.2 branch
2025-11-10 18:16:57 +01:00
wazuhci 7adc50cf81 feat: bump 4.14.2 2025-11-10 17:16:53 +00:00
Carlos Anguita 4e99641d02 Merge pull request #2068 from wazuh/enhancement/2066-revert-image-tag-for-4.14.1rc2 2025-11-07 10:47:58 +01:00
Enrique Araque b39237b2c0 Remove docker image tag for 4.14.1-rc2 2025-11-07 10:31:22 +01:00
Wazuh CI 582e5d67ef Merge pull request #2067 from wazuh/enhancement/wqa4608-bump-4.14.1
Bump 4.14.1 branch
2025-11-07 09:45:57 +01:00
wazuhci 4dac06e335 feat: bump 4.14.1 2025-11-07 08:45:51 +00:00
Carlos Anguita f08620251d Merge pull request #2059 from wazuh/enhancement/2055-revert-image-tag-for-4.14.1rc1 2025-10-31 10:10:53 +01:00
Enrique Araque f7cebff2e9 Remove image tag for 4.14.1 rc1 2025-10-31 10:09:11 +01:00
Wazuh CI a9ef0e901a Merge pull request #2056 from wazuh/enhancement/wqa4563-bump-4.14.1
Bump 4.14.1 branch
2025-10-30 10:32:35 +01:00
wazuhci b031e317f7 feat: bump 4.14.1 2025-10-30 09:32:26 +00:00
Gonzalo Acuña 2fccb3f4c4 Merge pull request #2048 from wazuh/merge-4.14.0-into-4.14.1
Merge 4.14.0 into 4.14.1
2025-10-23 12:52:25 -03:00
Victor Carlos Erenu afb044a3b0 Resolving conflicts 2025-10-23 22:42:19 +07:00
Carlos Anguita 4c7ee8abac Merge pull request #2042 from wazuh/enhancement/2040-revert-image-tag-for-4.14.0rc2 2025-10-17 12:08:03 +02:00
Enrique Araque 17d61960d5 Revert docker image tag for 4.14.0-rc1 2025-10-17 11:58:48 +02:00
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
Gonzalo Acuña 652a7cfe9a Merge pull request #2027 from wazuh/enhancement/1934-wazuh-cert-tool-generator
Wazuh cert tool generator improvements
2025-09-26 16:01:19 -03:00
vcerenu c910773076 Modify readme 2025-09-26 15:52:09 -03:00
vcerenu 901f29b68f Add changelog 2025-09-26 15:37:33 -03:00
vcerenu 2d56895f47 Improve error messages 2025-09-26 15:33:42 -03:00
vcerenu ccab3b6d7e Modify Wazuh cert tool generation 2025-09-26 12:14:09 -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 ed92382ff1 Merge pull request #2018 from wazuh/merge-4.14.0-into-4.14.1
Merge 4.14.0 into 4.14.1
2025-09-24 14:50:27 -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 1d03c17d60 Merge pull request #2007 from wazuh/merge-4.14.0-into-4.14.1
Merge 4.14.0 into 4.14.1
2025-09-19 05:34:03 -03:00
Gonzalo Acuña ee087c7ebf Merge branch '4.14.1' into merge-4.14.0-into-4.14.1 2025-09-19 05:24:26 -03: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
Gonzalo Acuña 9b916b1ce8 Merge pull request #1992 from wazuh/merge-4.14.0-into-4.14.1
Merge 4.14.0 into 4.14.1
2025-09-05 09:07:14 -03:00
Victor Ereñú 75e09fcc19 Merge branch '4.14.1' into merge-4.14.0-into-4.14.1 2025-09-05 09:03:44 -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 555a0e2590 Merge pull request #1973 from wazuh/merge-4.14.0-into-4.14.1 2025-08-14 13:29:36 +02:00
vcerenu 54fe999414 Merge branch '4.14.1' of github.com:wazuh/wazuh-docker into 4.14.0 2025-08-14 08:22:00 -03: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
Wazuh CI 6f94d5aa65 Merge pull request #1947 from wazuh/enhancement/wqa3035-bump-4.14.1
Bump 4.14.1 branch
2025-07-29 18:11:15 +02:00
wazuhci 846ae52263 feat: bump 4.14.1 2025-07-29 16:11:09 +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
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
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
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 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
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 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 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
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
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 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 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
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
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 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
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
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
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ñú 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
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
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
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
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 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 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
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 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
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 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
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 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 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
97 changed files with 3665 additions and 1009 deletions
+5 -2
View File
@@ -1,3 +1,6 @@
WAZUH_VERSION=4.7.5
WAZUH_IMAGE_VERSION=4.7.5
WAZUH_VERSION=4.14.5
WAZUH_IMAGE_VERSION=4.14.5
WAZUH_TAG_REVISION=1
FILEBEAT_TEMPLATE_BRANCH=4.14.5
WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.5.tar.gz
WAZUH_UI_REVISION=1
+1 -1
View File
@@ -56,7 +56,7 @@ package:
wazuh-manager:
installed: true
versions:
- 4.7.5-1
- 4.14.5
port:
tcp:1514:
listening: true
+245
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))
+35 -14
View File
@@ -1,18 +1,39 @@
filebeatout1=$(docker exec multi-node_wazuh.master_1 sh -c 'filebeat test output')
filebeatstatus1=$(echo "${filebeatout1}" | grep -c OK)
if [[ filebeatstatus1 -eq 7 ]]; then
echo "No errors in master filebeat"
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
echo "Errors in master filebeat"
echo "${filebeatout1}"
exit 1
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
filebeatout2=$(docker exec multi-node_wazuh.worker_1 sh -c 'filebeat test output')
filebeatstatus2=$(echo "${filebeatout2}" | grep -c OK)
if [[ filebeatstatus2 -eq 7 ]]; then
echo "No errors in worker filebeat"
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
echo "Errors in worker filebeat"
echo "${filebeatout2}"
exit 1
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
+18 -7
View File
@@ -1,9 +1,20 @@
filebeatout=$(docker exec single-node_wazuh.manager_1 sh -c 'filebeat test output')
filebeatstatus=$(echo "${filebeatout}" | grep -c OK)
if [[ filebeatstatus -eq 7 ]]; then
echo "No errors in filebeat"
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
echo "Errors in filebeat"
echo "${filebeatout}"
exit 1
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
+142
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@v6
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
@@ -0,0 +1,298 @@
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.5'
required: true
docker_reference:
description: 'wazuh-docker reference'
required: true
filebeat_module_version:
description: 'Filebeat module version'
default: '0.5'
required: true
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: false
type: string
revision:
description: 'Package revision'
default: '1'
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.5'
required: true
type: string
docker_reference:
description: 'wazuh-docker reference'
required: false
type: string
filebeat_module_version:
description: 'Filebeat module version'
default: '0.5'
required: true
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: false
type: string
revision:
description: 'Package revision'
default: '1'
required: true
type: string
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:
setup:
runs-on: ubuntu-22.04
permissions:
id-token: write
contents: read
env:
IMAGE_REGISTRY: ${{ inputs.dev && vars.IMAGE_REGISTRY_DEV || vars.IMAGE_REGISTRY_PROD }}
IMAGE_TAG: ${{ inputs.image_tag }}
FILEBEAT_MODULE_VERSION: ${{ inputs.filebeat_module_version }}
REVISION: ${{ inputs.revision }}
outputs:
WAZUH_COMPONENTS: ${{ steps.compute-outputs.outputs.WAZUH_COMPONENTS }}
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 "* filebeat_module_version: ${{ inputs.filebeat_module_version }}"
echo "* products: ${{ inputs.products }}"
echo "* revision: ${{ inputs.revision }}"
echo "* dev: ${{ inputs.dev }}"
echo "---------------------------------------------"
- name: Set up variables
id: compute-outputs
run: |
if [[ "${{ inputs.products }}" != "null" && "${{ inputs.products }}" != "" ]]; then
# Convert comma-separated list to JSON array format
IFS=',' read -ra COMPONENTS <<< "${{ inputs.products }}"
JSON_ARRAY="["
for i in "${!COMPONENTS[@]}"; do
if [ $i -gt 0 ]; then
JSON_ARRAY+=","
fi
JSON_ARRAY+="\"${COMPONENTS[$i]}\""
done
JSON_ARRAY+="]"
echo "WAZUH_COMPONENTS=$JSON_ARRAY" >> $GITHUB_OUTPUT
else
echo "WAZUH_COMPONENTS=[\"wazuh-manager\",\"wazuh-dashboard\",\"wazuh-indexer\",\"wazuh-agent\"]" >> $GITHUB_OUTPUT
fi
build-and-push:
runs-on: ubuntu-22.04
permissions:
id-token: write
contents: read
needs:
- setup
strategy:
fail-fast: false # all jobs will run even if one fails
matrix:
wazuh_component: ${{ fromJson(needs.setup.outputs.WAZUH_COMPONENTS) }}
env:
IMAGE_REGISTRY: ${{ inputs.dev && vars.IMAGE_REGISTRY_DEV || vars.IMAGE_REGISTRY_PROD }}
IMAGE_TAG: ${{ inputs.image_tag }}
REVISION: ${{ inputs.revision }}
steps:
- name: Checkout repository
uses: actions/checkout@v6
with:
ref: ${{ inputs.docker_reference }}
- name: free disk space
uses: ./.github/free-disk-space
- name: Set up QEMU
uses: docker/setup-qemu-action@v4
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v4
- name: Configure aws credentials
if: ${{ inputs.dev == true }}
uses: aws-actions/configure-aws-credentials@v6
with:
role-to-assume: ${{ secrets.AWS_IAM_DOCKER_ROLE }}
aws-region: "${{ secrets.AWS_REGION }}"
- name: Log in to Amazon ECR
if: ${{ inputs.dev == true }}
uses: aws-actions/amazon-ecr-login@v2
- name: Log in to Docker Hub
if: ${{ inputs.dev == false }}
uses: docker/login-action@v4
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-images.sh -v $WAZUH_VER -r $REVISION -d $DEV_STAGE -f $FILEBEAT_MODULE_VERSION -rg $IMAGE_REGISTRY -m -c ${{ matrix.wazuh_component }}
else
./build-images.sh -v $IMAGE_TAG -r $REVISION -f $FILEBEAT_MODULE_VERSION -rg $IMAGE_REGISTRY -m -c ${{ matrix.wazuh_component }}
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
working-directory: ./build-docker-images
- name: Image exists validation
if: ${{ inputs.dev == false }}
id: validation
run: |
IMAGE_TAG=${{ inputs.image_tag }}
PURPOSE=""
if [[ "$IMAGE_TAG" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
if docker manifest inspect $IMAGE_REGISTRY/wazuh/wazuh-manager:$IMAGE_TAG > /dev/null 2>&1; then
PURPOSE="regeneration"
echo "Image wazuh/wazuh-manager:$IMAGE_TAG exists. Setting PURPOSE to 'regeneration'"
else
PURPOSE="new release"
echo "Image wazuh/wazuh-manager:$IMAGE_TAG does NOT exist. Setting PURPOSE to 'new release'"
fi
echo "✅ Release tag: '$IMAGE_TAG'"
elif [[ "$IMAGE_TAG" =~ ^[0-9]+\.[0-9]+\.[0-9]+-(alpha|beta|rc)[0-9]+$ ]]; then
PURPOSE="new stage"
echo "✅ Stage tag: '$IMAGE_TAG'. Setting PURPOSE to 'new stage'"
else
echo "❌ No release or stage tag ('$IMAGE_TAG'), the GH issue will not be created"
fi
echo "purpose=$PURPOSE" >> $GITHUB_OUTPUT
- name: GH issue notification
if: ${{ inputs.dev == false && steps.validation.outputs.purpose != '' }}
run: |
IMAGE_TAG=${{ inputs.image_tag }}
GH_TITLE=""
GH_MESSAGE=""
PURPOSE="${{ steps.validation.outputs.purpose }}"
## Setting GH issue title
GH_TITLE="Artifactory vulnerabilities update \`v$IMAGE_TAG\`"
## Setting GH issue body
GH_MESSAGE=$(cat <<- EOF | tr -d '\r' | sed 's/^[[:space:]]*//'
### Description
- [ ] Update the [Artifactory vulnerabilities](${{ secrets.NOTIFICATION_SHEET_URL }}) sheet with the \`v$IMAGE_TAG\` vulnerabilities.
**Purpose**: $PURPOSE
>[!NOTE]
>To update the \`Tentative Release\` column, follow these steps:
https://github.com/wazuh/${{ secrets.NOTIFICATION_REPO }}/issues/2049#issuecomment-2671590268
EOF
)
# Print the GH Variables content
echo "--- Variable Content ---"
echo "$GH_TITLE"
echo "------------------------"
echo "--- Variable Content ---"
echo "$GH_MESSAGE"
echo "------------------------"
## GH issue creation
ISSUE_URL=$(gh issue create \
-R wazuh/${{ secrets.NOTIFICATION_REPO }} \
--title "$GH_TITLE" \
--body "$GH_MESSAGE" \
--label "level/task" \
--label "type/maintenance" \
--label "request/operational")
## Adding the issue to the team project
PROJECT_ITEM_ID=$(gh project item-add \
${{ secrets.NOTIFICATION_PROJECT_NUMBER }} \
--url $ISSUE_URL \
--owner wazuh \
--format json \
| jq -r '.id')
## Setting Objective
gh project item-edit --id $PROJECT_ITEM_ID --project-id ${{ secrets.NOTIFICATION_PROJECT_ID }} --field-id ${{ secrets.NOTIFICATION_PROJECT_OBJECTIVE_ID }} --text "Security scans"
## Setting Priority
gh project item-edit --id $PROJECT_ITEM_ID --project-id ${{ secrets.NOTIFICATION_PROJECT_ID }} --field-id ${{ secrets.NOTIFICATION_PROJECT_PRIORITY_ID }} --single-select-option-id ${{ secrets.NOTIFICATION_PROJECT_PRIORITY_OPTION_ID }}
## Setting Size
gh project item-edit --id $PROJECT_ITEM_ID --project-id ${{ secrets.NOTIFICATION_PROJECT_ID }} --field-id ${{ secrets.NOTIFICATION_PROJECT_SIZE_ID }} --single-select-option-id ${{ secrets.NOTIFICATION_PROJECT_SIZE_OPTION_ID }}
## Setting Subteam
gh project item-edit --id $PROJECT_ITEM_ID --project-id ${{ secrets.NOTIFICATION_PROJECT_ID }} --field-id ${{ secrets.NOTIFICATION_PROJECT_SUBTEAM_ID }} --single-select-option-id ${{ secrets.NOTIFICATION_PROJECT_SUBTEAM_OPTION_ID }}
env:
GH_TOKEN: ${{ secrets.NOTIFICATION_GH_ARTIFACT_TOKEN }}
+96 -37
View File
@@ -4,14 +4,15 @@ on: [pull_request]
jobs:
build-docker-images:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v6
- name: Build Wazuh images
run: build-docker-images/build-images.sh
run: ./build-images.sh
working-directory: ./build-docker-images
- name: Create enviroment variables
run: cat .env > $GITHUB_ENV
@@ -22,28 +23,36 @@ jobs:
docker save wazuh/wazuh-manager:${{env.WAZUH_IMAGE_VERSION}} -o /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-manager.tar
docker save wazuh/wazuh-indexer:${{env.WAZUH_IMAGE_VERSION}} -o /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-indexer.tar
docker save wazuh/wazuh-dashboard:${{env.WAZUH_IMAGE_VERSION}} -o /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-dashboard.tar
docker save wazuh/wazuh-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@v3
uses: actions/upload-artifact@v7
with:
name: docker-artifact-manager
path: /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-manager.tar
retention-days: 1
- name: Temporarily save Wazuh indexer Docker image
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v7
with:
name: docker-artifact-indexer
path: /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-indexer.tar
retention-days: 1
- name: Temporarily save Wazuh dashboard Docker image
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v7
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@v7
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:
@@ -56,43 +65,48 @@ jobs:
GOSS_FILE: .github/.goss.yaml
check-single-node:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
needs: build-docker-images
steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v6
- name: Create enviroment variables
run: cat .env > $GITHUB_ENV
- name: Retrieve saved Wazuh indexer Docker image
uses: actions/download-artifact@v3
uses: actions/download-artifact@v8
with:
name: docker-artifact-indexer
- name: Retrieve saved Wazuh manager Docker image
uses: actions/download-artifact@v3
uses: actions/download-artifact@v8
with:
name: docker-artifact-manager
- name: Retrieve saved Wazuh dashboard Docker image
uses: actions/download-artifact@v3
uses: actions/download-artifact@v8
with:
name: docker-artifact-dashboard
- name: Retrieve saved Wazuh agent Docker image
uses: actions/download-artifact@v8
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
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
run: docker compose -f single-node/docker-compose.yml up -d
- name: Check Wazuh indexer start
run: |
@@ -126,8 +140,9 @@ jobs:
- 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 100 ]]; then
if [[ $docs -gt 0 ]]; then
echo "wazuh-alerts index documents: ${docs}"
else
echo "wazuh-alerts index documents: ${docs}"
@@ -138,7 +153,7 @@ jobs:
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 -eq 3 ]]; then
if [[ $qty_templates -gt 3 ]]; then
echo "wazuh templates:"
echo "${templates}"
else
@@ -161,10 +176,6 @@ jobs:
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
run: ./.github/single-node-log-check.sh
- name: Check filebeat output
run: ./.github/single-node-filebeat-check.sh
@@ -178,50 +189,79 @@ jobs:
exit 1
fi
- name: Stop single node stack
run: docker-compose -f single-node/docker-compose.yml down
- 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-latest
runs-on: ubuntu-22.04
needs: build-docker-images
steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v6
- 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@v3
uses: actions/download-artifact@v8
with:
name: docker-artifact-dashboard
- name: Retrieve saved Wazuh manager Docker image
uses: actions/download-artifact@v3
uses: actions/download-artifact@v8
with:
name: docker-artifact-manager
- name: Retrieve saved Wazuh indexer Docker image
uses: actions/download-artifact@v3
uses: actions/download-artifact@v8
with:
name: docker-artifact-indexer
- name: Retrieve saved Wazuh agent Docker image
uses: actions/download-artifact@v8
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
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
run: docker compose -f multi-node/docker-compose.yml up -d
- name: Check Wazuh indexer start
run: |
sleep 120
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
@@ -250,8 +290,15 @@ jobs:
- 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 100 ]]; then
if [[ $docs -gt 0 ]]; then
echo "wazuh-alerts index documents: ${docs}"
else
echo "wazuh-alerts index documents: ${docs}"
@@ -262,7 +309,7 @@ jobs:
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 -eq 3 ]]; then
if [[ $qty_templates -gt 3 ]]; then
echo "wazuh templates:"
echo "${templates}"
else
@@ -292,10 +339,6 @@ jobs:
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
run: ./.github/multi-node-log-check.sh
- name: Check filebeat output
run: ./.github/multi-node-filebeat-check.sh
@@ -307,4 +350,20 @@ jobs:
else
echo "Wazuh dashboard status: ${status}"
exit 1
fi
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
@@ -11,8 +11,7 @@ on:
- published
pull_request:
branches:
- master
- stable
- main
schedule:
- cron: '34 2 * * 1'
workflow_dispatch:
@@ -27,16 +26,22 @@ jobs:
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
name: Build images and upload Trivy results
runs-on: "ubuntu-latest"
runs-on: "ubuntu-22.04"
steps:
- name: Checkout code
uses: actions/checkout@v3
with: { ref: 4.4 }
uses: actions/checkout@v6
- 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
@@ -11,8 +11,7 @@ on:
- published
pull_request:
branches:
- master
- stable
- main
schedule:
- cron: '34 2 * * 1'
workflow_dispatch:
@@ -27,16 +26,22 @@ jobs:
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
name: Build images and upload Trivy results
runs-on: "ubuntu-latest"
runs-on: "ubuntu-22.04"
steps:
- name: Checkout code
uses: actions/checkout@v3
with: { ref: 4.4 }
uses: actions/checkout@v6
- 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
@@ -11,8 +11,7 @@ on:
- published
pull_request:
branches:
- master
- stable
- main
schedule:
- cron: '34 2 * * 1'
workflow_dispatch:
@@ -27,16 +26,22 @@ jobs:
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
name: Build images and upload Trivy results
runs-on: "ubuntu-latest"
runs-on: "ubuntu-22.04"
steps:
- name: Checkout code
uses: actions/checkout@v3
with: { ref: 4.4 }
uses: actions/checkout@v6
- 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
+2 -1
View File
@@ -1,4 +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
multi-node/config/wazuh_indexer_ssl_certs/*.key
*.log
+329
View File
@@ -1,6 +1,335 @@
# Change Log
All notable changes to this project will be documented in this file.
## [4.14.5]
### Added
- None
### Changed
- Updated GitHub actions version for wazuh-docker workflows. ([#2290](https://github.com/wazuh/wazuh-docker/pull/2290))
### Fixed
- Fix WAZUH_AGENT_GROUP variable ([#2262](https://github.com/wazuh/wazuh-docker/pull/2262))
- Fix bumper script early exit ([#2261](https://github.com/wazuh/wazuh-docker/pull/2261))
### Deleted
- None
## [4.14.4]
### Added
- None
### Changed
- Backport from 5.0.0: Allow building separate targets #2177 ([#2184](https://github.com/wazuh/wazuh-docker/pull/2184))
### Fixed
- INDEXER_URL substitution fix ([#2226](https://github.com/wazuh/wazuh-docker/pull/2226))
### Deleted
- None
## [4.14.3]
### Added
- Update indexer-certs-gen README.md for clarity on procedure ([#2132](https://github.com/wazuh/wazuh-docker/pull/2132))
- Update certs generator image version to 0.0.4 ([#2130](https://github.com/wazuh/wazuh-docker/pull/2130))
### Changed
- Add IMAGE_TAG stage reference ([#2176](https://github.com/wazuh/wazuh-docker/pull/2176))
- Modify run_as parameter value - v4.14.3 ([#2157](https://github.com/wazuh/wazuh-docker/pull/2157))
- Adapt Wazuh Agent Dockerfile for multi-architecture support ([#2149](https://github.com/wazuh/wazuh-docker/pull/2149))
- Agent group parameter added ([#2127](https://github.com/wazuh/wazuh-docker/pull/2127))
- Adapt to multi architecture build ([#2120](https://github.com/wazuh/wazuh-docker/pull/2120))
### Fixed
- None
### Deleted
- None
## [4.14.2]
### Added
- Code improvements for 4.14.2 ([#2090](https://github.com/wazuh/wazuh-docker/pull/2090))
- Artifactory vulnerabilities notification ([#2078](https://github.com/wazuh/wazuh-docker/pull/2078))
### Changed
- Filebeat module version update ([#2115](https://github.com/wazuh/wazuh-docker/pull/2115))
- The location of the remove command for the wazuh-authd certificates has been changed. ([#2094](https://github.com/wazuh/wazuh-docker/pull/2094))
- Removed sslmanager key from the docker manager image to 4.14.2. ([#2093](https://github.com/wazuh/wazuh-docker/pull/2093))
### Fixed
- Add missing SSL ciphers and protocols and remove outdated ports parameters from opensearch.yml template ([#2104](https://github.com/wazuh/wazuh-docker/pull/2104))
### Deleted
- None
## [4.14.1]
### Added
- None
### Changed
- Wazuh cert tool generator improvements ([#2027](https://github.com/wazuh/wazuh-docker/pull/2027))
### Fixed
- None
### Deleted
- None
## [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
+29 -234
View File
@@ -2,257 +2,52 @@
[![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 manager: it runs the Wazuh manager, Wazuh API and Filebeat OSS
* Wazuh dashboard: provides a web user interface to browse through alerts data and allows you to visualize agents configuration and status.
* Wazuh indexer: Wazuh indexer container (working as a single-node cluster or as a multi-node cluster). **Be aware to increase the `vm.max_map_count` setting, as it's detailed in the [Wazuh documentation](https://documentation.wazuh.com/current/docker/wazuh-container.html#increase-max-map-count-on-your-host-linux).**
The `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.
The folder `build-docker-images` contains a README explaining how to build the Wazuh images and the necessary assets.
The folder `indexer-certs-creator` contains a README explaining how to create the certificates creator tool and the necessary assets.
The folder `single-node` contains a README explaining how to run a Wazuh environment with one Wazuh manager, one Wazuh indexer, and one Wazuh dashboard.
The folder `multi-node` contains a README explaining how to run a Wazuh environment with two Wazuh managers, three Wazuh indexer, and one Wazuh dashboard.
## Capabilities
- 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.5`, `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
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).
## Get Involved
Documentation on how to provide these two can be found at [Wazuh Docker Documentation](https://documentation.wazuh.com/current/docker/wazuh-container.html#production-deployment).
- **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-wui" # Wazuh API username
API_PASSWORD="MyS3cr37P450r.*-" # Wazuh API password - Must comply with requirements
# (8+ length, uppercase, lowercase, specials chars)
INDEXER_URL=https://wazuh.indexer:9200 # Wazuh indexer URL
INDEXER_USERNAME=admin # Wazuh indexer Username
INDEXER_PASSWORD=SecretPassword # Wazuh indexer 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
```
### Dashboard
```
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
DASHBOARD_USERNAME=kibanaserver # Custom user saved in the dashboard keystore
DASHBOARD_PASSWORD=kibanaserver # Custom password saved in the dashboard keystore
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 ##
```
## Directory structure
├── build-docker-images
│   ├── docker-compose.yml
│   ├── wazuh-dashboard
│   │   ├── config
│   │   │   ├── config.sh
│   │   │   ├── config.yml
│   │   │   ├── entrypoint.sh
│   │   │   ├── opensearch_dashboards.yml
│   │   │   ├── wazuh_app_config.sh
│   │   │   └── wazuh.yml
│   │   └── Dockerfile
│   ├── wazuh-indexer
│   │   ├── config
│   │   │   ├── config.sh
│   │   │   ├── config.yml
│   │   │   ├── entrypoint.sh
│   │   │   ├── internal_users.yml
│   │   │   ├── opensearch.yml
│   │   │   ├── roles_mapping.yml
│   │   │   ├── roles.yml
│   │   │   └── securityadmin.sh
│   │   └── Dockerfile
│   └── wazuh-manager
│   ├── config
│   │   ├── create_user.py
│   │   ├── etc
│   │   │   ├── cont-init.d
│   │   │   │   ├── 0-wazuh-init
│   │   │   │   ├── 1-config-filebeat
│   │   │   │   └── 2-manager
│   │   │   └── services.d
│   │   │   ├── filebeat
│   │   │   │   ├── finish
│   │   │   │   └── run
│   │   │   └── ossec-logs
│   │   │   └── run
│   │   ├── filebeat.yml
│   │   ├── permanent_data.env
│   │   ├── permanent_data.sh
│   │   └── wazuh.repo
│   └── Dockerfile
├── CHANGELOG.md
├── indexer-certs-creator
│   ├── config
│   │   └── entrypoint.sh
│   └── Dockerfile
├── LICENSE
├── multi-node
│   ├── config
│   │   ├── 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
│   │   └── wazuh_indexer_ssl_certs
│   │   └── certs.yml
│   ├── docker-compose.yml
│   ├── generate-indexer-certs.yml
│   ├── Migration-to-Wazuh-4.3.md
│   └── volume-migrator.sh
├── README.md
├── single-node
│   ├── config
│   │   ├── wazuh_cluster
│   │   │   └── wazuh_manager.conf
│   │   ├── wazuh_dashboard
│   │   │   ├── opensearch_dashboards.yml
│   │   │   └── wazuh.yml
│   │   ├── wazuh_indexer
│   │   │   ├── internal_users.yml
│   │   │   └── wazuh.indexer.yml
│   │   └── wazuh_indexer_ssl_certs
│   │   ├── admin-key.pem
│   │   ├── admin.pem
│   │   ├── certs.yml
│   │   ├── root-ca.key
│   │   ├── root-ca.pem
│   │   ├── wazuh.dashboard-key.pem
│   │   ├── wazuh.dashboard.pem
│   │   ├── wazuh.indexer-key.pem
│   │   ├── wazuh.indexer.pem
│   │   ├── wazuh.manager-key.pem
│   │   └── wazuh.manager.pem
│   ├── docker-compose.yml
│   ├── generate-indexer-certs.yml
│   └── README.md
└── VERSION
## Branches
* `master` branch contains the latest code, be aware of possible bugs on this branch.
* `stable` branch on correspond to the last Wazuh stable version.
## Compatibility Matrix
| Wazuh version | ODFE | XPACK |
|---------------|---------|--------|
| v4.7.5 | | |
| v4.7.4 | | |
| v4.7.3 | | |
| v4.7.2 | | |
| v4.7.1 | | |
| v4.7.0 | | |
| v4.6.0 | | |
| v4.5.4 | | |
| v4.5.3 | | |
| v4.5.2 | | |
| v4.5.1 | | |
| v4.5.0 | | |
| v4.4.5 | | |
| v4.4.4 | | |
| v4.4.3 | | |
| v4.4.2 | | |
| v4.4.1 | | |
| v4.4.0 | | |
| v4.3.11 | | |
| v4.3.10 | | |
| v4.3.9 | | |
| v4.3.8 | | |
| v4.3.7 | | |
| v4.3.6 | | |
| v4.3.5 | | |
| v4.3.4 | | |
| v4.3.3 | | |
| v4.3.2 | | |
| v4.3.1 | | |
| 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
## 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
+45
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)
-2
View File
@@ -1,2 +0,0 @@
WAZUH-DOCKER_VERSION="4.7.5"
REVISION="40720"
+4
View File
@@ -0,0 +1,4 @@
{
"version": "4.14.5",
"stage": "rc1"
}
+22 -14
View File
@@ -1,32 +1,40 @@
# 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
```
The creation of the images for the Wazuh stack deployment in Docker is done with the `build-docker-images/build-images.sh` script
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:
To execute it, make sure to be in the `build-docker-images` directory:
```bash
cd build-docker-images
```
$ build-docker-images/build-images.sh -v 4.5.2
Then execute:
```bash
./build-images.sh
```
The script also allows to build images from other versions of Wazuh by using the `-v` or `--version` argument:
```bash
./build-images.sh -v 4.14.5
```
To get all the available script options use the -h or --help option:
```
$ build-docker-images/build-images.sh -h
```bash
./build-images.sh -h
Usage: build-docker-images/build-images.sh [OPTIONS]
Usage: ./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.3.
-f, --filebeat-module <ref> [Optional] Set Filebeat module version. By default 0.5.
-r, --revision <rev> [Optional] Package revision. By default 1
-v, --version <ver> [Optional] Set the Wazuh version should be builded. By default, 4.7.5.
-rg, --registry <reg> [Optional] Set the Docker registry to push the images.
-v, --version <ver> [Optional] Set the Wazuh version should be builded. By default, 4.14.5.
-m, --multiarch [Optional] Enable multi-architecture builds.
-h, --help Show this help.
```
+115 -22
View File
@@ -1,8 +1,4 @@
WAZUH_IMAGE_VERSION=4.7.5
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}
#!/bin/bash
# Wazuh package generator
# Copyright (C) 2023, Wazuh Inc.
@@ -12,10 +8,14 @@ IMAGE_VERSION=${WAZUH_IMAGE_VERSION}
# License (version 2) as published by the FSF - Free Software
# Foundation.
WAZUH_IMAGE_VERSION="4.7.5"
IMAGE_TAG=4.14.5
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')
WAZUH_REGISTRY=docker.io
WAZUH_IMAGE_VERSION="4.14.5"
WAZUH_TAG_REVISION="1"
WAZUH_DEV_STAGE=""
FILEBEAT_MODULE_VERSION="0.3"
FILEBEAT_MODULE_VERSION="0.5"
# -----------------------------------------------------------------------------
@@ -43,6 +43,7 @@ build() {
if [ "${WAZUH_DEV_STAGE}" ];then
FILEBEAT_TEMPLATE_BRANCH="v${FILEBEAT_TEMPLATE_BRANCH}-${WAZUH_DEV_STAGE,,}"
IMAGE_TAG="${WAZUH_IMAGE_VERSION}-${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
@@ -50,27 +51,96 @@ build() {
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}"
IMAGE_TAG="${WAZUH_IMAGE_VERSION}"
elif curl --output /dev/null --silent --head --fail "https://github.com/wazuh/wazuh/tree/${FILEBEAT_TEMPLATE_BRANCH}"; then
FILEBEAT_TEMPLATE_BRANCH="${FILEBEAT_TEMPLATE_BRANCH}"
IMAGE_TAG="${WAZUH_IMAGE_VERSION}"
else
WAZUH_MASTER_VERSION="$(curl -s https://raw.githubusercontent.com/wazuh/wazuh/master/src/VERSION | sed -e 's/v//g')"
if [ "${FILEBEAT_TEMPLATE_BRANCH}" == "${WAZUH_MASTER_VERSION}" ]; then
FILEBEAT_TEMPLATE_BRANCH="master"
else
echo "The indicated branch does not exist in the wazuh/wazuh repository: ${FILEBEAT_TEMPLATE_BRANCH}"
clean 1
fi
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
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
echo WAZUH_REGISTRY=$WAZUH_REGISTRY >> ../.env
echo IMAGE_TAG=$IMAGE_TAG >> ../.env
docker-compose -f build-docker-images/build-images.yml --env-file .env build --no-cache
set -a
source ../.env
set +a
# Define all available components
local all_components=("wazuh-indexer" "wazuh-manager" "wazuh-dashboard" "wazuh-agent")
local components_to_build=()
# Determine which components to build
if [ -z "${WAZUH_COMPONENT}" ]; then
echo "No component specified. Building all components..."
components_to_build=("${all_components[@]}")
else
# Validate component
case "${WAZUH_COMPONENT}" in
wazuh-indexer|wazuh-manager|wazuh-dashboard|wazuh-agent)
components_to_build=("${WAZUH_COMPONENT}")
;;
*)
echo "Error: Unknown component '${WAZUH_COMPONENT}'" >&2
clean 1
;;
esac
fi
# Determine build command and base options
if [ "${MULTIARCH}" ]; then
build_cmd="docker buildx build --platform linux/amd64,linux/arm64 --push --no-cache"
else
build_cmd="docker build --no-cache"
fi
# Build each component
for component in "${components_to_build[@]}"; do
echo "Building ${component} image..."
# Build common args (used by all components)
build_args=(
-t "${WAZUH_REGISTRY}/wazuh/${component}:${IMAGE_TAG}"
--build-arg WAZUH_VERSION="${WAZUH_IMAGE_VERSION}"
--build-arg WAZUH_TAG_REVISION="${WAZUH_TAG_REVISION}"
)
# Add component-specific args
case "${component}" in
wazuh-indexer)
# No additional args for wazuh-indexer
;;
wazuh-manager)
build_args+=(
--build-arg FILEBEAT_TEMPLATE_BRANCH="${FILEBEAT_TEMPLATE_BRANCH}"
--build-arg WAZUH_FILEBEAT_MODULE="${WAZUH_FILEBEAT_MODULE}"
)
;;
wazuh-dashboard)
build_args+=(
--build-arg WAZUH_UI_REVISION="${WAZUH_UI_REVISION}"
)
;;
wazuh-agent)
# No additional args for wazuh-agent
;;
esac
# Execute build
$build_cmd "${build_args[@]}" ${component}/ || clean 1
echo "${component} image built successfully!"
done
echo ""
echo "Image build process completed!"
return 0
}
@@ -81,10 +151,13 @@ help() {
echo
echo "Usage: $0 [OPTIONS]"
echo
echo " -d, --dev <ref> [Optional] Set the development stage you want to build, example rc1 or beta1, not used by default."
echo " -d, --dev <ref> [Optional] Set the development stage you want to build, example rc4 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 " -rg, --registry <reg> [Optional] Set the Docker registry to push the images."
echo " -c, --component <comp> [Required] Set the Wazuh component to build. Accepted values: 'wazuh-indexer', 'wazuh-manager', 'wazuh-dashboard', 'wazuh-agent'."
echo " -v, --version <ver> [Optional] Set the Wazuh version should be builded. By default, ${WAZUH_IMAGE_VERSION}."
echo " -m, --multiarch [Optional] Enable multi-architecture builds."
echo " -h, --help Show this help."
echo
exit $1
@@ -115,6 +188,10 @@ main() {
help 1
fi
;;
"-m"|"--multiarch")
MULTIARCH="true"
shift
;;
"-r"|"--revision")
if [ -n "${2}" ]; then
WAZUH_TAG_REVISION="${2}"
@@ -123,6 +200,14 @@ main() {
help 1
fi
;;
"-rg"|"--registry")
if [ -n "${2}" ]; then
WAZUH_REGISTRY="${2}"
shift 2
else
help 1
fi
;;
"-v"|"--version")
if [ -n "$2" ]; then
WAZUH_IMAGE_VERSION="$2"
@@ -131,6 +216,14 @@ main() {
help 1
fi
;;
"-c"|"--component")
if [ -n "${2}" ]; then
WAZUH_COMPONENT="${2}"
shift 2
else
help 1
fi
;;
*)
help 1
esac
+13 -5
View File
@@ -1,6 +1,4 @@
# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
version: '3.7'
services:
wazuh.manager:
build:
@@ -10,7 +8,7 @@ services:
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}
image: ${WAZUH_REGISTRY}/wazuh/wazuh-manager:${IMAGE_TAG}
hostname: wazuh.manager
restart: always
ports:
@@ -36,13 +34,23 @@ services:
- 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_REGISTRY}/wazuh/wazuh-agent:${IMAGE_TAG}
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}
image: ${WAZUH_REGISTRY}/wazuh/wazuh-indexer:${IMAGE_TAG}
hostname: wazuh.indexer
restart: always
ports:
@@ -64,7 +72,7 @@ services:
WAZUH_VERSION: ${WAZUH_VERSION}
WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION}
WAZUH_UI_REVISION: ${WAZUH_UI_REVISION}
image: wazuh/wazuh-dashboard:${WAZUH_IMAGE_VERSION}
image: ${WAZUH_REGISTRY}/wazuh/wazuh-dashboard:${IMAGE_TAG}
hostname: wazuh.dashboard
restart: always
ports:
@@ -0,0 +1,40 @@
# 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='CHANGE_AGENT_NAME'
ARG WAZUH_AGENT_GROUP='CHANGE_AGENT_GROUP'
ARG TARGETARCH
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 && \
S6_ARCH="amd64" && \
if [ "${TARGETARCH}" = "arm64" ]; then S6_ARCH="aarch64"; fi && \
curl --fail --silent -L https://github.com/just-containers/s6-overlay/releases/download/${S6_VERSION}/s6-overlay-${S6_ARCH}.tar.gz \
-o /tmp/s6-overlay-${S6_ARCH}.tar.gz && \
tar xzf /tmp/s6-overlay-${S6_ARCH}.tar.gz -C / --exclude="./bin" && \
tar xzf /tmp/s6-overlay-${S6_ARCH}.tar.gz -C /usr ./bin && \
rm /tmp/s6-overlay-${S6_ARCH}.tar.gz
COPY config/etc/ /etc/
RUN rm /etc/yum.repos.d/wazuh.repo
ENTRYPOINT [ "/init" ]
@@ -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
@@ -0,0 +1,92 @@
#!/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"}
WAZUH_AGENT_GROUP=${WAZUH_AGENT_GROUP:-"default"}
##############################################################################
# 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>CHANGE_AGENT_NAME</agent_name>#<agent_name>$WAZUH_AGENT_NAME</agent_name>#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf
sed -i "s#<groups>CHANGE_AGENT_GROUP</groups>#<groups>$WAZUH_AGENT_GROUP</groups>#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
@@ -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
@@ -0,0 +1,4 @@
#!/usr/bin/with-contenv sh
# dumping ossec.log to standard output
exec tail -F /var/ossec/logs/ossec.log
+20 -38
View File
@@ -1,40 +1,34 @@
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
FROM ubuntu:focal AS builder
FROM amazonlinux:2023 AS builder
ARG WAZUH_VERSION
ARG WAZUH_TAG_REVISION
ARG INSTALL_DIR=/usr/share/wazuh-dashboard
ARG WAZUH_UI_REVISION
ARG INSTALL_DIR=/usr/share/wazuh-dashboard
# Update and install dependencies
RUN apt-get update && apt install curl libcap2-bin xz-utils -y
RUN yum install curl-minimal libcap openssl -y
# Create Install dir
RUN mkdir -p $INSTALL_DIR
COPY config/check_repository.sh /
RUN chmod 775 /check_repository.sh && \
source /check_repository.sh
# Download and extract Wazuh dashboard base
COPY config/dl_base.sh .
RUN bash dl_base.sh
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
COPY config/install_wazuh_app.sh /
RUN chmod 775 /install_wazuh_app.sh
RUN bash /install_wazuh_app.sh
# Copy and set permissions to config files
COPY config/opensearch_dashboards.yml $INSTALL_DIR/config/
COPY config/wazuh.yml $INSTALL_DIR/data/wazuh/config/
RUN chown 101:101 $INSTALL_DIR/config/opensearch_dashboards.yml && chmod 664 $INSTALL_DIR/config/opensearch_dashboards.yml
# Create and set permissions to data directories
RUN mkdir -p $INSTALL_DIR/data/wazuh && chown -R 101:101 $INSTALL_DIR/data/wazuh && chmod -R 775 $INSTALL_DIR/data/wazuh
RUN mkdir -p $INSTALL_DIR/data/wazuh/config && chown -R 101:101 $INSTALL_DIR/data/wazuh/config && chmod -R 775 $INSTALL_DIR/data/wazuh/config
RUN mkdir -p $INSTALL_DIR/data/wazuh/logs && chown -R 101:101 $INSTALL_DIR/data/wazuh/logs && chmod -R 775 $INSTALL_DIR/data/wazuh/logs
################################################################################
# Build stage 1 (the current Wazuh dashboard image):
#
@@ -42,7 +36,7 @@ RUN mkdir -p $INSTALL_DIR/data/wazuh/logs && chown -R 101:101 $INSTALL_DIR/data/
# Add entrypoint
# Add wazuh_app_config
################################################################################
FROM ubuntu:focal
FROM amazonlinux:2023
# Set environment variables
ENV USER="wazuh-dashboard" \
@@ -56,21 +50,6 @@ ENV PATTERN="" \
CHECKS_TEMPLATE="" \
CHECKS_API="" \
CHECKS_SETUP="" \
EXTENSIONS_PCI="" \
EXTENSIONS_GDPR="" \
EXTENSIONS_HIPAA="" \
EXTENSIONS_NIST="" \
EXTENSIONS_TSC="" \
EXTENSIONS_AUDIT="" \
EXTENSIONS_OSCAP="" \
EXTENSIONS_CISCAT="" \
EXTENSIONS_AWS="" \
EXTENSIONS_GCP="" \
EXTENSIONS_GITHUB=""\
EXTENSIONS_OFFICE=""\
EXTENSIONS_VIRUSTOTAL="" \
EXTENSIONS_OSQUERY="" \
EXTENSIONS_DOCKER="" \
APP_TIMEOUT="" \
API_SELECTOR="" \
IP_SELECTOR="" \
@@ -80,6 +59,9 @@ ENV PATTERN="" \
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 \
@@ -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
@@ -9,8 +9,8 @@ export CONFIG_DIR=${INSTALLATION_DIR}/config
## Variables
CERT_TOOL=wazuh-certs-tool.sh
PACKAGES_URL=https://packages.wazuh.com/4.7/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.7/
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}')
@@ -1,25 +0,0 @@
REPOSITORY="packages.wazuh.com/4.x"
WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '\"tag_name\":' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2-)
MAJOR_BUILD=$(echo $WAZUH_VERSION | cut -d. -f1)
MID_BUILD=$(echo $WAZUH_VERSION | cut -d. -f2)
MINOR_BUILD=$(echo $WAZUH_VERSION | cut -d. -f3)
MAJOR_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f1)
MID_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f2)
MINOR_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f3)
## check version to use the correct repository
if [ "$MAJOR_BUILD" -gt "$MAJOR_CURRENT" ]; then
REPOSITORY="packages-dev.wazuh.com/pre-release"
elif [ "$MAJOR_BUILD" -eq "$MAJOR_CURRENT" ]; then
if [ "$MID_BUILD" -gt "$MID_CURRENT" ]; then
REPOSITORY="packages-dev.wazuh.com/pre-release"
elif [ "$MID_BUILD" -eq "$MID_CURRENT" ]; then
if [ "$MINOR_BUILD" -gt "$MINOR_CURRENT" ]; then
REPOSITORY="packages-dev.wazuh.com/pre-release"
fi
fi
fi
curl -o wazuh-dashboard-base.tar.xz https://${REPOSITORY}/stack/dashboard/wazuh-dashboard-base-${WAZUH_VERSION}-${WAZUH_TAG_REVISION}-linux-x64.tar.xz
tar -xf wazuh-dashboard-base.tar.xz --directory $INSTALL_DIR --strip-components=1
@@ -1,25 +0,0 @@
## variables
WAZUH_APP=https://packages.wazuh.com/4.x/ui/dashboard/wazuh-${WAZUH_VERSION}-${WAZUH_UI_REVISION}.zip
WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '\"tag_name\":' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2-)
MAJOR_BUILD=$(echo $WAZUH_VERSION | cut -d. -f1)
MID_BUILD=$(echo $WAZUH_VERSION | cut -d. -f2)
MINOR_BUILD=$(echo $WAZUH_VERSION | cut -d. -f3)
MAJOR_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f1)
MID_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f2)
MINOR_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f3)
## check version to use the correct repository
if [ "$MAJOR_BUILD" -gt "$MAJOR_CURRENT" ]; then
WAZUH_APP=https://packages-dev.wazuh.com/pre-release/ui/dashboard/wazuh-${WAZUH_VERSION}-${WAZUH_UI_REVISION}.zip
elif [ "$MAJOR_BUILD" -eq "$MAJOR_CURRENT" ]; then
if [ "$MID_BUILD" -gt "$MID_CURRENT" ]; then
WAZUH_APP=https://packages-dev.wazuh.com/pre-release/ui/dashboard/wazuh-${WAZUH_VERSION}-${WAZUH_UI_REVISION}.zip
elif [ "$MID_BUILD" -eq "$MID_CURRENT" ]; then
if [ "$MINOR_BUILD" -gt "$MINOR_CURRENT" ]; then
WAZUH_APP=https://packages-dev.wazuh.com/pre-release/ui/dashboard/wazuh-${WAZUH_VERSION}-${WAZUH_UI_REVISION}.zip
fi
fi
fi
# Install Wazuh App
$INSTALL_DIR/bin/opensearch-dashboards-plugin install $WAZUH_APP --allow-root
@@ -1,13 +0,0 @@
server.host: 0.0.0.0
server.port: 5601
opensearch.hosts: https://wazuh.indexer:9200
opensearch.ssl.verificationMode: none
opensearch.requestHeadersWhitelist: [ authorization,securitytenant ]
opensearch_security.multitenancy.enabled: false
opensearch_security.readonly_mode.roles: ["kibana_read_only"]
server.ssl.enabled: true
server.ssl.key: "/usr/share/wazuh-dashboard/config/certs/dashboard-key.pem"
server.ssl.certificate: "/usr/share/wazuh-dashboard/config/certs/dashboard.pem"
opensearch.ssl.certificateAuthorities: ["/usr/share/wazuh-dashboard/config/certs/root-ca.pem"]
uiSettings.overrides.defaultRoute: /app/wazuh
@@ -5,7 +5,7 @@ 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}"
api_run_as="${RUN_AS:-true}"
dashboard_config_file="/usr/share/wazuh-dashboard/data/wazuh/config/wazuh.yml"
@@ -15,21 +15,6 @@ declare -A CONFIG_MAP=(
[checks.template]=$CHECKS_TEMPLATE
[checks.api]=$CHECKS_API
[checks.setup]=$CHECKS_SETUP
[extensions.pci]=$EXTENSIONS_PCI
[extensions.gdpr]=$EXTENSIONS_GDPR
[extensions.hipaa]=$EXTENSIONS_HIPAA
[extensions.nist]=$EXTENSIONS_NIST
[extensions.tsc]=$EXTENSIONS_TSC
[extensions.audit]=$EXTENSIONS_AUDIT
[extensions.oscap]=$EXTENSIONS_OSCAP
[extensions.ciscat]=$EXTENSIONS_CISCAT
[extensions.aws]=$EXTENSIONS_AWS
[extensions.gcp]=$EXTENSIONS_GCP
[extensions.github]=$EXTENSIONS_GITHUB
[extensions.office]=$EXTENSIONS_OFFICE
[extensions.virustotal]=$EXTENSIONS_VIRUSTOTAL
[extensions.osquery]=$EXTENSIONS_OSQUERY
[extensions.docker]=$EXTENSIONS_DOCKER
[timeout]=$APP_TIMEOUT
[api.selector]=$API_SELECTOR
[ip.selector]=$IP_SELECTOR
+24 -10
View File
@@ -1,10 +1,17 @@
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
FROM ubuntu:focal AS builder
FROM amazonlinux:2023 AS builder
ARG WAZUH_VERSION
ARG WAZUH_TAG_REVISION
RUN apt-get update -y && apt-get install curl openssl xz-utils -y
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 /
@@ -12,6 +19,8 @@ COPY config/config.sh .
COPY config/config.yml /
COPY config/action_groups.yml /
COPY config/internal_users.yml /
COPY config/roles_mapping.yml /
@@ -25,14 +34,17 @@ RUN bash config.sh
#
# Copy wazuh-indexer from stage 0
# Add entrypoint
################################################################################
FROM ubuntu:focal
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 \
@@ -50,24 +62,26 @@ COPY config/entrypoint.sh /
COPY config/securityadmin.sh /
RUN chmod 700 /entrypoint.sh && chmod 700 /securityadmin.sh
RUN chown 1000:1000 /*.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 chown -R 1000:1000 /usr/share/wazuh-indexer
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 600 /usr/share/wazuh-indexer/jvm.options && \
chmod 600 /usr/share/wazuh-indexer/opensearch.yml
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
@@ -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
@@ -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
@@ -13,48 +13,17 @@ 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}
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
rm -rf ${INSTALLATION_DIR}/
## variables
REPOSITORY="packages.wazuh.com/4.x"
WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '\"tag_name\":' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2-)
MAJOR_BUILD=$(echo $WAZUH_VERSION | cut -d. -f1)
MID_BUILD=$(echo $WAZUH_VERSION | cut -d. -f2)
MINOR_BUILD=$(echo $WAZUH_VERSION | cut -d. -f3)
MAJOR_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f1)
MID_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f2)
MINOR_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f3)
## check version to use the correct repository
if [ "$MAJOR_BUILD" -gt "$MAJOR_CURRENT" ]; then
REPOSITORY="packages-dev.wazuh.com/pre-release"
elif [ "$MAJOR_BUILD" -eq "$MAJOR_CURRENT" ]; then
if [ "$MID_BUILD" -gt "$MID_CURRENT" ]; then
REPOSITORY="packages-dev.wazuh.com/pre-release"
elif [ "$MID_BUILD" -eq "$MID_CURRENT" ]; then
if [ "$MINOR_BUILD" -gt "$MINOR_CURRENT" ]; then
REPOSITORY="packages-dev.wazuh.com/pre-release"
fi
fi
fi
curl -o ${INDEXER_FILE} https://${REPOSITORY}/stack/indexer/${BASE_FILE}
tar -xf ${INDEXER_FILE}
## TOOLS
## Variables
CERT_TOOL=wazuh-certs-tool.sh
PASSWORD_TOOL=wazuh-passwords-tool.sh
PACKAGES_URL=https://packages.wazuh.com/4.7/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.7/
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}')
@@ -93,7 +62,6 @@ 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}
@@ -103,24 +71,11 @@ mkdir -p ${TARGET_DIR}/usr/lib/tmpfiles.d
mkdir -p ${TARGET_DIR}/usr/lib/sysctl.d
mkdir -p ${TARGET_DIR}/usr/lib/systemd/system
mkdir -p ${TARGET_DIR}${CONFIG_DIR}/certs
# Move configuration files for wazuh-indexer
mv -f ${BASE_DIR}/etc/init.d/${NAME} ${TARGET_DIR}/etc/init.d/${NAME}
mv -f ${BASE_DIR}/etc/wazuh-indexer/* ${TARGET_DIR}${CONFIG_DIR}
mv -f ${BASE_DIR}/etc/sysconfig/${NAME} ${TARGET_DIR}/etc/default/
mv -f ${BASE_DIR}/usr/lib/tmpfiles.d/* ${TARGET_DIR}/usr/lib/tmpfiles.d/
mv -f ${BASE_DIR}/usr/lib/sysctl.d/* ${TARGET_DIR}/usr/lib/sysctl.d/
mv -f ${BASE_DIR}/usr/lib/systemd/system/* ${TARGET_DIR}/usr/lib/systemd/system/
rm -rf ${BASE_DIR}/etc
rm -rf ${BASE_DIR}/usr
# Copy installation files to final location
cp -pr ${BASE_DIR}/* ${TARGET_DIR}${INSTALLATION_DIR}
# Copy the security tools
cp /$CERT_TOOL ${TARGET_DIR}${INSTALLATION_DIR}/plugins/opensearch-security/tools/
cp /$PASSWORD_TOOL ${TARGET_DIR}${INSTALLATION_DIR}/plugins/opensearch-security/tools/
# Copy Wazuh's config files for the security plugin
cp -pr /roles_mapping.yml ${TARGET_DIR}${INSTALLATION_DIR}/opensearch-security/
cp -pr /roles.yml ${TARGET_DIR}${INSTALLATION_DIR}/opensearch-security/
cp -pr /internal_users.yml ${TARGET_DIR}${INSTALLATION_DIR}/opensearch-security/
cp -pr /roles_mapping.yml ${TARGET_DIR}${CONFIG_DIR}/opensearch-security/
cp -pr /roles.yml ${TARGET_DIR}${CONFIG_DIR}/opensearch-security/
cp -pr /action_groups.yml ${TARGET_DIR}${CONFIG_DIR}/opensearch-security/
cp -pr /internal_users.yml ${TARGET_DIR}${CONFIG_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
@@ -131,9 +86,9 @@ cp -pr /wazuh-certificates/admin.pem ${TARGET_DIR}${CONFIG_DIR}/certs/admin.pem
cp -pr /wazuh-certificates/admin-key.pem ${TARGET_DIR}${CONFIG_DIR}/certs/admin-key.pem
# Delete xms and xmx parameters in jvm.options
sed '/-Xms/d' -i ${TARGET_DIR}${CONFIG_DIR}/jvm.options
sed '/-Xmx/d' -i ${TARGET_DIR}${CONFIG_DIR}/jvm.options
sed -i 's/-Djava.security.policy=file:\/\/\/etc\/wazuh-indexer\/opensearch-performance-analyzer\/opensearch_security.policy/-Djava.security.policy=file:\/\/\/usr\/share\/wazuh-indexer\/opensearch-performance-analyzer\/opensearch_security.policy/g' ${TARGET_DIR}${CONFIG_DIR}/jvm.options
sed '/-Xms/d' -i /etc/wazuh-indexer/jvm.options
sed '/-Xmx/d' -i /etc/wazuh-indexer/jvm.options
sed -i 's/-Djava.security.policy=file:\/\/\/etc\/wazuh-indexer\/opensearch-performance-analyzer\/opensearch_security.policy/-Djava.security.policy=file:\/\/\/usr\/share\/wazuh-indexer\/opensearch-performance-analyzer\/opensearch_security.policy/g' /etc/wazuh-indexer/jvm.options
chmod -R 500 ${TARGET_DIR}${CONFIG_DIR}/certs
@@ -6,7 +6,7 @@ umask 0002
export USER=wazuh-indexer
export INSTALLATION_DIR=/usr/share/wazuh-indexer
export OPENSEARCH_PATH_CONF=${INSTALLATION_DIR}
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)
@@ -1,18 +1,26 @@
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/certs/indexer.pem
plugins.security.ssl.http.pemkey_filepath: /usr/share/wazuh-indexer/certs/indexer-key.pem
plugins.security.ssl.http.pemtrustedcas_filepath: /usr/share/wazuh-indexer/certs/root-ca.pem
plugins.security.ssl.transport.pemcert_filepath: /usr/share/wazuh-indexer/certs/indexer.pem
plugins.security.ssl.transport.pemkey_filepath: /usr/share/wazuh-indexer/certs/indexer-key.pem
plugins.security.ssl.transport.pemtrustedcas_filepath: /usr/share/wazuh-indexer/certs/root-ca.pem
plugins.security.ssl.http.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.ssl.http.enabled_ciphers:
- "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256"
- "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"
- "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256"
- "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384"
plugins.security.ssl.http.enabled_protocols:
- "TLSv1.2"
plugins.security.authcz.admin_dn:
- "CN=admin,OU=Wazuh,O=Wazuh,L=California,C=US"
plugins.security.check_snapshot_restore_write_privileges: true
@@ -142,7 +142,7 @@ wazuh_ui_user:
allowed_actions:
- "read"
tenant_permissions: []
static: false
static: false
wazuh_ui_admin:
reserved: true
@@ -160,4 +160,12 @@ wazuh_ui_admin:
- "manage"
- "index"
tenant_permissions: []
static: false
static: false
# ISM API permissions role
manage_ism:
reserved: true
hidden: false
cluster_permissions:
- "manage_ism"
static: false
@@ -33,7 +33,7 @@ kibana_user:
- "kibanauser"
users:
- "wazuh_user"
- "wazuh_admin"
- "wazuh_admin"
description: "Maps kibanauser to kibana_user"
readall:
@@ -68,4 +68,11 @@ wazuh_ui_user:
hosts: []
users:
- "wazuh_user"
and_backend_roles: []
and_backend_roles: []
# ISM API permissions role mapping
manage_ism:
reserved: true
hidden: false
users:
- "kibanaserver"
+29 -21
View File
@@ -1,5 +1,5 @@
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
FROM ubuntu:focal
FROM amazonlinux:2023
RUN rm /bin/sh && ln -s /bin/bash /bin/sh
@@ -8,27 +8,35 @@ 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"
ARG TARGETARCH
RUN apt-get update && apt install curl apt-transport-https lsb-release gnupg -y
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 apt-get update && \
apt-get install wazuh-manager=${WAZUH_VERSION}-${WAZUH_TAG_REVISION}
COPY config/filebeat_module.sh /
RUN chmod 775 /filebeat_module.sh
RUN source /filebeat_module.sh
ARG S6_VERSION="v2.2.0.3"
RUN 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
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 && \
S6_ARCH="amd64" && \
if [ "${TARGETARCH}" = "arm64" ]; then S6_ARCH="aarch64"; fi && \
curl --fail --silent -L https://github.com/just-containers/s6-overlay/releases/download/${S6_VERSION}/s6-overlay-${S6_ARCH}.tar.gz \
-o /tmp/s6-overlay-${S6_ARCH}.tar.gz && \
tar xzf /tmp/s6-overlay-${S6_ARCH}.tar.gz -C / --exclude="./bin" && \
tar xzf /tmp/s6-overlay-${S6_ARCH}.tar.gz -C /usr ./bin && \
rm /tmp/s6-overlay-${S6_ARCH}.tar.gz && \
rm -f /var/ossec/etc/sslmanager.key && \
rm -f /var/ossec/etc/sslmanager.cert
COPY config/etc/ /etc/
COPY --chown=root:wazuh config/create_user.py /var/ossec/framework/scripts/create_user.py
@@ -43,11 +51,6 @@ RUN chmod go-w /etc/filebeat/wazuh-template.json
# Prepare permanent data
# Sync calls are due to https://github.com/docker/docker/issues/9547
COPY config/permanent_data.env config/permanent_data.sh /
RUN chmod 755 /permanent_data.sh && \
sync && /permanent_data.sh && \
sync && rm /permanent_data.sh
#Make mount directories for keep permissions
RUN mkdir -p /var/ossec/var/multigroups && \
@@ -58,7 +61,12 @@ RUN mkdir -p /var/ossec/var/multigroups && \
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 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
@@ -1,29 +1,15 @@
## variables
APT_KEY=https://packages.wazuh.com/key/GPG-KEY-WAZUH
REPOSITORY="deb https://packages.wazuh.com/4.x/apt/ stable main"
WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '\"tag_name\":' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2-)
MAJOR_BUILD=$(echo $WAZUH_VERSION | cut -d. -f1)
MID_BUILD=$(echo $WAZUH_VERSION | cut -d. -f2)
MINOR_BUILD=$(echo $WAZUH_VERSION | cut -d. -f3)
MAJOR_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f1)
MID_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f2)
MINOR_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f3)
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 version to use the correct repository
if [ "$MAJOR_BUILD" -gt "$MAJOR_CURRENT" ]; then
APT_KEY=https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH
REPOSITORY="deb https://packages-dev.wazuh.com/pre-release/apt/ unstable main"
elif [ "$MAJOR_BUILD" -eq "$MAJOR_CURRENT" ]; then
if [ "$MID_BUILD" -gt "$MID_CURRENT" ]; then
APT_KEY=https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH
REPOSITORY="deb https://packages-dev.wazuh.com/pre-release/apt/ unstable main"
elif [ "$MID_BUILD" -eq "$MID_CURRENT" ]; then
if [ "$MINOR_BUILD" -gt "$MINOR_CURRENT" ]; then
APT_KEY=https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH
REPOSITORY="deb https://packages-dev.wazuh.com/pre-release/apt/ unstable main"
fi
fi
## check tag to use the correct repository
if [[ -n "${WAZUH_TAG}" ]]; then
APT_KEY=https://packages.wazuh.com/key/GPG-KEY-WAZUH
GPG_SIGN="gpgcheck=1\ngpgkey=${APT_KEY}]"
REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages.wazuh.com/4.x/yum/\nprotect=1"
fi
apt-key adv --fetch-keys ${APT_KEY}
echo ${REPOSITORY} | tee -a /etc/apt/sources.list.d/wazuh.list
rpm --import "${APT_KEY}"
echo -e "${REPOSITORY}" | tee /etc/yum.repos.d/wazuh.repo
@@ -6,8 +6,6 @@ source /permanent_data.env
WAZUH_INSTALL_PATH=/var/ossec
WAZUH_CONFIG_MOUNT=/wazuh-config-mount
AUTO_ENROLLMENT_ENABLED=${AUTO_ENROLLMENT_ENABLED:-true}
##############################################################################
# Aux functions
@@ -47,12 +45,8 @@ mount_permanent_data() {
if find ${permanent_dir} -mindepth 1 | read; then
print "The path ${permanent_dir} is already mounted"
else
if find ${data_tmp} -mindepth 1 | read; then
print "Installing ${permanent_dir}"
exec_cmd "cp -a ${data_tmp}. ${permanent_dir}"
else
print "The path ${permanent_dir} is empty, skiped"
fi
exec_cmd "cp -ar ${data_tmp}. ${permanent_dir}"
fi
done
}
@@ -74,8 +68,17 @@ apply_exclusion_data() {
mkdir -p ${DIR}
fi
safe_cp() {
if cp -p "$1" "$2" 2>/dev/null; then
return 0
else
echo "Warning: Could not copy $1 (may be read-only)"
return 0
fi
}
print "Updating ${exclusion_file}"
exec_cmd "cp -p ${WAZUH_INSTALL_PATH}/data_tmp/exclusion/${exclusion_file} ${exclusion_file}"
exec_cmd "safe_cp ${WAZUH_INSTALL_PATH}/data_tmp/exclusion/${exclusion_file} ${exclusion_file}"
fi
done
}
@@ -171,21 +174,23 @@ set_custom_cluster_key() {
}
##############################################################################
# Modify /var/ossec/queue/rids directory owner on
# container start.
# Set correct ownership for Wazuh related directories
# on container start.
##############################################################################
set_rids_owner() {
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
# Change any ossec user/group to wazuh user/group
##############################################################################
set_correct_permOwner() {
find / -group 997 -exec chown :101 {} +;
find / -user 999 -exec chown 101 {} +;
find / -group 997 -exec chown :999 {} +;
find / -group 101 -exec chown :999 {} +;
find / -user 101 -exec chown 999 {} +;
}
##############################################################################
@@ -198,7 +203,7 @@ main() {
# Restore files stored in permanent data that are not permanent (i.e. internal_options.conf)
apply_exclusion_data
# Apply correct permission and ownership
set_correct_permOwner
@@ -208,13 +213,10 @@ main() {
# Remove some files in permanent_data (i.e. .template.db)
remove_data_files
# Generate wazuh-authd certs if AUTO_ENROLLMENT_ENABLED is true and does not exist
if [ $AUTO_ENROLLMENT_ENABLED == true ]
# Create wazuh-authd key and cert if not present
if [ ! -e ${WAZUH_INSTALL_PATH}/etc/sslmanager.key ]
then
if [ ! -e ${WAZUH_INSTALL_PATH}/etc/sslmanager.key ]
then
create_ossec_key_cert
fi
create_ossec_key_cert
fi
# Mount selected files (WAZUH_CONFIG_MOUNT) to container
@@ -229,8 +231,8 @@ main() {
# Delete temporary data folder
rm -rf ${WAZUH_INSTALL_PATH}/data_tmp
# Set rids directory owner
set_rids_owner
# Set correct ownership for Wazuh related directories
configure_permissions
}
main
@@ -4,8 +4,8 @@
set -e
if [ "$INDEXER_URL" != "" ]; then
>&2 echo "Customize Elasticsearch ouput IP"
sed -i "s|hosts:.*|hosts: ['$INDEXER_URL']|g" /etc/filebeat/filebeat.yml
>&2 echo "Customize Elasticsearch output IP"
sed -i "s|hosts:.*|hosts: [$INDEXER_URL]|g" /etc/filebeat/filebeat.yml
fi
# Configure filebeat.yml security settings
@@ -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,6 +126,9 @@ function_wazuh_migration
# create API custom user
function_create_custom_user
# configure Vulnerabilty detection
function_configure_vulnerability_detection
# run entrypoint scripts
function_entrypoint_scripts
@@ -8,9 +8,9 @@ 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://wazuh.indexer:9200']
@@ -1,25 +1,11 @@
REPOSITORY="packages.wazuh.com/4.x"
WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '\"tag_name\":' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2-)
MAJOR_BUILD=$(echo $WAZUH_VERSION | cut -d. -f1)
MID_BUILD=$(echo $WAZUH_VERSION | cut -d. -f2)
MINOR_BUILD=$(echo $WAZUH_VERSION | cut -d. -f3)
MAJOR_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f1)
MID_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f2)
MINOR_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f3)
## variables
REPOSITORY="packages-dev.wazuh.com/pre-release"
WAZUH_TAG=$(curl --silent https://api.github.com/repos/wazuh/wazuh/git/refs/tags | grep '["]ref["]:' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 11- | grep ^v${WAZUH_VERSION}$)
## check version to use the correct repository
if [ "$MAJOR_BUILD" -gt "$MAJOR_CURRENT" ]; then
REPOSITORY="packages-dev.wazuh.com/pre-release"
elif [ "$MAJOR_BUILD" -eq "$MAJOR_CURRENT" ]; then
if [ "$MID_BUILD" -gt "$MID_CURRENT" ]; then
REPOSITORY="packages-dev.wazuh.com/pre-release"
elif [ "$MID_BUILD" -eq "$MID_CURRENT" ]; then
if [ "$MINOR_BUILD" -gt "$MINOR_CURRENT" ]; then
REPOSITORY="packages-dev.wazuh.com/pre-release"
fi
fi
## check tag to use the correct repository
if [[ -n "${WAZUH_TAG}" ]]; then
REPOSITORY="packages.wazuh.com/4.x"
fi
curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/${FILEBEAT_CHANNEL}-${FILEBEAT_VERSION}-amd64.deb &&\
dpkg -i ${FILEBEAT_CHANNEL}-${FILEBEAT_VERSION}-amd64.deb && rm -f ${FILEBEAT_CHANNEL}-${FILEBEAT_VERSION}-amd64.deb && \
yum install filebeat-${FILEBEAT_VERSION}-${FILEBEAT_REVISION} -y && \
curl -s https://${REPOSITORY}/filebeat/${WAZUH_FILEBEAT_MODULE} | tar -xvz -C /usr/share/filebeat/module
@@ -16,13 +16,16 @@ 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/pagerduty"
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"
@@ -53,14 +56,52 @@ 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
@@ -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
+1
View File
@@ -0,0 +1 @@
book
+212
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
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
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"
Executable
+3
View File
@@ -0,0 +1,3 @@
#! /bin/sh
mdbook build
+32
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.5
```
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 rc4 or beta1, not used by default.
-f, --filebeat-module <ref> [Optional] Set Filebeat module version. By default 0.5.
-r, --revision <rev> [Optional] Package revision. By default 1
-v, --version <ver> [Optional] Set the Wazuh version should be builded. By default, 4.14.5.
-h, --help Show this help.
```
+40
View File
@@ -0,0 +1,40 @@
# Development Guide - Introduction
Welcome to the Development Guide for Wazuh-docker version 4.14.5. 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
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
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.5). 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.5`.
```bash
git clone [https://github.com/wazuh/wazuh-docker.git](https://github.com/wazuh/wazuh-docker.git)
cd wazuh-docker
git checkout v4.14.5
```
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.
+45
View File
@@ -0,0 +1,45 @@
# Reference Manual - Description
This section provides a detailed description of Wazuh-docker (version 4.14.5), 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.5:
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.5, 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.
+47
View File
@@ -0,0 +1,47 @@
# Reference Manual - Introduction
Welcome to the Reference Manual for Wazuh-Docker, version 4.14.5. 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.5 of Wazuh-Docker. Ensure you are using the documentation that corresponds to your deployed version.
@@ -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.5 for detailed information on all possible configuration parameters for each component.
+28
View File
@@ -0,0 +1,28 @@
# Reference Manual - Configuration
This section details how to configure your Wazuh-Docker deployment (version 4.14.5). 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.
@@ -0,0 +1,120 @@
# 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
- [Environment Variables in Wazuh Docker Deployment](#environment-variables-in-wazuh-docker-deployment)
- [Table of Contents](#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)
- [Examples:](#examples)
---
## 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_AGENT_GROUP=default
- 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.
---
@@ -0,0 +1,46 @@
# Reference Manual - Deployment
This section provides detailed instructions for deploying Wazuh-Docker (version 4.14.5) 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.5`) 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.5
```
- 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.
@@ -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.
@@ -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.
@@ -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
```
@@ -0,0 +1,58 @@
# Reference Manual - Getting Started
This section guides you through the initial steps to get your Wazuh-docker (version 4.14.5) 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.5.
```bash
git clone [https://github.com/wazuh/wazuh-docker.git](https://github.com/wazuh/wazuh-docker.git)
cd wazuh-docker
git checkout v4.14.5
# 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.
+73
View File
@@ -0,0 +1,73 @@
# Reference Manual - Requirements
Before deploying Wazuh-Docker (version 4.14.5), 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
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.5).
---
**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.5, 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.5, 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
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.
Executable
+3
View File
@@ -0,0 +1,3 @@
#! /bin/sh
mdbook serve
+2 -2
View File
@@ -1,7 +1,7 @@
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
FROM ubuntu:focal
FROM amazonlinux:2023
RUN apt-get update && apt-get install openssl curl -y
RUN yum update -y && yum install openssl curl-minimal -y
WORKDIR /
+27 -4
View File
@@ -1,9 +1,32 @@
# Certificate creation image build
# 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.
The dockerfile hosted in this directory is used to build the image required for generating Wazuh Docker single-node and multi-node certificate files
To create the image, the following command must be executed:
## Pre-requisites
1. Verify the Docker Buildx plugin is properly set up
2. For multi-architecture image builds:
- Ensure QEMU is installed
- Check permissions to push images to a Docker registry
Useful documentation:
- https://docs.docker.com/build/building/multi-platform/
- https://www.qemu.org/download/
## Procedure
Execute the following to run the script used to build the wazuh-certs-generator docker image
```console
cd indexer-certs-creator
```
$ docker build -t wazuh/wazuh-certs-generator:0.0.1 .
```console
./build-image.sh -v <IMAGE_TAG> [-m] [-rg <REGISTRY>]
```
- Replace <IMAGE_TAG> with the new image desired tag.
- Use the `-m` flag to build a multi-architecture image (supports both `amd64` and `arm64`)
- If multiarch build is enabled, the script will attempt to push the image to the specified registry. This image upload will only work if credentials are properly configured.
- Use the `-rg <REGISTRY>` parameter to specify a custom Docker registry (default is Docker Hub)
+107
View File
@@ -0,0 +1,107 @@
#!/bin/bash
# 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_CERTS_IMAGE_VERSION="0.0.4"
WAZUH_REGISTRY="docker.io"
# -----------------------------------------------------------------------------
trap ctrl_c INT
clean() {
exit_code=$1
exit ${exit_code}
}
ctrl_c() {
clean 1
}
# -----------------------------------------------------------------------------
build() {
IMAGE_TAG="${WAZUH_CERTS_IMAGE_VERSION}"
echo WAZUH_REGISTRY=$WAZUH_REGISTRY > .env
echo IMAGE_TAG=$IMAGE_TAG >> .env
set -a
source .env
set +a
if [ "${MULTIARCH}" ]; then
docker buildx bake \
--file build-image.yml \
--set *.platform=linux/amd64,linux/arm64 \
--push \
--no-cache || clean 1
else
docker buildx bake \
--file build-image.yml \
--load \
--no-cache || clean 1
fi
return 0
}
# -----------------------------------------------------------------------------
help() {
echo
echo "Usage: $0 [OPTIONS]"
echo
echo " -v, --version <ver> [Optional] Set the image version. By default ${WAZUH_CERTS_IMAGE_VERSION}."
echo " -rg, --registry <reg> [Optional] Set the Docker registry to push the images."
echo " -m, --multiarch [Optional] Enable multi-architecture builds."
echo " -h, --help Show this help."
echo
exit $1
}
# -----------------------------------------------------------------------------
main() {
while [ -n "${1}" ]
do
case "${1}" in
"-h"|"--help")
help 0
;;
"-m"|"--multiarch")
MULTIARCH="true"
shift
;;
"-rg"|"--registry")
if [ -n "${2}" ]; then
WAZUH_REGISTRY="${2}"
shift 2
else
help 1
fi
;;
"-v"|"--version")
if [ -n "$2" ]; then
WAZUH_CERTS_IMAGE_VERSION="$2"
shift 2
else
help 1
fi
;;
*)
help 1
esac
done
build || clean 1
clean 0
}
main "$@"
+8
View File
@@ -0,0 +1,8 @@
# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
services:
wazuh.certs.generator:
build:
context: .
dockerfile: Dockerfile
image: ${WAZUH_REGISTRY}/wazuh/wazuh-certs-generator:${IMAGE_TAG}
hostname: wazuh-certs-generator
+29 -22
View File
@@ -8,29 +8,35 @@
## Variables
CERT_TOOL=wazuh-certs-tool.sh
PASSWORD_TOOL=wazuh-passwords-tool.sh
PACKAGES_URL=https://packages.wazuh.com/4.7/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.7/
PACKAGES_URL=https://packages.wazuh.com/$CERT_TOOL_VERSION/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/$CERT_TOOL_VERSION/
## 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}')
OUTPUT_FILE="/$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"
download_package() {
local url=$1
echo "Checking $url$CERT_TOOL ..."
if curl -fsL "$url$CERT_TOOL" -o "$OUTPUT_FILE"; then
echo "Downloaded $CERT_TOOL from $url"
return 0
else
return 1
fi
}
# Try first the prod URL, if it fails try the dev URL
if download_package "$PACKAGES_URL"; then
:
elif download_package "$PACKAGES_DEV_URL"; then
:
else
echo "The tool to create the certificates does not exist in any bucket"
echo "ERROR: certificates were not created"
exit 1
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
chmod 700 "$OUTPUT_FILE"
##############################################################################
# Creating Cluster certificates
@@ -38,7 +44,7 @@ chmod 700 /$CERT_TOOL
## Execute cert tool and parsin cert.yml to set UID permissions
source /$CERT_TOOL -A
nodes_server=$( cert_parseYaml /config.yml | grep nodes_server__name | sed 's/nodes_server__name=//' )
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"
@@ -51,11 +57,12 @@ 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 101:101 /certificates/root-ca-manager.pem
chown 101:101 /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 101:101 "/certificates/${i}.pem"
chown 101:101 "/certificates/${i}-key.pem"
chown 999:999 "/certificates/${i}.pem"
chown 999:999 "/certificates/${i}-key.pem"
done
+5 -5
View File
@@ -1,6 +1,6 @@
# Deploy Wazuh Docker in multi node configuration
This deployment is defined in the `docker-compose.yml` file with two Wazuh manager containers, three Wazuh indexer containers, and one Wazuh dashboard container. It can be deployed by following these steps:
This deployment is defined in the `docker-compose.yml` file with two Wazuh manager containers, three Wazuh indexer containers, and one Wazuh dashboard container. It can be deployed by following these steps:
1) Increase max_map_count on your host (Linux). This command must be run with root permissions:
```
@@ -8,18 +8,18 @@ $ sysctl -w vm.max_map_count=262144
```
2) Run the certificate creation script:
```
$ docker-compose -f generate-indexer-certs.yml run --rm generator
$ docker compose -f generate-indexer-certs.yml run --rm generator
```
3) Start the environment with docker-compose:
3) Start the environment with docker compose:
- In the foregroud:
```
$ docker-compose up
$ docker compose up
```
- In the background:
```
$ docker-compose up -d
$ docker compose up -d
```
@@ -79,7 +79,7 @@
<os>yes</os>
<network>yes</network>
<packages>yes</packages>
<ports all="no">yes</ports>
<ports all="yes">yes</ports>
<processes>yes</processes>
<!-- Database synchronization settings -->
@@ -95,91 +95,27 @@
<skip_nfs>yes</skip_nfs>
</sca>
<vulnerability-detector>
<enabled>no</enabled>
<interval>5m</interval>
<min_full_scan_interval>6h</min_full_scan_interval>
<run_on_start>yes</run_on_start>
<vulnerability-detection>
<enabled>yes</enabled>
<index-status>yes</index-status>
<feed-update-interval>60m</feed-update-interval>
</vulnerability-detection>
<!-- Ubuntu OS vulnerabilities -->
<provider name="canonical">
<enabled>no</enabled>
<os>trusty</os>
<os>xenial</os>
<os>bionic</os>
<os>focal</os>
<os>jammy</os>
<update_interval>1h</update_interval>
</provider>
<!-- Debian OS vulnerabilities -->
<provider name="debian">
<enabled>no</enabled>
<os>buster</os>
<os>bullseye</os>
<os>bookworm</os>
<update_interval>1h</update_interval>
</provider>
<!-- RedHat OS vulnerabilities -->
<provider name="redhat">
<enabled>no</enabled>
<os>5</os>
<os>6</os>
<os>7</os>
<os>8</os>
<os>9</os>
<update_interval>1h</update_interval>
</provider>
<!-- Amazon Linux OS vulnerabilities -->
<provider name="alas">
<enabled>no</enabled>
<os>amazon-linux</os>
<os>amazon-linux-2</os>
<os>amazon-linux-2023</os>
<update_interval>1h</update_interval>
</provider>
<!-- SUSE Linux Enterprise OS vulnerabilities -->
<provider name="suse">
<enabled>no</enabled>
<os>11-server</os>
<os>11-desktop</os>
<os>12-server</os>
<os>12-desktop</os>
<os>15-server</os>
<os>15-desktop</os>
<update_interval>1h</update_interval>
</provider>
<!-- Arch OS vulnerabilities -->
<provider name="arch">
<enabled>no</enabled>
<update_interval>1h</update_interval>
</provider>
<!-- Windows OS vulnerabilities -->
<provider name="msu">
<enabled>yes</enabled>
<update_interval>1h</update_interval>
</provider>
<!-- Alma Linux OS vulnerabilities -->
<provider name="almalinux">
<enabled>no</enabled>
<os>8</os>
<os>9</os>
<update_interval>1h</update_interval>
</provider>
<!-- Aggregate vulnerabilities -->
<provider name="nvd">
<enabled>yes</enabled>
<update_interval>1h</update_interval>
</provider>
</vulnerability-detector>
<indexer>
<enabled>yes</enabled>
<hosts>
<host>https://wazuh1.indexer:9200</host>
<host>https://wazuh2.indexer:9200</host>
<host>https://wazuh3.indexer:9200</host>
</hosts>
<ssl>
<certificate_authorities>
<ca>/etc/ssl/root-ca.pem</ca>
</certificate_authorities>
<certificate>/etc/ssl/filebeat.pem</certificate>
<key>/etc/ssl/filebeat.key</key>
</ssl>
</indexer>
<!-- File integrity monitoring -->
<syscheck>
@@ -321,6 +257,9 @@
<list>etc/lists/audit-keys</list>
<list>etc/lists/amazon/aws-eventnames</list>
<list>etc/lists/security-eventchannel</list>
<list>etc/lists/malicious-ioc/malicious-ip</list>
<list>etc/lists/malicious-ioc/malicious-domains</list>
<list>etc/lists/malicious-ioc/malware-hashes</list>
<!-- User-defined ruleset -->
<decoder_dir>etc/decoders</decoder_dir>
@@ -371,9 +310,4 @@
<location>/var/ossec/logs/active-responses.log</location>
</localfile>
<localfile>
<log_format>syslog</log_format>
<location>/var/log/dpkg.log</location>
</localfile>
</ossec_config>
@@ -79,7 +79,7 @@
<os>yes</os>
<network>yes</network>
<packages>yes</packages>
<ports all="no">yes</ports>
<ports all="yes">yes</ports>
<processes>yes</processes>
<!-- Database synchronization settings -->
@@ -95,91 +95,27 @@
<skip_nfs>yes</skip_nfs>
</sca>
<vulnerability-detector>
<enabled>no</enabled>
<interval>5m</interval>
<min_full_scan_interval>6h</min_full_scan_interval>
<run_on_start>yes</run_on_start>
<vulnerability-detection>
<enabled>yes</enabled>
<index-status>yes</index-status>
<feed-update-interval>60m</feed-update-interval>
</vulnerability-detection>
<!-- Ubuntu OS vulnerabilities -->
<provider name="canonical">
<enabled>no</enabled>
<os>trusty</os>
<os>xenial</os>
<os>bionic</os>
<os>focal</os>
<os>jammy</os>
<update_interval>1h</update_interval>
</provider>
<!-- Debian OS vulnerabilities -->
<provider name="debian">
<enabled>no</enabled>
<os>buster</os>
<os>bullseye</os>
<os>bookworm</os>
<update_interval>1h</update_interval>
</provider>
<!-- RedHat OS vulnerabilities -->
<provider name="redhat">
<enabled>no</enabled>
<os>5</os>
<os>6</os>
<os>7</os>
<os>8</os>
<os>9</os>
<update_interval>1h</update_interval>
</provider>
<!-- Amazon Linux OS vulnerabilities -->
<provider name="alas">
<enabled>no</enabled>
<os>amazon-linux</os>
<os>amazon-linux-2</os>
<os>amazon-linux-2023</os>
<update_interval>1h</update_interval>
</provider>
<!-- SUSE Linux Enterprise OS vulnerabilities -->
<provider name="suse">
<enabled>no</enabled>
<os>11-server</os>
<os>11-desktop</os>
<os>12-server</os>
<os>12-desktop</os>
<os>15-server</os>
<os>15-desktop</os>
<update_interval>1h</update_interval>
</provider>
<!-- Arch OS vulnerabilities -->
<provider name="arch">
<enabled>no</enabled>
<update_interval>1h</update_interval>
</provider>
<!-- Alma Linux OS vulnerabilities -->
<provider name="almalinux">
<enabled>no</enabled>
<os>8</os>
<os>9</os>
<update_interval>1h</update_interval>
</provider>
<!-- Windows OS vulnerabilities -->
<provider name="msu">
<enabled>yes</enabled>
<update_interval>1h</update_interval>
</provider>
<!-- Aggregate vulnerabilities -->
<provider name="nvd">
<enabled>yes</enabled>
<update_interval>1h</update_interval>
</provider>
</vulnerability-detector>
<indexer>
<enabled>yes</enabled>
<hosts>
<host>https://wazuh1.indexer:9200</host>
<host>https://wazuh2.indexer:9200</host>
<host>https://wazuh3.indexer:9200</host>
</hosts>
<ssl>
<certificate_authorities>
<ca>/etc/ssl/root-ca.pem</ca>
</certificate_authorities>
<certificate>/etc/ssl/filebeat.pem</certificate>
<key>/etc/ssl/filebeat.key</key>
</ssl>
</indexer>
<!-- File integrity monitoring -->
<syscheck>
@@ -321,6 +257,9 @@
<list>etc/lists/audit-keys</list>
<list>etc/lists/amazon/aws-eventnames</list>
<list>etc/lists/security-eventchannel</list>
<list>etc/lists/malicious-ioc/malicious-ip</list>
<list>etc/lists/malicious-ioc/malicious-domains</list>
<list>etc/lists/malicious-ioc/malware-hashes</list>
<!-- User-defined ruleset -->
<decoder_dir>etc/decoders</decoder_dir>
@@ -371,9 +310,4 @@
<location>/var/ossec/logs/active-responses.log</location>
</localfile>
<localfile>
<log_format>syslog</log_format>
<location>/var/log/dpkg.log</location>
</localfile>
</ossec_config>
@@ -9,4 +9,8 @@ server.ssl.enabled: true
server.ssl.key: "/usr/share/wazuh-dashboard/certs/wazuh-dashboard-key.pem"
server.ssl.certificate: "/usr/share/wazuh-dashboard/certs/wazuh-dashboard.pem"
opensearch.ssl.certificateAuthorities: ["/usr/share/wazuh-dashboard/certs/root-ca.pem"]
uiSettings.overrides.defaultRoute: /app/wazuh
uiSettings.overrides.defaultRoute: /app/wz-home
# Session expiration settings
opensearch_security.cookie.ttl: 900000
opensearch_security.session.ttl: 900000
opensearch_security.session.keepalive: true
+1 -1
View File
@@ -4,4 +4,4 @@ hosts:
port: 55000
username: wazuh-wui
password: "MyS3cr37P450r.*-"
run_as: false
run_as: true
@@ -21,6 +21,13 @@ plugins.security.ssl.transport.pemtrustedcas_filepath: ${OPENSEARCH_PATH_CONF}/c
plugins.security.ssl.http.enabled: true
plugins.security.ssl.transport.enforce_hostname_verification: false
plugins.security.ssl.transport.resolve_hostname: false
plugins.security.ssl.http.enabled_ciphers:
- "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256"
- "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"
- "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256"
- "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384"
plugins.security.ssl.http.enabled_protocols:
- "TLSv1.2"
plugins.security.authcz.admin_dn:
- "CN=admin,OU=Wazuh,O=Wazuh,L=California,C=US"
plugins.security.check_snapshot_restore_write_privileges: true
@@ -21,6 +21,13 @@ plugins.security.ssl.transport.pemtrustedcas_filepath: ${OPENSEARCH_PATH_CONF}/c
plugins.security.ssl.http.enabled: true
plugins.security.ssl.transport.enforce_hostname_verification: false
plugins.security.ssl.transport.resolve_hostname: false
plugins.security.ssl.http.enabled_ciphers:
- "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256"
- "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"
- "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256"
- "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384"
plugins.security.ssl.http.enabled_protocols:
- "TLSv1.2"
plugins.security.authcz.admin_dn:
- "CN=admin,OU=Wazuh,O=Wazuh,L=California,C=US"
plugins.security.check_snapshot_restore_write_privileges: true
@@ -21,6 +21,13 @@ plugins.security.ssl.transport.pemtrustedcas_filepath: ${OPENSEARCH_PATH_CONF}/c
plugins.security.ssl.http.enabled: true
plugins.security.ssl.transport.enforce_hostname_verification: false
plugins.security.ssl.transport.resolve_hostname: false
plugins.security.ssl.http.enabled_ciphers:
- "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256"
- "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"
- "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256"
- "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384"
plugins.security.ssl.http.enabled_protocols:
- "TLSv1.2"
plugins.security.authcz.admin_dn:
- "CN=admin,OU=Wazuh,O=Wazuh,L=California,C=US"
plugins.security.check_snapshot_restore_write_privileges: true
+24 -26
View File
@@ -1,9 +1,7 @@
# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
version: '3.7'
services:
wazuh.master:
image: wazuh/wazuh-manager:4.7.5
image: wazuh/wazuh-manager:4.14.5
hostname: wazuh.master
restart: always
ulimits:
@@ -18,7 +16,7 @@ services:
- "514:514/udp"
- "55000:55000"
environment:
- INDEXER_URL=https://wazuh1.indexer:9200
- INDEXER_URL="https://wazuh1.indexer:9200","https://wazuh2.indexer:9200","https://wazuh3.indexer:9200"
- INDEXER_USERNAME=admin
- INDEXER_PASSWORD=SecretPassword
- FILEBEAT_SSL_VERIFICATION_MODE=full
@@ -45,7 +43,7 @@ services:
- ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
wazuh.worker:
image: wazuh/wazuh-manager:4.7.5
image: wazuh/wazuh-manager:4.14.5
hostname: wazuh.worker
restart: always
ulimits:
@@ -81,7 +79,7 @@ services:
- ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf
wazuh1.indexer:
image: wazuh/wazuh-indexer:4.7.5
image: wazuh/wazuh-indexer:4.14.5
hostname: wazuh1.indexer
restart: always
ports:
@@ -98,16 +96,16 @@ services:
hard: 65536
volumes:
- wazuh-indexer-data-1:/var/lib/wazuh-indexer
- ./config/wazuh_indexer_ssl_certs/root-ca.pem:/usr/share/wazuh-indexer/certs/root-ca.pem
- ./config/wazuh_indexer_ssl_certs/wazuh1.indexer-key.pem:/usr/share/wazuh-indexer/certs/wazuh1.indexer.key
- ./config/wazuh_indexer_ssl_certs/wazuh1.indexer.pem:/usr/share/wazuh-indexer/certs/wazuh1.indexer.pem
- ./config/wazuh_indexer_ssl_certs/admin.pem:/usr/share/wazuh-indexer/certs/admin.pem
- ./config/wazuh_indexer_ssl_certs/admin-key.pem:/usr/share/wazuh-indexer/certs/admin-key.pem
- ./config/wazuh_indexer/wazuh1.indexer.yml:/usr/share/wazuh-indexer/opensearch.yml
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
- ./config/wazuh_indexer_ssl_certs/root-ca.pem:/usr/share/wazuh-indexer/config/certs/root-ca.pem
- ./config/wazuh_indexer_ssl_certs/wazuh1.indexer-key.pem:/usr/share/wazuh-indexer/config/certs/wazuh1.indexer.key
- ./config/wazuh_indexer_ssl_certs/wazuh1.indexer.pem:/usr/share/wazuh-indexer/config/certs/wazuh1.indexer.pem
- ./config/wazuh_indexer_ssl_certs/admin.pem:/usr/share/wazuh-indexer/config/certs/admin.pem
- ./config/wazuh_indexer_ssl_certs/admin-key.pem:/usr/share/wazuh-indexer/config/certs/admin-key.pem
- ./config/wazuh_indexer/wazuh1.indexer.yml:/usr/share/wazuh-indexer/config/opensearch.yml
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/config/opensearch-security/internal_users.yml
wazuh2.indexer:
image: wazuh/wazuh-indexer:4.7.5
image: wazuh/wazuh-indexer:4.14.5
hostname: wazuh2.indexer
restart: always
environment:
@@ -122,14 +120,14 @@ services:
hard: 65536
volumes:
- wazuh-indexer-data-2:/var/lib/wazuh-indexer
- ./config/wazuh_indexer_ssl_certs/root-ca.pem:/usr/share/wazuh-indexer/certs/root-ca.pem
- ./config/wazuh_indexer_ssl_certs/wazuh2.indexer-key.pem:/usr/share/wazuh-indexer/certs/wazuh2.indexer.key
- ./config/wazuh_indexer_ssl_certs/wazuh2.indexer.pem:/usr/share/wazuh-indexer/certs/wazuh2.indexer.pem
- ./config/wazuh_indexer/wazuh2.indexer.yml:/usr/share/wazuh-indexer/opensearch.yml
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
- ./config/wazuh_indexer_ssl_certs/root-ca.pem:/usr/share/wazuh-indexer/config/certs/root-ca.pem
- ./config/wazuh_indexer_ssl_certs/wazuh2.indexer-key.pem:/usr/share/wazuh-indexer/config/certs/wazuh2.indexer.key
- ./config/wazuh_indexer_ssl_certs/wazuh2.indexer.pem:/usr/share/wazuh-indexer/config/certs/wazuh2.indexer.pem
- ./config/wazuh_indexer/wazuh2.indexer.yml:/usr/share/wazuh-indexer/config/opensearch.yml
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/config/opensearch-security/internal_users.yml
wazuh3.indexer:
image: wazuh/wazuh-indexer:4.7.5
image: wazuh/wazuh-indexer:4.14.5
hostname: wazuh3.indexer
restart: always
environment:
@@ -144,14 +142,14 @@ services:
hard: 65536
volumes:
- wazuh-indexer-data-3:/var/lib/wazuh-indexer
- ./config/wazuh_indexer_ssl_certs/root-ca.pem:/usr/share/wazuh-indexer/certs/root-ca.pem
- ./config/wazuh_indexer_ssl_certs/wazuh3.indexer-key.pem:/usr/share/wazuh-indexer/certs/wazuh3.indexer.key
- ./config/wazuh_indexer_ssl_certs/wazuh3.indexer.pem:/usr/share/wazuh-indexer/certs/wazuh3.indexer.pem
- ./config/wazuh_indexer/wazuh3.indexer.yml:/usr/share/wazuh-indexer/opensearch.yml
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
- ./config/wazuh_indexer_ssl_certs/root-ca.pem:/usr/share/wazuh-indexer/config/certs/root-ca.pem
- ./config/wazuh_indexer_ssl_certs/wazuh3.indexer-key.pem:/usr/share/wazuh-indexer/config/certs/wazuh3.indexer.key
- ./config/wazuh_indexer_ssl_certs/wazuh3.indexer.pem:/usr/share/wazuh-indexer/config/certs/wazuh3.indexer.pem
- ./config/wazuh_indexer/wazuh3.indexer.yml:/usr/share/wazuh-indexer/config/opensearch.yml
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/config/opensearch-security/internal_users.yml
wazuh.dashboard:
image: wazuh/wazuh-dashboard:4.7.5
image: wazuh/wazuh-dashboard:4.14.5
hostname: wazuh.dashboard
restart: always
ports:
+3 -3
View File
@@ -1,10 +1,10 @@
# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
version: '3'
services:
generator:
image: wazuh/wazuh-certs-generator:0.0.1
image: wazuh/wazuh-certs-generator:0.0.4
hostname: wazuh-certs-generator
environment:
- CERT_TOOL_VERSION=4.14
volumes:
- ./config/wazuh_indexer_ssl_certs/:/certificates/
- ./config/certs.yml:/config/certs.yml
+4 -4
View File
@@ -8,17 +8,17 @@ $ sysctl -w vm.max_map_count=262144
```
2) Run the certificate creation script:
```
$ docker-compose -f generate-indexer-certs.yml run --rm generator
$ docker compose -f generate-indexer-certs.yml run --rm generator
```
3) Start the environment with docker-compose:
3) Start the environment with docker compose:
- In the foregroud:
```
$ docker-compose up
$ docker compose up
```
- In the background:
```
$ docker-compose up -d
$ docker compose up -d
```
The environment takes about 1 minute to get up (depending on your Docker host) for the first time since Wazuh Indexer must be started for the first time and the indexes and index patterns must be generated.
@@ -79,7 +79,7 @@
<os>yes</os>
<network>yes</network>
<packages>yes</packages>
<ports all="no">yes</ports>
<ports all="yes">yes</ports>
<processes>yes</processes>
<!-- Database synchronization settings -->
@@ -95,91 +95,25 @@
<skip_nfs>yes</skip_nfs>
</sca>
<vulnerability-detector>
<enabled>no</enabled>
<interval>5m</interval>
<min_full_scan_interval>6h</min_full_scan_interval>
<run_on_start>yes</run_on_start>
<vulnerability-detection>
<enabled>yes</enabled>
<index-status>yes</index-status>
<feed-update-interval>60m</feed-update-interval>
</vulnerability-detection>
<!-- Ubuntu OS vulnerabilities -->
<provider name="canonical">
<enabled>no</enabled>
<os>trusty</os>
<os>xenial</os>
<os>bionic</os>
<os>focal</os>
<os>jammy</os>
<update_interval>1h</update_interval>
</provider>
<!-- Debian OS vulnerabilities -->
<provider name="debian">
<enabled>no</enabled>
<os>buster</os>
<os>bullseye</os>
<os>bookworm</os>
<update_interval>1h</update_interval>
</provider>
<!-- RedHat OS vulnerabilities -->
<provider name="redhat">
<enabled>no</enabled>
<os>5</os>
<os>6</os>
<os>7</os>
<os>8</os>
<os>9</os>
<update_interval>1h</update_interval>
</provider>
<!-- Amazon Linux OS vulnerabilities -->
<provider name="alas">
<enabled>no</enabled>
<os>amazon-linux</os>
<os>amazon-linux-2</os>
<os>amazon-linux-2023</os>
<update_interval>1h</update_interval>
</provider>
<!-- SUSE Linux Enterprise OS vulnerabilities -->
<provider name="suse">
<enabled>no</enabled>
<os>11-server</os>
<os>11-desktop</os>
<os>12-server</os>
<os>12-desktop</os>
<os>15-server</os>
<os>15-desktop</os>
<update_interval>1h</update_interval>
</provider>
<!-- Arch OS vulnerabilities -->
<provider name="arch">
<enabled>no</enabled>
<update_interval>1h</update_interval>
</provider>
<!-- Alma Linux OS vulnerabilities -->
<provider name="almalinux">
<enabled>no</enabled>
<os>8</os>
<os>9</os>
<update_interval>1h</update_interval>
</provider>
<!-- Windows OS vulnerabilities -->
<provider name="msu">
<enabled>yes</enabled>
<update_interval>1h</update_interval>
</provider>
<!-- Aggregate vulnerabilities -->
<provider name="nvd">
<enabled>yes</enabled>
<update_interval>1h</update_interval>
</provider>
</vulnerability-detector>
<indexer>
<enabled>yes</enabled>
<hosts>
<host>https://wazuh.indexer:9200</host>
</hosts>
<ssl>
<certificate_authorities>
<ca>/etc/ssl/root-ca.pem</ca>
</certificate_authorities>
<certificate>/etc/ssl/filebeat.pem</certificate>
<key>/etc/ssl/filebeat.key</key>
</ssl>
</indexer>
<!-- File integrity monitoring -->
<syscheck>
@@ -321,6 +255,9 @@
<list>etc/lists/audit-keys</list>
<list>etc/lists/amazon/aws-eventnames</list>
<list>etc/lists/security-eventchannel</list>
<list>etc/lists/malicious-ioc/malicious-ip</list>
<list>etc/lists/malicious-ioc/malicious-domains</list>
<list>etc/lists/malicious-ioc/malware-hashes</list>
<!-- User-defined ruleset -->
<decoder_dir>etc/decoders</decoder_dir>
@@ -9,4 +9,8 @@ server.ssl.enabled: true
server.ssl.key: "/usr/share/wazuh-dashboard/certs/wazuh-dashboard-key.pem"
server.ssl.certificate: "/usr/share/wazuh-dashboard/certs/wazuh-dashboard.pem"
opensearch.ssl.certificateAuthorities: ["/usr/share/wazuh-dashboard/certs/root-ca.pem"]
uiSettings.overrides.defaultRoute: /app/wazuh
uiSettings.overrides.defaultRoute: /app/wz-home
# Session expiration settings
opensearch_security.cookie.ttl: 900000
opensearch_security.session.ttl: 900000
opensearch_security.session.keepalive: true
+1 -1
View File
@@ -4,4 +4,4 @@ hosts:
port: 55000
username: wazuh-wui
password: "MyS3cr37P450r.*-"
run_as: false
run_as: true
@@ -1,20 +1,26 @@
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
http.port: 9200-9299
transport.tcp.port: 9300-9399
compatibility.override_main_response_version: true
plugins.security.ssl.http.pemcert_filepath: /usr/share/wazuh-indexer/certs/wazuh.indexer.pem
plugins.security.ssl.http.pemkey_filepath: /usr/share/wazuh-indexer/certs/wazuh.indexer.key
plugins.security.ssl.http.pemtrustedcas_filepath: /usr/share/wazuh-indexer/certs/root-ca.pem
plugins.security.ssl.transport.pemcert_filepath: /usr/share/wazuh-indexer/certs/wazuh.indexer.pem
plugins.security.ssl.transport.pemkey_filepath: /usr/share/wazuh-indexer/certs/wazuh.indexer.key
plugins.security.ssl.transport.pemtrustedcas_filepath: /usr/share/wazuh-indexer/certs/root-ca.pem
plugins.security.ssl.http.pemcert_filepath: /usr/share/wazuh-indexer/config/certs/wazuh.indexer.pem
plugins.security.ssl.http.pemkey_filepath: /usr/share/wazuh-indexer/config/certs/wazuh.indexer.key
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/wazuh.indexer.pem
plugins.security.ssl.transport.pemkey_filepath: /usr/share/wazuh-indexer/config/certs/wazuh.indexer.key
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.ssl.http.enabled_ciphers:
- "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256"
- "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"
- "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256"
- "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384"
plugins.security.ssl.http.enabled_protocols:
- "TLSv1.2"
plugins.security.authcz.admin_dn:
- "CN=admin,OU=Wazuh,O=Wazuh,L=California,C=US"
plugins.security.check_snapshot_restore_write_privileges: true
+12 -14
View File
@@ -1,9 +1,7 @@
# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
version: '3.7'
services:
wazuh.manager:
image: wazuh/wazuh-manager:4.7.5
image: wazuh/wazuh-manager:4.14.5
hostname: wazuh.manager
restart: always
ulimits:
@@ -19,7 +17,7 @@ services:
- "514:514/udp"
- "55000:55000"
environment:
- INDEXER_URL=https://wazuh.indexer:9200
- INDEXER_URL="https://wazuh.indexer:9200"
- INDEXER_USERNAME=admin
- INDEXER_PASSWORD=SecretPassword
- FILEBEAT_SSL_VERIFICATION_MODE=full
@@ -46,13 +44,13 @@ services:
- ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
wazuh.indexer:
image: wazuh/wazuh-indexer:4.7.5
image: wazuh/wazuh-indexer:4.14.5
hostname: wazuh.indexer
restart: always
ports:
- "9200:9200"
environment:
- "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m"
- "OPENSEARCH_JAVA_OPTS=-Xms1g -Xmx1g"
ulimits:
memlock:
soft: -1
@@ -62,16 +60,16 @@ services:
hard: 65536
volumes:
- wazuh-indexer-data:/var/lib/wazuh-indexer
- ./config/wazuh_indexer_ssl_certs/root-ca.pem:/usr/share/wazuh-indexer/certs/root-ca.pem
- ./config/wazuh_indexer_ssl_certs/wazuh.indexer-key.pem:/usr/share/wazuh-indexer/certs/wazuh.indexer.key
- ./config/wazuh_indexer_ssl_certs/wazuh.indexer.pem:/usr/share/wazuh-indexer/certs/wazuh.indexer.pem
- ./config/wazuh_indexer_ssl_certs/admin.pem:/usr/share/wazuh-indexer/certs/admin.pem
- ./config/wazuh_indexer_ssl_certs/admin-key.pem:/usr/share/wazuh-indexer/certs/admin-key.pem
- ./config/wazuh_indexer/wazuh.indexer.yml:/usr/share/wazuh-indexer/opensearch.yml
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
- ./config/wazuh_indexer_ssl_certs/root-ca.pem:/usr/share/wazuh-indexer/config/certs/root-ca.pem
- ./config/wazuh_indexer_ssl_certs/wazuh.indexer-key.pem:/usr/share/wazuh-indexer/config/certs/wazuh.indexer.key
- ./config/wazuh_indexer_ssl_certs/wazuh.indexer.pem:/usr/share/wazuh-indexer/config/certs/wazuh.indexer.pem
- ./config/wazuh_indexer_ssl_certs/admin.pem:/usr/share/wazuh-indexer/config/certs/admin.pem
- ./config/wazuh_indexer_ssl_certs/admin-key.pem:/usr/share/wazuh-indexer/config/certs/admin-key.pem
- ./config/wazuh_indexer/wazuh.indexer.yml:/usr/share/wazuh-indexer/config/opensearch.yml
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/config/opensearch-security/internal_users.yml
wazuh.dashboard:
image: wazuh/wazuh-dashboard:4.7.5
image: wazuh/wazuh-dashboard:4.14.5
hostname: wazuh.dashboard
restart: always
ports:
+3 -3
View File
@@ -1,10 +1,10 @@
# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
version: '3'
services:
generator:
image: wazuh/wazuh-certs-generator:0.0.1
image: wazuh/wazuh-certs-generator:0.0.4
hostname: wazuh-certs-generator
environment:
- CERT_TOOL_VERSION=4.14
volumes:
- ./config/wazuh_indexer_ssl_certs/:/certificates/
- ./config/certs.yml:/config/certs.yml
+174
View File
@@ -0,0 +1,174 @@
#!/bin/bash
# This script is used to update the version of a repository in the specified files.
# It takes a version number as an argument and updates the version in the specified files.
# Usage: ./repository_bumper.sh <version>
# Global variables
DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
LOG_FILE="${DIR}/tools/repository_bumper_$(date +"%Y-%m-%d_%H-%M-%S-%3N").log"
VERSION=""
STAGE=""
FILES_EDITED=()
FILES_EXCLUDED='--exclude="repository_bumper_*.log" --exclude="CHANGELOG.md" --exclude="repository_bumper.sh" --exclude="*_bumper_repository.yml"'
get_old_version_and_stage() {
local VERSION_FILE="${DIR}/VERSION.json"
OLD_VERSION=$(jq -r '.version' "${VERSION_FILE}")
OLD_STAGE=$(jq -r '.stage' "${VERSION_FILE}")
echo "Old version: ${OLD_VERSION}" | tee -a "${LOG_FILE}"
echo "Old stage: ${OLD_STAGE}" | tee -a "${LOG_FILE}"
}
grep_command() {
# This function is used to search for a specific string in the specified directory.
# It takes two arguments: the string to search for and the directory to search in.
# Usage: grep_command <string> <directory>
eval grep -Rl "${1}" "${2}" --exclude-dir=".git" $FILES_EXCLUDED "${3}"
}
update_version_in_files() {
local OLD_MAYOR="$(echo "${OLD_VERSION}" | cut -d '.' -f 1)"
local OLD_MINOR="$(echo "${OLD_VERSION}" | cut -d '.' -f 2)"
local OLD_PATCH="$(echo "${OLD_VERSION}" | cut -d '.' -f 3)"
local NEW_MAYOR="$(echo "${VERSION}" | cut -d '.' -f 1)"
local NEW_MINOR="$(echo "${VERSION}" | cut -d '.' -f 2)"
local NEW_PATCH="$(echo "${VERSION}" | cut -d '.' -f 3)"
m_m_p_files=( $(grep_command "${OLD_MAYOR}\.${OLD_MINOR}\.${OLD_PATCH}" "${DIR}") )
for file in "${m_m_p_files[@]}"; do
sed -i "s/\bv${OLD_MAYOR}\.${OLD_MINOR}\.${OLD_PATCH}\b/v${NEW_MAYOR}\.${NEW_MINOR}\.${NEW_PATCH}/g; s/\b${OLD_MAYOR}\.${OLD_MINOR}\.${OLD_PATCH}/${NEW_MAYOR}\.${NEW_MINOR}\.${NEW_PATCH}/g" "${file}"
if [[ $(git diff --name-only "${file}") ]]; then
FILES_EDITED+=("${file}")
fi
done
m_m_files=( $(grep_command "${OLD_MAYOR}\.${OLD_MINOR}" "${DIR}") )
for file in "${m_m_files[@]}"; do
sed -i -E "/[0-9]+\.[0-9]+\.[0-9]+/! s/(^|[^0-9.])(${OLD_MAYOR}\.${OLD_MINOR})([^0-9.]|$)/\1${NEW_MAYOR}.${NEW_MINOR}\3/g" "$file"
if [[ $(git diff --name-only "${file}") ]]; then
FILES_EDITED+=("${file}")
fi
done
m_x_files=( $(grep_command "${OLD_MAYOR}\.x" "${DIR}") )
for file in "${m_x_files[@]}"; do
sed -i "s/\b${OLD_MAYOR}\.x\b/${NEW_MAYOR}\.x/g" "${file}"
if [[ $(git diff --name-only "${file}") ]]; then
FILES_EDITED+=("${file}")
fi
done
if ! sed -i "/^All notable changes to this project will be documented in this file.$/a \\\n## [${VERSION}]\\n\\n### Added\\n\\n- None\\n\\n### Changed\\n\\n- None\\n\\n### Fixed\\n\\n- None\\n\\n### Deleted\\n\\n- None" "${DIR}/CHANGELOG.md"; then
echo "Error: Failed to update CHANGELOG.md" | tee -a "${LOG_FILE}"
fi
if [[ $(git diff --name-only "${DIR}/CHANGELOG.md") ]]; then
FILES_EDITED+=("${DIR}/CHANGELOG.md")
fi
}
update_stage_in_files() {
local OLD_STAGE="$(echo "${OLD_STAGE}")"
files=( $(grep_command "${OLD_STAGE}" "${DIR}" --exclude="README.md") )
for file in "${files[@]}"; do
sed -i "s/${OLD_STAGE}/${STAGE}/g" "${file}"
if [[ $(git diff --name-only "${file}") ]]; then
FILES_EDITED+=("${file}")
fi
done
}
update_docker_images_tag() {
local NEW_TAG="$1"
local DOCKERFILES=( $(grep_command "wazuh/wazuh-[a-zA-Z0-9._-]*" "${DIR}" "--exclude="README.md" --exclude="generate-indexer-certs.yml"") )
for file in "${DOCKERFILES[@]}"; do
sed -i -E "s/(wazuh\/wazuh-[a-zA-Z0-9._-]*):[a-zA-Z0-9._-]+/\1:${NEW_TAG}/g" "${file}"
if [[ $(git diff --name-only "${file}") ]]; then
FILES_EDITED+=("${file}")
fi
done
}
main() {
echo "Starting repository version bumping process..." | tee -a "${LOG_FILE}"
echo "Log file: ${LOG_FILE}"
# Parse arguments
while [[ $# -gt 0 ]]; do
case $1 in
--version)
VERSION="$2"
shift 2
;;
--stage)
STAGE="$2"
shift 2
;;
--tag)
TAG="$2"
shift 2
;;
*)
echo "Unknown argument: $1"
exit 1
;;
esac
done
# Validate arguments
if [[ -z "${VERSION}" ]]; then
echo "Error: --version argument is required." | tee -a "${LOG_FILE}"
exit 1
fi
if [[ -z "${STAGE}" ]]; then
echo "Error: --stage argument is required." | tee -a "${LOG_FILE}"
exit 1
fi
# Validate if version is in the correct format
if ! [[ "${VERSION}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
echo "Error: Version must be in the format X.Y.Z (e.g., 1.2.3)." | tee -a "${LOG_FILE}"
exit 1
fi
# Validate if stage is in the correct format
STAGE=$(echo "${STAGE}" | tr '[:upper:]' '[:lower:]')
if ! [[ "${STAGE}" =~ ^(alpha[0-9]*|beta[0-9]*|rc[0-9]*|stable)$ ]]; then
echo "Error: Stage must be one of the following examples: alpha1, beta1, rc1, stable." | tee -a "${LOG_FILE}"
exit 1
fi
# Validate if tag is true or false
if [[ -n "${TAG}" && ! "${TAG}" =~ ^(true|false)$ ]]; then
echo "Error: --tag must be either true or false." | tee -a "${LOG_FILE}"
exit 1
fi
# Get old version and stage
get_old_version_and_stage
if [[ "${OLD_VERSION}" != "${VERSION}" ]]; then
echo "Updating version from ${OLD_VERSION} to ${VERSION}" | tee -a "${LOG_FILE}"
update_version_in_files "${VERSION}"
fi
if [[ "${OLD_STAGE}" != "${STAGE}" ]]; then
echo "Updating stage from ${OLD_STAGE} to ${STAGE}" | tee -a "${LOG_FILE}"
update_stage_in_files "${STAGE}"
fi
# Update Docker images tag if tag is true
if [[ "${TAG}" == "true" ]]; then
echo "Updating Docker images tag to ${VERSION}-${STAGE}" | tee -a "${LOG_FILE}"
update_docker_images_tag "${VERSION}-${STAGE}"
fi
echo "The following files were edited:" | tee -a "${LOG_FILE}"
for file in $(printf "%s\n" "${FILES_EDITED[@]}" | sort -u); do
echo "${file}" | tee -a "${LOG_FILE}"
done
echo "Version and stage updated successfully." | tee -a "${LOG_FILE}"
}
# Call the main method with all arguments
main "$@"
+195
View File
@@ -0,0 +1,195 @@
<!--
Wazuh - Agent - Default configuration for amzn 2023
More info at: https://documentation.wazuh.com
Mailing list: https://groups.google.com/forum/#!forum/wazuh
-->
<ossec_config>
<client>
<server>
<address>CHANGE_MANAGER_IP</address>
<port>CHANGE_MANAGER_PORT</port>
<protocol>tcp</protocol>
</server>
<config-profile>amzn, amzn2023</config-profile>
<notify_time>10</notify_time>
<time-reconnect>60</time-reconnect>
<auto_restart>yes</auto_restart>
<crypto_method>aes</crypto_method>
<enrollment>
<enabled>yes</enabled>
<manager_address>CHANGE_ENROLL_IP</manager_address>
<port>CHANGE_ENROLL_PORT</port>
<agent_name>CHANGE_AGENT_NAME</agent_name>
<authorization_pass_path>etc/authd.pass</authorization_pass_path>
<groups>CHANGE_AGENT_GROUP</groups>
</enrollment>
</client>
<client_buffer>
<!-- Agent buffer options -->
<disabled>no</disabled>
<queue_size>5000</queue_size>
<events_per_second>500</events_per_second>
</client_buffer>
<!-- Policy monitoring -->
<rootcheck>
<disabled>no</disabled>
<check_files>yes</check_files>
<check_trojans>yes</check_trojans>
<check_dev>yes</check_dev>
<check_sys>yes</check_sys>
<check_pids>yes</check_pids>
<check_ports>yes</check_ports>
<check_if>yes</check_if>
<!-- Frequency that rootcheck is executed - every 12 hours -->
<frequency>43200</frequency>
<rootkit_files>etc/shared/rootkit_files.txt</rootkit_files>
<rootkit_trojans>etc/shared/rootkit_trojans.txt</rootkit_trojans>
<skip_nfs>yes</skip_nfs>
<ignore>/var/lib/containerd</ignore>
<ignore>/var/lib/docker/overlay2</ignore>
</rootcheck>
<wodle name="cis-cat">
<disabled>yes</disabled>
<timeout>1800</timeout>
<interval>1d</interval>
<scan-on-start>yes</scan-on-start>
<java_path>wodles/java</java_path>
<ciscat_path>wodles/ciscat</ciscat_path>
</wodle>
<!-- Osquery integration -->
<wodle name="osquery">
<disabled>yes</disabled>
<run_daemon>yes</run_daemon>
<log_path>/var/log/osquery/osqueryd.results.log</log_path>
<config_path>/etc/osquery/osquery.conf</config_path>
<add_labels>yes</add_labels>
</wodle>
<!-- System inventory -->
<wodle name="syscollector">
<disabled>no</disabled>
<interval>1h</interval>
<scan_on_start>yes</scan_on_start>
<hardware>yes</hardware>
<os>yes</os>
<network>yes</network>
<packages>yes</packages>
<ports all="yes">yes</ports>
<processes>yes</processes>
<!-- Database synchronization settings -->
<synchronization>
<max_eps>10</max_eps>
</synchronization>
</wodle>
<sca>
<enabled>yes</enabled>
<scan_on_start>yes</scan_on_start>
<interval>12h</interval>
<skip_nfs>yes</skip_nfs>
</sca>
<!-- File integrity monitoring -->
<syscheck>
<disabled>no</disabled>
<!-- Frequency that syscheck is executed default every 12 hours -->
<frequency>43200</frequency>
<scan_on_start>yes</scan_on_start>
<!-- Directories to check (perform all possible verifications) -->
<directories>/etc,/usr/bin,/usr/sbin</directories>
<directories>/bin,/sbin,/boot</directories>
<!-- Files/directories to ignore -->
<ignore>/etc/mtab</ignore>
<ignore>/etc/hosts.deny</ignore>
<ignore>/etc/mail/statistics</ignore>
<ignore>/etc/random-seed</ignore>
<ignore>/etc/random.seed</ignore>
<ignore>/etc/adjtime</ignore>
<ignore>/etc/httpd/logs</ignore>
<ignore>/etc/utmpx</ignore>
<ignore>/etc/wtmpx</ignore>
<ignore>/etc/cups/certs</ignore>
<ignore>/etc/dumpdates</ignore>
<ignore>/etc/svc/volatile</ignore>
<!-- File types to ignore -->
<ignore type="sregex">.log$|.swp$</ignore>
<!-- Check the file, but never compute the diff -->
<nodiff>/etc/ssl/private.key</nodiff>
<skip_nfs>yes</skip_nfs>
<skip_dev>yes</skip_dev>
<skip_proc>yes</skip_proc>
<skip_sys>yes</skip_sys>
<!-- Nice value for Syscheck process -->
<process_priority>10</process_priority>
<!-- Maximum output throughput -->
<max_eps>50</max_eps>
<!-- Database synchronization settings -->
<synchronization>
<enabled>yes</enabled>
<interval>5m</interval>
<max_eps>10</max_eps>
</synchronization>
</syscheck>
<!-- Log analysis -->
<localfile>
<log_format>command</log_format>
<command>df -P</command>
<frequency>360</frequency>
</localfile>
<localfile>
<log_format>full_command</log_format>
<command>netstat -tulpn | sed 's/\([[:alnum:]]\+\)\ \+[[:digit:]]\+\ \+[[:digit:]]\+\ \+\(.*\):\([[:digit:]]*\)\ \+\([0-9\.\:\*]\+\).\+\ \([[:digit:]]*\/[[:alnum:]\-]*\).*/\1 \2 == \3 == \4 \5/' | sort -k 4 -g | sed 's/ == \(.*\) ==/:\1/' | sed 1,2d</command>
<alias>netstat listening ports</alias>
<frequency>360</frequency>
</localfile>
<localfile>
<log_format>full_command</log_format>
<command>last -n 20</command>
<frequency>360</frequency>
</localfile>
<!-- Active response -->
<active-response>
<disabled>no</disabled>
<ca_store>etc/wpk_root.pem</ca_store>
<ca_verification>yes</ca_verification>
</active-response>
<!-- Choose between "plain", "json", or "plain,json" for the format of internal logs -->
<logging>
<log_format>plain</log_format>
</logging>
</ossec_config>
<ossec_config>
<localfile>
<log_format>syslog</log_format>
<location>/var/ossec/logs/active-responses.log</location>
</localfile>
</ossec_config>
+9
View File
@@ -0,0 +1,9 @@
# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
services:
wazuh.agent:
image: wazuh/wazuh-agent:4.14.5
restart: always
environment:
- WAZUH_MANAGER_SERVER=<WAZUH_MANAGER_IP>
volumes:
- ./config/wazuh-agent-conf:/wazuh-config-mount/etc/ossec.conf