yahoo_1999/fk-wazuh
1
0
Fork 0
forked from wazuh/wazuh-docker
Code Pull Requests Activity
3,438 Commits 125 Branches 170 Tags
main
Commit Graph
93 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Alberto R 3525003ef7 Bumped to 4.4.0 2023-05-18 22:03:03 +02:00
Alberto Rodríguez 910e28956b Merge pull request #760 from wazuh/merge-4.4 
Version check fix
 2022-12-02 17:19:02 +01:00
Alberto Rodríguez 3d19774d7e Merge pull request #758 from wazuh/merge-4.4 
Merge 4.3 in 4.4 branch
 2022-12-01 16:23:05 +01:00
Alberto Rodríguez c87580cfb5 Merge pull request #754 from wazuh/753-opensearch_java_opts-duplicate-parameters 
Remove Xms and Xmx parameter into jvm.options
 2022-11-29 15:45:36 +01:00
Alberto Rodríguez e0cd80c105 Update build-docker-images/wazuh-indexer/config/config.sh 2022-11-29 15:44:36 +01:00
Alberto Rodríguez 15205ada03 Merge pull request #742 from wazuh/bump-4-3-10 
Bump 4.3 to 4.3.10
 2022-11-11 16:20:58 +01:00
Alberto Rodríguez 3d4521c7d8 Merge pull request #678 from wazuh/bump-4-3-5 
Bump 4.3 to 4.3.5
 2022-06-24 09:53:14 +02:00
Alberto Rodríguez 2fe1eaea8f Merge pull request #676 from wazuh/fix_ck_conf 
Modify variables
 2022-06-22 15:32:29 +02:00
Alberto Rodríguez 5d98c157f8 Merge pull request #669 from wazuh/fix-test-ci 
CI Docker
 2022-06-20 15:42:22 +02:00
Alberto R 01a0e3dabd Fixed typo defining variable 2022-06-08 15:37:50 +02:00
Alberto R b3d576623e Added UI revision 2022-06-08 15:11:54 +02:00
Alberto R 0520a771fe Bumped version 2022-06-08 10:10:23 +02:00
Alberto Rodríguez 8889c1237d Merge pull request #663 from wazuh/bump_4_3_3 
Bump 4.3.3 to 4.3 Branch
 2022-05-31 23:12:53 +02:00
Alberto Rodríguez 946e3d6c5c Merge pull request #657 from wazuh/update-filebeat-module 
Update filebeat module version
 2022-05-30 20:13:53 +02:00
Alberto Rodríguez dc34688b04 Merge pull request #653 from wazuh/change-copyright-format 
Changed copyright format
 2022-05-24 14:28:49 +02:00
Alberto R f3ae530bfa Fixed company name 2022-05-24 14:14:50 +02:00
Alberto R ae558612df Changed copyright format 2022-05-24 14:13:16 +02:00
Alberto Rodríguez 0576fcaf52 Merge pull request #652 from wazuh/fix_whitelist_4_3 
Fix whitelist in 4.3
 2022-05-23 16:10:00 +02:00
Alberto Rodríguez 5d88983066 Merge pull request #651 from wazuh/fix_whitelist_4_4 
Fix whitelist in 4.4
 2022-05-23 16:09:43 +02:00
Alberto Rodríguez ed5c5d70ba Merge pull request #649 from wazuh/master 
Merge master into 4.4
 2022-05-23 14:21:52 +02:00
Alberto Rodríguez 97f5a6bf04 Merge pull request #648 from wazuh/merge_master 
Merge 4.3 into master
 2022-05-23 14:15:22 +02:00
Alberto Rodríguez 04389ad2ae Merge pull request #641 from wazuh/640-kibana_user_parameter 
Modify Dashboard user parameter
 2022-05-18 10:06:35 +02:00
