diff --git a/CHANGELOG.md b/CHANGELOG.md index df32b004..b0117d06 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,17 @@ All notable changes to this project will be documented in this file. +## [v3.12.2] + +### Added + +- Update to Wazuh version 3.12.2_7.6.2 +- Add reference to local-env branch on the readme ([@xr09](https://github.com/xr09)) [PR#82](https://github.com/wazuh/wazuh-kubernetes/pull/82) + +### Fixed + +- Path to elasticearch deployment yamls was outdated ([@jctello](https://github.com/jctello)) [PR#82](https://github.com/wazuh/wazuh-kubernetes/pull/84/commits/927b7dabc96d5c1c9f63981858661bba6206b6ef) + ## [v3.12.0] ### Added diff --git a/README.md b/README.md index a5a64518..0e36e5c8 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ The *instructions.md* file describes how to deploy Wazuh on Kubernetes. │ ├── README.md │ ├── VERSION │ ├── CHANGELOG.md - │ ├── LICENSE + │ ├── LICENSE │ ├── cleanup.md │ ├── instructions.md │ ├── upgrade.md @@ -59,6 +59,12 @@ The *instructions.md* file describes how to deploy Wazuh on Kubernetes. ## Branches * `master` branch contains the latest code, be aware of possible bugs on this branch. +* `local-environment` branch contains modifications for deploying on local environments. + +## Local development + +To deploy a cluster on your local environment (like Minikube or Kind) use the branch [local-environment](https://github.com/wazuh/wazuh-kubernetes/tree/local-environment/minikube) + ## Contribute diff --git a/VERSION b/VERSION index 3d15db2e..2f44f6e7 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -VERSION="v3.12.0_7.6.1" -REVISION="31200" +VERSION="v3.12.2_7.6.2" +REVISION="31220" diff --git a/elastic_stack/elasticsearch/cluster/elasticsearch-data-sts.yaml b/elastic_stack/elasticsearch/cluster/elasticsearch-data-sts.yaml index ff34565e..8fe14f60 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.12.0_7.6.1' + image: 'wazuh/wazuh-elasticsearch:3.12.2_7.6.2' 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 0e4a07fd..116def61 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.12.0_7.6.1' + image: 'wazuh/wazuh-elasticsearch:3.12.2_7.6.2' 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 90a7679e..23487e34 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.12.0_7.6.1' + image: 'wazuh/wazuh-elasticsearch:3.12.2_7.6.2' resources: requests: cpu: 500m diff --git a/elastic_stack/kibana/kibana-deploy.yaml b/elastic_stack/kibana/kibana-deploy.yaml index a01c900b..710e2f62 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.12.0_7.6.1' + image: 'wazuh/wazuh-kibana:3.12.2_7.6.2' resources: requests: cpu: 200m diff --git a/elastic_stack/kibana/nginx-deploy.yaml b/elastic_stack/kibana/nginx-deploy.yaml index 0e23a711..c8126f37 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.12.0_7.6.1' + image: 'wazuh/wazuh-nginx:3.12.2_7.6.2' resources: requests: cpu: 100m diff --git a/instructions.md b/instructions.md index 68ec45e4..db41fc5f 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.12.0_7.6.1' +- Image: Docker Hub 'wazuh/wazuh:3.12.2_7.6.2' - 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.12.0_7.6.1' +- Image: Docker Hub 'wazuh/wazuh:3.12.2_7.6.2' - Controller: StatefulSet @@ -46,7 +46,7 @@ Details: Elasticsearch pod. No Elasticsearch cluster is supported yet. Details: -- Image: wazuh/wazuh-elasticsearch:3.12.0_7.6.1 +- Image: wazuh/wazuh-elasticsearch:3.12.2_7.6.2 - 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.12.0_7.6.1' +- image: Docker Hub 'wazuh/kibana:3.12.2_7.6.2' - 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.12.0_7.6.1' +- image: Docker Hub 'wazuh/nginx:3.12.2_7.6.2' - Controller: Deployment @@ -134,9 +134,10 @@ Elasticsearch deployment. ```BASH $ kubectl apply -f elastic_stack/elasticsearch/elasticsearch-svc.yaml -$ kubectl apply -f elastic_stack/elasticsearch/elasticsearch-api-svc.yaml -$ kubectl apply -f elastic_stack/elasticsearch/elasticsearch-sts.yaml +$ kubectl apply -f elastic_stack/elasticsearch//elasticsearch-api-svc.yaml +$ kubectl apply -f elastic_stack/elasticsearch//elasticsearch-sts.yaml ``` +Where `` is either `single-node` or `cluster` ### Step 3.3: Deploy Kibana and Nginx diff --git a/upgrade.md b/upgrade.md index 7fae21b6..cf781124 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.12.0_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.2_7.6.2`. ``` containers: - name: wazuh-manager - image: 'wazuh/wazuh:3.12.0_7.6.1' + image: 'wazuh/wazuh:3.12.2_7.6.2' ``` 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.12.0_7.6.1' + image: 'wazuh/wazuh:3.12.2_7.6.2' ``` diff --git a/wazuh_managers/wazuh-master-sts.yaml b/wazuh_managers/wazuh-master-sts.yaml index 543c6e62..1a028529 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.12.0_7.6.1' + image: 'wazuh/wazuh:3.12.2_7.6.2' resources: requests: cpu: 2 diff --git a/wazuh_managers/wazuh-worker-0-sts.yaml b/wazuh_managers/wazuh-worker-0-sts.yaml index 4fe293f8..af507385 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.12.0_7.6.1' + image: 'wazuh/wazuh:3.12.2_7.6.2' resources: requests: cpu: 2 diff --git a/wazuh_managers/wazuh-worker-1-sts.yaml b/wazuh_managers/wazuh-worker-1-sts.yaml index d0c89d60..fd19c5a5 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.12.0_7.6.1' + image: 'wazuh/wazuh:3.12.2_7.6.2' resources: requests: cpu: 2