yahoo_1999/fk-wazuh
1
0
Fork 0
forked from wazuh/wazuh-docker
Code Pull Requests Activity
1,636 Commits 125 Branches 170 Tags
5aaeb0d944647c055eea49de46ba2855f6877c70
Commit Graph
87 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Gonzalo Acuña 095d878b04 Merge pull request #825 from wazuh/bump-4-3-11 
Bump 4.3 to 4.3.11
 2023-04-24 10:56:52 -03:00
Gonzalo Acuña 1c69a38bd8 Merge pull request #813 from wazuh/807-docker-update-from-4310-to-440 
Disable cluster option
 2023-04-05 14:52:28 -03:00
Gonzalo Acuña 949a465855 Merge pull request #811 from wazuh/revert-799-bump-4-4-1 
Revert "Bump `4.4` to `4.4.1`"
 2023-04-05 13:49:23 -03:00
Gonzalo Acuña f7bbac5a08 Revert "Bump 4.4 to 4.4.1" 2023-04-05 13:46:20 -03:00
Gonzalo Acuña 11820b01e9 Merge pull request #799 from wazuh/bump-4-4-1 
Bump `4.4` to `4.4.1`
 2023-03-31 11:02:25 -03:00
Gonzalo Acuña 304eedcb51 Merge pull request #793 from wazuh/bump_4-4 
Change revision number
 2023-03-28 10:03:41 -03:00
Gonzalo Acuña 2f58da59de Merge pull request #776 from wazuh/change_password 
Update indexer password
 2023-02-01 10:59:11 -03:00
Gonzalo Acuña 3190c4246e Merge pull request #766 from wazuh/765-change-wazuh-dashboard-and-indexer-base-path 
Modify base path
 2022-12-27 08:11:21 -03:00
Gonzalo Acuña 5fb369f9e8 Merge pull request #764 from wazuh/756-indexer-password 
Indexer password updated in README.md
 2022-12-19 16:03:14 -03:00
Gonzalo Acuña b08fd3e384 Merge pull request #726 from wazuh/bump-4-3-9 
Bump 4.3 to 4.3.9
 2022-10-11 09:47:12 -03:00
Gonzalo Acuña f42b30b71d Merge pull request #720 from wazuh/bump-4-3-8 
Bump 4.3 to 4.3.8
 2022-09-14 12:15:09 -03:00
Gonzalo Acuña 5774b93977 Merge pull request #684 from wazuh/fix-keystore-create 
Add option to recreate keystore in entrypoint
 2022-07-01 12:16:43 -03:00
Gonzalo Acuña fb66a358c8 Merge pull request #667 from wazuh/bump_4_3_3 
Bump 4.3.3 into 4.3
 2022-06-02 10:53:25 -03:00
Gonzalo Acuña cb0bccc9b5 Merge pull request #639 from wazuh/bump_4_3_1 
Wazuh Docker 4.3.1
 2022-05-17 09:31:37 -03:00
Gonzalo Acuña 8598da8100 Merge pull request #637 from wazuh/628-change.port-yml 
Change dashboard port
 2022-05-12 13:35:33 -03:00
Gonzalo Acuña eed0cd6930 Merge pull request #635 from wazuh/634-change-docker-compose 
Change doc migration
 2022-05-12 11:43:00 -03:00
Gonzalo Acuña 1505d063f5 Merge pull request #633 from wazuh/632-remove-acme-user 
Change acme-user
 2022-05-11 15:36:41 -03:00
Gonzalo Acuña f534642f75 Merge pull request #624 from wazuh/621-permission-warnings 
Change config file permissions
 2022-04-29 10:36:04 -03:00
Gonzalo Acuña 73901f9753 Merge pull request #600 from wazuh/adapt-name-and-volumes 
Replace Service name and volumes
 2022-03-29 15:35:29 -03:00
Gonzalo Acuña 3e54eeb62f Merge branch 'master' into 4.2-merge_master 2022-03-28 11:34:55 -03:00
Gonzalo Acuña bf319d3d4b Merge pull request #494 from krzee/master 
In bash if already tests exit status is 0 or not
 2021-12-16 14:34:16 -03:00
Gonzalo Acuña eebbdae82e Merge pull request #555 from wazuh/4.2.5-into-master 
Merge 4.2.5 into master
 2021-11-16 16:23:58 -03:00
Gonzalo Acuña a9442d7345 Merge pull request #544 from wazuh/507-permanent-folder 
Fix directory problem in permanent_data
 2021-11-05 08:28:08 -03:00
Gonzalo Acuña d530faa8f3 Merge pull request #543 from wazuh/507-permanent-folder 
Add /var/ossec/logs/archives to permanent_data
 2021-11-04 12:16:05 -03:00
Gonzalo Acuña 6008492dd7 Merge pull request #539 from wazuh/merge-4.2.4-into-master 
Merge 4.2 into master
 2021-10-20 17:30:57 -03:00
Gonzalo Acuña 4ebeaba873 Merge pull request #538 from wazuh/535-release-4.2.4 
Update release 4.2.4
 2021-10-20 10:09:52 -03:00
Gonzalo Acuña 67d92fc992 Merge pull request #537 from wazuh/535-release-4.2.4 
Release v4.2.4
 2021-10-18 15:28:34 -03:00