Commit Graph
100 Commits
Author SHA1 Message Date
Gonzalo Acuña a1be73f820 Merge pull request #1807 from wazuh/enhancement/1792-add-wazuh-image
BACKPORT: Agent Docker images code
2025-05-12 14:26:38 -03: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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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 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 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
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
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
Gonzalo Acuña 2b25f362fd Merge pull request #1351 from wazuh/1348-rollback-image-version
Rollback rc1 image version
2024-05-22 12:05:17 -03:00
Gonzalo Acuña 2bd7c0d6f1 Merge pull request #1350 from wazuh/1348-commit-image-version
Commit rc1 image version
2024-05-22 11:50:36 -03:00
Gonzalo Acuña 7df0ee2a22 Merge pull request #1345 from wazuh/bump-4.7.5-version
Bump 4.7.5 version
2024-05-15 07:27:47 -03:00
Gonzalo Acuña d2181f78cd Merge pull request #1300 from wazuh/bump-version-4.7.4
Bumped version to 4.7.4
2024-04-18 10:24:02 -03:00
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
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
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
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
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
Gonzalo Acuña b0c5fb3559 Merge pull request #1261 from wazuh/update-AL2023-20240304
Update AL2023 20240304
2024-03-14 08:56:51 -03: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
Gonzalo Acuña 781fa76384 Merge pull request #1254 from wazuh/814-add-exceptions
Add file exceptions
2024-03-06 09:47:42 -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
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
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
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 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 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
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
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
Gonzalo Acuña 0de952d1b3 Merge pull request #1230 from wazuh/bump-revision
Bump revision to 40804
2024-02-23 11:58:04 -03: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
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
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
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
Gonzalo Acuña 7f09331a95 Merge pull request #1213 from wazuh/bump-revision
Bump 4.7.3 version
2024-02-19 10:48:34 -03:00
Gonzalo Acuña ec9076261f Merge pull request #1209 from wazuh/21806-dashboard-does-not-displays-alerts-while-alertlog-file-does-in-docker-deployments
Add filebeat parameters to inject wazuh template
2024-02-19 09:16:19 -03:00
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
Gonzalo Acuña 91a56eb429 Merge pull request #1204 from wazuh/merge-4.8.2-into-master
Merge `4.8.2` into `master`
2024-02-07 13:52:49 -03:00
Gonzalo Acuña c99985f479 Merge pull request #1203 from wazuh/merge-4.8.1-into-4.8.2
Merge `4.8.1` into `4.8.2`
2024-02-07 13:46:23 -03:00
Gonzalo Acuña a6d0a1ffeb Merge pull request #1202 from wazuh/merge-4.8.0-into-4.8.1
Merge `4.8.0` into `4.8.1`
2024-02-07 13:42:45 -03:00
Gonzalo Acuña f746e96b74 Merge branch '4.8.1' into merge-4.8.0-into-4.8.1 2024-02-07 13:16:49 -03:00
Gonzalo Acuña 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 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
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
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
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
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 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
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
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
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
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
Gonzalo Acuña ca8cf4f717 Merge pull request #1159 from wazuh/merge-4.7.1-into-4.7.2
Merge 4.7.1 into 4.7.2
2023-12-20 14:13:11 -03:00
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 402c5d6fea Merge pull request #1153 from wazuh/Bump-4.7.1-RC3
Bump 4.7.1 to RC3 revision
2023-12-15 14:05:33 -03:00
Gonzalo Acuña 4210c23a4c Merge pull request #1146 from wazuh/mantainence/Bump-Revision-for4.7.1-rc2
Bumped revision for 4.7.1 rc2
2023-12-07 15:27:22 -03:00
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
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