From f555401471d2c49c6ca44484df8e2496d45e3c1b Mon Sep 17 00:00:00 2001 From: "Manuel J. Bernal" Date: Thu, 5 Mar 2020 18:35:04 +0100 Subject: [PATCH 1/2] Bump version --- CHANGELOG.md | 8 +++++++- VERSION | 4 ++-- .../elasticsearch/cluster/elasticsearch-data-sts.yaml | 2 +- .../cluster/elasticsearch-master-sts.yaml | 2 +- .../elasticsearch/single-node/elasticsearch-sts.yaml | 2 +- elastic_stack/kibana/kibana-deploy.yaml | 2 +- elastic_stack/kibana/nginx-deploy.yaml | 2 +- instructions.md | 10 +++++----- upgrade.md | 6 +++--- wazuh_managers/wazuh-master-sts.yaml | 2 +- wazuh_managers/wazuh-worker-0-sts.yaml | 2 +- wazuh_managers/wazuh-worker-1-sts.yaml | 2 +- 12 files changed, 25 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85e1bcba..d8ffd4a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,11 +2,17 @@ All notable changes to this project will be documented in this file. +## [v3.11.4] + +### Added + +- Update to Wazuh version 3.11.4_7.6.1 + ## [v3.11.3] ### Added -- Update to Wazuh version 3.11.3_7.5.2 +- Update to Wazuh version 3.11.4_7.6.1 ## [v3.11.2] diff --git a/VERSION b/VERSION index 0c293cb2..e496186b 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -VERSION="v3.11.3_7.5.2" -REVISION="31130" +VERSION="v3.11.4_7.6.1" +REVISION="31140" diff --git a/elastic_stack/elasticsearch/cluster/elasticsearch-data-sts.yaml b/elastic_stack/elasticsearch/cluster/elasticsearch-data-sts.yaml index 7ab361ee..9dccc853 100644 --- a/elastic_stack/elasticsearch/cluster/elasticsearch-data-sts.yaml +++ b/elastic_stack/elasticsearch/cluster/elasticsearch-data-sts.yaml @@ -52,7 +52,7 @@ spec: privileged: true containers: - name: wazuh-elasticsearch - image: 'wazuh/wazuh-elasticsearch:3.11.3_7.5.2' + image: 'wazuh/wazuh-elasticsearch:3.11.4_7.6.1' resources: requests: cpu: 500m diff --git a/elastic_stack/elasticsearch/cluster/elasticsearch-master-sts.yaml b/elastic_stack/elasticsearch/cluster/elasticsearch-master-sts.yaml index 20c104ff..1065f135 100644 --- a/elastic_stack/elasticsearch/cluster/elasticsearch-master-sts.yaml +++ b/elastic_stack/elasticsearch/cluster/elasticsearch-master-sts.yaml @@ -52,7 +52,7 @@ spec: privileged: true containers: - name: wazuh-elasticsearch - image: 'wazuh/wazuh-elasticsearch:3.11.3_7.5.2' + image: 'wazuh/wazuh-elasticsearch:3.11.4_7.6.1' resources: requests: cpu: 500m diff --git a/elastic_stack/elasticsearch/single-node/elasticsearch-sts.yaml b/elastic_stack/elasticsearch/single-node/elasticsearch-sts.yaml index 76a8888f..ce84e120 100644 --- a/elastic_stack/elasticsearch/single-node/elasticsearch-sts.yaml +++ b/elastic_stack/elasticsearch/single-node/elasticsearch-sts.yaml @@ -52,7 +52,7 @@ spec: privileged: true containers: - name: wazuh-elasticsearch - image: 'wazuh/wazuh-elasticsearch:3.11.3_7.5.2' + image: 'wazuh/wazuh-elasticsearch:3.11.4_7.6.1' resources: requests: cpu: 500m diff --git a/elastic_stack/kibana/kibana-deploy.yaml b/elastic_stack/kibana/kibana-deploy.yaml index 66907aee..ef51c3f9 100644 --- a/elastic_stack/kibana/kibana-deploy.yaml +++ b/elastic_stack/kibana/kibana-deploy.yaml @@ -25,7 +25,7 @@ spec: spec: containers: - name: wazuh-kibana - image: 'wazuh/wazuh-kibana:3.11.3_7.5.2' + image: 'wazuh/wazuh-kibana:3.11.4_7.6.1' resources: requests: cpu: 200m diff --git a/elastic_stack/kibana/nginx-deploy.yaml b/elastic_stack/kibana/nginx-deploy.yaml index b27beb07..492d4e1e 100644 --- a/elastic_stack/kibana/nginx-deploy.yaml +++ b/elastic_stack/kibana/nginx-deploy.yaml @@ -25,7 +25,7 @@ spec: spec: containers: - name: wazuh-nginx - image: 'wazuh/wazuh-nginx:3.11.3_7.5.2' + image: 'wazuh/wazuh-nginx:3.11.4_7.6.1' resources: requests: cpu: 100m diff --git a/instructions.md b/instructions.md index 7a971787..9dfb3192 100644 --- a/instructions.md +++ b/instructions.md @@ -29,7 +29,7 @@ This pod contains the master node of the Wazuh cluster. The master node centrali The management is performed only in this node, so the agent registration service (authd) and the API are placed here. Details: -- Image: Docker Hub 'wazuh/wazuh:3.11.3_7.5.2' +- Image: Docker Hub 'wazuh/wazuh:3.11.4_7.6.1' - Controller: StatefulSet #### Wazuh worker 0 / 1 @@ -37,7 +37,7 @@ Details: These pods contain a worker node of the Wazuh cluster. They will receive the agent events. Details: -- Image: Docker Hub 'wazuh/wazuh:3.11.3_7.5.2' +- Image: Docker Hub 'wazuh/wazuh:3.11.4_7.6.1' - Controller: StatefulSet @@ -46,7 +46,7 @@ Details: Elasticsearch pod. No Elasticsearch cluster is supported yet. Details: -- Image: wazuh/wazuh-elasticsearch:3.11.3_7.5.2 +- Image: wazuh/wazuh-elasticsearch:3.11.4_7.6.1 - Controller: StatefulSet #### Kibana @@ -54,7 +54,7 @@ Details: Kibana pod. It lets you visualize your Elasticsearch data, along with other features as the Wazuh app. Details: -- image: Docker Hub 'wazuh/kibana:3.11.3_7.5.2' +- image: Docker Hub 'wazuh/kibana:3.11.4_7.6.1' - Controller: Deployment #### Nginx @@ -62,7 +62,7 @@ Details: The nginx pod acts as a reverse proxy for a safer access to Kibana. Details: -- image: Docker Hub 'wazuh/nginx:3.11.3_7.5.2' +- image: Docker Hub 'wazuh/nginx:3.11.4_7.6.1' - Controller: Deployment diff --git a/upgrade.md b/upgrade.md index 54c2a1f6..65a9dc1f 100644 --- a/upgrade.md +++ b/upgrade.md @@ -27,12 +27,12 @@ Any file that we modify referring to the files previously mentioned, will be cha To better understand it, we will give an example: -We have our newly created Kubernetes environment following our instructions. In this example, the image of Wazuh used has been `wazuh/wazuh:3.11.3_7.5.2`. +We have our newly created Kubernetes environment following our instructions. In this example, the image of Wazuh used has been `wazuh/wazuh:3.11.4_7.6.1`. ``` containers: - name: wazuh-manager - image: 'wazuh/wazuh:3.11.3_7.5.2' + image: 'wazuh/wazuh:3.11.4_7.6.1' ``` Let's proceed by creating a set of rules in our `local_rules.xml` file at location `/var/ossec/etc/rules` in our wazuh manager master pod. @@ -187,7 +187,7 @@ And now we're going to upgrade to the next version: ``` containers: - name: wazuh-manager - image: 'wazuh/wazuh:3.11.3_7.5.2' + image: 'wazuh/wazuh:3.11.4_7.6.1' ``` diff --git a/wazuh_managers/wazuh-master-sts.yaml b/wazuh_managers/wazuh-master-sts.yaml index 68056ef8..2aef29ab 100644 --- a/wazuh_managers/wazuh-master-sts.yaml +++ b/wazuh_managers/wazuh-master-sts.yaml @@ -33,7 +33,7 @@ spec: name: wazuh-manager-master-conf containers: - name: wazuh-manager - image: 'wazuh/wazuh:3.11.3_7.5.2' + image: 'wazuh/wazuh:3.11.4_7.6.1' resources: requests: cpu: 2 diff --git a/wazuh_managers/wazuh-worker-0-sts.yaml b/wazuh_managers/wazuh-worker-0-sts.yaml index 3b2459be..0563aefa 100644 --- a/wazuh_managers/wazuh-worker-0-sts.yaml +++ b/wazuh_managers/wazuh-worker-0-sts.yaml @@ -47,7 +47,7 @@ spec: name: wazuh-manager-worker-0-conf containers: - name: wazuh-manager - image: 'wazuh/wazuh:3.11.3_7.5.2' + image: 'wazuh/wazuh:3.11.4_7.6.1' resources: requests: cpu: 2 diff --git a/wazuh_managers/wazuh-worker-1-sts.yaml b/wazuh_managers/wazuh-worker-1-sts.yaml index aaa3341c..cdc93b0f 100644 --- a/wazuh_managers/wazuh-worker-1-sts.yaml +++ b/wazuh_managers/wazuh-worker-1-sts.yaml @@ -47,7 +47,7 @@ spec: name: wazuh-manager-worker-1-conf containers: - name: wazuh-manager - image: 'wazuh/wazuh:3.11.3_7.5.2' + image: 'wazuh/wazuh:3.11.4_7.6.1' resources: requests: cpu: 2 From 2ae0bed85fe87890c0dba414620a576d98bd85da Mon Sep 17 00:00:00 2001 From: "Manuel J. Bernal" Date: Tue, 24 Mar 2020 17:03:12 +0100 Subject: [PATCH 2/2] Bump version --- CHANGELOG.md | 6 ++++++ VERSION | 4 ++-- .../elasticsearch/cluster/elasticsearch-data-sts.yaml | 2 +- .../cluster/elasticsearch-master-sts.yaml | 2 +- .../elasticsearch/single-node/elasticsearch-sts.yaml | 2 +- elastic_stack/kibana/kibana-deploy.yaml | 2 +- elastic_stack/kibana/nginx-deploy.yaml | 2 +- instructions.md | 10 +++++----- upgrade.md | 6 +++--- wazuh_managers/wazuh-master-sts.yaml | 2 +- wazuh_managers/wazuh-worker-0-sts.yaml | 2 +- wazuh_managers/wazuh-worker-1-sts.yaml | 2 +- 12 files changed, 24 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d8ffd4a1..df32b004 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes to this project will be documented in this file. +## [v3.12.0] + +### Added + +- Update to Wazuh version 3.12.0_7.6.1 + ## [v3.11.4] ### Added diff --git a/VERSION b/VERSION index e496186b..3d15db2e 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -VERSION="v3.11.4_7.6.1" -REVISION="31140" +VERSION="v3.12.0_7.6.1" +REVISION="31200" diff --git a/elastic_stack/elasticsearch/cluster/elasticsearch-data-sts.yaml b/elastic_stack/elasticsearch/cluster/elasticsearch-data-sts.yaml index 9dccc853..ff34565e 100644 --- a/elastic_stack/elasticsearch/cluster/elasticsearch-data-sts.yaml +++ b/elastic_stack/elasticsearch/cluster/elasticsearch-data-sts.yaml @@ -52,7 +52,7 @@ spec: privileged: true containers: - name: wazuh-elasticsearch - image: 'wazuh/wazuh-elasticsearch:3.11.4_7.6.1' + image: 'wazuh/wazuh-elasticsearch:3.12.0_7.6.1' resources: requests: cpu: 500m diff --git a/elastic_stack/elasticsearch/cluster/elasticsearch-master-sts.yaml b/elastic_stack/elasticsearch/cluster/elasticsearch-master-sts.yaml index 1065f135..0e4a07fd 100644 --- a/elastic_stack/elasticsearch/cluster/elasticsearch-master-sts.yaml +++ b/elastic_stack/elasticsearch/cluster/elasticsearch-master-sts.yaml @@ -52,7 +52,7 @@ spec: privileged: true containers: - name: wazuh-elasticsearch - image: 'wazuh/wazuh-elasticsearch:3.11.4_7.6.1' + image: 'wazuh/wazuh-elasticsearch:3.12.0_7.6.1' resources: requests: cpu: 500m diff --git a/elastic_stack/elasticsearch/single-node/elasticsearch-sts.yaml b/elastic_stack/elasticsearch/single-node/elasticsearch-sts.yaml index ce84e120..90a7679e 100644 --- a/elastic_stack/elasticsearch/single-node/elasticsearch-sts.yaml +++ b/elastic_stack/elasticsearch/single-node/elasticsearch-sts.yaml @@ -52,7 +52,7 @@ spec: privileged: true containers: - name: wazuh-elasticsearch - image: 'wazuh/wazuh-elasticsearch:3.11.4_7.6.1' + image: 'wazuh/wazuh-elasticsearch:3.12.0_7.6.1' resources: requests: cpu: 500m diff --git a/elastic_stack/kibana/kibana-deploy.yaml b/elastic_stack/kibana/kibana-deploy.yaml index ef51c3f9..a01c900b 100644 --- a/elastic_stack/kibana/kibana-deploy.yaml +++ b/elastic_stack/kibana/kibana-deploy.yaml @@ -25,7 +25,7 @@ spec: spec: containers: - name: wazuh-kibana - image: 'wazuh/wazuh-kibana:3.11.4_7.6.1' + image: 'wazuh/wazuh-kibana:3.12.0_7.6.1' resources: requests: cpu: 200m diff --git a/elastic_stack/kibana/nginx-deploy.yaml b/elastic_stack/kibana/nginx-deploy.yaml index 492d4e1e..0e23a711 100644 --- a/elastic_stack/kibana/nginx-deploy.yaml +++ b/elastic_stack/kibana/nginx-deploy.yaml @@ -25,7 +25,7 @@ spec: spec: containers: - name: wazuh-nginx - image: 'wazuh/wazuh-nginx:3.11.4_7.6.1' + image: 'wazuh/wazuh-nginx:3.12.0_7.6.1' resources: requests: cpu: 100m diff --git a/instructions.md b/instructions.md index 9dfb3192..68ec45e4 100644 --- a/instructions.md +++ b/instructions.md @@ -29,7 +29,7 @@ This pod contains the master node of the Wazuh cluster. The master node centrali The management is performed only in this node, so the agent registration service (authd) and the API are placed here. Details: -- Image: Docker Hub 'wazuh/wazuh:3.11.4_7.6.1' +- Image: Docker Hub 'wazuh/wazuh:3.12.0_7.6.1' - Controller: StatefulSet #### Wazuh worker 0 / 1 @@ -37,7 +37,7 @@ Details: These pods contain a worker node of the Wazuh cluster. They will receive the agent events. Details: -- Image: Docker Hub 'wazuh/wazuh:3.11.4_7.6.1' +- Image: Docker Hub 'wazuh/wazuh:3.12.0_7.6.1' - Controller: StatefulSet @@ -46,7 +46,7 @@ Details: Elasticsearch pod. No Elasticsearch cluster is supported yet. Details: -- Image: wazuh/wazuh-elasticsearch:3.11.4_7.6.1 +- Image: wazuh/wazuh-elasticsearch:3.12.0_7.6.1 - Controller: StatefulSet #### Kibana @@ -54,7 +54,7 @@ Details: Kibana pod. It lets you visualize your Elasticsearch data, along with other features as the Wazuh app. Details: -- image: Docker Hub 'wazuh/kibana:3.11.4_7.6.1' +- image: Docker Hub 'wazuh/kibana:3.12.0_7.6.1' - Controller: Deployment #### Nginx @@ -62,7 +62,7 @@ Details: The nginx pod acts as a reverse proxy for a safer access to Kibana. Details: -- image: Docker Hub 'wazuh/nginx:3.11.4_7.6.1' +- image: Docker Hub 'wazuh/nginx:3.12.0_7.6.1' - Controller: Deployment diff --git a/upgrade.md b/upgrade.md index 65a9dc1f..7fae21b6 100644 --- a/upgrade.md +++ b/upgrade.md @@ -27,12 +27,12 @@ Any file that we modify referring to the files previously mentioned, will be cha To better understand it, we will give an example: -We have our newly created Kubernetes environment following our instructions. In this example, the image of Wazuh used has been `wazuh/wazuh:3.11.4_7.6.1`. +We have our newly created Kubernetes environment following our instructions. In this example, the image of Wazuh used has been `wazuh/wazuh:3.12.0_7.6.1`. ``` containers: - name: wazuh-manager - image: 'wazuh/wazuh:3.11.4_7.6.1' + image: 'wazuh/wazuh:3.12.0_7.6.1' ``` Let's proceed by creating a set of rules in our `local_rules.xml` file at location `/var/ossec/etc/rules` in our wazuh manager master pod. @@ -187,7 +187,7 @@ And now we're going to upgrade to the next version: ``` containers: - name: wazuh-manager - image: 'wazuh/wazuh:3.11.4_7.6.1' + image: 'wazuh/wazuh:3.12.0_7.6.1' ``` diff --git a/wazuh_managers/wazuh-master-sts.yaml b/wazuh_managers/wazuh-master-sts.yaml index 2aef29ab..543c6e62 100644 --- a/wazuh_managers/wazuh-master-sts.yaml +++ b/wazuh_managers/wazuh-master-sts.yaml @@ -33,7 +33,7 @@ spec: name: wazuh-manager-master-conf containers: - name: wazuh-manager - image: 'wazuh/wazuh:3.11.4_7.6.1' + image: 'wazuh/wazuh:3.12.0_7.6.1' resources: requests: cpu: 2 diff --git a/wazuh_managers/wazuh-worker-0-sts.yaml b/wazuh_managers/wazuh-worker-0-sts.yaml index 0563aefa..4fe293f8 100644 --- a/wazuh_managers/wazuh-worker-0-sts.yaml +++ b/wazuh_managers/wazuh-worker-0-sts.yaml @@ -47,7 +47,7 @@ spec: name: wazuh-manager-worker-0-conf containers: - name: wazuh-manager - image: 'wazuh/wazuh:3.11.4_7.6.1' + image: 'wazuh/wazuh:3.12.0_7.6.1' resources: requests: cpu: 2 diff --git a/wazuh_managers/wazuh-worker-1-sts.yaml b/wazuh_managers/wazuh-worker-1-sts.yaml index cdc93b0f..d0c89d60 100644 --- a/wazuh_managers/wazuh-worker-1-sts.yaml +++ b/wazuh_managers/wazuh-worker-1-sts.yaml @@ -47,7 +47,7 @@ spec: name: wazuh-manager-worker-1-conf containers: - name: wazuh-manager - image: 'wazuh/wazuh:3.11.4_7.6.1' + image: 'wazuh/wazuh:3.12.0_7.6.1' resources: requests: cpu: 2