Alberto Rodríguez 2c848fb3e1 Merge pull request #631 from wazuh/reports-dashboard-fix 
Add dependencies for Wazuh dashboard
 2022-05-06 15:06:55 +02:00
Alberto R e1ed44d847 Changed artifacts dev URLs 2022-05-06 08:36:59 +02:00
Alberto Rodríguez 33c9758fd8 Merge pull request #625 from wazuh/622-ErrorInCP-to4.3 
Error while copying multigroups files during second Docker deployment
 2022-05-03 08:41:00 +02:00
Alberto Rodríguez 62f2324bf7 Merge pull request #623 from wazuh/621-permission-warnings 
Change config file permissions
 2022-04-28 17:04:14 +02:00
Alberto Rodríguez c4e2cc54c5 Merge pull request #620 from wazuh/move-certs-yml 
Fix certs.yml Path
 2022-04-26 19:34:10 +02:00
Alberto Rodríguez a16d9ab969 Create .gitignore 2022-04-26 16:29:32 +02:00
Alberto Rodríguez d11627bf89 Merge pull request #615 from wazuh/510-wazuh-manager-ubuntu 
Base Change for Wazuh Manager Docker Image
 2022-04-13 19:05:21 +02:00
Alberto Rodríguez 23179bf155 Merge pull request #614 from wazuh/613-fix-indexer-certs-creator-to-parse-correctly-certsyml 
Fix parse cert.yml according to wazuh_cert_tools modifications
 2022-04-12 18:11:54 +02:00
Alberto Rodríguez 5464bf4b91 Merge pull request #611 from wazuh/608-misc-fixes 
Test rework of Docker repository
 2022-04-11 18:07:42 +02:00
Alberto R 28cbfa5dd6 Merge branch '4.3' into 608-misc-fixes 2022-04-11 17:46:44 +02:00
Alberto Rodríguez 5f078b6d29 Update README.md 2022-04-08 19:49:10 +02:00
Alberto Rodríguez ce8908bcd8 Merge pull request #610 from wazuh/609-change-config 
Changed config.yml format
 2022-04-08 19:34:47 +02:00
Alberto Rodríguez b89382b2bf Merge pull request #604 from wazuh/602-certificate_permissions-to4.3 
Fix permission in certificates
 2022-04-07 22:04:48 +02:00
Alberto Rodríguez 9dca2f589a Update entrypoint.sh 2022-04-07 22:00:48 +02:00
Alberto Rodríguez 6f053fece2 Update entrypoint.sh 2022-04-07 22:00:09 +02:00
Alberto Rodríguez 4defd499d4 Merge pull request #607 from wazuh/599-dashboard-fix 
Fix dashboard
 2022-04-01 13:56:04 +02:00
Alberto R 20e5315042 Merge remote-tracking branch 'origin/4.3' into 602-certificate_permissions-to4.3 2022-04-01 13:09:06 +02:00
Alberto Rodríguez 5076bcc949 Update README.md 2022-04-01 11:56:57 +02:00
Alberto Rodríguez 8b66ae464c Update README.md 2022-04-01 11:56:47 +02:00
Alberto Rodríguez 8bb6650b2d Update README.md 2022-04-01 11:55:47 +02:00
Alberto Rodríguez afb0d19a12 Update README.md 2022-04-01 11:53:39 +02:00
Alberto Rodríguez 139065a87c Update Migration-to-Wazuh-4.3.md 2022-04-01 11:39:56 +02:00
Alberto Rodríguez 42df77d89c Update README.md 2022-04-01 11:34:52 +02:00
Alberto Rodríguez 6cde5f5c60 Update README.md 2022-04-01 11:23:30 +02:00
Alberto Rodríguez b0e2b5aca0 Merge pull request #605 from wazuh/4.3-inprovements 
4.3.0 improvements
 2022-04-01 11:13:48 +02:00
Alberto Rodríguez 0ff309d1fc Merge pull request #603 from wazuh/change-directories 
Change directories structure
 2022-04-01 11:10:55 +02:00
