Compare commits

...

82 Commits

Author SHA1 Message Date
Carlos Anguita
e822b0744e Merge pull request #1804 from wazuh/merge-4.12.2-into-4.13.0 2025-05-08 10:22:11 +02:00
Enrique Araque
c6284f5b2d Merge branch '4.12.2' into merge-4.12.2-into-4.13.0 2025-05-08 10:19:01 +02:00
Carlos Anguita
212bc7d346 Merge pull request #1803 from wazuh/merge-4.12.1-into-4.12.2 2025-05-08 10:13:51 +02:00
Enrique Araque
f0c945b3bd Merge branch '4.12.1' into merge-4.12.1-into-4.12.2 2025-05-08 10:12:01 +02:00
Carlos Anguita
c6bc6cad0b Merge pull request #1802 from wazuh/merge-4.12.0-into-4.12.1 2025-05-08 10:08:54 +02:00
Enrique Araque
4eea59da8b Merge branch '4.12.0' into merge-4.12.0-into-4.12.1 2025-05-08 10:04:07 +02:00
Gonzalo Acuña
2cf6253985 Merge pull request #1798 from wazuh/enhancement/1797-bump-4.12.2-version
Bump 4.12.2 version
2025-05-06 14:01:13 -03:00
vcerenu
81a41f93ed Bump 4.12.2 version 2025-05-06 13:56:32 -03:00
Carlos Anguita
0f15acb783 Merge pull request #1789 from wazuh/enhancement/1787-revert-image-tag-for-4.12.0-rc1 2025-04-30 11:32:26 +02:00
Enrique Araque
118c7805e3 Revert docker image tag for 4.12.0-rc1 2025-04-30 11:30:05 +02:00
Carlos Anguita
7245dfb0ef Merge pull request #1788 from wazuh/enhancement/1787-bump-revision-for-4.12.0-rc1 2025-04-30 11:26:28 +02:00
Enrique Araque
b82b0efdd8 Bump revision for 4.12.0-rc1 and add a fogotten changelog entry 2025-04-30 11:24:31 +02: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
c-bordon
4b04578cf5 Updated major.minor replacement 2025-04-22 12:08:13 -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
Gonzalo Acuña
3fe18c0f53 Revert bump image tag 4.12.0-beta1 2025-04-16 09:20:02 -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
Gonzalo Acuña
cea3caee44 Bump image tag 4.12.0-beta1 2025-04-16 09:13:27 -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
Gonzalo Acuña
c17b22c13b Bump 4.12.0 to beta1 2025-04-16 09:05:42 -03:00
c-bordon
2e22add312 Removed README exception 2025-04-15 16:37:41 -03:00
c-bordon
e161490f4d Updated changelog 2025-04-15 14:37:50 -03:00
c-bordon
1445bdc420 Removed mmp version replacement 2025-04-15 14:21:49 -03:00
c-bordon
9b2f667a8e Added repository_bumper script 2025-04-15 12:05:28 -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
Enrique Araque
49b45fb342 Merge branch '4.10.2' into merge-4.10.2-into-4.11.0 2025-04-11 13:42:03 +02:00
Gonzalo Acuña
5d272abb51 Merge pull request #1775 from wazuh/newversion/1774-bump-to-4.12.1
Bump to 4.12.1
2025-04-09 12:38:07 -03:00
Jesus Garcia
a371c28a05 Bump to 4.12.1 2025-04-09 10:24:24 -05:00
Gonzalo Acuña
1da9ce981c Merge pull request #1772 from wazuh/enhancement/1770-revert-stage
Revert tags
2025-04-03 12:49:58 -03:00
Gonzalo Acuña
938a3df846 Revert tags 2025-04-03 12:48:17 -03:00
Gonzalo Acuña
3672c99a31 Merge pull request #1771 from wazuh/enhancement/1770-bump-stage
Bump stage and tags
2025-04-03 12:45:48 -03:00
Gonzalo Acuña
4a9f83ddee Bump stage and tags 2025-04-03 12:43:32 -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
Gonzalo Acuña
34b3c00596 Conflicts resolution 2025-04-01 11:46:57 -03:00
Gonzalo Acuña
c1fd8e2380 Merge branch '4.12.0' into merge-4.11.2-into-4.12.0 2025-04-01 11:38:17 -03:00
Gonzalo Acuña
cf972d3858 Merge pull request #1761 from wazuh/idr/2137-review-wrong-references-in-devops-workflows
Remove default docker reference version from workflow
2025-03-26 16:44:02 -03:00
Jesus Garcia
51d3d7a946 Remove default docker reference version from workflow 2025-03-25 16:21:59 -05:00
Gonzalo Acuña
e1bf0a0dc5 Merge pull request #1757 from wazuh/enhancement/1735-remove-stable-branch
Remove 'stable' branch ocurrencies
2025-03-18 14:28:55 -03:00
Jesus Garcia
c1565a5553 Remove 'stable' branch ocurrencies 2025-03-18 11:16:52 -05:00
Gonzalo Acuña
75fb9a4e4c Merge pull request #1754 from wazuh/merge-4.12.0-into-4.13.0
Merge 4.12.0 into 4.13.0
2025-03-12 14:16:07 -03:00
Gonzalo Acuña
f002f7e7b0 Merge pull request #1753 from wazuh/merge-4.11.1-into-4.12.0
Merge 4.11.1 into 4.12.0
2025-03-12 14:09:45 -03:00
vcerenu
72c0b196d0 Resolving merge conflicts 2025-03-12 14:04:58 -03:00
Gonzalo Acuña
4aaf0a1b8c Merge pull request #1750 from wazuh/enhancement/5142-change-wazuhkeystore-use
Modify wazuh-keystore  use
2025-03-12 09:31:23 -03:00
vcerenu
1186c6f9d6 Modify wazuh-keystore use 2025-03-11 15:31:31 -03:00
vcerenu
87a3ccd3ee Add changelog 2025-03-11 15:08:41 -03:00
vcerenu
7f08f4cbff Modify wazuh-keystore use 2025-03-11 15:07:14 -03:00
Gonzalo Acuña
607b01351e Merge pull request #1749 from wazuh/enhancement/1748-bump-4130-version
Bump 4.13.0 version
2025-03-10 14:03:15 -03:00
vcerenu
b2de3600ce Bump 4.13.0 version 2025-03-10 13:44:19 -03:00
Carlos Anguita
4433476038 Merge pull request #1743 from wazuh/merge-4.11.1-into-4.12.0
Merge 4.11.1 into 4.12.0
2025-03-07 12:22:20 +01:00
Enrique Araque
e60c07a18f Merge 4.11.1 into 4.12.0 2025-03-07 12:18:07 +01:00
Carlos Anguita
288630a722 Merge pull request #1734 from wazuh/enhancement/1731-merge-4.11.1-into-4.12.0 2025-02-21 12:37:51 +01:00
Enrique Araque
5c1d43c702 merge 4.11.1 into 4.12.0 2025-02-21 12:33:49 +01: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
vcerenu
ebf8379373 Delete VERSION file reference 2025-02-17 14:44:43 -03:00
vcerenu
d024c37fc5 Change VERSION file format 2025-02-17 14:13:58 -03:00
vcerenu
87f3dccb0f Add newline 2025-02-17 13:36:46 -03:00
vcerenu
29e679363d Add changelog 2025-02-17 13:35:49 -03:00
vcerenu
6195484a82 Change VERSION file format 2025-02-17 13:23:35 -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
vcerenu
6e432a133d Resolving merge conflicts 2025-02-04 09:31:51 -03:00
Enrique Araque
c4bef8df3e Merge pull request #1696 from wazuh/merge-4.11.0-into-4.12.0 2025-01-17 11:39:08 +01:00
Enrique Araque
31440d4a54 Merge branch '4.11.0' into merge-4.11.0-into-4.12.0 2025-01-17 11:35:45 +01:00
Carlos Anguita
af11b8cbbb Merge pull request #1672 from wazuh/merge-4.11.0-into-4.12.0 2025-01-10 11:56:57 +01:00
Enrique Araque
77ef56ada7 Update 4.11.0 version to 4.12.0 2025-01-10 11:53:10 +01:00
Enrique Araque
081436be42 Merge 4.11.0 into 4.12.0 2025-01-10 11:50:32 +01:00
Gonzalo Acuña
6a3b470f3c Merge pull request #1662 from wazuh/change/1644-change-workflow-so-version
Change Ubuntu version used in workflows
2024-12-20 16:18:36 -03:00
vcerenu
91295a4b39 Change Ubuntu version used in workflows 2024-12-20 13:13:02 -03:00
Gonzalo Acuña
8885425b7f Merge pull request #1661 from wazuh/enhancement/1657-bump-4.12.0-version
Bump 4.12.0 version
2024-12-20 10:50:02 -03:00
vcerenu
39768a397a Bump 4.12.0 version 2024-12-20 10:45:08 -03:00
Gonzalo Acuña
be82d2c41d Merge pull request #1651 from wazuh/enhancement/1650-bump-4.10.3-version
Bump 4.10.3 version
2024-12-18 14:46:53 -03:00
vcerenu
ff54368593 Bump new version 2024-12-18 13:58:58 -03:00
Gonzalo Acuña
79ad691772 Merge pull request #1639 from wazuh/merge-4.10.1-into-4.10.2
Merge 4.10.1 into 4.10.2
2024-12-13 09:35:02 -03:00
Enrique Araque
0980cf0257 Merge branch '4.10.1' into merge-4.10.1-into-4.10.2 2024-12-13 13:31:28 +01:00
Gonzalo Acuña
a13406a029 Merge pull request #1603 from wazuh/bug/1601-permanent_data
Fix permanent data scripts
2024-11-05 14:20:28 -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
vcerenu
22f34ccb40 Add changelog 2024-11-01 11:55:54 -03:00
vcerenu
369560f59f Fix permanent data scripts 2024-11-01 11:45:39 -03:00
Gonzalo Acuña
f809a1ebbb Merge pull request #1583 from wazuh/merge-4.10.1-into-4.10.2
Merge 4.10.1 into 4.10.2
2024-10-17 12:52:29 -03:00
vcerenu
a5c313843e Resolve conflicts 2024-10-17 12:49:32 -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
c-bordon
e6c5e82a32 Bumped branch 4.10.2 to 4.10.2 version 2024-10-03 12:11:27 -03:00
24 changed files with 277 additions and 108 deletions

