Commit Graph
100 Commits
Author SHA1 Message Date
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 9918f95f3f Merge pull request #1269 from wazuh/bug/1193-review-version-references-in-the-master-branch-5.0
Fixed references to 4.8 in `master`
2024-03-20 12:58:23 -03:00
Gonzalo Acuña 654d1dbf36 Merge pull request #1268 from wazuh/bug/1193-review-version-references-in-the-master-branch
Fixed references to 4.8 version
2024-03-20 12:58:19 -03:00
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 e8d2463d99 Merge pull request #1251 from wazuh/merge-4.9.0-into-master
Merge 4.9.0 into master
2024-03-04 13:47:24 -03:00
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 799dadc1cf Merge pull request #1243 from wazuh/merge-4.9.0-into-master
Merge 4.9.0 into master
2024-03-01 15:55:14 -03:00
Gonzalo Acuña 8f3478361d Merge pull request #1242 from wazuh/merge-4.8.2-into-4.9.0
Merge 4.8.2 into 4.9.0
2024-03-01 15:41:47 -03:00
Gonzalo Acuña 6a242a36ce Merge pull request #1240 from wazuh/merge-4.8.1-into-4.8.2
Merge 4.8.1 into 4.8.2
2024-03-01 14:43:38 -03:00
Gonzalo Acuña 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
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
Gonzalo Acuña 375d94d22f Merge pull request #1135 from wazuh/bump_revision_number
bump revision number
2023-11-27 09:47:36 -03:00
Gonzalo Acuña 139f7a52f6 Merge pull request #1124 from wazuh/1119-update-filebeat-module-download-url
Update Filebeat module download URL
2023-11-22 09:38:08 -03:00
Gonzalo Acuña 2df37520a7 Merge pull request #1125 from wazuh/change/492-remove-report-dependencies
Removed report dependencies from Wazuh dashboard image
2023-11-22 09:00:13 -03:00
Gonzalo Acuña 45ca9a1b37 Merge pull request #1127 from wazuh/enhancement/bump-version-4.8.1
Bump version to 4.8.1
2023-11-22 08:39:12 -03:00
Gonzalo Acuña 27962e38f1 Merge pull request #1086 from wazuh/maintenance/1332-update-wazuh-kibana-app-references
Updated wazuh-kibana-app reference
2023-10-25 12:40:14 -03:00
Gonzalo Acuña 0ecf533cdc Merge pull request #1085 from wazuh/1079-make-directories-for-docker-composeyml
Make directories for docker-compose.yml
2023-10-25 09:47:02 -03:00
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 60563720f3 Merge pull request #1059 from wazuh/bug/1054-remove-filebeat-template-value
Removed value of Filebeat template variable
2023-10-17 11:05:17 -03:00
Gonzalo Acuña 8aad8651d7 Merge pull request #1058 from wazuh/bump-version-4.5.4
Bump 4.5.4 version
2023-10-17 09:03:27 -03:00
Gonzalo Acuña b8ff013b36 Merge pull request #1056 from wazuh/bug/1054-the-images-build-fails-due-to-filebeat-template-branch
Fixed Filebeat template bug in image generation
2023-10-17 08:33:09 -03:00
Gonzalo Acuña 89e0fc9604 Merge pull request #1033 from wazuh/bump-revision-4.6.0
Bump revision to 40602
2023-10-06 09:15:14 -03:00
Gonzalo Acuña ded91b2f0a Merge pull request #1029 from wazuh/bump-4.5.3-revision
Bump 4.5.3 revision
2023-10-05 11:48:22 -03:00
Gonzalo Acuña b4db7f16cc Merge pull request #1026 from wazuh/bug/change-validation-order-for-wazuh-branch-to4.6.0
Changed validation order for wazuh branch
2023-10-04 15:42:36 -03:00
Gonzalo Acuña 9d3701fa60 Merge pull request #1025 from wazuh/enhancement/1016-allow-branch-parameters-on-build-imagessh-to4.6.0
Updated build-images.sh script to support build parameters
2023-10-04 13:49:42 -03:00
Gonzalo Acuña d6a72c6fb1 Merge pull request #1024 from wazuh/bug/1017-warning-opensearchsecurityplugin-wazuh-indexer-has-insecure-file-permissions-should-be-0600-to4.6.0
Updated file permissions to have the same permissions as in package installation in Wazuh indexer
2023-10-04 11:22:44 -03:00
Gonzalo Acuña 93c53a712d Merge pull request #1021 from wazuh/change/1020-bump-revision-4.5.3-rc2
Bump revision to 40507
2023-09-28 08:24:43 -03:00
Gonzalo Acuña 958e466682 Merge pull request #1013 from wazuh/bump-4.6.0-revision
Revision Bump
2023-09-22 14:49:59 -03:00
Gonzalo Acuña 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
Gonzalo Acuña a98e57bb6c Merge pull request #1010 from wazuh/merge-4.7.0-into-4.7.1
Merge 4.7.0 into 4.7.1
2023-09-22 07:32:20 -03:00
Gonzalo Acuña 6407325761 Merge pull request #1009 from wazuh/merge-4.6.0-into-4.7.0
Merge 4.6.0 into 4.7.0
2023-09-22 07:09:17 -03:00
Gonzalo Acuña d6b73cb3dc Merge pull request #1008 from wazuh/merge-4.5.3-into-4.6.0
Merge 4.5.3 into 4.6.0
2023-09-22 06:36:48 -03:00
Gonzalo Acuña 149df5e492 Merge pull request #973 from wazuh/17617-vdt-alas2023-support
Add Amazon Linux 2023 VDT default configuration
2023-09-21 11:03:11 -03:00
Gonzalo Acuña 8fbda5afd3 Merge pull request #1005 from wazuh/idr-263-security-policy
Create SECURITY.md
2023-09-20 08:43:39 -03:00
Gonzalo Acuña b40e90d19c Create SECURITY.md
Wazuh security policy added.
2023-09-20 08:29:53 -03:00
Gonzalo Acuña a6c22d9618 Merge pull request #1003 from wazuh/bump-version-4.7.1
Bump version to 4.7.1
2023-09-20 08:14:05 -03:00
Gonzalo Acuña 536dd51aa7 Merge pull request #1000 from wazuh/18966-error-in-wazuh-docker-startup
Error in Wazuh Docker startup
2023-09-18 14:37:34 -03:00
Gonzalo Acuña 088b855f73 Merge pull request #997 from wazuh/990-persist-logo
Persist the custom logo in the Wazuh dashboard
2023-09-18 14:14:30 -03:00
Gonzalo Acuña 41515e9c49 Merge pull request #998 from wazuh/258-shuffle-permanent-data
Check the permanent_data.env file and include any missing files
2023-09-15 14:44:27 -03:00
Gonzalo Acuña d1c252c6c0 Merge pull request #996 from wazuh/979-remove-goss-from-manager-image
Remove goss install
2023-09-14 16:14:58 -03:00
Gonzalo Acuña 0c6077c3e0 Merge pull request #992 from wazuh/984-build-imagessh-script-is-not-capable-of-using-repos-majorminorpatch-branches
Change wazuh template origin
2023-09-13 11:09:44 -03:00
Gonzalo Acuña 73ada94ed6 Merge pull request #988 from wazuh/987-add-support-to-define-the-default-value-of-extensionsgithub-and-extensionsoffice-in-the-wazuh-dashboard-docker-image
Add extensions into wazuh.yml
2023-09-08 14:13:00 -03:00
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
Gonzalo Acuña 17029c5510 Merge pull request #985 from wazuh/merge-4.6.0-into-4.7.0
Merge `4.6.0` into `4.7.0`
2023-09-07 10:43:35 -03:00
Gonzalo Acuña 637110c278 Merge pull request #983 from wazuh/merge-4.5.3-into-4.6.0
Merge `4.5.3` into `4.6.0`
2023-09-07 09:01:40 -03:00
Gonzalo Acuña 1fae0d3452 Merge pull request #982 from wazuh/merge-4.5.2-into-4.5.3
Merge `4.5.2` into `4.5.3`
2023-09-07 08:12:25 -03:00
Gonzalo Acuña 8886e2347e Merge pull request #968 from wazuh/951-fix-wazuh-dashboard-modules-persist
Fixed Wazuh dashboard modules persistency
2023-08-30 15:06:24 -03:00
Gonzalo Acuña f1d8565989 Merge pull request #971 from wazuh/bump-4.5.3
Bump to `4.5.3`
2023-08-29 08:28:50 -03:00
Gonzalo Acuña b377a0f6eb Merge pull request #966 from wazuh/18542-vdt-bookworm-support
Add Debian Bookworm to VDT default configuration
2023-08-25 13:17:17 -03:00
Gonzalo Acuña 3434070c06 Merge pull request #948 from wazuh/modify_scan_version
Change repository checkout
2023-08-24 15:38:41 -03:00
Gonzalo Acuña 8169e95107 Merge pull request #963 from wazuh/merge-4.7.0-into-master
Merge 4.7.0 into master
2023-08-24 13:34:29 -03:00
Gonzalo Acuña 2de4a28098 Merge pull request #962 from wazuh/merge-4.6.0-into-4.7.0
Merge 4.6.0 into 4.7.0
2023-08-24 13:14:32 -03:00
Gonzalo Acuña 760fc8ccbf Merge pull request #961 from wazuh/merge-4.5.2-into-4.6.0
Merge 4.5.2 into 4.6.0
2023-08-24 13:10:01 -03:00