Compare commits

...

51 Commits

Author SHA1 Message Date
Gonzalo Acuña
15a856dc32 Merge pull request #1489 from wazuh/enhancement/1485-revert-image-tag
Revert image tag
2024-08-19 12:03:40 -03:00
vcerenu
1486b5942c Revert image tag 2024-08-19 11:52:49 -03:00
Gonzalo Acuña
25319ee004 Merge pull request #1488 from wazuh/enhancement/1485-change-image-tag
Change image tag to RC1
2024-08-19 11:46:15 -03:00
vcerenu
f47ca7fbc0 Change image tag 2024-08-19 11:39:03 -03:00
Gonzalo Acuña
5ef94b819c Merge pull request #1487 from wazuh/enhancement/1485-fix-changelog-link
Fix changelog links
2024-08-19 11:29:20 -03:00
vcerenu
e77ceb6ad6 Fix changelog links 2024-08-19 11:16:06 -03:00
Gonzalo Acuña
127e74296a Merge pull request #1486 from wazuh/enhancement/1485-bump-revision
Bump 4.8.2 revision to 40819
2024-08-19 11:05:28 -03:00
vcerenu
0aa63db271 Bump REVISION to 40819 2024-08-19 10:50:11 -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
c-bordon
11d2c84203 Fixed goos.yaml file 2024-08-16 07:09:50 -03:00
c-bordon
2e52ebd7b7 Bump 4.8.2 branch to 4.8.2 version 2024-08-16 06:48:46 -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
David Correa Rodríguez
62fc011c2c Updated files of README.MD 2024-07-18 15:26:39 +02:00
David Correa Rodríguez
65fe95472b Merge pull request #1442 from wazuh/enhancement/1439-revert-image-tag
Reverted image tag for 4.8.1 RC4
2024-07-17 12:24:57 +02:00
David Correa Rodríguez
21e1943cab Reverted image tag for 4.8.1 RC4 2024-07-17 12:22:15 +02:00
David Correa Rodríguez
4a2d9b54d3 Merge pull request #1441 from wazuh/enhancement/1439-change-image-tag
Changed image tag for 4.8.1-RC4
2024-07-17 12:17:44 +02:00
David Correa Rodríguez
3f320be95d Changed image tag for 4.8.1-RC4 2024-07-17 12:13:52 +02:00
David Correa Rodríguez
5712d37a7a Merge pull request #1440 from wazuh/enhancement/1439-bump-revision
Bumped revision for 4.8.1 RC4
2024-07-17 12:09:30 +02:00
David Correa Rodríguez
5d5cc9d30a Bumped revision for 4.8.1 RC4 2024-07-17 12:06:16 +02:00
David Correa Rodríguez
956d42e932 Merge pull request #1436 from wazuh/enhancement/1433-revert-image-tag
Reverted image tag for 4.8.1 RC3
2024-07-15 11:32:13 +02:00
David Correa Rodríguez
1e70aad5f8 Reverted image tag for 4.8.1 RC3 2024-07-15 11:30:08 +02:00
David Correa Rodríguez
09841ba9e4 Merge pull request #1435 from wazuh/enhancement/1433-chage-image-tag
Changed image tag for 4.8.1 RC3
2024-07-15 11:26:33 +02:00
David Correa Rodríguez
c014ea77f4 Changed image tag for 4.8.1 RC3 2024-07-15 11:23:03 +02:00
David Correa Rodríguez
12d8e8f122 Merge pull request #1434 from wazuh/enhancement/1433-bump-revision
Bumped revision for 4.8.1 RC3
2024-07-15 11:16:11 +02:00
David Correa Rodríguez
fe327f10a3 Bumped revision for 4.8.1 RC3 2024-07-15 11:10:52 +02:00
Gonzalo Acuña
0c57402b94 Merge pull request #1426 from wazuh/revert-1419-enhancement/1414-add-new-keystore
Revert "Add new keystore certificate"
2024-07-11 14:31:04 -03:00
vcerenu
1e261c165e Revert test changes 2024-07-11 14:28:12 -03:00
Victor Ereñú
b60e875962 Revert "Add new keystore certificate" 2024-07-11 23:01:18 +10:00
Gonzalo Acuña
2709a8e457 Merge pull request #1422 from wazuh/enhancement/1417-rollback-image-version
Rollback image version
2024-07-04 14:48:42 -03:00
vcerenu
0682effeca Rollback image version 2024-07-04 14:43:23 -03:00
Gonzalo Acuña
c248592d39 Merge pull request #1421 from wazuh/enhancement/1417-change-image-version
Change image version por rc2
2024-07-04 14:38:49 -03:00
vcerenu
6049aec381 change image version por rc2 2024-07-04 14:32:07 -03:00
Gonzalo Acuña
ad6a08c2b0 Merge pull request #1420 from wazuh/enhancement/1417-bump-revision-number
Bump revision number
2024-07-04 14:24:01 -03:00
vcerenu
a583069698 Bump revision number 2024-07-04 14:13:07 -03:00
Gonzalo Acuña
a67c407bfe Merge pull request #1419 from wazuh/enhancement/1414-add-new-keystore
Add new keystore certificate
2024-07-04 13:59:36 -03:00
vcerenu
6138516ad9 Fix wazuh documents tests 2024-07-04 13:36:55 -03:00
vcerenu
665f6fd84a Fix goss test 2024-07-04 13:01:22 -03:00
vcerenu
2487a5481e Add new keystore generation 2024-07-02 15:01:37 -03:00
David Correa Rodríguez
8cb7da82df Merge pull request #1413 from wazuh/enhancement/1410-revert-image-tag
Reverted image tag for 4.8.1 RC1
2024-07-02 10:29:05 +02:00
David Correa Rodríguez
91513bda93 Reverted image tag for 4.8.1 RC1 2024-07-02 10:24:17 +02:00
David Correa Rodríguez
6b62f1c738 Merge pull request #1412 from wazuh/enhancement/1410-change-image-tag
Changed image tag for 4.8.1 RC1
2024-07-02 10:21:31 +02:00
David Correa Rodríguez
7257ddc0aa Changed image tag for 4.8.1 RC1 2024-07-02 10:09:45 +02:00
David Correa Rodríguez
bdd919fc48 Merge pull request #1411 from wazuh/enhancement/1410-support-4.8.1-rc1-stage
Bumped REVISION to 40814
2024-07-02 10:04:46 +02:00
David Correa Rodríguez
3112eb2bd5 Bumped REVISION to 40814 2024-07-02 09:55:52 +02:00
Gonzalo Acuña
88842eede8 Merge pull request #1390 from wazuh/merge-4.8.0-into-4.8.1
Merge 4.8.0 into 4.8.1
2024-06-12 12:35:20 -03:00
c-bordon
ef4f28a0c1 Updated revision number 2024-06-12 12:31:22 -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
Gonzalo Acuña
ec68bd1049 Merge pull request #1380 from wazuh/maintenance/1378-bump-4.8.1
Bump version and revision
2024-06-04 13:27:19 -03:00
Gonzalo Acuña
0650c53e47 Version bump 2024-06-04 13:02:47 -03:00
Gonzalo Acuña
3dfb3505a2 Merge pull request #1379 from wazuh/maintenance/1378-bump-4.8.1
Bump to 4.8.1
2024-06-04 12:12:14 -03:00
Gonzalo Acuña
f8b2399347 Bump to 4.8.1 2024-06-04 11:43:03 -03:00
10 changed files with 56 additions and 48 deletions