6
.env
View File

@@ -1,6 +1,6 @@
WAZUH_VERSION=4.11.2
WAZUH_IMAGE_VERSION=4.11.2
WAZUH_VERSION=4.13.0
WAZUH_IMAGE_VERSION=4.13.0
WAZUH_TAG_REVISION=1
FILEBEAT_TEMPLATE_BRANCH=4.11.2
FILEBEAT_TEMPLATE_BRANCH=4.13.0
WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.4.tar.gz
WAZUH_UI_REVISION=1

2
.github/.goss.yaml vendored
View File

@@ -56,7 +56,7 @@ package:
wazuh-manager:
installed: true
versions:
- 4.11.2
- 4.13.0
port:
tcp:1514:
listening: true

View File

@@ -242,4 +242,4 @@ runs:
echo "/dev/root:"
printSavedSpace $((AVAILABLE_ROOT_END - AVAILABLE_ROOT_INITIAL))
echo "overall:"
printSavedSpace $((AVAILABLE_END - AVAILABLE_INITIAL))
printSavedSpace $((AVAILABLE_END - AVAILABLE_INITIAL))

View File

@@ -6,11 +6,10 @@ on:
inputs:
image_tag:
description: 'Docker image tag'
default: '4.11.2'
default: '4.13.0'
required: true
docker_reference:
description: 'wazuh-docker reference'
default: 'v4.11.2'
required: true
products:
description: 'Comma-separated list of the image names to build and push'
@@ -42,12 +41,11 @@ on:
inputs:
image_tag:
description: 'Docker image tag'
default: '4.11.2'
default: '4.13.0'
required: true
type: string
docker_reference:
description: 'wazuh-docker reference'
default: 'v4.11.2'
required: false
type: string
products:
@@ -82,7 +80,7 @@ on:
jobs:
build-and-push:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Print inputs

