Compare commits

...

20 Commits

Author SHA1 Message Date
Wazuh CI
efddce0e3e Merge pull request #2041 from wazuh/enhancement/wqa4467-bump-4.14.0
Bump 4.14.0 branch
2025-10-17 11:07:23 +02:00
wazuhci
b400409314 feat: bump 4.14.0 2025-10-17 09:07:17 +00:00
Carlos Anguita
05fcfd5652 Merge pull request #2034 from wazuh/enhancement/2031-revert-image-tag-for-4.14.0rc1 2025-10-09 12:41:47 +02:00
Enrique Araque
0e1fa7f1c0 Revert docker image tag for 4.14.0-rc1 2025-10-09 12:38:50 +02:00
Wazuh CI
77323aaaee Merge pull request #2033 from wazuh/enhancement/wqa4387-bump-4.14.0
Bump 4.14.0 branch
2025-10-09 11:58:22 +02:00
wazuhci
7334111f1c feat: bump 4.14.0 2025-10-09 09:58:17 +00:00
Gonzalo Acuña
782d2cfa67 Merge pull request #2029 from wazuh/bug/2028-indexer-dir-owner
Change Wazuh indexer directory owner
2025-09-30 08:10:09 -03:00
vcerenu
84e13a51c1 Add changelog 2025-09-29 15:46:48 -03:00
vcerenu
3835b4c6db Change Wazuh indexer directory permissions 2025-09-29 15:14:41 -03:00
Carlos Anguita
44a7f8cedc Merge pull request #2025 from wazuh/enhancement/2023-revert-image-tag-for-4.14.0alpha1 2025-09-26 09:54:38 +02:00
Enrique Araque
57c6ac12d0 Change docker image for 4.14.0-alpha1 2025-09-26 09:51:26 +02:00
Wazuh CI
2b0575b1f9 Merge pull request #2024 from wazuh/enhancement/wqa4084-bump-4.14.0
Bump 4.14.0 branch
2025-09-26 08:49:37 +02:00
wazuhci
ecf80f9122 feat: bump 4.14.0 2025-09-26 06:49:29 +00:00
Gonzalo Acuña
e22d4a9d40 Merge pull request #2020 from wazuh/enhancement/2013-filebeat-install-method
Change filebeat install method
2025-09-25 12:17:21 -03:00
Gonzalo Acuña
3186bc7711 Merge branch '4.14.0' into enhancement/2013-filebeat-install-method 2025-09-25 12:16:55 -03:00
Gonzalo Acuña
a5f0113c75 Merge pull request #2021 from wazuh/change/3118-chat
Remove dashboard chat setting
2025-09-25 08:57:26 -03:00
Gonzalo Acuña
d4371324c9 Changelog update 2025-09-25 08:35:11 -03:00
Gonzalo Acuña
9eb188fc88 Remove dashboard chat setting 2025-09-25 08:32:58 -03:00
vcerenu
8f5aa86dff Add changelog 2025-09-25 08:08:40 -03:00
vcerenu
a42a354c68 Change filebeat install method 2025-09-23 15:41:50 -03:00
12 changed files with 22 additions and 20 deletions

View File

