Commit Graph
30 Commits
Author SHA1 Message Date
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 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 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