View File

@@ -4,7 +4,7 @@ on: [pull_request]
jobs:
build-docker-images:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Check out code
@@ -61,7 +61,7 @@ jobs:
GOSS_FILE: .github/.goss.yaml
check-single-node:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
needs: build-docker-images
steps:
@@ -189,7 +189,7 @@ jobs:
run: ./.github/single-node-log-check.sh
check-multi-node:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
needs: build-docker-images
steps:

View File

@@ -11,8 +11,7 @@ on:
- published
pull_request:
branches:
- master
- stable
- main
schedule:
- cron: '34 2 * * 1'
workflow_dispatch:
@@ -27,7 +26,7 @@ jobs:
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
name: Build images and upload Trivy results
runs-on: "ubuntu-latest"
runs-on: "ubuntu-22.04"
steps:
- name: Checkout code
uses: actions/checkout@v3

View File

@@ -11,8 +11,7 @@ on:
- published
pull_request:
branches:
- master
- stable
- main
schedule:
- cron: '34 2 * * 1'
workflow_dispatch:
@@ -27,7 +26,7 @@ jobs:
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
name: Build images and upload Trivy results
runs-on: "ubuntu-latest"
runs-on: "ubuntu-22.04"
steps:
- name: Checkout code
uses: actions/checkout@v3