Alberto Rodríguez 9887b103c3 Update README.md 2022-03-31 21:10:09 +02:00
Alberto Rodríguez 6f82cea54b Merge pull request #601 from wazuh/remove-https-nginx 
Remove https nginx configuration
 2022-03-29 20:09:24 +02:00
Alberto Rodríguez 9cd399c2df Merge pull request #598 from wazuh/4.2-merge_master 
Merge 4.2 into master
 2022-03-28 16:58:01 +02:00
Alberto Rodríguez a4be008028 Merge pull request #596 from wazuh/595-bump_426 
Bump to 4.2.6
 2022-03-28 15:49:25 +02:00
Alberto Rodríguez e7065fc52b Merge pull request #593 from wazuh/wp_1334-remove-demo-certificates-4.3 
Remove demo certificates from demo deployment
 2022-03-28 14:06:16 +02:00
Alberto Rodríguez 2ebb32dc8d Merge pull request #591 from wazuh/cert_tool 
Cert tool updates
 2022-03-23 15:20:46 +01:00
Alberto Rodríguez f3ebc642dd Merge pull request #590 from wazuh/docker-migration 
Docker migration procedure
 2022-03-22 18:36:54 +01:00
Alberto Rodríguez 1d6757bbba Merge pull request #588 from wazuh/4.3-wazuhapp 
Wazuh app options restore.
 2022-03-18 16:12:53 +01:00
Alberto Rodríguez 370826d560 Update Dockerfile 2022-03-17 17:24:30 +01:00
Alberto Rodríguez 06d7eb1528 Update Dockerfile 2022-03-17 17:23:50 +01:00
Alberto Rodríguez 45e9218c60 Updated base URL 2022-03-17 17:21:45 +01:00
Alberto Rodríguez 553a84f5a9 Merge pull request #577 from wazuh/new-packages-release 
Wazuh indexer and dashboard release
 2022-03-17 17:15:24 +01:00
Alberto R 42f1d8d3e3 Removed comments 2022-03-17 17:14:18 +01:00
Alberto R f9ea4ae8ab Removed X-Pack support from readme 2022-03-17 17:11:11 +01:00
Alberto Rodríguez 6ed22a1323 Merge pull request #586 from wazuh/new-packages-release-dashboard 
Wazuh dashboard image updates
 2022-03-17 17:07:18 +01:00
Alberto Rodríguez aed910737d Merge pull request #585 from wazuh/new-packages-release-elastic 
Elastic and kibana files cleanup
 2022-03-17 16:47:59 +01:00
Alberto R c6ce62e38f Fixed wazuh-certs-tool.sh and wazuh-passwords-tool.sh URLs 2022-03-17 11:09:57 +01:00
Alberto Rodríguez 31b44f3627 Merge pull request #584 from wazuh/new-packages-release-tool 
Tools download logic updated
 2022-03-15 17:51:14 +01:00
Alberto R 8e42f30b19 Minor fix 2022-03-04 17:56:20 +01:00
Alberto Rodríguez 1897579314 Merge pull request #575 from wazuh/fix/574-update-create_user-script 
Update `create_user.py` script to create the RBAC database before trying to read
 2022-02-09 11:54:19 +01:00
Alberto Rodríguez dfd55cb73d Merge pull request #561 from wazuh/restart-worker-container 
Add log4j workaround
 2021-12-15 15:13:43 +01:00
Alberto Rodríguez c48bb6dade Merge pull request #549 from NullOranje/add-wazuh.monitoring.creation-variable 
Add environment variable to customize wazuh.monitoring.creation interval
 2021-11-25 15:07:22 +01:00
Alberto R 84fe19e868 Bumped to 4.4.0 2021-11-24 17:01:09 +01:00
Alberto Rodríguez 2a297bab38 Merge pull request #527 from wazuh/merge-42-into-master 
Merge 4.2 in master
 2021-10-04 15:42:01 +02:00
