Merge pull request #596 from wazuh/595-bump_426

Bump to 4.2.6
2025-10-24 00:23:44 +00:00 · 2022-03-28 15:49:25 +02:00 · 2022-03-25 10:28:14 -03:00 · 2021-11-15 20:12:48 +01:00 · 2021-11-15 11:48:03 -03:00 · 2021-11-15 11:47:20 -03:00
15 changed files with 55 additions and 22 deletions
--- a/.goss.yaml
+++ b/.goss.yaml
@@ -56,7 +56,7 @@ package:
  wazuh-manager:
    installed: true
    versions:
-    - 4.2.1
+    - 4.2.6
 port:
  tcp:1514:
    listening: true
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,32 @@
 # Change Log
 All notable changes to this project will be documented in this file.

+## Wazuh Docker v4.2.6
+### Added
+
+- Update Wazuh to version [4.2.6](https://github.com/wazuh/wazuh/blob/v4.2.6/CHANGELOG.md#v426)
+
+## Wazuh Docker v4.2.5
+### Added
+
+- Update Wazuh to version [4.2.5](https://github.com/wazuh/wazuh/blob/v4.2.5/CHANGELOG.md#v425)
+
+## Wazuh Docker v4.2.4
+### Added
+
+- Update Wazuh to version [4.2.4](https://github.com/wazuh/wazuh/blob/v4.2.4/CHANGELOG.md#v424)
+
+
+## Wazuh Docker v4.2.3
+### Added
+
+- Update Wazuh to version [4.2.3](https://github.com/wazuh/wazuh/blob/v4.2.3/CHANGELOG.md#v423)
+
+## Wazuh Docker v4.2.2
+### Added
+
+- Update Wazuh to version [4.2.2](https://github.com/wazuh/wazuh/blob/v4.2.2/CHANGELOG.md#v422)
+
 ## Wazuh Docker v4.2.1
 ### Added

--- a/README.md
+++ b/README.md
@@ -154,6 +154,11 @@ ADMIN_PRIVILEGES=true               # App privileges

 | Wazuh version | ODFE    | XPACK  |
 |---------------|---------|--------|
+| v4.2.6        | 1.13.2  | 7.11.2 |
+| v4.2.5        | 1.13.2  | 7.11.2 |
+| v4.2.4        | 1.13.2  | 7.11.2 |
+| v4.2.3        | 1.13.2  | 7.11.2 |
+| v4.2.2        | 1.13.2  | 7.11.2 |
 | v4.2.1        | 1.13.2  | 7.11.2 |
 | v4.2.0        | 1.13.2  | 7.10.2 |
 | v4.1.5        | 1.13.2  | 7.10.2 |
--- a/4
+++ b/4
@@ -1,2 +1,2 @@
-WAZUH-DOCKER_VERSION="4.2.1"
-REVISION="40214"
+WAZUH-DOCKER_VERSION="4.2.6"
+REVISION="40221"
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.7'

 services:
  wazuh:
-    image: wazuh/wazuh-odfe:4.2.1
+    image: wazuh/wazuh-odfe:4.2.6
    hostname: wazuh-manager
    restart: always
    ports:
@@ -50,7 +50,7 @@ services:
        hard: 65536

  kibana:
-    image: wazuh/wazuh-kibana-odfe:4.2.1
+    image: wazuh/wazuh-kibana-odfe:4.2.6
    hostname: kibana
    restart: always
    ports:
--- a/generate-elasticsearch-certs.yml
+++ b/generate-elasticsearch-certs.yml
@@ -10,7 +10,7 @@ services:
          bin/elasticsearch-certutil cert --silent --pem --in config/certificates/instances.yml -out config/certificates/bundle.zip;
          unzip config/certificates/bundle.zip -d config/certificates/;
        fi;
-        chown -R 1000:0 /certs
+        chown -R 1000:0 config/certificates
      '
    user: "0"
    working_dir: /usr/share/elasticsearch
--- a/kibana-odfe/Dockerfile
+++ b/kibana-odfe/Dockerfile
@@ -2,7 +2,7 @@
 FROM amazon/opendistro-for-elasticsearch-kibana:1.13.2
 USER kibana
 ARG ELASTIC_VERSION=7.10.2
-ARG WAZUH_VERSION=4.2.1
+ARG WAZUH_VERSION=4.2.6
 ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}"

 WORKDIR /usr/share/kibana
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -2,7 +2,7 @@
 FROM docker.elastic.co/kibana/kibana:7.10.2
 USER kibana
 ARG ELASTIC_VERSION=7.10.2
-ARG WAZUH_VERSION=4.2.1
+ARG WAZUH_VERSION=4.2.6
 ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}"

 WORKDIR /usr/share/kibana
--- a/production-cluster.yml
+++ b/production-cluster.yml
@@ -3,7 +3,7 @@ version: '3.7'

 services:
  wazuh-master:
-    image: wazuh/wazuh-odfe:4.2.1
+    image: wazuh/wazuh-odfe:4.2.6
    hostname: wazuh-master
    restart: always
    ports:
@@ -38,7 +38,7 @@ services:
      - ./production_cluster/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf

  wazuh-worker:
-    image: wazuh/wazuh-odfe:4.2.1
+    image: wazuh/wazuh-odfe:4.2.6
    hostname: wazuh-worker
    restart: always
    environment:
@@ -134,7 +134,7 @@ services:
      - ./production_cluster/elastic_opendistro/internal_users.yml:/usr/share/elasticsearch/plugins/opendistro_security/securityconfig/internal_users.yml

  kibana:
-    image: wazuh/wazuh-kibana-odfe:4.2.1
+    image: wazuh/wazuh-kibana-odfe:4.2.6
    hostname: kibana
    restart: always
    ports:
--- a/production_cluster/wazuh_cluster/wazuh_manager.conf
+++ b/production_cluster/wazuh_cluster/wazuh_manager.conf
@@ -200,8 +200,8 @@
  <global>
    <white_list>127.0.0.1</white_list>
    <white_list>^localhost.localdomain$</white_list>
-    <white_list>4.2.2.1</white_list>
-    <white_list>4.2.2.2</white_list>
+    <white_list>4.2.6.1</white_list>
+    <white_list>4.2.6.2</white_list>
    <white_list>208.67.220.220</white_list>
  </global>

--- a/production_cluster/wazuh_cluster/wazuh_worker.conf
+++ b/production_cluster/wazuh_cluster/wazuh_worker.conf
@@ -200,8 +200,8 @@
  <global>
    <white_list>127.0.0.1</white_list>
    <white_list>^localhost.localdomain$</white_list>
-    <white_list>4.2.2.1</white_list>
-    <white_list>4.2.2.2</white_list>
+    <white_list>4.2.6.1</white_list>
+    <white_list>4.2.6.2</white_list>
    <white_list>208.67.220.220</white_list>
  </global>

--- a/wazuh-odfe/Dockerfile
+++ b/wazuh-odfe/Dockerfile
@@ -3,7 +3,7 @@ FROM centos:7

 ARG FILEBEAT_CHANNEL=filebeat-oss
 ARG FILEBEAT_VERSION=7.10.2
-ARG WAZUH_VERSION=4.2.1
+ARG WAZUH_VERSION=4.2.6
 ARG TEMPLATE_VERSION="master"
 ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.1.tar.gz"

@@ -13,6 +13,7 @@ RUN rpm --import https://packages.wazuh.com/key/GPG-KEY-WAZUH
 COPY config/wazuh.repo /etc/yum.repos.d/wazuh.repo

 RUN yum --enablerepo=updates clean metadata && \
+  yum upgrade -y && \
  yum -y install openssl which expect openssh-clients && yum -y install wazuh-manager-${WAZUH_VERSION} -y && \
  sed -i "s/^enabled=1/enabled=0/" /etc/yum.repos.d/wazuh.repo && \
  yum clean all && rm -rf /var/cache/yum
--- a/wazuh-odfe/config/permanent_data.env
+++ b/wazuh-odfe/config/permanent_data.env
@@ -4,13 +4,13 @@ PERMANENT_DATA[((i++))]="/var/ossec/api/configuration"
 PERMANENT_DATA[((i++))]="/var/ossec/etc"
 PERMANENT_DATA[((i++))]="/var/ossec/logs"
 PERMANENT_DATA[((i++))]="/var/ossec/queue"
-PERMANENT_DATA[((i++))]="/var/ossec/queue/logcollector"
 PERMANENT_DATA[((i++))]="/var/ossec/agentless"
 PERMANENT_DATA[((i++))]="/var/ossec/var/multigroups"
 PERMANENT_DATA[((i++))]="/var/ossec/integrations"
 PERMANENT_DATA[((i++))]="/var/ossec/active-response/bin"
 PERMANENT_DATA[((i++))]="/var/ossec/wodles"
 PERMANENT_DATA[((i++))]="/etc/filebeat"
+
 export PERMANENT_DATA

 # Files mounted in a volume that should not be permanent
@@ -58,6 +58,7 @@ PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/gcloud"
 PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/gcloud.py"
 PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/integration.py"
 PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/tools.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/utils.py"
 export PERMANENT_DATA_EXCP

 # Files mounted in a volume that should be deleted
@@ -68,4 +69,4 @@ export PERMANENT_DATA_DEL
 i=0
 PERMANENT_DATA_MOVE[((i++))]="/var/ossec/logs/ossec /var/ossec/logs/wazuh"
 PERMANENT_DATA_MOVE[((i++))]="/var/ossec/queue/ossec /var/ossec/queue/sockets"
-export PERMANENT_DATA_MOVE
+export PERMANENT_DATA_MOVE
--- a/xpack-compose.yml
+++ b/xpack-compose.yml
@@ -3,7 +3,7 @@ version: '3.7'

 services:
  wazuh:
-    image: wazuh/wazuh:4.2.1
+    image: wazuh/wazuh:4.2.6
    hostname: wazuh-manager
    restart: always
    ports:
@@ -146,7 +146,7 @@ services:


  kibana:
-    image: wazuh/wazuh-kibana:4.2.1
+    image: wazuh/wazuh-kibana:4.2.6
    hostname: kibana
    restart: always
    ports:
--- a/xpack-from-sources.yml
+++ b/xpack-from-sources.yml
@@ -8,7 +8,7 @@ services:
      args:
        - FILEBEAT_CHANNEL=filebeat
        - FILEBEAT_VERSION=7.11.2
-    image: wazuh/wazuh:4.2.1
+    image: wazuh/wazuh:4.2.6
    hostname: wazuh-manager
    restart: always
    ports:
@@ -152,7 +152,7 @@ services:

  kibana:
    build: kibana/
-    image: wazuh/wazuh-kibana:4.2.1
+    image: wazuh/wazuh-kibana:4.2.6
    hostname: kibana
    restart: always
    ports:
Author	SHA1	Message	Date
Alberto Rodríguez	a4be008028	Merge pull request #596 from wazuh/595-bump_426 Bump to 4.2.6	2022-03-28 15:49:25 +02:00
Gonzalo Acuña	85e62cfd0e	Bump to 4.2.6	2022-03-25 10:28:14 -03:00
José Fernández Aguilera	5cabaa4700	Merge pull request #553 from wazuh/10842-release-4.2.5 Update release 4.2.5	2021-11-15 20:12:48 +01:00
vcerenu	603e48237b	Bump release 4.2.5	2021-11-15 11:48:03 -03:00
vcerenu	71628e1575	Bump release 4.2.5	2021-11-15 11:47:20 -03:00
vcerenu	a5d13c9fc6	Bump release 4.2.5	2021-11-15 10:35:40 -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
vcerenu	f02697786c	fix directory problem in permanent_data	2021-11-04 16:00:09 -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
vcerenu	898f699d85	507 - add /var/ossec/logs/archives to permanent_data	2021-11-04 11:05:04 -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
vcerenu	aa59a302c3	Update release 4.2.4	2021-10-19 16:37:13 -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
vcerenu	fbe7a0a571	update release 4.2.4	2021-10-14 16:39:41 -03:00
vcerenu	ffffe5539a	update release 4.2.4	2021-10-14 16:23:43 -03:00
José Fernández Aguilera	d46ce7aee3	Merge pull request #530 from wazuh/529-release-423 Release v4.2.3	2021-10-07 15:54:45 +02:00
vcerenu	4d0b06b91e	bump release 4.2.3	2021-10-06 08:38:25 -03:00
vcerenu	391b5d237c	bump release 4.2.3	2021-10-05 12:57:25 -03:00
Alberto Rodríguez	e99ba259e0	Added `util.py` to permanent data	2021-09-23 20:00:03 +02:00
Alberto Rodríguez	f00245007d	Merge pull request #516 from wazuh/4.2.2 Release v4.2.2	2021-09-15 16:50:12 +02:00
vcerenu	084407f9c9	Update 4.2.2	2021-09-15 10:55:43 -03:00
vcerenu	f0ebabad89	Update 4.2.2	2021-09-15 10:51:19 -03:00