View File

@@ -11,8 +11,7 @@ on:
- published
pull_request:
branches:
- master
- stable
- main
schedule:
- cron: '34 2 * * 1'
workflow_dispatch:
@@ -27,7 +26,7 @@ jobs:
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
name: Build images and upload Trivy results
runs-on: "ubuntu-latest"
runs-on: "ubuntu-22.04"
steps:
- name: Checkout code
uses: actions/checkout@v3

3
.gitignore vendored
View File

@@ -1,4 +1,5 @@
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
*.log

View File

@@ -1,6 +1,81 @@
# Change Log
All notable changes to this project will be documented in this file.
## [4.13.0]
### Added
- Added repository_bumper script. ([#1781](https://github.com/wazuh/wazuh-docker/pull/1781))
### Changed
- Modify wazuh-keystore use ([#1750](https://github.com/wazuh/wazuh-docker/pull/1750)) \- (wazuh-keystore)
### Fixed
- None
### Deleted
- Remove default docker reference version from workflow ([#1761](https://github.com/wazuh/wazuh-docker/pull/1761))
- Remove 'stable' branch ocurrencies ([#1757](https://github.com/wazuh/wazuh-docker/pull/1757))
## [4.12.2]
### Added
- None
### Changed
- None
### Fixed
- None
### Deleted
- None
## [4.12.1]
### Added
- None
### Changed
- None
### Fixed
- None
### Deleted
- None
## [4.12.0]
### Added
- None
### Changed
- Change VERSION file format ([#1728](https://github.com/wazuh/wazuh-docker/pull/1728)) \- (VERSION file)
- Change Ubuntu version used in workflows ([#1662](https://github.com/wazuh/wazuh-docker/pull/1662)) \- (Docker workflows)
### Fixed
- Fix permanent data scripts ([#1603](https://github.com/wazuh/wazuh-docker/pull/1603))
### Deleted
- None
## [4.11.2]
### Added

View File

@@ -165,60 +165,19 @@ WAZUH_MONITORING_REPLICAS=0 ##
│   ├── docker-compose.yml
│   ├── generate-indexer-certs.yml
│   └── README.md
└── VERSION
└── VERSION.json
## Branches
* `master` branch contains the latest code, be aware of possible bugs on this branch.
* `stable` branch corresponds to the last Wazuh stable version.
* `main` branch contains the latest code, be aware of possible bugs on this branch.
## Compatibility Matrix
| Wazuh version | ODFE | XPACK |
|---------------|---------|--------|
| v4.11.2 | | |
| v4.11.1 | | |
| v4.11.0 | | |
| v4.10.1 | | |
| v4.10.0 | | |
| v4.9.2 | | |
| v4.9.1 | | |
| v4.9.0 | | |
| v4.8.2 | | |
| v4.8.1 | | |
| v4.8.0 | | |
| v4.7.5 | | |
| v4.7.4 | | |
| v4.7.3 | | |
| v4.7.2 | | |
| v4.7.1 | | |
| v4.7.0 | | |
| v4.6.0 | | |
| v4.5.4 | | |
| v4.5.3 | | |
| v4.5.2 | | |
| v4.5.1 | | |
| v4.5.0 | | |
| v4.4.5 | | |
| v4.4.4 | | |
| v4.4.3 | | |
| v4.4.2 | | |
| v4.4.1 | | |
| v4.4.0 | | |
| 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.3.0+ | N/A | N/A |
| 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 |

View File

@@ -1,2 +0,0 @@
WAZUH-DOCKER_VERSION="4.11.2"
REVISION="41122"

4
VERSION.json Normal file
View File

@@ -0,0 +1,4 @@
{
"version": "4.13.0",
"stage": "alpha0"
}

View File

@@ -13,7 +13,7 @@ This script initializes the environment variables needed to build each of the im
The script allows you to build images from other versions of Wazuh, to do this you must use the -v or --version argument:
```
$ build-docker-images/build-images.sh -v 4.11.2
$ build-docker-images/build-images.sh -v 4.13.0
```
To get all the available script options use the -h or --help option:
@@ -26,7 +26,7 @@ Usage: build-docker-images/build-images.sh [OPTIONS]
-d, --dev <ref> [Optional] Set the development stage you want to build, example rc1 or beta1, not used by default.
-f, --filebeat-module <ref> [Optional] Set Filebeat module version. By default 0.4.
-r, --revision <rev> [Optional] Package revision. By default 1
-v, --version <ver> [Optional] Set the Wazuh version should be builded. By default, 4.11.2.
-v, --version <ver> [Optional] Set the Wazuh version should be builded. By default, 4.13.0.
-h, --help Show this help.
```

View File

@@ -1,4 +1,4 @@
WAZUH_IMAGE_VERSION=4.11.2
WAZUH_IMAGE_VERSION=4.13.0
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')
@@ -12,7 +12,7 @@ IMAGE_VERSION=${WAZUH_IMAGE_VERSION}
# License (version 2) as published by the FSF - Free Software
# Foundation.
WAZUH_IMAGE_VERSION="4.11.2"
WAZUH_IMAGE_VERSION="4.13.0"
WAZUH_TAG_REVISION="1"
WAZUH_DEV_STAGE=""
FILEBEAT_MODULE_VERSION="0.4"
@@ -53,13 +53,8 @@ build() {
elif curl --output /dev/null --silent --head --fail "https://github.com/wazuh/wazuh/tree/${FILEBEAT_TEMPLATE_BRANCH}"; then
FILEBEAT_TEMPLATE_BRANCH="${FILEBEAT_TEMPLATE_BRANCH}"
else
WAZUH_MASTER_VERSION="$(curl -s https://raw.githubusercontent.com/wazuh/wazuh/master/src/VERSION | sed -e 's/v//g')"
if [ "${FILEBEAT_TEMPLATE_BRANCH}" == "${WAZUH_MASTER_VERSION}" ]; then
FILEBEAT_TEMPLATE_BRANCH="master"
else
echo "The indicated branch does not exist in the wazuh/wazuh repository: ${FILEBEAT_TEMPLATE_BRANCH}"
clean 1
fi
echo "The indicated branch does not exist in the wazuh/wazuh repository: ${FILEBEAT_TEMPLATE_BRANCH}"
clean 1
fi
fi

View File

@@ -9,8 +9,8 @@ export CONFIG_DIR=${INSTALLATION_DIR}/config
## Variables
CERT_TOOL=wazuh-certs-tool.sh
PACKAGES_URL=https://packages.wazuh.com/4.11/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.11/
PACKAGES_URL=https://packages.wazuh.com/4.13/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.13/
## Check if the cert tool exists in S3 buckets
CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk '{print $2}')

View File

@@ -22,8 +22,8 @@ export REPO_DIR=/unattended_installer
## Variables
CERT_TOOL=wazuh-certs-tool.sh
PASSWORD_TOOL=wazuh-passwords-tool.sh
PACKAGES_URL=https://packages.wazuh.com/4.11/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.11/
PACKAGES_URL=https://packages.wazuh.com/4.13/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.13/
## Check if the cert tool exists in S3 buckets
CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk '{print $2}')

View File

@@ -47,12 +47,8 @@ mount_permanent_data() {
if find ${permanent_dir} -mindepth 1 | read; then
print "The path ${permanent_dir} is already mounted"
else
if find ${data_tmp} -mindepth 1 | read; then
print "Installing ${permanent_dir}"
exec_cmd "cp -a ${data_tmp}. ${permanent_dir}"
else
print "The path ${permanent_dir} is empty, skipped"
fi
exec_cmd "cp -ar ${data_tmp}. ${permanent_dir}"
fi
done
}

View File

@@ -115,8 +115,8 @@ function_entrypoint_scripts() {
function_configure_vulnerability_detection() {
if [ "$INDEXER_PASSWORD" != "" ]; then
>&2 echo "Configuring password."
/var/ossec/bin/wazuh-keystore -f indexer -k username -v $INDEXER_USERNAME
/var/ossec/bin/wazuh-keystore -f indexer -k password -v $INDEXER_PASSWORD
echo "$INDEXER_USERNAME" | /var/ossec/bin/wazuh-keystore -f indexer -k username
echo "$INDEXER_PASSWORD" | /var/ossec/bin/wazuh-keystore -f indexer -k password
fi
}

View File

@@ -30,11 +30,7 @@ mkdir ${PERMANENT_PATH}
for permanent_dir in "${PERMANENT_DATA[@]}"; do
# Create the directory for the permanent file if it does not exist
DIR=$(dirname "${permanent_dir}")
if [ ! -e ${PERMANENT_PATH}${DIR} ]
then
mkdir -p ${PERMANENT_PATH}${DIR}
fi
mv ${permanent_dir} ${PERMANENT_PATH}${permanent_dir}
mkdir -p ${PERMANENT_PATH}${DIR}
cp -ar ${permanent_dir} ${PERMANENT_PATH}${DIR}
done

View File

@@ -8,8 +8,8 @@
## Variables
CERT_TOOL=wazuh-certs-tool.sh
PASSWORD_TOOL=wazuh-passwords-tool.sh
PACKAGES_URL=https://packages.wazuh.com/4.11/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.11/
PACKAGES_URL=https://packages.wazuh.com/4.13/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.13/
## Check if the cert tool exists in S3 buckets
CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk '{print $2}')

View File

@@ -3,7 +3,7 @@ version: '3.7'
services:
wazuh.master:
image: wazuh/wazuh-manager:4.11.2
image: wazuh/wazuh-manager:4.13.0
hostname: wazuh.master
restart: always
ulimits:
@@ -45,7 +45,7 @@ services:
- ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
wazuh.worker:
image: wazuh/wazuh-manager:4.11.2
image: wazuh/wazuh-manager:4.13.0
hostname: wazuh.worker
restart: always
ulimits:
@@ -81,7 +81,7 @@ services:
- ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf
wazuh1.indexer:
image: wazuh/wazuh-indexer:4.11.2
image: wazuh/wazuh-indexer:4.13.0
hostname: wazuh1.indexer
restart: always
ports:
@@ -107,7 +107,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
wazuh2.indexer:
image: wazuh/wazuh-indexer:4.11.2
image: wazuh/wazuh-indexer:4.13.0
hostname: wazuh2.indexer
restart: always
environment:
@@ -129,7 +129,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
wazuh3.indexer:
image: wazuh/wazuh-indexer:4.11.2
image: wazuh/wazuh-indexer:4.13.0
hostname: wazuh3.indexer
restart: always
environment:
@@ -151,7 +151,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
wazuh.dashboard:
image: wazuh/wazuh-dashboard:4.11.2
image: wazuh/wazuh-dashboard:4.13.0
hostname: wazuh.dashboard
restart: always
ports:

View File

@@ -3,7 +3,7 @@ version: '3.7'
services:
wazuh.manager:
image: wazuh/wazuh-manager:4.11.2
image: wazuh/wazuh-manager:4.13.0
hostname: wazuh.manager
restart: always
ulimits:
@@ -46,7 +46,7 @@ services:
- ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
wazuh.indexer:
image: wazuh/wazuh-indexer:4.11.2
image: wazuh/wazuh-indexer:4.13.0
hostname: wazuh.indexer
restart: always
ports:
@@ -71,7 +71,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
wazuh.dashboard:
image: wazuh/wazuh-dashboard:4.11.2
image: wazuh/wazuh-dashboard:4.13.0
hostname: wazuh.dashboard
restart: always
ports:

150
tools/repository_bumper.sh Normal file
View File

@@ -0,0 +1,150 @@
#!/bin/bash
# This script is used to update the version of a repository in the specified files.
# It takes a version number as an argument and updates the version in the specified files.
# Usage: ./repository_bumper.sh <version>
# Global variables
DIR=$(dirname "$(pwd)")
LOG_FILE="${DIR}/tools/repository_bumper_$(date +"%Y-%m-%d_%H-%M-%S-%3N").log"
VERSION=""
STAGE=""
FILES_EDITED=()
get_old_version_and_stage() {
local VERSION_FILE="${DIR}/VERSION.json"
OLD_VERSION=$(jq -r '.version' "${VERSION_FILE}")
OLD_STAGE=$(jq -r '.stage' "${VERSION_FILE}")
echo "Old version: ${OLD_VERSION}" | tee -a "${LOG_FILE}"
echo "Old stage: ${OLD_STAGE}" | tee -a "${LOG_FILE}"
}
grep_command() {
# This function is used to search for a specific string in the specified directory.
# It takes two arguments: the string to search for and the directory to search in.
# Usage: grep_command <string> <directory>
eval grep -Rl "${1}" "${2}" --exclude-dir=".git" --exclude="repository_bumper_*.log" --exclude="CHANGELOG.md" "${3}"
}
update_version_in_files() {
local OLD_MAYOR="$(echo "${OLD_VERSION}" | cut -d '.' -f 1)"
local OLD_MINOR="$(echo "${OLD_VERSION}" | cut -d '.' -f 2)"
local OLD_PATCH="$(echo "${OLD_VERSION}" | cut -d '.' -f 3)"
local NEW_MAYOR="$(echo "${VERSION}" | cut -d '.' -f 1)"
local NEW_MINOR="$(echo "${VERSION}" | cut -d '.' -f 2)"
local NEW_PATCH="$(echo "${VERSION}" | cut -d '.' -f 3)"
m_m_p_files=( $(grep_command "${OLD_MAYOR}\.${OLD_MINOR}\.${OLD_PATCH}" "${DIR}") )
for file in "${m_m_p_files[@]}"; do
sed -i "s/\bv${OLD_MAYOR}\.${OLD_MINOR}\.${OLD_PATCH}\b/v${NEW_MAYOR}\.${NEW_MINOR}\.${NEW_PATCH}/g; s/\b${OLD_MAYOR}\.${OLD_MINOR}\.${OLD_PATCH}/${NEW_MAYOR}\.${NEW_MINOR}\.${NEW_PATCH}/g" "${file}"
if [[ $(git diff --name-only "${file}") ]]; then
FILES_EDITED+=("${file}")
fi
done
m_m_files=( $(grep_command "${OLD_MAYOR}\.${OLD_MINOR}" "${DIR}") )
for file in "${m_m_files[@]}"; do
sed -i -E "/[0-9]+\.[0-9]+\.[0-9]+/! s/(^|[^0-9.])(${OLD_MAYOR}\.${OLD_MINOR})([^0-9.]|$)/\1${NEW_MAYOR}.${NEW_MINOR}\3/g" "$file"
if [[ $(git diff --name-only "${file}") ]]; then
FILES_EDITED+=("${file}")
fi
done
m_x_files=( $(grep_command "${OLD_MAYOR}\.x" "${DIR}") )
for file in "${m_x_files[@]}"; do
sed -i "s/\b${OLD_MAYOR}\.x\b/${NEW_MAYOR}\.x/g" "${file}"
if [[ $(git diff --name-only "${file}") ]]; then
FILES_EDITED+=("${file}")
fi
done
if ! sed -i "/^All notable changes to this project will be documented in this file.$/a \\\n## [${VERSION}]\\n\\n### Added\\n\\n- None\\n\\n### Changed\\n\\n- None\\n\\n### Fixed\\n\\n- None\\n\\n### Deleted\\n\\n- None" "${DIR}/CHANGELOG.md"; then
echo "Error: Failed to update CHANGELOG.md" | tee -a "${LOG_FILE}"
fi
if [[ $(git diff --name-only "${DIR}/CHANGELOG.md") ]]; then
FILES_EDITED+=("${DIR}/CHANGELOG.md")
fi
}
update_stage_in_files() {
local OLD_STAGE="$(echo "${OLD_STAGE}")"
files=( $(grep_command "${OLD_STAGE}" "${DIR}" --exclude="README.md") )
for file in "${files[@]}"; do
sed -i "s/${OLD_STAGE}/${STAGE}/g" "${file}"
if [[ $(git diff --name-only "${file}") ]]; then
FILES_EDITED+=("${file}")
fi
done
}
main() {
echo "Starting repository version bumping process..." | tee -a "${LOG_FILE}"
echo "Log file: ${LOG_FILE}"
# Parse arguments
while [[ $# -gt 0 ]]; do
case $1 in
--version)
VERSION="$2"
shift 2
;;
--stage)
STAGE="$2"
shift 2
;;
*)
echo "Unknown argument: $1"
exit 1
;;
esac
done
# Validate arguments
if [[ -z "$VERSION" ]]; then
echo "Error: --version argument is required." | tee -a "${LOG_FILE}"
exit 1
fi
if [[ -z "$STAGE" ]]; then
echo "Error: --stage argument is required." | tee -a "${LOG_FILE}"
exit 1
fi
# Validate if version is in the correct format
if ! [[ "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
echo "Error: Version must be in the format X.Y.Z (e.g., 1.2.3)." | tee -a "${LOG_FILE}"
exit 1
fi
# Validate if stage is in the correct format
STAGE=$(echo "$STAGE" | tr '[:upper:]' '[:lower:]')
if ! [[ "$STAGE" =~ ^(alpha[0-9]*|beta[0-9]*|rc[0-9]*|stable)$ ]]; then
echo "Error: Stage must be one of the following examples: alpha1, beta1, rc1, stable." | tee -a "${LOG_FILE}"
exit 1
fi
# Get old version and stage
get_old_version_and_stage
if [[ "$OLD_VERSION" == "$VERSION" && "$OLD_STAGE" == "$STAGE" ]]; then
echo "Version and stage are already up to date." | tee -a "${LOG_FILE}"
echo "No changes needed." | tee -a "${LOG_FILE}"
exit 0
fi
if [[ "$OLD_VERSION" != "$VERSION" ]]; then
echo "Updating version from $OLD_VERSION to $VERSION" | tee -a "${LOG_FILE}"
update_version_in_files "$VERSION"
fi
if [[ "$OLD_STAGE" != "$STAGE" ]]; then
echo "Updating stage from $OLD_STAGE to $STAGE" | tee -a "${LOG_FILE}"
update_stage_in_files "$STAGE"
fi
echo "The following files were edited:" | tee -a "${LOG_FILE}"
for file in $(printf "%s\n" "${FILES_EDITED[@]}" | sort -u); do
echo "${file}" | tee -a "${LOG_FILE}"
done
echo "Version and stage updated successfully." | tee -a "${LOG_FILE}"
}
# Call the main method with all arguments
main "$@"