From b5db817ecce580219162bda66d3098aa2d745e14 Mon Sep 17 00:00:00 2001
From: Manuel Gutierrez <1380243+xr09@users.noreply.github.com>
Date: Mon, 22 Feb 2021 12:31:59 +0100
Subject: [PATCH] Bump to 4.1.1

---
 .goss.yaml             | 2 +-
 CHANGELOG.md           | 6 ++++++
 README.md              | 2 ++
 VERSION                | 4 ++--
 docker-compose.yml     | 4 ++--
 kibana-odfe/Dockerfile | 2 +-
 kibana/Dockerfile      | 2 +-
 production-cluster.yml | 6 +++---
 wazuh-odfe/Dockerfile  | 2 +-
 xpack-compose.yml      | 4 ++--
 xpack-from-sources.yml | 4 ++--
 11 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/.goss.yaml b/.goss.yaml
index 7901f2cb..2b78a8fa 100644
--- a/.goss.yaml
+++ b/.goss.yaml
@@ -56,7 +56,7 @@ package:
   wazuh-manager:
     installed: true
     versions:
-    - 4.1.0
+    - 4.1.1
 port:
   tcp:1514:
     listening: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ced89db..4ebeb27d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 All notable changes to this project will be documented in this file.
+
+## Wazuh Docker v4.1.1
+### Added
+
+- Update Wazuh to version [4.1.1](https://github.com/wazuh/wazuh/blob/v4.1.1/CHANGELOG.md#v411)
+
 ## Wazuh Docker v4.1.0
 ### Added
 
diff --git a/README.md b/README.md
index b559095d..9b68bd2b 100644
--- a/README.md
+++ b/README.md
@@ -155,6 +155,8 @@ ADMIN_PRIVILEGES=true               # App privileges
 
 | Wazuh version | ODFE    | XPACK  |
 |---------------|---------|--------|
+| v4.1.1        | 1.12.0  | 7.10.2 |
+|---------------|---------|--------|
 | v4.1.0        | 1.12.0  | 7.10.2 |
 |---------------|---------|--------|
 | v4.0.4        | 1.11.0  |        |
diff --git a/VERSION b/VERSION
index 37c74115..648c321b 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-WAZUH-DOCKER_VERSION="4.1.0"
-REVISION="41000"
+WAZUH-DOCKER_VERSION="4.1.1"
+REVISION="41100"
diff --git a/docker-compose.yml b/docker-compose.yml
index 35656427..435819f0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.7'
 
 services:
   wazuh:
-    image: wazuh/wazuh-odfe:4.1.0
+    image: wazuh/wazuh-odfe:4.1.1
     hostname: wazuh-manager
     restart: always
     ports:
@@ -50,7 +50,7 @@ services:
         hard: 65536
 
   kibana:
-    image: wazuh/wazuh-kibana-odfe:4.1.0
+    image: wazuh/wazuh-kibana-odfe:4.1.1
     hostname: kibana
     restart: always
     ports:
diff --git a/kibana-odfe/Dockerfile b/kibana-odfe/Dockerfile
index bebc0480..be721de6 100644
--- a/kibana-odfe/Dockerfile
+++ b/kibana-odfe/Dockerfile
@@ -2,7 +2,7 @@
 FROM amazon/opendistro-for-elasticsearch-kibana:1.12.0
 USER kibana
 ARG ELASTIC_VERSION=7.10.0
-ARG WAZUH_VERSION=4.1.0
+ARG WAZUH_VERSION=4.1.1
 ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}"
 
 WORKDIR /usr/share/kibana
diff --git a/kibana/Dockerfile b/kibana/Dockerfile
index f1be86dd..4abf6e1c 100644
--- 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.1.0
+ARG WAZUH_VERSION=4.1.1
 ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}"
 
 WORKDIR /usr/share/kibana
diff --git a/production-cluster.yml b/production-cluster.yml
index c214c6ae..dda505a8 100644
--- a/production-cluster.yml
+++ b/production-cluster.yml
@@ -3,7 +3,7 @@ version: '3.7'
 
 services:
   wazuh-master:
-    image: wazuh/wazuh-odfe:4.1.0
+    image: wazuh/wazuh-odfe:4.1.1
     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.1.0
+    image: wazuh/wazuh-odfe:4.1.1
     hostname: wazuh-worker
     restart: always
     environment:
@@ -132,7 +132,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.1.0
+    image: wazuh/wazuh-kibana-odfe:4.1.1
     hostname: kibana
     restart: always
     ports:
diff --git a/wazuh-odfe/Dockerfile b/wazuh-odfe/Dockerfile
index fe308504..5a717e7f 100644
--- 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.0
-ARG WAZUH_VERSION=4.1.0-1
+ARG WAZUH_VERSION=4.1.1-1
 ARG TEMPLATE_VERSION="master"
 ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.1.tar.gz"
 
diff --git a/xpack-compose.yml b/xpack-compose.yml
index da4c2290..a439aaff 100644
--- a/xpack-compose.yml
+++ b/xpack-compose.yml
@@ -3,7 +3,7 @@ version: '3.7'
 
 services:
   wazuh:
-    image: wazuh/wazuh:4.1.0
+    image: wazuh/wazuh:4.1.1
     hostname: wazuh-manager
     restart: always
     ports:
@@ -146,7 +146,7 @@ services:
 
 
   kibana:
-    image: wazuh/wazuh-kibana:4.1.0
+    image: wazuh/wazuh-kibana:4.1.1
     hostname: kibana
     restart: always
     ports:
diff --git a/xpack-from-sources.yml b/xpack-from-sources.yml
index 465bc646..ce456f16 100644
--- a/xpack-from-sources.yml
+++ b/xpack-from-sources.yml
@@ -8,7 +8,7 @@ services:
       args:
         - FILEBEAT_CHANNEL=filebeat
         - FILEBEAT_VERSION=7.10.2
-    image: wazuh/wazuh:4.1.0
+    image: wazuh/wazuh:4.1.1
     hostname: wazuh-manager
     restart: always
     ports:
@@ -152,7 +152,7 @@ services:
 
   kibana:
     build: kibana/
-    image: wazuh/wazuh-kibana:4.1.0
+    image: wazuh/wazuh-kibana:4.1.1
     hostname: kibana
     restart: always
     ports: