Commit Graph
65 Commits
Author SHA1 Message Date
Carlos Bordon 4a9176b71e Merge pull request #1889 from wazuh/bug/wqa2229-add-admin-privilege-bumper
Added an admin flag to the repository bumper workflow merge action
2025-06-13 11:00:31 -03:00
Carlos Bordon 5ef7f7ee00 Merge pull request #1876 from wazuh/bug/wqa2126-fix-secret-reference
Fix repository bumper workflow environment secret
2025-06-10 08:38:14 -03:00
Carlos Bordon fb910000ff Merge pull request #1863 from wazuh/change/1860-integrate-bumper-script-via-github-action
Integrate bumper script via GitHub action
2025-06-09 13:12:28 -03:00
Carlos Bordon 4833f362ee Merge branch '4.13.0' into change/1860-integrate-bumper-script-via-github-action 2025-06-09 10:26:50 -03:00
Carlos Bordon 60e57c9ff3 Merge pull request #1870 from wazuh/bug/1869-missing-malicious-ioc-lists-at-ossecconf-ruleset-configuration
Add missing `malicious-ioc` ruleset lists
2025-06-09 10:17:22 -03:00
Carlos Bordon b5f61d37fa Merge pull request #1848 from wazuh/enhacement/remove-4.12.2-entries-from-4.13.0-branch
Remove 4.12.2 references from 4.13.0 branch
2025-05-29 09:28:46 -03:00
Carlos Bordon e9851e5aa7 Merge pull request #1781 from wazuh/change/1778-repository-bumper-script-development
Added repository_bumper script
2025-04-22 15:47:46 -03:00
Carlos Bordon 8e78fdfeec Merge pull request #1785 from wazuh/enhancement/revert-bump-4.12.0-beta1-image-tag
Revert bump image tag 4.12.0-beta1
2025-04-16 09:23:33 -03:00
Carlos Bordon 34de7307f6 Merge pull request #1784 from wazuh/enhancement/bump-4.12.0-beta1-image-tag
Bump image tag 4.12.0-beta1
2025-04-16 09:16:19 -03:00
Carlos Bordon 1e28240ceb Merge pull request #1783 from wazuh/enhancement/bump-4.12.0-beta1
Bump 4.12.0 to beta1
2025-04-16 09:11:06 -03:00
Carlos Bordon b43c9ddc96 Merge pull request #1777 from wazuh/merge-4.12.1-into-4.13.0
Merge 4.12.1 into 4.13.0
2025-04-11 08:45:11 -03:00
Carlos Bordon dfb3289bd8 Merge pull request #1769 from wazuh/merge-4.12.0-into-4.13.0
Merge 4.12.0 into 4.13.0
2025-04-01 11:55:36 -03:00
Carlos Bordon 65b0d659d0 Merge pull request #1768 from wazuh/merge-4.11.2-into-4.12.0
Merge 4.11.2 into 4.12.0
2025-04-01 11:48:00 -03:00
Carlos Bordon fe0f76bd7b Merge pull request #1738 from wazuh/enhancement/1736-revert-bump-4.11.1-rc1
Revert image tag
2025-02-26 16:53:24 -03:00
Carlos Bordon 28acd68e6e Merge pull request #1737 from wazuh/enhancement/1736-bump-4.11.1-rc1
Bump 4.11.1-rc1 revision
2025-02-26 16:43:40 -03:00
Carlos Bordon f73a819ee4 Merge pull request #1728 from wazuh/enhancement/1722-change-VERSION-file-format
Change VERSION file format
2025-02-17 14:55:45 -03:00
Carlos Bordon 3d9981d9fa Merge pull request #1725 from wazuh/enhancement/1723-revert-image-tag
Revert docker image for 4.11.0-rc1
2025-02-14 08:51:25 -03:00
Carlos Bordon 660e472b7c Merge pull request #1724 from wazuh/enhancement/1723-bump-revision-to-41103
Bump revision and change image tag
2025-02-14 08:44:46 -03:00
Carlos Bordon b88d852b9f Merge pull request #1718 from wazuh/enhancement/1716-revert-tags
Revert image tags for beta1
2025-02-06 13:55:19 -03:00
Carlos Bordon c9bbf912b0 Merge pull request #1717 from wazuh/enhancement/1716-bump-revision
Revision bump
2025-02-06 13:47:06 -03:00
Carlos Bordon dafe93039f Merge pull request #1715 from wazuh/enhancement/1714-support-new-version-4.11.1
Support new Wazuh version 4.11.1
2025-02-06 09:16:02 -03:00
Carlos Bordon 7be457e3ff Merge pull request #1711 from wazuh/merge-4.11.0-into-4.12.0
Merge 4.11.0 into 4.12.0
2025-02-04 09:33:31 -03:00
Carlos Bordon f49bba385c Merge pull request #1710 from wazuh/merge-4.10.2-into-4.11.0
Merge 4.10.2 into 4.11.0
2025-02-04 09:21:48 -03:00
Carlos Bordon b9a52df0ff Merge pull request #1609 from wazuh/merge-4.10.1-into-4.10.2
Merge 4.10.1 into 4.10.2
2024-11-04 16:03:32 -03:00
Carlos Bordon 5252ce6c53 Merge pull request #1608 from wazuh/merge-4.10.0-into-4.10.1
Merge 4.10.0 into 4.10.1
2024-11-04 16:00:31 -03:00
Carlos Bordon f9adac8c56 Merge pull request #1607 from wazuh/merge-4.9.2-into-4.10.0
Merge 4.9.2 into 4.10.0
2024-11-04 15:57:10 -03:00
Carlos Bordon 574c7b05c7 Merge pull request #1599 from wazuh/enhancement/1596-revert-images-tag
Revert images tag for 4.9.2 rc1
2024-10-28 11:36:46 -03:00
Carlos Bordon f9c5215c8b Merge pull request #1576 from wazuh/enhancement/1574-change-image-tag
Change image tag for 4.9.1-rc4
2024-10-15 12:52:52 -03:00
Carlos Bordon c5970f2922 Merge pull request #1575 from wazuh/enhancement/1574-bump-revision
Bump Revision of new stageRC 4 for 4.9.1
2024-10-15 12:36:03 -03:00
Carlos Bordon 50769ef689 Merge pull request #1571 from wazuh/enhancement/1570-add-support-for-alpha-2
Add support for alpha 2
2024-10-10 12:48:49 -03:00
Carlos Bordon 447c0bdaf8 Merge pull request #1557 from wazuh/Bump-4.10.2-branch
Bumped branch 4.10.2 to 4.10.2 version
2024-10-03 12:31:49 -03:00
Carlos Bordon d237faa5ab Merge pull request #1555 from wazuh/bug/1554-wazuh-server-container-restarting-in-loop
Revert create_user.py script deletion
2024-10-03 08:38:10 -03:00
Carlos Bordon 46d6dc8fe5 Merge pull request #1544 from wazuh/enhancement/1543-bump-4.10.1-version
Bump new Wazuh 4.10.1 version
2024-09-24 12:26:03 -03:00
Carlos Bordon e06d5ae2e4 Merge pull request #1530 from wazuh/change/1529-update-security-policy-new-format
Changed SECURITY.md file
2024-09-16 15:37:36 -03:00
Carlos Bordon 82955c06ee Merge pull request #1523 from wazuh/change/1522-update-security-policy
Updated SECURITY.md file
2024-09-13 11:43:56 -03:00
Carlos Bordon 583f75176d Merge pull request #1484 from wazuh/bump-4.8.2-to-4.8.2
Bump 4.8.2 branch to 4.8.2 version
2024-08-16 07:10:47 -03:00
Carlos Bordon 80b7c047ec Merge pull request #1472 from wazuh/maintenance/1469-revert-image-tag
Revert image tag for 4.9.0 Beta1
2024-08-02 06:47:47 -03:00
Carlos Bordon 28c051a05e Merge pull request #1470 from wazuh/enhancement/1469-bump-revision-40904
Bump REVISION to 40904
2024-08-02 06:38:43 -03:00
Carlos Bordon 1f0f98ddaa Merge pull request #1471 from wazuh/maintenance/1469-change-image-tag
Changed image tag for 4.9.0 Beta1
2024-08-02 06:31:18 -03:00
Carlos Bordon f38bc64415 Merge pull request #1463 from wazuh/bug/758-wazuh-api-error-k8s
Add eazuh.yml file in the Wazuh dashboard image build process
2024-07-19 12:49:15 -03:00
Carlos Bordon 4c3a6696f6 Merge pull request #1449 from wazuh/merge-4.8.1-into-4.9.0
Merge 4.8.1 into 4.9.0
2024-07-18 10:31:53 -03:00
Carlos Bordon f3474a392e Merge pull request #1448 from wazuh/change/1445-update-readme
Updated files of README.MD
2024-07-18 10:28:57 -03:00
Carlos Bordon bdce114251 Merge pull request #1446 from wazuh/merge-4.8.1-into-4.9.0
Merge 4.8.1 into 4.9.0
2024-07-18 09:37:07 -03:00
Carlos Bordon 94b8b655cd Merge pull request #1396 from wazuh/enhancement/1395-bump-4.10.0-version
Bump 4.10.0 version
2024-06-19 10:53:50 -03:00
Carlos Bordon 0763499562 Merge branch '4.9.0' into merge-4.8.1-into-4.9.0 2024-06-12 12:40:15 -03:00
Carlos Bordon 79cdec2032 Merge branch '4.8.1' into merge-4.8.0-into-4.8.1 2024-06-12 12:23:53 -03:00
Carlos Bordon e60187803c Merge pull request #1366 from wazuh/1363-rollback-image-version
Rollback image version rc2
2024-05-29 12:30:57 -03:00
Carlos Bordon f0488805a4 Merge pull request #1365 from wazuh/1363-commit-image-version
Commit image version rc2
2024-05-29 12:15:40 -03:00
Carlos Bordon 2b44780605 Merge pull request #1364 from wazuh/1363-bump-revision
Bump revision rc2
2024-05-29 11:55:12 -03:00
Carlos Bordon 169d24af64 Merge pull request #1355 from wazuh/merge-4.7.5-into-4.8.0
Merge 4.7.5 into 4.8.0
2024-05-22 15:02:29 -03:00
Carlos Bordon bac9daa337 Merge pull request #1354 from wazuh/1348-revert-tag
Revert docker image tag
2024-05-22 14:40:41 -03:00
Carlos Bordon 9487dd592e Merge pull request #1353 from wazuh/1348-change-tag
Change docker image tag
2024-05-22 14:19:29 -03:00
Carlos Bordon b0d14dca28 Merge pull request #1352 from wazuh/1348-bump-revision
Bump revision
2024-05-22 14:05:38 -03:00
Carlos Bordon 16681104b4 Merge pull request #1131 from wazuh/merge-4.7.0-into-4.7.1
Merge 4.7.0 into 4.7.1
2023-11-24 08:40:32 -03:00
Carlos Bordon 717a897c11 Merge pull request #1121 from wazuh/change/1099-adapt-process-to-install-multiple-wazuh-dashboards-plugins
Adapted docker build to multiple Wazuh Dashboards plugins
2023-11-16 12:04:16 -03:00
Carlos Bordon 351c6b319c Merge pull request #1118 from wazuh/1115-ism-rollover-update-the-ism-checksh-script-to-accept-all-parameters
[ISM Rollover] Update the ism-check.sh script to accept all parameters
2023-11-15 12:57:25 -03:00
Carlos Bordon 6c50089d53 Merge pull request #1117 from wazuh/change/1116-update-filebeat-module-to-03-version
Updated Filebeat module version to 0.3
2023-11-14 15:11:57 -03:00
Carlos Bordon 25e4c24c87 Merge pull request #1105 from wazuh/change_revision
Support new stage RC 1 for 4.7.0 in wazuh-docker repository
2023-11-13 09:40:15 -03:00
Carlos Bordon a68da465d3 Merge pull request #1098 from wazuh/change/updateIndexerFiles-to4.8.0
Updated security config files
2023-11-09 09:15:01 -03:00
Carlos Bordon 49bc23682f Merge pull request #1093 from wazuh/merge-4.8.0-into-master
Merge 4.8.0 into master
2023-10-31 14:03:42 -03:00
Carlos Bordon 4863d54c99 Merge pull request #1092 from wazuh/merge-4.7.1-into-4.8.0
Merge 4.7.1 into 4.8.0
2023-10-31 13:52:40 -03:00
Carlos Bordon b27d991f0c Merge pull request #886 from wazuh/merge-4.5.1-into-4.6.0
Merge 4.5.1 into 4.6.0
2023-07-11 12:04:34 -03:00
Carlos Bordon 1a75d4eb77 Merge pull request #885 from wazuh/merge-4.5.0-into-4.5.1
Merge 4.5.0 into 4.5.1
2023-07-11 11:34:52 -03:00
Carlos Bordon 442d457933 Merge pull request #884 from wazuh/merge-4.4-into-4.5.0
Merge 4.4 into 4.5.0
2023-07-11 10:42:52 -03:00
Carlos Bordon ce8dd29425 Merge pull request #879 from wazuh/4.4.5-bump-revision
Bump revision
2023-07-10 09:00:24 -03:00