6
.env
View File

@@ -1,6 +1,6 @@
WAZUH_VERSION=4.8.0
WAZUH_IMAGE_VERSION=4.8.0
WAZUH_VERSION=4.8.2
WAZUH_IMAGE_VERSION=4.8.2
WAZUH_TAG_REVISION=1
FILEBEAT_TEMPLATE_BRANCH=4.8.0
FILEBEAT_TEMPLATE_BRANCH=4.8.2
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.8.0-1
- 4.8.2
port:
tcp:1514:
listening: true

View File

@@ -270,7 +270,7 @@ jobs:
sleep 10
done
docs="`curl -XGET "https://0.0.0.0:9200/wazuh-alerts*/_count" -u admin:SecretPassword -k -s | jq -r ".count"`"
if [[ $docs -gt 1 ]]; then
if [[ $docs -gt 0 ]]; then
echo "wazuh-alerts index documents: ${docs}"
else
echo "wazuh-alerts index documents: ${docs}"

View File

@@ -1,6 +1,16 @@
# Change Log
All notable changes to this project will be documented in this file.
## Wazuh Docker v4.8.2
### Added
- Update Wazuh to version [4.8.2](https://github.com/wazuh/wazuh/blob/v4.8.2/CHANGELOG.md#v482)
## Wazuh Docker v4.8.1
### Added
- Update Wazuh to version [4.8.1](https://github.com/wazuh/wazuh/blob/v4.8.1/CHANGELOG.md#v481)
## Wazuh Docker v4.8.0
### Added

View File

@@ -89,19 +89,23 @@ WAZUH_MONITORING_REPLICAS=0 ##
## Directory structure
├── build-docker-images
│   ├── docker-compose.yml
│   ├── build-images.sh
│   ├── build-images.yml
│   ├── README.md
│   ├── wazuh-dashboard
│   │   ├── config
│   │   │   ├── config.sh
│   │   │   ├── config.yml
│   │   │   ├── dl_base.sh
│   │   │   ├── entrypoint.sh
│   │   │   ├── install_wazuh_app.sh
│   │   │   ├── opensearch_dashboards.yml
│   │   │   ├── wazuh_app_config.sh
│   │   │   └── wazuh.yml
│   │   └── Dockerfile
│   ├── wazuh-indexer
│   │   ├── config
│ │ ├── action_groups.yml
   │   │   ├── action_groups.yml
│   │   │   ├── config.sh
│   │   │   ├── config.yml
│   │   │   ├── entrypoint.sh
@@ -113,6 +117,7 @@ WAZUH_MONITORING_REPLICAS=0 ##
│   │   └── Dockerfile
│   └── wazuh-manager
│   ├── config
│   │   ├── check_repository.sh
│   │   ├── create_user.py
│   │   ├── etc
│   │   │   ├── cont-init.d
@@ -125,19 +130,21 @@ WAZUH_MONITORING_REPLICAS=0 ##
│   │   │   │   └── run
│   │   │   └── ossec-logs
│   │   │   └── run
│   │   ├── filebeat_module.sh
│   │   ├── filebeat.yml
│   │   ├── permanent_data.env
│   │   ── permanent_data.sh
│   │   └── wazuh.repo
│   │   ── permanent_data.sh
│   └── Dockerfile
├── CHANGELOG.md
├── indexer-certs-creator
│   ├── config
│   │   └── entrypoint.sh
│   ── Dockerfile
│   ── Dockerfile
│   └── README.md
├── LICENSE
├── multi-node
│   ├── config
│   │   ├── certs.yml
│   │   ├── nginx
│   │   │   └── nginx.conf
│   │   ├── wazuh_cluster
@@ -146,40 +153,29 @@ WAZUH_MONITORING_REPLICAS=0 ##
│   │   ├── wazuh_dashboard
│   │   │   ├── opensearch_dashboards.yml
│   │   │   └── wazuh.yml
│   │   ── wazuh_indexer
│   │   │   ├── internal_users.yml
│   │   │   ├── wazuh1.indexer.yml
│   │   │   ├── wazuh2.indexer.yml
│   │   │   └── wazuh3.indexer.yml
│   │   └── wazuh_indexer_ssl_certs
│   │   └── certs.yml
│   │   ── wazuh_indexer
│   │   ├── internal_users.yml
│   │   ├── wazuh1.indexer.yml
│   │   ├── wazuh2.indexer.yml
│   │   └── wazuh3.indexer.yml
│   ├── docker-compose.yml
│   ├── generate-indexer-certs.yml
│   ├── Migration-to-Wazuh-4.3.md
│   ├── Migration-to-Wazuh-4.4.md
│   ├── README.md
│   └── volume-migrator.sh
├── README.md
├── SECURITY.md
├── single-node
│   ├── config
│   │   ├── certs.yml
│   │   ├── wazuh_cluster
│   │   │   └── wazuh_manager.conf
│   │   ├── wazuh_dashboard
│   │   │   ├── opensearch_dashboards.yml
│   │   │   └── wazuh.yml
│   │   ── wazuh_indexer
│   │   │   ├── internal_users.yml
│   │   │   └── wazuh.indexer.yml
│   │   └── wazuh_indexer_ssl_certs
│   │   ├── admin-key.pem
│   │   ├── admin.pem
│   │   ├── certs.yml
│   │   ├── root-ca.key
│   │   ├── root-ca.pem
│   │   ├── wazuh.dashboard-key.pem
│   │   ├── wazuh.dashboard.pem
│   │   ├── wazuh.indexer-key.pem
│   │   ├── wazuh.indexer.pem
│   │   ├── wazuh.manager-key.pem
│   │   └── wazuh.manager.pem
│   │   ── wazuh_indexer
│   │   ├── internal_users.yml
│   │   └── wazuh.indexer.yml
│   ├── docker-compose.yml
│   ├── generate-indexer-certs.yml
│   └── README.md
@@ -196,6 +192,8 @@ WAZUH_MONITORING_REPLICAS=0 ##
| Wazuh version | ODFE | XPACK |
|---------------|---------|--------|
| v4.8.2 | | |
| v4.8.1 | | |
| v4.8.0 | | |
| v4.7.5 | | |
| v4.7.4 | | |

View File

@@ -1,2 +1,2 @@
WAZUH-DOCKER_VERSION="4.8.0"
REVISION="40812"
WAZUH-DOCKER_VERSION="4.8.2"
REVISION="40819"

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.8.0
$ build-docker-images/build-images.sh -v 4.8.2
```
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.8.0.
-v, --version <ver> [Optional] Set the Wazuh version should be builded. By default, 4.8.2.
-h, --help Show this help.
```

View File

@@ -1,4 +1,4 @@
WAZUH_IMAGE_VERSION=4.8.0
WAZUH_IMAGE_VERSION=4.8.2
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.8.0"
WAZUH_IMAGE_VERSION="4.8.2"
WAZUH_TAG_REVISION="1"
WAZUH_DEV_STAGE=""
FILEBEAT_MODULE_VERSION="0.4"

View File

@@ -3,7 +3,7 @@ version: '3.7'
services:
wazuh.master:
image: wazuh/wazuh-manager:4.8.0
image: wazuh/wazuh-manager:4.8.2
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.8.0
image: wazuh/wazuh-manager:4.8.2
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.8.0
image: wazuh/wazuh-indexer:4.8.2
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.8.0
image: wazuh/wazuh-indexer:4.8.2
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.8.0
image: wazuh/wazuh-indexer:4.8.2
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.8.0
image: wazuh/wazuh-dashboard:4.8.2
hostname: wazuh.dashboard
restart: always
ports:

View File

@@ -3,7 +3,7 @@ version: '3.7'
services:
wazuh.manager:
image: wazuh/wazuh-manager:4.8.0
image: wazuh/wazuh-manager:4.8.2
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.8.0
image: wazuh/wazuh-indexer:4.8.2
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.8.0
image: wazuh/wazuh-dashboard:4.8.2
hostname: wazuh.dashboard
restart: always
ports: