Commit Graph
129 Commits
Author SHA1 Message Date
vcerenu 274c0bc692 resolving conflicts 2023-10-23 05:39:31 -03:00
vcerenu d45e2d984e resolving conflicts 2023-10-23 05:27:21 -03:00
vcerenu 781e6a4082 resolving conflicts 2023-10-23 05:25:42 -03:00
David Correa Rodríguez 0cd98767c8 Removed value of Filebeat template variable 2023-10-17 15:23:37 +02:00
David Correa Rodríguez 523a28b20d Fixed Filebeat template bug in image generation 2023-10-16 16:09:05 +02:00
David Correa Rodríguez 6b89644918 Merge branch '4.7.1' into merge-4.7.1-into-master 2023-10-09 11:07:47 +02:00
David Correa Rodríguez 25be906860 Merge branch '4.7.0' into merge-4.7.0-into-4.7.1 2023-10-09 10:50:11 +02:00
David Correa Rodríguez 14dcc8b6a6 Merge 4.6.0 into 4.7.0 2023-10-09 09:41:25 +02:00
c-bordon b22fa235c7 Updated build image script 2023-10-03 15:52:25 -03:00
David Correa Rodríguez d8f7fd6767 Merge remote-tracking branch 'origin/4.7.1' into merge-4.7.1-into-master 2023-09-22 12:47:11 +02:00
David Correa Rodríguez b3441a6b07 Updated TEMPLATE_VERSION variable 2023-09-22 12:23:37 +02:00
David Correa Rodríguez 7312f86235 Merge remote-tracking branch 'origin/4.6.0' into merge-4.6.0-into-4.7.0 2023-09-22 12:07:13 +02:00
David Correa Rodríguez 62627e32fd Merge remote-tracking branch 'origin/4.5.3' into merge-4.5.3-into-4.6.0 2023-09-22 11:11:45 +02:00
vcerenu 5769159cf9 change RBAC database procedure 2023-09-18 12:05:29 -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
vcerenu 0fbbf5aee2 add shuffle scripts into permanent data 2023-09-15 13:31:00 -03:00
vcerenu be19c70082 remove goss install 2023-09-14 12:25:57 -03:00
vcerenu de7754364d change wazuh template origin 2023-09-12 15:49:31 -03:00
vcerenu d0eaae482c modify base for Wazuh Docker images 2023-08-11 12:15:28 -03:00
vcerenu 919500bd74 bump master to 4.8.0 2023-07-14 16:22:52 -03:00
vcerenu 39208c513c bump version 4.5.1 2023-06-26 13:35:29 -03:00
vcerenu 8e3b8aada8 bump 4.6 version 2023-06-23 10:33:35 -03:00
vcerenu 6a98b87b8e bump 4.7 version 2023-06-22 17:26:55 -03:00
Raul Del Pozo Moreno 7427eff847 Added missing config 2023-05-18 22:14:26 +02:00
vcerenu dd46f8a2c1 bump 4.6 version 2023-05-18 22:06:21 +02:00
fcaffieri ea11d66f42 Add fix to avoid GLIBC crash, fix identation 2023-05-18 22:05:14 +02:00
fcaffieri 02a75a7678 Add fix to avoid GLIBC crash 2023-05-18 22:05:13 +02:00
fcaffieri 7e0311e99a disable filebeat metrics 2023-05-18 22:05:12 +02:00
vcerenu 697b7538cc bump release 4.5.0 2023-05-18 22:04:56 +02:00
vcerenu e9764b0a6a add 4.4 version 2023-05-18 22:03:39 +02:00
vcerenu 6398b66e10 add 4.4 version 2023-05-18 22:03:38 +02:00
fcaffieri d5932ac4a1 Add fix to avoid GLIBC crash, fix identation 2023-05-18 22:03:27 +02:00
fcaffieri 4b621466a0 Add fix to avoid GLIBC crash 2023-05-18 22:03:25 +02:00
fcaffieri e24d17f730 disable filebeat metrics 2023-05-18 22:03:24 +02:00
Alberto R 3525003ef7 Bumped to 4.4.0 2023-05-18 22:03:03 +02:00
Gonzalo Acuña 00a94ce5b0 Bump to 4.2.6 2023-05-18 22:02:33 +02:00
Raul Del Pozo Moreno e826236a28 Added missing config 2023-05-18 21:30:38 +02:00
fcaffieri e95455a12b Add fix to avoid GLIBC crash, fix identation 2023-05-18 21:25:37 +02:00
fcaffieri 887293d474 Add fix to avoid GLIBC crash 2023-05-18 21:25:36 +02:00
fcaffieri ae20f302c0 disable filebeat metrics 2023-05-18 21:25:36 +02:00
vcerenu 312466704d bump release 4.5.0 2023-05-18 21:25:00 +02:00
vcerenu 8febf33d58 add 4.4 version 2022-12-01 13:02:13 -03:00
vcerenu e11e7a10b8 add 4.4 version 2022-12-01 11:58:21 -03:00
vcerenu e9a0be25ce resolving conflicts in 4.3 merge 2022-11-30 15:27:48 -03:00
vcerenu 1db718ffc8 fix replace filebeat parameters 2022-08-10 16:15:17 -03:00
Elwali karkoub 6f966cb01a Update 0-wazuh-init 2022-08-09 07:42:12 +02:00
fcaffieri 4c710e6c20 Add fix to avoid GLIBC crash, fix identation 2022-07-06 18:01:53 -03:00
fcaffieri adf95cd132 Add fix to avoid GLIBC crash, fix identation 2022-07-06 18:01:13 -03:00
fcaffieri f97a719304 Add fix to avoid GLIBC crash 2022-07-06 17:35:20 -03:00
fcaffieri b6aa782730 Add fix to avoid GLIBC crash 2022-07-06 17:34:56 -03:00