yahoo_1999/fk-wazuh
1
0
Fork 0
forked from wazuh/wazuh-docker
Code Pull Requests Activity
1,795 Commits 125 Branches 170 Tags
520291162feddbbead01e888ca0db4e9c8dff313
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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 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 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 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 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
Gonzalo Acuña c0d97893a4 Merge pull request #960 from wazuh/merge-4.5.1-into-4.5.2 
Merge 4.5.1 into 4.5.2
 2023-08-24 12:31:06 -03:00
Gonzalo Acuña 41267d4ddf Merge pull request #946 from wazuh/944-bump-revision-2 
Revision update
 2023-08-17 12:20:42 -03:00
Gonzalo Acuña 865f7625f4 Merge pull request #945 from wazuh/944-bump-revision 
Revision update
 2023-08-17 09:02:13 -03:00
Gonzalo Acuña 8b8a28167e Merge pull request #942 from wazuh/904-docker-base-image-update-to-jammy 
Docker base image update to Jammy
 2023-08-15 13:51:04 -03:00
Gonzalo Acuña cb7d8785c6 Merge pull request #930 from wazuh/926-update-the-vulnerability-detector-default-configuration-block-with-missing-providers 
Update the vulnerability detector default configuration block with missing providers
 2023-08-14 15:19:54 -03:00
Gonzalo Acuña e67b7eae70 Merge pull request #938 from wazuh/merge-4.7.0-into-master 
Merge `4.7.0` into `master`
 2023-08-11 08:37:34 -03:00
Gonzalo Acuña 17ed766228 Merge pull request #937 from wazuh/merge-4.6.0-into-4.7.0 
Merge `4.6.0` into `4.7.0`
 2023-08-11 08:14:30 -03:00
Gonzalo Acuña 1dec665a97 Merge pull request #925 from wazuh/10774-alma-support 
Updating vulnerability detector default configuration with AlmaLinux support
 2023-08-09 09:46:28 -03:00
Gonzalo Acuña 32b1d88e36 Merge pull request #919 from wazuh/917-fix-conditional-block-in-build-imagesh-script 
Fixed conditional block in images building
 2023-08-03 10:02:24 -03:00
Gonzalo Acuña e01d39e138 Merge pull request #915 from wazuh/911-typos-in-the-script 
Typos in the script in charge of create Wazuh indexer's certificates
 2023-08-01 13:50:24 -03:00
Gonzalo Acuña d755ffbac8 Merge pull request #914 from wazuh/6282-add-notes-about 
Modify ulimit
 2023-08-01 12:01:13 -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
Gonzalo Acuña fc4cef1072 Merge pull request #900 from wazuh/merge-4.7.0-into-master 
Merge `4.7.0` into `master`
 2023-07-21 10:23:53 -03:00
Gonzalo Acuña 7d3bea67f7 Merge pull request #899 from wazuh/merge-4.6.0-into-4.7.0 
Merge `4.6.0` into `4.7.0`
 2023-07-21 10:07:45 -03:00
Gonzalo Acuña 3953986652 Merge pull request #898 from wazuh/merge-4.5.2-into-4.6.0 
Merge `4.5.2` into `4.6.0`
 2023-07-21 08:27:24 -03:00
Gonzalo Acuña f2dab81387 Merge branch '4.6.0' into merge-4.5.2-into-4.6.0 2023-07-21 08:15:57 -03:00
Gonzalo Acuña da82008a75 Merge pull request #894 from wazuh/bump-4.5.2 
Bump to 4.5.2
 2023-07-19 08:55:24 -03:00
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
Gonzalo Acuña ff1e5f991a Merge pull request #878 from wazuh/bump-4.4.5 
Bump to 4.4.5
 2023-07-07 08:48:54 -03:00
Gonzalo Acuña 75f92308a1 Merge pull request #877 from wazuh/merge-4.4.4-into-4.4 
Merge `4.4.4` into `4.4`
 2023-07-07 08:32:11 -03:00
Gonzalo Acuña 56dbf052c9 Merge pull request #867 from wazuh/merge-4.5-into-master 
Merge `4.5` into `master`
 2023-06-14 16:36:31 -03:00
Gonzalo Acuña 7abaea9b4c Merge pull request #866 from wazuh/merge-4.4.5-into-4.5 
Merge `4.4.5` into `4.5`
 2023-06-14 15:48:43 -03:00
Gonzalo Acuña 303b64c7ae Merge branch '4.5' into merge-4.4.5-into-4.5 2023-06-14 15:16:14 -03:00
Gonzalo Acuña 2340db4079 Merge pull request #865 from wazuh/merge-4.4-into-4.4.5 
Merge `4.4` into `4.4.5`
 2023-06-14 14:50:59 -03:00
Gonzalo Acuña 9159eda943 Merge branch '4.4.5' into merge-4.4-into-4.4.5 2023-06-14 14:07:23 -03:00
Gonzalo Acuña d278782134 Merge pull request #858 from wazuh/merge-4-4-4-to-4-4 
Bump `4.4` to `4.4.4`
 2023-06-13 15:58:51 -03:00
Gonzalo Acuña efc8ab88df Merge pull request #848 from wazuh/merge-4.5-master 
Merge 4.5 into master
 2023-05-22 09:56:01 -03:00
Gonzalo Acuña 944c6aa4c8 Revert "Bump 4.4 to 4.4.1" 2023-05-18 22:04:19 +02:00