Alberto Rodríguez f34b7d0465 Merge pull request #522 from wazuh/512-make-utils-persistent 
Make utils.py file persistent when using volumes
 2021-09-29 10:27:50 +02:00
Alberto Rodríguez e99ba259e0 Added util.py to permanent data 2021-09-23 20:00:03 +02:00
Alberto Rodríguez f00245007d Merge pull request #516 from wazuh/4.2.2 
Release v4.2.2
 2021-09-15 16:50:12 +02:00
Alberto Rodríguez afd70ff5f9 Merge pull request #513 from wazuh/4.2.1 
Release v4.2.1
 2021-09-14 15:12:06 +02:00
Alberto Rodríguez 1ed0bc8e01 Merge pull request #503 from wazuh/update-4.2 
Update 4.2
 2021-08-26 16:17:13 +02:00
Alberto R 64c61bcdbf Fixed mode Kibana settings 2021-06-28 23:35:30 +02:00
Alberto Rodríguez 4b75a6679b Merge pull request #483 from wazuh/orsifacundo-production_cluster-changes 
Add admin keypair to production deployment
 2021-06-10 08:06:35 +02:00
Alberto Rodríguez 5074eb0b44 Merge pull request #479 from wazuh/476-update-4.2 
Bump ODFE 3.13.2 on Wazuh 4.2.0
 2021-05-24 14:03:33 +02:00
Alberto Rodríguez 7b56e2425b Merge pull request #478 from wazuh/476-update-master 
Bump to ODFE 1.13.2
 2021-05-24 12:56:32 +02:00
Alberto Rodríguez 5f84a7eac2 Merge pull request #467 from wazuh/4.3 
Merge 4.3 in master
 2021-05-24 09:34:27 +02:00
Alberto Rodríguez 2eb9b7c8fc Merge pull request #447 from npdgm/master 
fix: missing directory for tasks manager db
 2021-05-11 09:27:45 +02:00
Alberto Rodríguez 09731ec148 Merge pull request #473 from wazuh/457-nginx-conf-readme-4.2 
457: Broken link fix and removed deprecated information at README
 2021-04-29 14:35:31 +02:00
Alberto Rodríguez dfa4ed7d00 Merge pull request #472 from wazuh/4.1 
Merge 4.1 in master
 2021-04-23 19:59:31 +02:00
Alberto Rodríguez 81f46b908a Merge pull request #470 from wazuh/bump-4.1.5 
Bumped to 4.1.5
 2021-04-22 18:56:52 +02:00
Alberto RodríguezandVíctor Moreno Jiménez 53bbddd754 Update VERSION 
Co-authored-by: Víctor Moreno Jiménez <victor.moreno@wazuh.com>
 2021-04-22 18:06:12 +02:00
Alberto R 7c3384f9a3 Bumped to 4.1.5 2021-04-22 17:43:49 +02:00
Alberto Rodríguez be3ecc1f80 Merge pull request #463 from wazuh/448-rename-users-groups 
Rename users and group according to Wazuh standard
 2021-04-14 15:09:26 +02:00
Alberto Rodríguez 1cf4376e3b Merge pull request #461 from wazuh/feature-name-change 
Feature name change
 2021-04-13 17:27:20 +02:00
Alberto Rodríguez 60c5b53844 Merge pull request #456 from wazuh/bump-4.1.4 
Bump to v4.1.4
 2021-03-26 15:11:11 +01:00
Alberto Rodríguez 89754be5cf Merge pull request #455 from wazuh/bump-4.1.3 
Bump to 4.1.3
 2021-03-23 18:09:31 +01:00
Alberto Rodríguez 110f30148e Merge pull request #445 from wazuh/release-wazuh_4.1.1 
Bump to 4.1.1
 2021-02-25 17:50:03 +01:00