Compare commits

...
254 Commits
Author SHA1 Message Date
Gonzalo Acuña e9c1ab98f1 Merge pull request #835 from wazuh/modify_changelog
Change link for changelog
2023-04-28 14:12:16 -03:00
vcerenu 623021be27 change link for changelog 2023-04-28 14:09:15 -03: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
vcerenu 53903126cf change revision number 2023-04-24 09:17:02 -03:00
vcerenu 63ceab20b0 bump 4.3.11 version 2023-04-19 16:59:53 -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 6ddaecd7b5 Indexer password updated in README.md 2022-12-19 14:59:35 -03: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
vcerenu 796751aec9 remove Xms and Xmx parameter into jvm.options 2022-11-28 17:24:13 -03: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
vcerenu c1bfc450ba bump 4.3.10 version 2022-11-11 11:34:09 -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
vcerenu fd08279f32 bump 4.3.9 version 2022-10-06 14:25:56 -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
vcerenu 7555453d55 bump 4.3.8 version 2022-09-14 10:39:31 -03:00
vcerenu 22b77749fa bump 4.3.8 version 2022-09-12 15:37:47 -03:00
José Fernández Aguilera 28e21b0282 Merge pull request #717 from wazuh/714-modify-password
Add Double Quote on password
2022-09-09 08:52:18 +02:00
vcerenu b83dcc087e doble quote for password 2022-09-08 12:17:45 -03:00
vcerenu 19c23456ec readme 2022-08-24 11:45:55 -03:00
José Fernández Aguilera f99721e98b Merge pull request #708 from wazuh/bump-4-3-7
Bump 4.3 to 4.3.7
2022-08-17 08:23:32 +02:00
vcerenu 38271d7797 bump 4.3.7 version 2022-08-12 12:44:20 -03:00
vcerenu c278f6a503 bump 4.3.7 version 2022-08-12 12:02:04 -03:00
vcerenu d6ba8c3661 Merge pull request #707 from wazuh/695-change-indexer-username
Filebeat parameters
2022-08-12 10:39:19 -03:00
vcerenu 1db718ffc8 fix replace filebeat parameters 2022-08-10 16:15:17 -03:00
vcerenu cf137c6703 Merge pull request #706 from wazuh/MigrationTo43-WazuhManagerNew
Fix permissions/ownership issue for Wazuh manager migration (4.2 -> 4.3)
2022-08-09 11:41:16 -03:00
Elwali karkoub 6f966cb01a Update 0-wazuh-init 2022-08-09 07:42:12 +02:00
José Fernández Aguilera 8bc11c48d9 Merge pull request #698 from wazuh/change-readme
Update Readme
2022-07-27 12:39:00 +02:00
vcerenu be1bc64e0f update api and dashboard user 2022-07-26 09:27:01 -03:00
José Fernández Aguilera 80e8057f79 Merge pull request #694 from wazuh/bump-4-3-6
Bump 4.3 to 4.3.6
2022-07-19 12:49:07 +02:00
vcerenu 296de14886 bump 4.3.6 version 2022-07-18 10:25:01 -03:00
José Fernández Aguilera 0245a7e0d8 Merge pull request #692 from wazuh/fix-key-generator
Fix certificate generator
2022-07-08 09:06:54 +02:00
vcerenu a9ea60b951 fix uid and gid for wazuh manager keys 2022-07-07 11:40:15 -03:00
José Fernández Aguilera 23cb7417bc Merge pull request #689 from wazuh/1665-Fix-filebeat-crash-due-to-glibc-to4.3
Add fix to avoid GLIBC crash
2022-07-07 08:59:47 +02:00
fcaffieri adf95cd132 Add fix to avoid GLIBC crash, fix identation 2022-07-06 18:01:13 -03:00
fcaffieri b6aa782730 Add fix to avoid GLIBC crash 2022-07-06 17:34:56 -03:00
José Fernández Aguilera 1d8d594a44 Merge pull request #685 from wazuh/1667-disable-filebeat-metrics-to4.3
Disable filebeat metrics
2022-07-04 15:59:55 +02:00
fcaffieri 265dfd39bf disable filebeat metrics 2022-07-04 09:16:57 -03:00
fcaffieri 28641accc2 disable filebeat metrics 2022-07-01 17:41:19 -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
vcerenu 9c0676014c add option to recreate keystore in entrypoint 2022-07-01 11:37:44 -03:00
vcerenu f933733a85 add option to recreate keystore in entrypoint 2022-07-01 10:59:52 -03:00
José Fernández Aguilera 2f2b8bc1f5 Merge pull request #682 from wazuh/bump-4-3-5
Change readme note from Docker images build
2022-06-30 11:54:24 +02:00
vcerenu 868424cdd2 Change readme note for build docker images process 2022-06-29 13:17:59 -03:00
vcerenu 84c4aab03d Change readme note for build docker images process 2022-06-29 12:35:24 -03: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
vcerenu 46ec0bd67f Add tag revision for Wazuh indexer and dashboard 2022-06-23 18:27:24 -03:00
vcerenu 61791c1984 Bump 4.3.5 2022-06-23 15:36:27 -03:00
Alberto Rodríguez 2fe1eaea8f Merge pull request #676 from wazuh/fix_ck_conf
Modify variables
2022-06-22 15:32:29 +02:00
vcerenu dc7691808b modify variable 2022-06-21 12:20:44 -03:00
vcerenu c3375e0141 modify variable 2022-06-21 11:46:25 -03:00
Alberto Rodríguez 5d98c157f8 Merge pull request #669 from wazuh/fix-test-ci
CI Docker
2022-06-20 15:42:22 +02:00
vcerenu 0f2b153123 Test CI 2022-06-14 13:21:07 -03:00
vcerenu a84ff7b1ff Test CI 2022-06-14 12:50:21 -03:00
vcerenu 672d1fc67a Test CI 2022-06-13 15:27:23 -03:00
vcerenu ecef793c7f Test CI 2022-06-10 17:12:38 -03:00
vcerenu 8fb1b51d08 Test CI 2022-06-10 16:53:45 -03:00
vcerenu 9b9c422dea Test CI 2022-06-10 16:37:34 -03:00
vcerenu 3059de4c9f Test CI 2022-06-10 16:20:06 -03:00
vcerenu d6557165da Test CI 2022-06-10 16:19:12 -03:00
vcerenu 174cf64b9b Test CI 2022-06-10 16:17:48 -03:00
vcerenu d3954c9f8d Test CI 2022-06-10 15:34:15 -03:00
vcerenu 6dbfc1bbbf Test CI 2022-06-10 15:33:42 -03:00
vcerenu 20d065cce3 Test CI 2022-06-10 10:53:31 -03:00
vcerenu de41cd08c9 Test CI 2022-06-10 10:23:56 -03:00
vcerenu 1c80201dc9 Test CI 2022-06-10 09:19:06 -03:00
vcerenu f5ba9370ea Test CI 2022-06-09 16:41:50 -03:00
vcerenu 94f62d25d3 Test CI 2022-06-09 16:23:58 -03:00
vcerenu 0384112385 Test CI 2022-06-09 15:38:58 -03:00
vcerenu 8d4c6c4170 Test CI 2022-06-09 15:37:03 -03:00
vcerenu 919eab0c84 Test CI 2022-06-09 15:28:44 -03:00
vcerenu 01e616ce76 Test CI 2022-06-09 15:19:02 -03:00
vcerenu 46740f306a Test CI 2022-06-09 15:16:59 -03:00
vcerenu b718d753de Test CI 2022-06-09 15:15:21 -03:00
vcerenu 731d3c3622 Test CI 2022-06-09 15:14:39 -03:00
vcerenu c17cc9a15b Test CI 2022-06-09 12:32:29 -03:00
vcerenu 8976d2f5b6 Test CI 2022-06-09 12:19:22 -03:00
vcerenu 03764ea251 Test CI 2022-06-09 12:18:37 -03:00
Volm, David 7c642638ff Allow other Exceptions to bubble up a stack trace instead of silently failing in create_user.py 2022-06-09 16:24:43 +02:00
vcerenu 6591e9ae68 Test CI 2022-06-09 10:36:10 -03:00
vcerenu 961b8bad21 Test CI 2022-06-09 09:24:57 -03:00
vcerenu ddc03699e5 Test CI 2022-06-08 18:36:09 -03:00
vcerenu b28ae3b3ab Test CI 2022-06-08 18:25:19 -03:00
vcerenu 67dc3e6e36 Test CI 2022-06-08 18:17:10 -03:00
vcerenu a34e0af547 Test CI 2022-06-08 18:14:12 -03:00
vcerenu 42c2ea5dba Test CI 2022-06-08 18:07:40 -03:00
vcerenu b95e02d41d Test CI 2022-06-08 18:00:25 -03:00
vcerenu 8e8b53e6e1 Test CI 2022-06-08 17:49:46 -03:00
vcerenu 40f55cfb53 Test CI 2022-06-08 17:26:35 -03:00
vcerenu a626216643 Test CI 2022-06-08 17:16:38 -03:00
vcerenu 0d7d4694fd Test CI 2022-06-08 17:11:13 -03:00
vcerenu 8ae1cd3f9d Test CI 2022-06-08 17:08:28 -03:00
vcerenu f06a7ec961 Test CI 2022-06-08 17:02:53 -03:00
vcerenu 3656850b56 Test CI 2022-06-08 17:00:01 -03:00
vcerenu 426670017f Test CI 2022-06-08 16:55:56 -03:00
vcerenu 22958aaf5e Test CI 2022-06-08 16:52:10 -03:00
vcerenu 35dfd86837 Test CI 2022-06-08 16:47:02 -03:00
vcerenu d4b0d60a54 Test CI 2022-06-08 16:41:56 -03:00
vcerenu 19a5a37bdf Test CI 2022-06-08 16:38:41 -03:00
vcerenu 0e2d942666 Test CI 2022-06-08 16:34:29 -03:00
vcerenu 0c2cb412fb Test CI 2022-06-08 16:29:57 -03:00
vcerenu 8748cd1ae2 Test CI 2022-06-08 16:26:57 -03:00
vcerenu 604232960b Test CI 2022-06-08 16:23:39 -03:00
vcerenu 5e211d2b13 Test CI 2022-06-08 16:20:25 -03:00
vcerenu 1a60522c27 Test CI 2022-06-08 16:11:00 -03:00
vcerenu e9c2f59c94 Test CI 2022-06-08 16:07:24 -03:00
vcerenu 451e91e407 Test CI 2022-06-08 15:57:13 -03:00
vcerenu 439a3fe252 Test CI 2022-06-08 15:45:48 -03:00
vcerenu 17389682a4 Test CI 2022-06-08 13:01:30 -03:00
vcerenu 719dc7dd16 Test CI 2022-06-08 12:55:37 -03:00
vcerenu 131c44ba63 Test CI 2022-06-08 12:40:44 -03:00
vcerenu 27a7479774 Test CI 2022-06-08 12:28:22 -03:00
vcerenu fea54b3ca7 Test CI 2022-06-08 12:24:11 -03:00
vcerenu f711968c2f Test CI 2022-06-08 11:53:32 -03:00
vcerenu adfaab647d Test CI 2022-06-08 11:50:15 -03:00
vcerenu 237b180ff5 Test CI 2022-06-08 11:49:18 -03: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
vcerenu d5550caa26 Test CI 2022-06-07 16:58:38 -03:00
vcerenu 637d5ccae1 Test CI 2022-06-07 16:55:06 -03:00
vcerenu 95207b0777 Test CI 2022-06-07 16:50:44 -03:00
vcerenu a40c510bba Test CI 2022-06-07 16:39:25 -03:00
vcerenu 7fdb1a91e5 Test CI 2022-06-07 16:36:07 -03:00
vcerenu 3b740e5dce Test CI 2022-06-07 12:22:44 -03:00
vcerenu 281f74582a Test CI 2022-06-07 12:04:47 -03:00
vcerenu 5418494f95 Test CI 2022-06-07 11:57:22 -03:00
vcerenu c6314893f2 Test CI 2022-06-07 11:50:28 -03:00
vcerenu 5d5f01ab45 Test CI 2022-06-07 11:44:41 -03:00
vcerenu 4b1c420fdd Test CI 2022-06-07 11:40:01 -03:00
vcerenu 3d4a7073ef Test CI 2022-06-07 11:37:31 -03:00
vcerenu c1ca498617 Test CI 2022-06-07 11:13:05 -03:00
vcerenu ac92c2f1c0 Test CI 2022-06-06 17:03:17 -03:00
vcerenu ec16fdf24c Test CI 2022-06-06 16:29:41 -03:00
vcerenu 525bb0ca2c Test CI 2022-06-06 16:06:49 -03:00
vcerenu a8bd7cba31 Test CI 2022-06-06 11:44:46 -03:00
vcerenu 9fb941f3e5 Test CI 2022-06-06 11:33:39 -03:00
vcerenu f67f8d1d3b Test CI 2022-06-06 11:15:35 -03:00
vcerenu 1645f8bac2 Test CI 2022-06-06 11:03:34 -03:00
vcerenu 7d394698a7 Test CI 2022-06-03 17:00:32 -03:00
vcerenu 73c25e86d6 Test CI 2022-06-03 16:42:19 -03:00
vcerenu add81b07e4 Test CI 2022-06-03 16:27:21 -03:00
vcerenu 8f6d24de77 Test CI 2022-06-03 16:24:26 -03:00
vcerenu 2fdb06d824 Test CI 2022-06-03 15:51:18 -03:00
vcerenu d578dfbd39 Test CI 2022-06-03 15:44:55 -03:00
vcerenu d7e937d2f8 Test CI 2022-06-02 16:41:22 -03:00
vcerenu 0313563a0c Test CI 2022-06-02 16:21:30 -03:00
vcerenu 0f2fd84173 Test CI 2022-06-02 15:47:59 -03:00
vcerenu 437fbe63d1 Test CI 2022-06-02 15:24:28 -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
vcerenu 83400ba1e5 bump 4.3.3 2022-06-02 10:31:20 -03: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
vcerenu f220927849 bump 4.3.3 version 2022-05-31 15:57:14 -03:00
vcerenu 480f0b7bef bump 4.3.3 version 2022-05-31 15:46:04 -03:00
vcerenu af8627b992 bump 4.3.3 version 2022-05-31 10:55:09 -03:00
vcerenu 384ed07584 bump 4.3.3 version 2022-05-31 10:44:06 -03: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
José Fernández Aguilera 259f18f96d Merge pull request #659 from wazuh/bump_4_3_2
Bump 4.3.2 to 4.3 Branch
2022-05-30 15:59:16 +02:00
vcerenu c22330761e bump 4.3.2 version 2022-05-30 10:29:46 -03:00
vcerenu a453502e9b bump 4.3.2 version 2022-05-30 07:00:22 -03:00
vcerenu de28f0babc test CI 2022-05-27 19:13:15 -03:00
vcerenu 8795763cd2 test CI 2022-05-27 18:50:10 -03:00
vcerenu de1e435e26 test CI 2022-05-27 18:27:50 -03:00
vcerenu 5591833d2f test CI 2022-05-27 18:21:37 -03:00
vcerenu 8b2f64a3f8 test CI 2022-05-27 18:03:25 -03:00
vcerenu 290affdaa3 test CI 2022-05-27 17:58:19 -03:00
vcerenu d1499136f6 test CI 2022-05-27 17:52:25 -03:00
vcerenu 613dc9fbb7 test CI 2022-05-27 17:44:02 -03:00
vcerenu 77520d56ea test CI 2022-05-27 17:35:42 -03:00
vcerenu 111f04fb0b test CI 2022-05-27 17:30:28 -03:00
vcerenu 30ed0e6bb4 test CI 2022-05-27 17:24:12 -03:00
vcerenu 3ab210f8c0 test CI 2022-05-27 16:58:21 -03:00
vcerenu 19fdf93942 test CI 2022-05-27 16:42:37 -03:00
vcerenu 9ef724b46c test CI 2022-05-27 16:37:02 -03:00
vcerenu 2e0a7b7c3d test CI 2022-05-27 16:31:17 -03:00
vcerenu 66dda69a91 test CI 2022-05-27 16:20:39 -03:00
vcerenu cacc8fc3d3 test CI 2022-05-27 14:01:47 -03:00
vcerenu 11b3160aa4 test CI 2022-05-27 13:55:14 -03:00
vcerenu bb7723d6be test CI 2022-05-27 13:42:32 -03:00
vcerenu 54756054bc test CI 2022-05-27 13:36:35 -03:00
vcerenu e0c7194444 test CI 2022-05-27 13:31:08 -03:00
vcerenu ba3409acee test CI 2022-05-27 13:20:44 -03:00
vcerenu 19e5c24a2e test CI 2022-05-27 12:25:00 -03:00
vcerenu b7a55ab174 test CI 2022-05-27 12:17:16 -03:00
vcerenu 111cfca50c test CI 2022-05-27 11:57:47 -03:00
vcerenu 704b183002 test CI 2022-05-27 11:44:22 -03:00
vcerenu 579fa10551 test CI 2022-05-27 11:33:26 -03:00
dfolcha 1bc73fb1c4 Update filebeat module version 2022-05-27 15:29:35 +02:00
vcerenu dfa11c08a4 test CI 2022-05-26 17:22:26 -03:00
vcerenu ceb920e87a test CI 2022-05-26 17:13:29 -03:00
vcerenu 330763bcb0 test CI 2022-05-26 16:13:04 -03:00
vcerenu 571fad7a08 test CI 2022-05-26 16:04:03 -03:00
vcerenu ccc781023d test CI 2022-05-26 16:03:09 -03:00
vcerenu 7e26034e22 test CI 2022-05-26 16:01:52 -03:00
vcerenu 182029155e test CI 2022-05-26 15:59:21 -03:00
vcerenu 872c121ba9 test CI 2022-05-26 15:41:25 -03:00
vcerenu 7e8055f128 test CI 2022-05-26 15:09:26 -03:00
vcerenu 469f7db61a test CI 2022-05-26 15:02:49 -03:00
vcerenu ec6bfa962d test CI 2022-05-26 14:27:59 -03:00
vcerenu 5f063fc445 test CI 2022-05-26 14:22:32 -03:00
vcerenu 9fdf342fa3 test CI 2022-05-26 13:15:56 -03:00
vcerenu b10a00cade test CI 2022-05-26 13:03:41 -03:00
vcerenu 3d3a3d1274 test CI 2022-05-26 12:36:30 -03:00
vcerenu 3a87d83deb test CI 2022-05-26 12:26:15 -03:00
vcerenu d22547b9c5 test CI 2022-05-26 11:24:38 -03:00
vcerenu bb11f13e86 test CI 2022-05-26 11:18:06 -03:00
vcerenu 79ac17ddbd test CI 2022-05-26 11:07:42 -03:00
vcerenu 59ad1b171c test CI 2022-05-26 10:58:42 -03:00
vcerenu 894ba9df12 test CI 2022-05-26 10:45:41 -03:00
vcerenu 5211401620 test CI 2022-05-24 15:38:28 -03:00
vcerenu 65f499c042 test CI 2022-05-24 15:30:49 -03:00
vcerenu db3d37aef6 test CI 2022-05-24 13:00:10 -03:00
vcerenu b1e13d3b72 test CI 2022-05-24 12:58:52 -03:00
vcerenu baa24a7614 test CI 2022-05-24 12:36:01 -03:00
vcerenu 4e975f8dd1 test CI 2022-05-24 12:24:20 -03: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
vcerenu e1fc82af79 test CI 2022-05-23 17:00:54 -03:00
vcerenu 5b03281631 test CI 2022-05-23 16:53:35 -03:00
vcerenu fe104c7ffb test CI 2022-05-23 12:55:57 -03:00
vcerenu 2d77063934 test CI 2022-05-23 12:28:45 -03:00
vcerenu bbeb831ceb change path for env file 2022-05-23 12:16:07 -03: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
vcerenu 70c3a2929e fix whitelist 2022-05-23 10:54:57 -03: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
Gonzalo Acuña bfeb4b007a Dashboard entrypoint update 2022-05-17 19:45:53 -03:00
vcerenu 7d06cb56ef Modify Dashboard user parameter 2022-05-17 17:58:22 -03:00
vcerenu f678aaf1e0 Modify Dashboard user parameter 2022-05-17 17:34:24 -03:00
vcerenu 020031c81d Modify Dashboard user parameter 2022-05-17 15:49:38 -03:00
vcerenu a40c870e78 test ci actions 2022-05-17 12:52:47 -03:00
vcerenu 8746063177 test ci actions 2022-05-17 12:44:33 -03:00
vcerenu e39f5a9ab5 test ci actions 2022-05-17 12:35:25 -03:00
vcerenu 316db4f384 test ci actions 2022-05-17 12:24:48 -03:00
vcerenu 8b39bff31d test ci actions 2022-05-17 12:23:55 -03:00
vcerenu e99476a99b test ci actions 2022-05-17 12:22:32 -03:00
vcerenu c2712a3929 test ci actions 2022-05-17 11:59:07 -03:00
vcerenu cb06e15a74 bump develope to 4.3.1 2022-05-17 11:35:52 -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
vcerenu 65fd592d52 Bump 4.3.1 version 2022-05-16 12:37:48 -03:00
vcerenu 86fbf77aa9 Bump 4.3.1 version 2022-05-13 12:16:42 -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
vcerenu 80bfc148d0 Change dashboard port 2022-05-12 13:28:13 -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
vcerenu 3adb7809dd change doc migration 2022-05-12 11:23:46 -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
vcerenu 446ecd86e6 change Wazuh API user 2022-05-11 14:05:44 -03:00
vcerenu ddcad44468 change Wazuh API user 2022-05-11 13:40:46 -03: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
vcerenu 3be8078248 add dependencies for Wazuh dashboard 2022-05-06 10:03:32 -03:00
José Fernández Aguilera 4478021f28 Merge pull request #630 from wazuh/reports-dashboard-fix
Add dependencies for Wazuh dashboard
2022-05-06 14:53:46 +02:00
vcerenu 8d8b9e1336 add dependencies for Wazuh dashboard 2022-05-06 09:32:14 -03:00
Alberto R e1ed44d847 Changed artifacts dev URLs 2022-05-06 08:36:59 +02:00
vcerenu 43d86dd5c8 add variables from wazuh version 2022-05-03 15:51:38 -03:00
48 changed files with 660 additions and 161 deletions
Executable
+3
View File
@@ -0,0 +1,3 @@
WAZUH_VERSION=4.3.11
WAZUH_IMAGE_VERSION=4.3.11
WAZUH_TAG_REVISION=1
+11 -23
View File
@@ -56,7 +56,7 @@ package:
wazuh-manager:
installed: true
versions:
- 4.3.0
- 4.3.11-1
port:
tcp:1514:
listening: true
@@ -70,28 +70,6 @@ port:
listening: true
ip:
- 0.0.0.0
user:
wazuh:
exists: true
groups:
- wazuh
home: /var/ossec
shell: /sbin/nologin
wazuh:
exists: true
groups:
- wazuh
home: /var/ossec
shell: /sbin/nologin
wazuh:
exists: true
groups:
- wazuh
home: /var/ossec
shell: /sbin/nologin
group:
wazuh:
exists: true
process:
filebeat:
running: true
@@ -113,3 +91,13 @@ process:
running: true
wazuh-modulesd:
running: true
user:
wazuh:
exists: true
groups:
- wazuh
home: /var/ossec
shell: /sbin/nologin
group:
wazuh:
exists: true
+18
View File
@@ -0,0 +1,18 @@
filebeatout1=$(docker exec multi-node_wazuh.master_1 sh -c 'filebeat test output')
filebeatstatus1=$(echo "${filebeatout1}" | grep -c OK)
if [[ filebeatstatus1 -eq 7 ]]; then
echo "No errors in master filebeat"
else
echo "Errors in master filebeat"
echo "${filebeatout1}"
exit 1
fi
filebeatout2=$(docker exec multi-node_wazuh.worker_1 sh -c 'filebeat test output')
filebeatstatus2=$(echo "${filebeatout2}" | grep -c OK)
if [[ filebeatstatus2 -eq 7 ]]; then
echo "No errors in worker filebeat"
else
echo "Errors in worker filebeat"
echo "${filebeatout2}"
exit 1
fi
+16
View File
@@ -0,0 +1,16 @@
log1=$(docker exec multi-node_wazuh.master_1 sh -c 'cat /var/ossec/logs/ossec.log' | grep -P "ERR|WARN|CRIT")
if [[ -z "$log1" ]]; then
echo "No errors in master ossec.log"
else
echo "Errors in master ossec.log:"
echo "${log1}"
exit 1
fi
log2=$(docker exec multi-node_wazuh.worker_1 sh -c 'cat /var/ossec/logs/ossec.log' | grep -P "ERR|WARN|CRIT")
if [[ -z "${log2}" ]]; then
echo "No errors in worker ossec.log"
else
echo "Errors in worker ossec.log:"
echo "${log2}"
exit 1
fi
+9
View File
@@ -0,0 +1,9 @@
filebeatout=$(docker exec single-node_wazuh.manager_1 sh -c 'filebeat test output')
filebeatstatus=$(echo "${filebeatout}" | grep -c OK)
if [[ filebeatstatus -eq 7 ]]; then
echo "No errors in filebeat"
else
echo "Errors in filebeat"
echo "${filebeatout}"
exit 1
fi
+8
View File
@@ -0,0 +1,8 @@
log=$(docker exec single-node_wazuh.manager_1 sh -c 'cat /var/ossec/logs/ossec.log' | grep -P "ERR|WARN|CRIT")
if [[ -z "$log" ]]; then
echo "No errors in ossec.log"
else
echo "Errors in ossec.log:"
echo "${log}"
exit 1
fi
+291 -12
View File
@@ -1,31 +1,310 @@
name: Wazuh Docker pipeline
on: [push]
on: [pull_request]
jobs:
build-stack:
build-docker-images:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Build the docker-compose stack
run: docker-compose -f build-wazuh-images.yml up -d --build
- name: Build Wazuh images
run: build-docker-images/build-images.sh
- name: Check running containers
run: docker ps -a
- name: Create enviroment variables
run: cat .env > $GITHUB_ENV
- name: Shutdown the stack
run: docker-compose -f build-wazuh-images.yml kill
- name: Create backup Docker images
run: |
mkdir -p /home/runner/work/wazuh-docker/wazuh-docker/docker-images/
docker save wazuh/wazuh-manager:${{env.WAZUH_IMAGE_VERSION}} -o /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-manager.tar
docker save wazuh/wazuh-indexer:${{env.WAZUH_IMAGE_VERSION}} -o /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-indexer.tar
docker save wazuh/wazuh-dashboard:${{env.WAZUH_IMAGE_VERSION}} -o /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-dashboard.tar
- name: Temporarily save Wazuh manager Docker image
uses: actions/upload-artifact@v3
with:
name: docker-artifact-manager
path: /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-manager.tar
retention-days: 1
- name: Temporarily save Wazuh indexer Docker image
uses: actions/upload-artifact@v3
with:
name: docker-artifact-indexer
path: /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-indexer.tar
retention-days: 1
- name: Temporarily save Wazuh dashboard Docker image
uses: actions/upload-artifact@v3
with:
name: docker-artifact-dashboard
path: /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-dashboard.tar
retention-days: 1
- name: Install Goss
uses: e1himself/goss-installation-action@v1.0.3
with:
version: v0.3.16
- name: Execute Goss tests (wazuh-odfe)
run: dgoss run wazuh/wazuh-manager:4.3.0
- name: Execute Goss tests (wazuh-manager)
run: dgoss run wazuh/wazuh-manager:${{env.WAZUH_IMAGE_VERSION}}
env:
GOSS_SLEEP: 30
GOSS_FILE: .github/.goss.yaml
GOSS_FILE: .github/.goss.yaml
check-single-node:
runs-on: ubuntu-latest
needs: build-docker-images
steps:
- name: Check out code
uses: actions/checkout@v3
- name: Create enviroment variables
run: cat .env > $GITHUB_ENV
- name: Retrieve saved Wazuh indexer Docker image
uses: actions/download-artifact@v3
with:
name: docker-artifact-indexer
- name: Retrieve saved Wazuh manager Docker image
uses: actions/download-artifact@v3
with:
name: docker-artifact-manager
- name: Retrieve saved Wazuh dashboard Docker image
uses: actions/download-artifact@v3
with:
name: docker-artifact-dashboard
- name: Docker load
run: |
docker load --input ./wazuh-indexer.tar
docker load --input ./wazuh-dashboard.tar
docker load --input ./wazuh-manager.tar
- name: Create single node certficates
run: docker-compose -f single-node/generate-indexer-certs.yml run --rm generator
- name: Start single node stack
run: docker-compose -f single-node/docker-compose.yml up -d
- name: Check Wazuh indexer start
run: |
sleep 60
status_green="`curl -XGET "https://0.0.0.0:9200/_cluster/health" -u admin:SecretPassword -k -s | grep green | wc -l`"
if [[ $status_green -eq 1 ]]; then
curl -XGET "https://0.0.0.0:9200/_cluster/health" -u admin:SecretPassword -k -s
else
curl -XGET "https://0.0.0.0:9200/_cluster/health" -u admin:SecretPassword -k -s
exit 1
fi
status_index="`curl -XGET "https://0.0.0.0:9200/_cat/indices" -u admin:SecretPassword -k -s | wc -l`"
status_index_green="`curl -XGET "https://0.0.0.0:9200/_cat/indices" -u admin:SecretPassword -k -s | grep "green" | wc -l`"
if [[ $status_index_green -eq $status_index ]]; then
curl -XGET "https://0.0.0.0:9200/_cat/indices" -u admin:SecretPassword -k -s
else
curl -XGET "https://0.0.0.0:9200/_cat/indices" -u admin:SecretPassword -k -s
exit 1
fi
- name: Check Wazuh indexer nodes
run: |
nodes="`curl -XGET "https://0.0.0.0:9200/_cat/nodes" -u admin:SecretPassword -k -s | grep -E "indexer" | wc -l`"
if [[ $nodes -eq 1 ]]; then
echo "Wazuh indexer nodes: ${nodes}"
else
echo "Wazuh indexer nodes: ${nodes}"
exit 1
fi
- name: Check documents into wazuh-alerts index
run: |
docs="`curl -XGET "https://0.0.0.0:9200/wazuh-alerts*/_doc/_search" -u admin:SecretPassword -k -s | jq -r ".hits.total.value"`"
if [[ $docs -gt 100 ]]; then
echo "wazuh-alerts index documents: ${docs}"
else
echo "wazuh-alerts index documents: ${docs}"
exit 1
fi
- name: Check Wazuh templates
run: |
qty_templates="`curl -XGET "https://0.0.0.0:9200/_cat/templates" -u admin:SecretPassword -k -s | grep -P "wazuh|wazuh-agent|wazuh-statistics" | wc -l`"
templates="`curl -XGET "https://0.0.0.0:9200/_cat/templates" -u admin:SecretPassword -k -s | grep -P "wazuh|wazuh-agent|wazuh-statistics"`"
if [[ $qty_templates -eq 3 ]]; then
echo "wazuh templates:"
echo "${templates}"
else
echo "wazuh templates:"
echo "${templates}"
exit 1
fi
- name: Check Wazuh manager start
run: |
services="`curl -k -s -X GET "https://0.0.0.0:55000/manager/status?pretty=true" -H "Authorization: Bearer ${{env.TOKEN}}" | jq -r .data.affected_items | grep running | wc -l`"
if [[ $services -gt 9 ]]; then
echo "Wazuh Manager Services: ${services}"
echo "OK"
else
echo "Wazuh indexer nodes: ${nodes}"
curl -k -X GET "https://0.0.0.0:55000/manager/status?pretty=true" -H "Authorization: Bearer ${{env.TOKEN}}" | jq -r .data.affected_items
exit 1
fi
env:
TOKEN: $(curl -s -u wazuh-wui:MyS3cr37P450r.*- -k -X GET "https://0.0.0.0:55000/security/user/authenticate?raw=true")
- name: Check errors in ossec.log
run: ./.github/single-node-log-check.sh
- name: Check filebeat output
run: ./.github/single-node-filebeat-check.sh
- name: Check Wazuh dashboard service URL
run: |
status=$(curl -XGET --silent https://0.0.0.0:443/app/status -k -u admin:SecretPassword -I -s | grep -E "^HTTP" | awk '{print $2}')
if [[ $status -eq 200 ]]; then
echo "Wazuh dashboard status: ${status}"
else
echo "Wazuh dashboard status: ${status}"
exit 1
fi
- name: Stop single node stack
run: docker-compose -f single-node/docker-compose.yml down
check-multi-node:
runs-on: ubuntu-latest
needs: build-docker-images
steps:
- name: Check out code
uses: actions/checkout@v3
- name: Create enviroment variables
run: cat .env > $GITHUB_ENV
- name: Retrieve saved Wazuh dashboard Docker image
uses: actions/download-artifact@v3
with:
name: docker-artifact-dashboard
- name: Retrieve saved Wazuh manager Docker image
uses: actions/download-artifact@v3
with:
name: docker-artifact-manager
- name: Retrieve saved Wazuh indexer Docker image
uses: actions/download-artifact@v3
with:
name: docker-artifact-indexer
- name: Docker load
run: |
docker load --input ./wazuh-manager.tar
docker load --input ./wazuh-indexer.tar
docker load --input ./wazuh-dashboard.tar
- name: Create multi node certficates
run: docker-compose -f multi-node/generate-indexer-certs.yml run --rm generator
- name: Start multi node stack
run: docker-compose -f multi-node/docker-compose.yml up -d
- name: Check Wazuh indexer start
run: |
sleep 120
status_green="`curl -XGET "https://0.0.0.0:9200/_cluster/health" -u admin:SecretPassword -k -s | grep green | wc -l`"
if [[ $status_green -eq 1 ]]; then
curl -XGET "https://0.0.0.0:9200/_cluster/health" -u admin:SecretPassword -k -s
else
curl -XGET "https://0.0.0.0:9200/_cluster/health" -u admin:SecretPassword -k -s
exit 1
fi
status_index="`curl -XGET "https://0.0.0.0:9200/_cat/indices" -u admin:SecretPassword -k -s | wc -l`"
status_index_green="`curl -XGET "https://0.0.0.0:9200/_cat/indices" -u admin:SecretPassword -k -s | grep -E "green" | wc -l`"
if [[ $status_index_green -eq $status_index ]]; then
curl -XGET "https://0.0.0.0:9200/_cat/indices" -u admin:SecretPassword -k -s
else
curl -XGET "https://0.0.0.0:9200/_cat/indices" -u admin:SecretPassword -k -s
exit 1
fi
- name: Check Wazuh indexer nodes
run: |
nodes="`curl -XGET "https://0.0.0.0:9200/_cat/nodes" -u admin:SecretPassword -k -s | grep -E "indexer" | wc -l`"
if [[ $nodes -eq 3 ]]; then
echo "Wazuh indexer nodes: ${nodes}"
else
echo "Wazuh indexer nodes: ${nodes}"
exit 1
fi
- name: Check documents into wazuh-alerts index
run: |
docs="`curl -XGET "https://0.0.0.0:9200/wazuh-alerts*/_doc/_search" -u admin:SecretPassword -k -s | jq -r ".hits.total.value"`"
if [[ $docs -gt 200 ]]; then
echo "wazuh-alerts index documents: ${docs}"
else
echo "wazuh-alerts index documents: ${docs}"
exit 1
fi
- name: Check Wazuh templates
run: |
qty_templates="`curl -XGET "https://0.0.0.0:9200/_cat/templates" -u admin:SecretPassword -k -s | grep "wazuh" | wc -l`"
templates="`curl -XGET "https://0.0.0.0:9200/_cat/templates" -u admin:SecretPassword -k -s | grep "wazuh"`"
if [[ $qty_templates -eq 3 ]]; then
echo "wazuh templates:"
echo "${templates}"
else
echo "wazuh templates:"
echo "${templates}"
exit 1
fi
- name: Check Wazuh manager start
run: |
services="`curl -k -s -X GET "https://0.0.0.0:55000/manager/status?pretty=true" -H "Authorization: Bearer ${{env.TOKEN}}" | jq -r .data.affected_items | grep running | wc -l`"
if [[ $services -gt 10 ]]; then
echo "Wazuh Manager Services: ${services}"
echo "OK"
else
echo "Wazuh indexer nodes: ${nodes}"
curl -k -s -X GET "https://0.0.0.0:55000/manager/status?pretty=true" -H "Authorization: Bearer ${{env.TOKEN}}" | jq -r .data.affected_items
exit 1
fi
nodes=$(curl -k -s -X GET "https://0.0.0.0:55000/cluster/nodes" -H "Authorization: Bearer ${{env.TOKEN}}" | jq -r ".data.affected_items[].name" | wc -l)
if [[ $nodes -eq 2 ]]; then
echo "Wazuh manager nodes: ${nodes}"
else
echo "Wazuh manager nodes: ${nodes}"
exit 1
fi
env:
TOKEN: $(curl -s -u wazuh-wui:MyS3cr37P450r.*- -k -X GET "https://0.0.0.0:55000/security/user/authenticate?raw=true")
- name: Check errors in ossec.log
run: ./.github/multi-node-log-check.sh
- name: Check filebeat output
run: ./.github/multi-node-filebeat-check.sh
- name: Check Wazuh dashboard service URL
run: |
status=$(curl -XGET --silent https://0.0.0.0:443/app/status -k -u admin:SecretPassword -I | grep -E "^HTTP" | awk '{print $2}')
if [[ $status -eq 200 ]]; then
echo "Wazuh dashboard status: ${status}"
else
echo "Wazuh dashboard status: ${status}"
exit 1
fi
+1 -1
View File
@@ -1,4 +1,4 @@
single-node/config/wazuh_indexer_ssl_certs/*.pem
single-node/config/wazuh_indexer_ssl_certs/*.key
multi-node/config/wazuh_indexer_ssl_certs/*.pem
multi-node/config/wazuh_indexer_ssl_certs/*.key
multi-node/config/wazuh_indexer_ssl_certs/*.key
+67
View File
@@ -1,11 +1,78 @@
# Change Log
All notable changes to this project will be documented in this file.
## Wazuh Docker v4.3.11
### Added
- Update Wazuh to version [4.3.11](https://github.com/wazuh/wazuh/blob/v4.3.11/CHANGELOG.md#v4311)
## Wazuh Docker v4.3.10
### Added
- Update Wazuh to version [4.3.10](https://github.com/wazuh/wazuh/blob/v4.3.10/CHANGELOG.md#v4310)
## Wazuh Docker v4.3.9
### Added
- Update Wazuh to version [4.3.9](https://github.com/wazuh/wazuh/blob/v4.3.9/CHANGELOG.md#v439)
## Wazuh Docker v4.3.8
### Added
- Update Wazuh to version [4.3.8](https://github.com/wazuh/wazuh/blob/v4.3.8/CHANGELOG.md#v438)
## Wazuh Docker v4.3.7
### Added
- Update Wazuh to version [4.3.7](https://github.com/wazuh/wazuh/blob/v4.3.7/CHANGELOG.md#v437)
## Wazuh Docker v4.3.6
### Added
- Update Wazuh to version [4.3.6](https://github.com/wazuh/wazuh/blob/v4.3.6/CHANGELOG.md#v436)
## Wazuh Docker v4.3.5
### Added
- Update Wazuh to version [4.3.5](https://github.com/wazuh/wazuh/blob/v4.3.5/CHANGELOG.md#v435)
## Wazuh Docker v4.3.4
### Added
- Update Wazuh to version [4.3.4](https://github.com/wazuh/wazuh/blob/v4.3.4/CHANGELOG.md#v434)
## Wazuh Docker v4.3.3
### Added
- Update Wazuh to version [4.3.3](https://github.com/wazuh/wazuh/blob/v4.3.3/CHANGELOG.md#v433)
## Wazuh Docker v4.3.2
### Added
- Update Wazuh to version [4.3.2](https://github.com/wazuh/wazuh/blob/v4.3.2/CHANGELOG.md#v432)
## Wazuh Docker v4.3.1
### Added
- Update Wazuh to version [4.3.1](https://github.com/wazuh/wazuh/blob/v4.3.1/CHANGELOG.md#v431)
## Wazuh Docker v4.3.0
### Added
- Update Wazuh to version [4.3.0](https://github.com/wazuh/wazuh/blob/v4.3.0/CHANGELOG.md#v430)
## Wazuh Docker v4.2.7
### Added
- Update Wazuh to version [4.2.7](https://github.com/wazuh/wazuh/blob/v4.2.7/CHANGELOG.md#v427)
## Wazuh Docker v4.2.6
### Added
- Update Wazuh to version [4.2.6](https://github.com/wazuh/wazuh/blob/v4.2.6/CHANGELOG.md#v426)
## Wazuh Docker v4.2.5
### Added
+1 -1
View File
@@ -1,5 +1,5 @@
Portions Copyright (C) 2021 Wazuh, Inc.
Portions Copyright (C) 2017, Wazuh Inc.
Based on work Copyright (C) 2003 - 2013 Trend Micro, Inc.
This program is a free software; you can redistribute it and/or modify
+20 -5
View File
@@ -36,13 +36,13 @@ Default values are included when available.
### Wazuh
```
API_USERNAME="wazuh" # Wazuh API username
API_PASSWORD="wazuh" # Wazuh API password - Must comply with requirements
API_USERNAME="wazuh-wui" # Wazuh API username
API_PASSWORD="MyS3cr37P450r.*-" # Wazuh API password - Must comply with requirements
# (8+ length, uppercase, lowercase, specials chars)
INDEXER_URL=https://wazuh.indexer:9200 # Wazuh indexer URL
INDEXER_USERNAME=admin # Wazuh indexer Username
INDEXER_PASSWORD=admin # Wazuh indexer Password
INDEXER_PASSWORD=SecretPassword # Wazuh indexer Password
FILEBEAT_SSL_VERIFICATION_MODE=full # Filebeat SSL Verification mode (full or none)
SSL_CERTIFICATE_AUTHORITIES="" # Path of Filebeat SSL CA
SSL_CERTIFICATE="" # Path of Filebeat SSL Certificate
@@ -78,10 +78,12 @@ API_SELECTOR=true Defines if the user is allowed to change the sel
IP_SELECTOR=true # Defines if the user is allowed to change the selected index pattern directly from the Wazuh app top menu
IP_IGNORE="[]" # List of index patterns to be ignored
DASHBOARD_USERNAME=kibanaserver # Custom user saved in the dashboard keystore
DASHBOARD_PASSWORD=kibanaserver # Custom password saved in the dashboard keystore
WAZUH_MONITORING_ENABLED=true # Custom settings to enable/disable wazuh-monitoring indices
WAZUH_MONITORING_FREQUENCY=900 # Custom setting to set the frequency for wazuh-monitoring indices cron task
WAZUH_MONITORING_SHARDS=2 # Configure wazuh-monitoring-* indices shards and replicas
WAZUH_MONITORING_REPLICAS=0 #
WAZUH_MONITORING_REPLICAS=0 ##
```
## Directory structure
@@ -193,7 +195,20 @@ WAZUH_MONITORING_REPLICAS=0 #
| Wazuh version | ODFE | XPACK |
|---------------|---------|--------|
| v4.3.11 | | |
| v4.3.10 | | |
| v4.3.9 | | |
| v4.3.8 | | |
| v4.3.7 | | |
| v4.3.6 | | |
| v4.3.5 | | |
| v4.3.4 | | |
| v4.3.3 | | |
| v4.3.2 | | |
| v4.3.1 | | |
| v4.3.0 | | |
| v4.2.7 | 1.13.2 | 7.11.2 |
| v4.2.6 | 1.13.2 | 7.11.2 |
| v4.2.5 | 1.13.2 | 7.11.2 |
| v4.2.4 | 1.13.2 | 7.11.2 |
| v4.2.3 | 1.13.2 | 7.11.2 |
@@ -223,7 +238,7 @@ We thank you them and everyone else who has contributed to this project.
## License and copyright
Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
## Web references
+2 -2
View File
@@ -1,2 +1,2 @@
WAZUH-DOCKER_VERSION="4.3.0"
REVISION="43100"
WAZUH-DOCKER_VERSION="4.3.11"
REVISION="40324"
+7 -3
View File
@@ -1,7 +1,11 @@
# Wazuh Docker Image Builder
This stack allows you to build the Wazuh manager, indexer, and dashboard images locally by running the command:
The creation of the images for the Wazuh stack deployment in Docker is done with the build-images.yml script
To execute the process, the following must be executed in the root of the wazuh-docker repository:
```
$ docker-compose build
```
$ build-docker-images/build-images.sh
```
This script initializes the environment variables needed to build each of the images.
+17
View File
@@ -0,0 +1,17 @@
WAZUH_IMAGE_VERSION=4.3.11
WAZUH_VERSION=$(echo $WAZUH_IMAGE_VERSION | sed -e 's/\.//g')
WAZUH_TAG_REVISION=1
WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '\"tag_name\":' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2- | sed -e 's/\.//g')
## If wazuh manager exists in apt dev repository, change variables, if not, exit 1
if [ "$WAZUH_VERSION" -le "$WAZUH_CURRENT_VERSION" ]; then
IMAGE_VERSION=${WAZUH_IMAGE_VERSION}
else
IMAGE_VERSION=${WAZUH_IMAGE_VERSION}
fi
echo WAZUH_VERSION=$WAZUH_IMAGE_VERSION > .env
echo WAZUH_IMAGE_VERSION=$IMAGE_VERSION >> .env
echo WAZUH_TAG_REVISION=$WAZUH_TAG_REVISION >> .env
docker-compose -f build-docker-images/build-images.yml --env-file .env build --no-cache
@@ -1,10 +1,14 @@
# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2)
# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
version: '3.7'
services:
wazuh.manager:
build: wazuh-manager/
image: wazuh/wazuh-manager:4.3.0
build:
context: wazuh-manager/
args:
WAZUH_VERSION: ${WAZUH_VERSION}
WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION}
image: wazuh/wazuh-manager:${WAZUH_IMAGE_VERSION}
hostname: wazuh.manager
restart: always
ports:
@@ -31,8 +35,12 @@ services:
- filebeat_var:/var/lib/filebeat
wazuh.indexer:
build: wazuh-indexer/
image: wazuh/wazuh-indexer:4.3.0
build:
context: wazuh-indexer/
args:
WAZUH_VERSION: ${WAZUH_VERSION}
WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION}
image: wazuh/wazuh-indexer:${WAZUH_IMAGE_VERSION}
hostname: wazuh.indexer
restart: always
ports:
@@ -48,8 +56,12 @@ services:
hard: 65536
wazuh.dashboard:
build: wazuh-dashboard/
image: wazuh/wazuh-dashboard:4.3.0
build:
context: wazuh-dashboard/
args:
WAZUH_VERSION: ${WAZUH_VERSION}
WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION}
image: wazuh/wazuh-dashboard:${WAZUH_IMAGE_VERSION}
hostname: wazuh.dashboard
restart: always
ports:
+12 -11
View File
@@ -1,8 +1,10 @@
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
FROM ubuntu:focal AS builder
ARG WAZUH_VERSION=4.3.0
ARG WAZUH_VERSION
ARG WAZUH_TAG_REVISION
ARG INSTALL_DIR=/usr/share/wazuh-dashboard
ARG WAZUH_UI_REVISION=1
# Update and install dependencies
RUN apt-get update && apt install curl libcap2-bin xz-utils -y
@@ -11,21 +13,17 @@ RUN apt-get update && apt install curl libcap2-bin xz-utils -y
RUN mkdir -p $INSTALL_DIR
# Download and extract Wazuh dashboard base
RUN curl -o wazuh-dashboard-base.tar.xz https://packages-dev.wazuh.com/stack/dashboard/base/wazuh-dashboard-base-${WAZUH_VERSION}-linux-x64.tar.xz && \
tar -xf wazuh-dashboard-base.tar.xz --directory $INSTALL_DIR --strip-components=1
COPY config/dl_base.sh .
RUN bash dl_base.sh
# Generate certificates
COPY config/config.sh .
COPY config/config.yml /
RUN bash config.sh
# Create and configure Wazuh dashboard keystore
RUN $INSTALL_DIR/bin/opensearch-dashboards-keystore create --allow-root && \
echo kibanaserver | $INSTALL_DIR/bin/opensearch-dashboards-keystore add opensearch.username --stdin --allow-root && \
echo kibanaserver | $INSTALL_DIR/bin/opensearch-dashboards-keystore add opensearch.password --stdin --allow-root
# Install Wazuh App
RUN $INSTALL_DIR/bin/opensearch-dashboards-plugin install https://packages-dev.wazuh.com/pre-release/ui/dashboard/wazuh-${WAZUH_VERSION}.zip --allow-root
COPY config/install_wazuh_app.sh /
RUN chmod 775 /install_wazuh_app.sh
RUN bash /install_wazuh_app.sh
# Copy and set permissions to config files
COPY config/opensearch_dashboards.yml $INSTALL_DIR/config/
@@ -80,6 +78,9 @@ ENV PATTERN="" \
WAZUH_MONITORING_SHARDS="" \
WAZUH_MONITORING_REPLICAS=""
# Install dependencies
RUN apt update && apt install -y libnss3-dev fonts-liberation libfontconfig1
# Create wazuh-dashboard user and group
RUN getent group $GROUP || groupadd -r -g 1000 $GROUP
RUN useradd --system \
@@ -1,4 +1,4 @@
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
# This has to be exported to make some magic below work.
export DH_OPTIONS
@@ -0,0 +1,12 @@
WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '\"tag_name\":' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2- | sed -e 's/\.//g') && \
WAZUH_IMAGE_VERSION=$(echo $WAZUH_VERSION | sed -e 's/\.//g') && \
if [ "$WAZUH_IMAGE_VERSION" -le "$WAZUH_CURRENT_VERSION" ]; then
REPOSITORY="packages.wazuh.com"
else
REPOSITORY="packages-dev.wazuh.com"
fi
curl -o wazuh-dashboard-base.tar.xz https://${REPOSITORY}/stack/dashboard/base/wazuh-dashboard-base-${WAZUH_VERSION}-${WAZUH_TAG_REVISION}-linux-x64.tar.xz
tar -xf wazuh-dashboard-base.tar.xz --directory $INSTALL_DIR --strip-components=1
@@ -1,10 +1,20 @@
#!/bin/bash
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
INSTALL_DIR=/usr/share/wazuh-dashboard
DASHBOARD_USERNAME="${DASHBOARD_USERNAME:-kibanaserver}"
DASHBOARD_PASSWORD="${DASHBOARD_PASSWORD:-kibanaserver}"
# Create and configure Wazuh dashboard keystore
yes | $INSTALL_DIR/bin/opensearch-dashboards-keystore create --allow-root && \
echo $DASHBOARD_USERNAME | $INSTALL_DIR/bin/opensearch-dashboards-keystore add opensearch.username --stdin --allow-root && \
echo $DASHBOARD_PASSWORD | $INSTALL_DIR/bin/opensearch-dashboards-keystore add opensearch.password --stdin --allow-root
##############################################################################
# Start Wazuh dashboard
##############################################################################
/wazuh_app_config.sh
/wazuh_app_config.sh $WAZUH_UI_REVISION
/usr/share/wazuh-dashboard/bin/opensearch-dashboards -c /usr/share/wazuh-dashboard/config/opensearch_dashboards.yml
@@ -0,0 +1,12 @@
## Variables
WAZUH_IMAGE_VERSION=$(echo $WAZUH_VERSION | sed -e 's/\.//g')
WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '\"tag_name\":' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2- | sed -e 's/\.//g')
## If wazuh manager exists in apt dev repository, change variables, if not exit 1
if [ "$WAZUH_IMAGE_VERSION" -le "$WAZUH_CURRENT_VERSION" ]; then
WAZUH_APP=https://packages.wazuh.com/4.x/ui/dashboard/wazuh-${WAZUH_VERSION}-${WAZUH_UI_REVISION}.zip
else
WAZUH_APP=https://packages-dev.wazuh.com/pre-release/ui/dashboard/wazuh-${WAZUH_VERSION}-${WAZUH_UI_REVISION}.zip
fi
# Install Wazuh App
$INSTALL_DIR/bin/opensearch-dashboards-plugin install $WAZUH_APP --allow-root
@@ -1,5 +1,5 @@
server.host: 0.0.0.0
server.port: 443
server.port: 5601
opensearch.hosts: https://wazuh.indexer:9200
opensearch.ssl.verificationMode: none
opensearch.requestHeadersWhitelist: [ authorization,securitytenant ]
@@ -1,7 +1,7 @@
---
#
# Wazuh app - App configuration file
# Copyright (C) 2015-2021 Wazuh, Inc.
# Copyright (C) 2017, Wazuh Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -1,5 +1,5 @@
#!/bin/bash
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
wazuh_url="${WAZUH_API_URL:-https://wazuh}"
wazuh_port="${API_PORT:-55000}"
+4 -1
View File
@@ -1,6 +1,9 @@
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
FROM ubuntu:focal AS builder
ARG WAZUH_VERSION
ARG WAZUH_TAG_REVISION
RUN apt-get update -y && apt-get install curl openssl xz-utils -y
COPY config/opensearch.yml /
@@ -1,14 +1,16 @@
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
# This has to be exported to make some magic below work.
export DH_OPTIONS
export NAME=wazuh-indexer
export TARGET_DIR=${CURDIR}/debian/${NAME}
export WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '\"tag_name\":' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2- | sed -e 's/\.//g')
export WAZUH_IMAGE_VERSION=$(echo $WAZUH_VERSION | sed -e 's/\.//g')
# Package build options
export USER=${NAME}
export GROUP=${NAME}
export VERSION=4.3.0
export VERSION=${WAZUH_VERSION}-${WAZUH_TAG_REVISION}
export LOG_DIR=/var/log/${NAME}
export LIB_DIR=/var/lib/${NAME}
export PID_DIR=/run/${NAME}
@@ -19,10 +21,15 @@ export INDEXER_FILE=wazuh-indexer-base.tar.xz
export BASE_FILE=wazuh-indexer-base-${VERSION}-linux-x64.tar.xz
export REPO_DIR=/unattended_installer
rm -rf ${INSTALLATION_DIR}/
curl -o ${INDEXER_FILE} https://packages-dev.wazuh.com/stack/indexer/base/${BASE_FILE}
if [ "$WAZUH_IMAGE_VERSION" -le "$WAZUH_CURRENT_VERSION" ]; then
REPOSITORY="packages.wazuh.com"
else
REPOSITORY="packages-dev.wazuh.com"
fi
curl -o ${INDEXER_FILE} https://${REPOSITORY}/stack/indexer/base/${BASE_FILE}
tar -xf ${INDEXER_FILE}
## TOOLS
@@ -106,5 +113,9 @@ cp -pr /wazuh-certificates/root-ca.pem ${TARGET_DIR}${CONFIG_DIR}/certs/root-ca.
cp -pr /wazuh-certificates/admin.pem ${TARGET_DIR}${CONFIG_DIR}/certs/admin.pem
cp -pr /wazuh-certificates/admin-key.pem ${TARGET_DIR}${CONFIG_DIR}/certs/admin-key.pem
# Delete xms and xmx parameters in jvm.options
sed '/-Xms/d' -i ${TARGET_DIR}${CONFIG_DIR}/jvm.options
sed '/-Xmx/d' -i ${TARGET_DIR}${CONFIG_DIR}/jvm.options
chmod -R 500 ${TARGET_DIR}${CONFIG_DIR}/certs
chmod -R 400 ${TARGET_DIR}${CONFIG_DIR}/certs/*
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
set -e
umask 0002
@@ -84,9 +84,10 @@ if [[ "$(id -u)" == "0" ]]; then
fi
if [[ "$DISCOVERY" == "single-node" ]]; then
if [[ "$DISCOVERY" == "single-node" ]] && [[ ! -f "/var/lib/wazuh-indexer/.flag" ]]; then
# run securityadmin.sh for single node with CACERT, CERT and KEY parameter
nohup /securityadmin.sh &
touch "/var/lib/wazuh-indexer/.flag"
fi
run_as_other_user_if_needed /usr/share/wazuh-indexer/bin/opensearch <<<"$KEYSTORE_PASSWORD"
@@ -1,3 +1,3 @@
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
sleep 30
bash /usr/share/wazuh-indexer/plugins/opensearch-security/tools/securityadmin.sh -cd /usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/ -nhnv -cacert $CACERT -cert $CERT -key $KEY -p 9300 -icl
+13 -7
View File
@@ -1,18 +1,24 @@
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
FROM ubuntu:focal
ARG WAZUH_VERSION=4.3.0
RUN rm /bin/sh && ln -s /bin/bash /bin/sh
ARG WAZUH_VERSION
ARG WAZUH_TAG_REVISION
ARG TEMPLATE_VERSION=4.3
ARG FILEBEAT_CHANNEL=filebeat-oss
ARG FILEBEAT_VERSION=7.10.2
ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.1.tar.gz"
ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.2.tar.gz"
RUN apt-get update && apt install curl apt-transport-https lsb-release gnupg -y
RUN apt-key adv --fetch-keys https://packages.wazuh.com/key/GPG-KEY-WAZUH && \
echo "deb https://packages.wazuh.com/4.x/apt/ stable main" | tee -a /etc/apt/sources.list.d/wazuh.list && \
apt-get update && \
apt-get install wazuh-manager=${WAZUH_VERSION}-1
COPY config/check_repository.sh /
RUN chmod 775 /check_repository.sh
RUN source /check_repository.sh
RUN apt-get update && \
apt-get install wazuh-manager=${WAZUH_VERSION}-${WAZUH_TAG_REVISION}
RUN curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/${FILEBEAT_CHANNEL}-${FILEBEAT_VERSION}-amd64.deb &&\
dpkg -i ${FILEBEAT_CHANNEL}-${FILEBEAT_VERSION}-amd64.deb && rm -f ${FILEBEAT_CHANNEL}-${FILEBEAT_VERSION}-amd64.deb && \
@@ -0,0 +1,13 @@
## Variables
WAZUH_IMAGE_VERSION=$(echo $WAZUH_VERSION | sed -e 's/\.//g')
WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '\"tag_name\":' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2- | sed -e 's/\.//g')
## If wazuh manager exists in apt dev repository, change variables, if not exit 1
if [ "$WAZUH_IMAGE_VERSION" -le "$WAZUH_CURRENT_VERSION" ]; then
APT_KEY=https://packages.wazuh.com/key/GPG-KEY-WAZUH
REPOSITORY="deb https://packages.wazuh.com/4.x/apt/ stable main"
else
APT_KEY=https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH
REPOSITORY="deb https://packages-dev.wazuh.com/pre-release/apt/ unstable main"
fi
apt-key adv --fetch-keys ${APT_KEY}
echo ${REPOSITORY} | tee -a /etc/apt/sources.list.d/wazuh.list
@@ -21,7 +21,7 @@ try:
set_user_role,
update_user,
)
except Exception as e:
except ModuleNotFoundError as e:
logging.error("No module 'wazuh' found.")
sys.exit(1)
@@ -1,5 +1,5 @@
#!/usr/bin/with-contenv bash
# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2)
# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
# Variables
source /permanent_data.env
@@ -179,6 +179,15 @@ set_rids_owner() {
chown -R wazuh:wazuh /var/ossec/queue/rids
}
##############################################################################
# Change any ossec user/group to wazuh user/group
##############################################################################
set_correct_permOwner() {
find / -group 997 -exec chown :101 {} +;
find / -user 999 -exec chown 101 {} +;
}
##############################################################################
# Main function
##############################################################################
@@ -189,6 +198,9 @@ main() {
# Restore files stored in permanent data that are not permanent (i.e. internal_options.conf)
apply_exclusion_data
# Apply correct permission and ownership
set_correct_permOwner
# Rename files stored in permanent data (i.e. queue/ossec)
move_data_files
@@ -1,5 +1,5 @@
#!/usr/bin/with-contenv bash
# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2)
# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
set -e
@@ -12,32 +12,38 @@ fi
if [ "$INDEXER_USERNAME" != "" ]; then
>&2 echo "Configuring username."
sed -i "s|#username:.*|username: '$INDEXER_USERNAME'|g" /etc/filebeat/filebeat.yml
sed -i "s|#username:.*|username:|g" /etc/filebeat/filebeat.yml
sed -i "s|username:.*|username: '$INDEXER_USERNAME'|g" /etc/filebeat/filebeat.yml
fi
if [ "$INDEXER_PASSWORD" != "" ]; then
>&2 echo "Configuring password."
sed -i "s|#password:.*|password: '$INDEXER_PASSWORD'|g" /etc/filebeat/filebeat.yml
sed -i "s|#password:.*|password:|g" /etc/filebeat/filebeat.yml
sed -i "s|password:.*|password: '$INDEXER_PASSWORD'|g" /etc/filebeat/filebeat.yml
fi
if [ "$FILEBEAT_SSL_VERIFICATION_MODE" != "" ]; then
>&2 echo "Configuring SSL verification mode."
sed -i "s|#ssl.verification_mode:.*|ssl.verification_mode: $FILEBEAT_SSL_VERIFICATION_MODE|g" /etc/filebeat/filebeat.yml
sed -i "s|#ssl.verification_mode:.*|ssl.verification_mode:|g" /etc/filebeat/filebeat.yml
sed -i "s|ssl.verification_mode:.*|ssl.verification_mode: '$FILEBEAT_SSL_VERIFICATION_MODE'|g" /etc/filebeat/filebeat.yml
fi
if [ "$SSL_CERTIFICATE_AUTHORITIES" != "" ]; then
>&2 echo "Configuring Certificate Authorities."
sed -i "s|#ssl.certificate_authorities:.*|ssl.certificate_authorities: ['$SSL_CERTIFICATE_AUTHORITIES']|g" /etc/filebeat/filebeat.yml
sed -i "s|#ssl.certificate_authorities:.*|ssl.certificate_authorities:|g" /etc/filebeat/filebeat.yml
sed -i "s|ssl.certificate_authorities:.*|ssl.certificate_authorities: ['$SSL_CERTIFICATE_AUTHORITIES']|g" /etc/filebeat/filebeat.yml
fi
if [ "$SSL_CERTIFICATE" != "" ]; then
>&2 echo "Configuring SSL Certificate."
sed -i "s|#ssl.certificate:.*|ssl.certificate: '$SSL_CERTIFICATE'|g" /etc/filebeat/filebeat.yml
sed -i "s|#ssl.certificate:.*|ssl.certificate:|g" /etc/filebeat/filebeat.yml
sed -i "s|ssl.certificate:.*|ssl.certificate: '$SSL_CERTIFICATE'|g" /etc/filebeat/filebeat.yml
fi
if [ "$SSL_KEY" != "" ]; then
>&2 echo "Configuring SSL Key."
sed -i "s|#ssl.key:.*|ssl.key: '$SSL_KEY'|g" /etc/filebeat/filebeat.yml
sed -i "s|#ssl.key:.*|ssl.key:|g" /etc/filebeat/filebeat.yml
sed -i "s|ssl.key:.*|ssl.key: '$SSL_KEY'|g" /etc/filebeat/filebeat.yml
fi
@@ -20,3 +20,12 @@ output.elasticsearch:
#ssl.certificate_authorities:
#ssl.certificate:
#ssl.key:
logging.metrics.enabled: false
seccomp:
default_action: allow
syscalls:
- action: allow
names:
- rseq
@@ -1,5 +1,5 @@
#!/bin/bash
# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2)
# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
# Variables
source /permanent_data.env
+1 -1
View File
@@ -1,4 +1,4 @@
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
FROM ubuntu:focal
RUN apt-get update && apt-get install openssl curl -y
+5 -5
View File
@@ -1,5 +1,5 @@
#!/bin/bash
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
##############################################################################
# Downloading Cert Gen Tool
@@ -51,11 +51,11 @@ chown 1000:1000 /certificates/*
echo "Setting UID for wazuh manager and worker"
cp /certificates/root-ca.pem /certificates/root-ca-manager.pem
cp /certificates/root-ca.key /certificates/root-ca-manager.key
chown 999:997 /certificates/root-ca-manager.pem
chown 999:997 /certificates/root-ca-manager.key
chown 101:101 /certificates/root-ca-manager.pem
chown 101:101 /certificates/root-ca-manager.key
for i in ${node_names[@]};
do
chown 999:997 "/certificates/${i}.pem"
chown 999:997 "/certificates/${i}-key.pem"
chown 101:101 "/certificates/${i}.pem"
chown 101:101 "/certificates/${i}-key.pem"
done
+1 -1
View File
@@ -17,7 +17,7 @@ Assuming that you have a v4.2 production deployment, perform the following steps
**4. Spin down the 4.2 environment.**
`docker-compose -f production-cluster.yml down`
**Steps 5 and 6 can be done with the volume-migrator.sh script, specifying Docker version and project name as parameters.**
**Steps 5 and 6 can be done with the volume-migrator.sh script, specifying Docker compose version and project name as parameters.**
Ex: $ multi-node/volume-migrator.sh 1.25.0 multi-node
@@ -222,7 +222,6 @@
<global>
<white_list>127.0.0.1</white_list>
<white_list>^localhost.localdomain$</white_list>
<white_list>127.0.0.53</white_list>
</global>
<command>
@@ -350,24 +349,9 @@
<location>/var/ossec/logs/active-responses.log</location>
</localfile>
<localfile>
<log_format>syslog</log_format>
<location>/var/log/auth.log</location>
</localfile>
<localfile>
<log_format>syslog</log_format>
<location>/var/log/syslog</location>
</localfile>
<localfile>
<log_format>syslog</log_format>
<location>/var/log/dpkg.log</location>
</localfile>
<localfile>
<log_format>syslog</log_format>
<location>/var/log/kern.log</location>
</localfile>
</ossec_config>
@@ -222,7 +222,6 @@
<global>
<white_list>127.0.0.1</white_list>
<white_list>^localhost.localdomain$</white_list>
<white_list>127.0.0.53</white_list>
</global>
<command>
@@ -350,24 +349,9 @@
<location>/var/ossec/logs/active-responses.log</location>
</localfile>
<localfile>
<log_format>syslog</log_format>
<location>/var/log/auth.log</location>
</localfile>
<localfile>
<log_format>syslog</log_format>
<location>/var/log/syslog</location>
</localfile>
<localfile>
<log_format>syslog</log_format>
<location>/var/log/dpkg.log</location>
</localfile>
<localfile>
<log_format>syslog</log_format>
<location>/var/log/kern.log</location>
</localfile>
</ossec_config>
@@ -1,5 +1,5 @@
server.host: 0.0.0.0
server.port: 443
server.port: 5601
opensearch.hosts: https://wazuh1.indexer:9200
opensearch.ssl.verificationMode: certificate
opensearch.requestHeadersWhitelist: ["securitytenant","Authorization"]
+2 -2
View File
@@ -2,6 +2,6 @@ hosts:
- 1513629884013:
url: "https://wazuh.master"
port: 55000
username: acme-user
password: MyS3cr37P450r.*-
username: wazuh-wui
password: "MyS3cr37P450r.*-"
run_as: false
+10 -10
View File
@@ -1,9 +1,9 @@
# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2)
# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
version: '3.7'
services:
wazuh.master:
image: wazuh/wazuh-manager:4.3.0
image: wazuh/wazuh-manager:4.3.11
hostname: wazuh.master
restart: always
ports:
@@ -18,7 +18,7 @@ services:
- SSL_CERTIFICATE_AUTHORITIES=/etc/ssl/root-ca.pem
- SSL_CERTIFICATE=/etc/ssl/filebeat.pem
- SSL_KEY=/etc/ssl/filebeat.key
- API_USERNAME=acme-user
- API_USERNAME=wazuh-wui
- API_PASSWORD=MyS3cr37P450r.*-
volumes:
- master-wazuh-api-configuration:/var/ossec/api/configuration
@@ -38,7 +38,7 @@ services:
- ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
wazuh.worker:
image: wazuh/wazuh-manager:4.3.0
image: wazuh/wazuh-manager:4.3.11
hostname: wazuh.worker
restart: always
environment:
@@ -67,7 +67,7 @@ services:
- ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf
wazuh1.indexer:
image: wazuh/wazuh-indexer:4.3.0
image: wazuh/wazuh-indexer:4.3.11
hostname: wazuh1.indexer
restart: always
ports:
@@ -93,7 +93,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml
wazuh2.indexer:
image: wazuh/wazuh-indexer:4.3.0
image: wazuh/wazuh-indexer:4.3.11
hostname: wazuh2.indexer
restart: always
environment:
@@ -115,7 +115,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml
wazuh3.indexer:
image: wazuh/wazuh-indexer:4.3.0
image: wazuh/wazuh-indexer:4.3.11
hostname: wazuh3.indexer
restart: always
environment:
@@ -137,15 +137,15 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml
wazuh.dashboard:
image: wazuh/wazuh-dashboard:4.3.0
image: wazuh/wazuh-dashboard:4.3.11
hostname: wazuh.dashboard
restart: always
ports:
- 443:443
- 443:5601
environment:
- OPENSEARCH_HOSTS="https://wazuh1.indexer:9200"
- WAZUH_API_URL="https://wazuh.master"
- API_USERNAME=acme-user
- API_USERNAME=wazuh-wui
- API_PASSWORD=MyS3cr37P450r.*-
volumes:
- ./config/wazuh_indexer_ssl_certs/wazuh.dashboard.pem:/usr/share/wazuh-dashboard/certs/wazuh-dashboard.pem
+1 -1
View File
@@ -1,4 +1,4 @@
# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2)
# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
version: '3'
services:
@@ -222,7 +222,6 @@
<global>
<white_list>127.0.0.1</white_list>
<white_list>^localhost.localdomain$</white_list>
<white_list>10.0.0.106</white_list>
</global>
<command>
@@ -1,5 +1,5 @@
server.host: 0.0.0.0
server.port: 443
server.port: 5601
opensearch.hosts: https://wazuh.indexer:9200
opensearch.ssl.verificationMode: certificate
opensearch.requestHeadersWhitelist: ["securitytenant","Authorization"]
+2 -2
View File
@@ -2,6 +2,6 @@ hosts:
- 1513629884013:
url: "https://wazuh.manager"
port: 55000
username: acme-user
password: MyS3cr37P450r.*-
username: wazuh-wui
password: "MyS3cr37P450r.*-"
run_as: false
+7 -7
View File
@@ -1,9 +1,9 @@
# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2)
# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
version: '3.7'
services:
wazuh.manager:
image: wazuh/wazuh-manager:4.3.0
image: wazuh/wazuh-manager:4.3.11
hostname: wazuh.manager
restart: always
ports:
@@ -19,7 +19,7 @@ services:
- SSL_CERTIFICATE_AUTHORITIES=/etc/ssl/root-ca.pem
- SSL_CERTIFICATE=/etc/ssl/filebeat.pem
- SSL_KEY=/etc/ssl/filebeat.key
- API_USERNAME=acme-user
- API_USERNAME=wazuh-wui
- API_PASSWORD=MyS3cr37P450r.*-
volumes:
- wazuh_api_configuration:/var/ossec/api/configuration
@@ -39,7 +39,7 @@ services:
- ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
wazuh.indexer:
image: wazuh/wazuh-indexer:4.3.0
image: wazuh/wazuh-indexer:4.3.11
hostname: wazuh.indexer
restart: always
ports:
@@ -64,16 +64,16 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml
wazuh.dashboard:
image: wazuh/wazuh-dashboard:4.3.0
image: wazuh/wazuh-dashboard:4.3.11
hostname: wazuh.dashboard
restart: always
ports:
- 443:443
- 443:5601
environment:
- INDEXER_USERNAME=admin
- INDEXER_PASSWORD=SecretPassword
- WAZUH_API_URL=https://wazuh.manager
- API_USERNAME=acme-user
- API_USERNAME=wazuh-wui
- API_PASSWORD=MyS3cr37P450r.*-
volumes:
- ./config/wazuh_indexer_ssl_certs/wazuh.dashboard.pem:/usr/share/wazuh-dashboard/certs/wazuh-dashboard.pem
+1 -1
View File
@@ -1,4 +1,4 @@
# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2)
# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
version: '3'
services: