Merge pull request #553 from wazuh/10842-release-4.2.5

Update release 4.2.5
wazuh · Nov 15, 2021 · 5cabaa4 · 5cabaa4
2 parents a9442d7 + 603e482
commit 5cabaa4
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 21 deletions.
diff --git a/.goss.yaml b/.goss.yaml
@@ -56,7 +56,7 @@ package:
   wazuh-manager:
     installed: true
     versions:
-    - 4.2.4
+    - 4.2.5
 port:
   tcp:1514:
     listening: true

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## 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
 

diff --git a/README.md b/README.md
@@ -154,6 +154,7 @@ ADMIN_PRIVILEGES=true               # App privileges
 
 | Wazuh version | ODFE    | XPACK  |
 |---------------|---------|--------|
+| 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 |

diff --git a/VERSION b/VERSION
@@ -1,2 +1,2 @@
-WAZUH-DOCKER_VERSION="4.2.4"
-REVISION="40219"
+WAZUH-DOCKER_VERSION="4.2.5"
+REVISION="40220"
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.7'
 
 services:
   wazuh:
-    image: wazuh/wazuh-odfe:4.2.4
+    image: wazuh/wazuh-odfe:4.2.5
     hostname: wazuh-manager
     restart: always
     ports:
@@ -50,7 +50,7 @@ services:
         hard: 65536
 
   kibana:
-    image: wazuh/wazuh-kibana-odfe:4.2.4
+    image: wazuh/wazuh-kibana-odfe:4.2.5
     hostname: kibana
     restart: always
     ports:

diff --git 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.4
+ARG WAZUH_VERSION=4.2.5
 ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}"
 
 WORKDIR /usr/share/kibana

diff --git 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.4
+ARG WAZUH_VERSION=4.2.5
 ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}"
 
 WORKDIR /usr/share/kibana

diff --git a/production-cluster.yml b/production-cluster.yml
@@ -3,7 +3,7 @@ version: '3.7'
 
 services:
   wazuh-master:
-    image: wazuh/wazuh-odfe:4.2.4
+    image: wazuh/wazuh-odfe:4.2.5
     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.4
+    image: wazuh/wazuh-odfe:4.2.5
     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.4
+    image: wazuh/wazuh-kibana-odfe:4.2.5
     hostname: kibana
     restart: always
     ports:

diff --git 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.4.1</white_list>
-    <white_list>4.2.4.2</white_list>
+    <white_list>4.2.5.1</white_list>
+    <white_list>4.2.5.2</white_list>
     <white_list>208.67.220.220</white_list>
   </global>
 

diff --git 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.4.1</white_list>
-    <white_list>4.2.4.2</white_list>
+    <white_list>4.2.5.1</white_list>
+    <white_list>4.2.5.2</white_list>
     <white_list>208.67.220.220</white_list>
   </global>
 

diff --git 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.4
+ARG WAZUH_VERSION=4.2.5
 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

diff --git a/wazuh-odfe/config/permanent_data.env b/wazuh-odfe/config/permanent_data.env
@@ -2,9 +2,7 @@
 i=0
 PERMANENT_DATA[((i++))]="/var/ossec/api/configuration"
 PERMANENT_DATA[((i++))]="/var/ossec/etc"
-PERMANENT_DATA[((i++))]="/var/ossec/logs/archives"
 PERMANENT_DATA[((i++))]="/var/ossec/logs"
-PERMANENT_DATA[((i++))]="/var/ossec/queue/logcollector"
 PERMANENT_DATA[((i++))]="/var/ossec/queue"
 PERMANENT_DATA[((i++))]="/var/ossec/agentless"
 PERMANENT_DATA[((i++))]="/var/ossec/var/multigroups"

diff --git a/xpack-compose.yml b/xpack-compose.yml
@@ -3,7 +3,7 @@ version: '3.7'
 
 services:
   wazuh:
-    image: wazuh/wazuh:4.2.4
+    image: wazuh/wazuh:4.2.5
     hostname: wazuh-manager
     restart: always
     ports:
@@ -146,7 +146,7 @@ services:
 
 
   kibana:
-    image: wazuh/wazuh-kibana:4.2.4
+    image: wazuh/wazuh-kibana:4.2.5
     hostname: kibana
     restart: always
     ports:

diff --git 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.4
+    image: wazuh/wazuh:4.2.5
     hostname: wazuh-manager
     restart: always
     ports:
@@ -152,7 +152,7 @@ services:
 
   kibana:
     build: kibana/
-    image: wazuh/wazuh-kibana:4.2.4
+    image: wazuh/wazuh-kibana:4.2.5
     hostname: kibana
     restart: always
     ports: