Fixed unsigned merge commit

CHANGELOG.md

@@ -2,6 +2,42 @@
 
 All notable changes to this project will be documented in this file.
 
+## [4.7.0]
+
+### Added
+
+- Update to Wazuh version [4.7.0](https://github.com/wazuh/wazuh/blob/v4.7.0/CHANGELOG.md#v470)
+
+## [4.6.0]
+
+### Added
+
+- Update to Wazuh version [4.6.0](https://github.com/wazuh/wazuh/blob/v4.6.0/CHANGELOG.md#v460)
+
+## [4.5.1]
+
+### Added
+
+- Update to Wazuh version [4.5.1](https://github.com/wazuh/wazuh/blob/v4.5.1/CHANGELOG.md#v451)
+
+## [4.5.0]
+
+### Added
+
+- Update to Wazuh version [4.5.0](https://github.com/wazuh/wazuh/blob/v4.5.0/CHANGELOG.md#v450)
+
+## [4.4.5]
+
+### Added
+
+- Update to Wazuh version [4.4.5](https://github.com/wazuh/wazuh/blob/v4.4.5/CHANGELOG.md#v445)
+
+## [4.4.4]
+
+### Added
+
+- Update to Wazuh version [4.4.4](https://github.com/wazuh/wazuh/blob/v4.4.4/CHANGELOG.md#v444)
+
 ## [4.4.3]
 
 ### Added

VERSION

@@ -1,2 +1,2 @@
-VERSION="4.4.3"
-REVISION="40409"
+VERSION="4.7.0"
+REVISION="40700"

upgrade.md

@@ -7,20 +7,16 @@ When upgrading our version of Wazuh installed in Kubernetes we must follow the f
 Our Kubernetes deployment uses our Wazuh images from Docker. If we look at the following code extracted from the Wazuh configuration using Docker we can see which directories and files are used in the upgrades.
 
 ```
-DATA_DIRS[((i++))]="api/configuration"
-DATA_DIRS[((i++))]="etc"
-DATA_DIRS[((i++))]="logs"
-DATA_DIRS[((i++))]="queue/db"
-DATA_DIRS[((i++))]="queue/rootcheck"
-DATA_DIRS[((i++))]="queue/agent-groups"
-DATA_DIRS[((i++))]="queue/agent-info"
-DATA_DIRS[((i++))]="queue/agents-timestamp"
-DATA_DIRS[((i++))]="queue/agentless"
-DATA_DIRS[((i++))]="queue/cluster"
-DATA_DIRS[((i++))]="queue/rids"
-DATA_DIRS[((i++))]="queue/fts"
-DATA_DIRS[((i++))]="var/multigroups"
-
+PERMANENT_DATA[((i++))]="/var/ossec/api/configuration"
+PERMANENT_DATA[((i++))]="/var/ossec/etc"
+PERMANENT_DATA[((i++))]="/var/ossec/logs"
+PERMANENT_DATA[((i++))]="/var/ossec/queue"
+PERMANENT_DATA[((i++))]="/var/ossec/agentless"
+PERMANENT_DATA[((i++))]="/var/ossec/var/multigroups"
+PERMANENT_DATA[((i++))]="/var/ossec/integrations"
+PERMANENT_DATA[((i++))]="/var/ossec/active-response/bin"
+PERMANENT_DATA[((i++))]="/var/ossec/wodles"
+PERMANENT_DATA[((i++))]="/etc/filebeat"
 ```
 
 Any file that we modify referring to the files previously mentioned, will be changed also the corresponding volume. When the corresponding Wazuh pod is created again, it will get the cited files from the volume, thus keeping the changes made previously.

wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml

@@ -32,7 +32,7 @@ spec:
             secretName: dashboard-certs
       containers:
         - name: wazuh-dashboard
-          image: 'wazuh/wazuh-dashboard:4.4.3'
+          image: 'wazuh/wazuh-dashboard:4.7.0'
           resources:
             limits:
               cpu: 500m

wazuh/indexer_stack/wazuh-indexer/cluster/indexer-sts.yaml

@@ -59,7 +59,7 @@ spec:
             privileged: true
       containers:
         - name: wazuh-indexer
-          image: 'wazuh/wazuh-indexer:4.4.3'
+          image: 'wazuh/wazuh-indexer:4.7.0'
           resources:
             limits:
               cpu: 500m

wazuh/wazuh_managers/wazuh-master-sts.yaml

@@ -41,7 +41,7 @@ spec:
         fsGroup: 101
       containers:
         - name: wazuh-manager
-          image: 'wazuh/wazuh-manager:4.4.3'
+          image: 'wazuh/wazuh-manager:4.7.0'
           resources:
             limits:
               cpu: 400m

wazuh/wazuh_managers/wazuh-worker-sts.yaml

@@ -44,7 +44,7 @@ spec:
         fsGroup: 101
       containers:
         - name: wazuh-manager
-          image: 'wazuh/wazuh-manager:4.4.3'
+          image: 'wazuh/wazuh-manager:4.7.0'
           resources:
             limits:
               cpu: 400m