From a74ff79d402238e7a3c3d75d74ecb43d916f672c Mon Sep 17 00:00:00 2001 From: "Manuel J. Bernal" Date: Tue, 21 May 2019 21:39:30 +0200 Subject: [PATCH] Bump version --- CHANGELOG.md | 3 +++ VERSION | 2 +- .../cluster/elasticsearch-data-sts.yaml | 2 +- .../cluster/elasticsearch-master-sts.yaml | 2 +- .../single-node/elasticsearch-sts.yaml | 2 +- elastic_stack/kibana/kibana-deploy.yaml | 2 +- elastic_stack/kibana/nginx-deploy.yaml | 2 +- elastic_stack/logstash/logstash-deploy.yaml | 2 +- instructions.md | 12 ++++++------ local-storage/pv-claim.yaml | 11 +++++++++++ local-storage/pv-volume.yaml | 14 ++++++++++++++ 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 +- 15 files changed, 47 insertions(+), 19 deletions(-) create mode 100644 local-storage/pv-claim.yaml create mode 100644 local-storage/pv-volume.yaml diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ca0878..f35bd87 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ All notable changes to this project will be documented in this file. +## [v3.9.1] + +- Update to Wazuh version 3.9.1_6.8.0 ## [v3.9.0] diff --git a/VERSION b/VERSION index 4649e52..55f7929 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -VERSION="v3.9.0_6.7.2" +VERSION="v3.9.1_6.8.0" REVISION="3901" diff --git a/elastic_stack/elasticsearch/cluster/elasticsearch-data-sts.yaml b/elastic_stack/elasticsearch/cluster/elasticsearch-data-sts.yaml index 44983f5..6c330f4 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.9.0_6.7.2' + image: 'wazuh/wazuh-elasticsearch:3.9.1_6.8.0' 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 fc83612..e8f1b94 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.9.0_6.7.2' + image: 'wazuh/wazuh-elasticsearch:3.9.1_6.8.0' 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 30b84b7..85920e4 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.9.0_6.7.2' + image: 'wazuh/wazuh-elasticsearch:3.9.1_6.8.0' resources: requests: cpu: 500m diff --git a/elastic_stack/kibana/kibana-deploy.yaml b/elastic_stack/kibana/kibana-deploy.yaml index 6161a7b..b281289 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.9.0_6.7.2' + image: 'wazuh/wazuh-kibana:3.9.1_6.8.0' resources: requests: cpu: 200m diff --git a/elastic_stack/kibana/nginx-deploy.yaml b/elastic_stack/kibana/nginx-deploy.yaml index 2cd809f..834a056 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.9.0_6.7.2' + image: 'wazuh/wazuh-nginx:3.9.1_6.8.0' resources: requests: cpu: 100m diff --git a/elastic_stack/logstash/logstash-deploy.yaml b/elastic_stack/logstash/logstash-deploy.yaml index 9573a53..c24038d 100644 --- a/elastic_stack/logstash/logstash-deploy.yaml +++ b/elastic_stack/logstash/logstash-deploy.yaml @@ -25,7 +25,7 @@ spec: spec: containers: - name: wazuh-logstash - image: 'wazuh/wazuh-logstash:3.9.0_6.7.2' + image: 'wazuh/wazuh-logstash:3.9.1_6.8.0' resources: requests: cpu: 500m diff --git a/instructions.md b/instructions.md index 7295daf..a119cd5 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.9.0_6.7.2' +- Image: Docker Hub 'wazuh/wazuh:3.9.1_6.8.0' - 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.9.0_6.7.2' +- Image: Docker Hub 'wazuh/wazuh:3.9.1_6.8.0' - Controller: StatefulSet @@ -46,7 +46,7 @@ Details: Elasticsearch pod. It receives and stores alerts received from Logstash. No Elasticsearch cluster is supported yet. Details: -- Image: wazuh/wazuh-elasticsearch:3.9.0_6.7.2 +- Image: wazuh/wazuh-elasticsearch:3.9.1_6.8.0 - Controller: StatefulSet @@ -55,7 +55,7 @@ Details: Logstash pod. It receives the alerts from each Filebeat located in every Wazuh manager. Then, the alerts are sent to Elasticsearch. Details: -- image: Docker Hub 'wazuh/logstash:3.9.0_6.7.2' +- image: Docker Hub 'wazuh/logstash:3.9.1_6.8.0' - Controller: Deployment @@ -64,7 +64,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.9.0_6.7.2' +- image: Docker Hub 'wazuh/kibana:3.9.1_6.8.0' - Controller: Deployment #### Nginx @@ -72,7 +72,7 @@ Details: The nginx pod acts as a reverse proxy for a safer access to Kibana. Details: -- image: Docker Hub 'wazuh/nginx:3.9.0_6.7.2' +- image: Docker Hub 'wazuh/nginx:3.9.1_6.8.0' - Controller: Deployment diff --git a/local-storage/pv-claim.yaml b/local-storage/pv-claim.yaml new file mode 100644 index 0000000..07c2449 --- /dev/null +++ b/local-storage/pv-claim.yaml @@ -0,0 +1,11 @@ +kind: PersistentVolumeClaim +apiVersion: v1 +metadata: + name: task-pv-claim +spec: + storageClassName: manual + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 3Gi \ No newline at end of file diff --git a/local-storage/pv-volume.yaml b/local-storage/pv-volume.yaml new file mode 100644 index 0000000..985606d --- /dev/null +++ b/local-storage/pv-volume.yaml @@ -0,0 +1,14 @@ +kind: PersistentVolume +apiVersion: v1 +metadata: + name: task-pv-volume + labels: + type: local +spec: + storageClassName: manual + capacity: + storage: 10Gi + accessModes: + - ReadWriteOnce + hostPath: + path: "/data" \ No newline at end of file diff --git a/upgrade.md b/upgrade.md index 99c520f..fa0cdc0 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.9.0_6.7.2`. +We have our newly created Kubernetes environment following our instructions. In this example, the image of Wazuh used has been `wazuh/wazuh:3.9.1_6.8.0`. ``` containers: - name: wazuh-manager - image: 'wazuh/wazuh:3.9.0_6.7.2' + image: 'wazuh/wazuh:3.9.1_6.8.0' ``` 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.9.0_6.7.2' + image: 'wazuh/wazuh:3.9.1_6.8.0' ``` diff --git a/wazuh_managers/wazuh-master-sts.yaml b/wazuh_managers/wazuh-master-sts.yaml index 8046c9c..26c462b 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.9.0_6.7.2' + image: 'wazuh/wazuh:3.9.1_6.8.0' resources: requests: cpu: 500m diff --git a/wazuh_managers/wazuh-worker-0-sts.yaml b/wazuh_managers/wazuh-worker-0-sts.yaml index 8ac64ea..5c9299f 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.9.0_6.7.2' + image: 'wazuh/wazuh:3.9.1_6.8.0' resources: requests: cpu: 500m diff --git a/wazuh_managers/wazuh-worker-1-sts.yaml b/wazuh_managers/wazuh-worker-1-sts.yaml index cbcf3e7..27e39cf 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.9.0_6.7.2' + image: 'wazuh/wazuh:3.9.1_6.8.0' resources: requests: cpu: 500m