@@ -9,6 +9,8 @@ All notable changes to this project will be documented in this file.
### Changed
- Change filebeat install method ([#2020](https://github.com/wazuh/wazuh-docker/pull/2020))
- Remove dashboard chat setting ([#2021](https://github.com/wazuh/wazuh-docker/pull/2021))
- Rollback data source setting ([#1999](https://github.com/wazuh/wazuh-docker/pull/1999))
- Dashboard settings added ([#1998](https://github.com/wazuh/wazuh-docker/pull/1998))
- Add filebeat config file in the PERMANENT_DATA_EXCP list ([#1898](https://github.com/wazuh/wazuh-docker/pull/1898))
@@ -16,6 +18,7 @@ All notable changes to this project will be documented in this file.
### Fixed
- Change Wazuh indexer directory owner ([#2029](https://github.com/wazuh/wazuh-docker/pull/2029))
- Double the amount of space consumed in Wazuh Indexer ([#1953](https://github.com/wazuh/wazuh-docker/pull/1953))
- Fix config directory for opensearch_security plugin work ([#1951](https://github.com/wazuh/wazuh-docker/pull/1951))
- Update Dockerfile to copy opensearch-security files ([#1928](https://github.com/wazuh/wazuh-docker/pull/1928))

View File

@@ -1,4 +1,4 @@
{
"version": "4.14.0",
"stage": "alpha0"
"stage": "rc2"
}

View File

@@ -76,7 +76,7 @@ help() {
echo
echo "Usage: $0 [OPTIONS]"
echo
echo " -d, --dev <ref> [Optional] Set the development stage you want to build, example rc1 or beta1, not used by default."
echo " -d, --dev <ref> [Optional] Set the development stage you want to build, example rc2 or beta1, not used by default."
echo " -f, --filebeat-module <ref> [Optional] Set Filebeat module version. By default ${FILEBEAT_MODULE_VERSION}."
echo " -r, --revision <rev> [Optional] Package revision. By default ${WAZUH_TAG_REVISION}"
echo " -v, --version <ver> [Optional] Set the Wazuh version should be builded. By default, ${WAZUH_IMAGE_VERSION}."

View File

@@ -62,9 +62,10 @@ COPY config/entrypoint.sh /
COPY config/securityadmin.sh /
RUN chmod 700 /entrypoint.sh && chmod 700 /securityadmin.sh
RUN chown 1000:1000 /*.sh
RUN chmod 700 /entrypoint.sh && chmod 700 /securityadmin.sh && \
mkdir -p /usr/share/wazuh-indexer && \
chown 1000:1000 /usr/share/wazuh-indexer && \
chown 1000:1000 /*.sh
COPY --from=builder --chown=1000:1000 /usr/share/wazuh-indexer /usr/share/wazuh-indexer
COPY --from=builder --chown=1000:1000 /etc/wazuh-indexer /usr/share/wazuh-indexer/config

View File

@@ -8,6 +8,7 @@ ARG WAZUH_TAG_REVISION
ARG FILEBEAT_TEMPLATE_BRANCH
ARG FILEBEAT_CHANNEL=filebeat-oss
ARG FILEBEAT_VERSION=7.10.2
ARG FILEBEAT_REVISION=2
ARG WAZUH_FILEBEAT_MODULE
ARG S6_VERSION="v2.2.0.3"

View File

@@ -7,6 +7,5 @@ if [[ -n "${WAZUH_TAG}" ]]; then
REPOSITORY="packages.wazuh.com/4.x"
fi
curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/${FILEBEAT_CHANNEL}-${FILEBEAT_VERSION}-x86_64.rpm &&\
yum install -y ${FILEBEAT_CHANNEL}-${FILEBEAT_VERSION}-x86_64.rpm && rm -f ${FILEBEAT_CHANNEL}-${FILEBEAT_VERSION}-x86_64.rpm && \
yum install filebeat-${FILEBEAT_VERSION}-${FILEBEAT_REVISION} -y && \
curl -s https://${REPOSITORY}/filebeat/${WAZUH_FILEBEAT_MODULE} | tar -xvz -C /usr/share/filebeat/module

View File

@@ -23,7 +23,7 @@ $ build-docker-images/build-images.sh -h
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.
-d, --dev <ref> [Optional] Set the development stage you want to build, example rc2 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.14.0.

View File

@@ -14,4 +14,3 @@ uiSettings.overrides.defaultRoute: /app/wz-home
opensearch_security.cookie.ttl: 900000
opensearch_security.session.ttl: 900000
opensearch_security.session.keepalive: true
assistant.chat.enabled: true

View File

@@ -1,7 +1,7 @@
# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
services:
wazuh.master:
image: wazuh/wazuh-manager:4.14.0
image: wazuh/wazuh-manager:4.14.0-rc2
hostname: wazuh.master
restart: always
ulimits:
@@ -43,7 +43,7 @@ services:
- ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
wazuh.worker:
image: wazuh/wazuh-manager:4.14.0
image: wazuh/wazuh-manager:4.14.0-rc2
hostname: wazuh.worker
restart: always
ulimits:
@@ -79,7 +79,7 @@ services:
- ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf
wazuh1.indexer:
image: wazuh/wazuh-indexer:4.14.0
image: wazuh/wazuh-indexer:4.14.0-rc2
hostname: wazuh1.indexer
restart: always
ports:
@@ -105,7 +105,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/config/opensearch-security/internal_users.yml
wazuh2.indexer:
image: wazuh/wazuh-indexer:4.14.0
image: wazuh/wazuh-indexer:4.14.0-rc2
hostname: wazuh2.indexer
restart: always
environment:
@@ -127,7 +127,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/config/opensearch-security/internal_users.yml
wazuh3.indexer:
image: wazuh/wazuh-indexer:4.14.0
image: wazuh/wazuh-indexer:4.14.0-rc2
hostname: wazuh3.indexer
restart: always
environment:
@@ -149,7 +149,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/config/opensearch-security/internal_users.yml
wazuh.dashboard:
image: wazuh/wazuh-dashboard:4.14.0
image: wazuh/wazuh-dashboard:4.14.0-rc2
hostname: wazuh.dashboard
restart: always
ports:

View File

@@ -14,4 +14,3 @@ uiSettings.overrides.defaultRoute: /app/wz-home
opensearch_security.cookie.ttl: 900000
opensearch_security.session.ttl: 900000
opensearch_security.session.keepalive: true
assistant.chat.enabled: true

View File

@@ -1,7 +1,7 @@
# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
services:
wazuh.manager:
image: wazuh/wazuh-manager:4.14.0
image: wazuh/wazuh-manager:4.14.0-rc2
hostname: wazuh.manager
restart: always
ulimits:
@@ -44,7 +44,7 @@ services:
- ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
wazuh.indexer:
image: wazuh/wazuh-indexer:4.14.0
image: wazuh/wazuh-indexer:4.14.0-rc2
hostname: wazuh.indexer
restart: always
ports:
@@ -69,7 +69,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/config/opensearch-security/internal_users.yml
wazuh.dashboard:
image: wazuh/wazuh-dashboard:4.14.0
image: wazuh/wazuh-dashboard:4.14.0-rc2
hostname: wazuh.dashboard
restart: always
ports:

View File

@@ -1,7 +1,7 @@
# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
services:
wazuh.agent:
image: wazuh/wazuh-agent:4.14.0
image: wazuh/wazuh-agent:4.14.0-rc2
restart: always
environment:
- WAZUH_MANAGER_SERVER=<WAZUH_MANAGER_IP>