Merge pull request #997 from wazuh/990-persist-logo

Persist the custom logo in the Wazuh dashboard
Merge pull request #998 from wazuh/258-shuffle-permanent-data
2025-10-23 04:51:57 +00:00 · 2023-09-18 14:14:30 -03:00 · 2023-09-15 14:44:27 -03:00 · 2023-09-15 13:31:00 -03:00 · 2023-09-15 12:49:32 -03:00 · 2023-09-15 12:41:05 -03:00
14 changed files with 90 additions and 27 deletions
--- a/.env
+++ b/.env
@@ -1,3 +1,3 @@
-WAZUH_VERSION=4.5.0
-WAZUH_IMAGE_VERSION=4.5.0
+WAZUH_VERSION=4.5.3
+WAZUH_IMAGE_VERSION=4.5.3
 WAZUH_TAG_REVISION=1
--- a/.github/.goss.yaml
+++ b/.github/.goss.yaml
@@ -56,7 +56,7 @@ package:
  wazuh-manager:
    installed: true
    versions:
-    - 4.5.0-1
+    - 4.5.3-1
 port:
  tcp:1514:
    listening: true
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,21 @@
 # Change Log
 All notable changes to this project will be documented in this file.

+## Wazuh Docker v4.5.3
+### Added
+
+- Update Wazuh to version [4.5.3](https://github.com/wazuh/wazuh/blob/v4.5.3/CHANGELOG.md#v453)
+
+## Wazuh Docker v4.5.2
+### Added
+
+- Update Wazuh to version [4.5.2](https://github.com/wazuh/wazuh/blob/v4.5.2/CHANGELOG.md#v452)
+
+## Wazuh Docker v4.5.1
+### Added
+
+- Update Wazuh to version [4.5.1](https://github.com/wazuh/wazuh/blob/v4.5.1/CHANGELOG.md#v451)
+
 ## Wazuh Docker v4.5.0
 ### Added

--- a/README.md
+++ b/README.md
@@ -195,6 +195,9 @@ WAZUH_MONITORING_REPLICAS=0         ##

 | Wazuh version | ODFE    | XPACK  |
 |---------------|---------|--------|
+| v4.5.3        |         |        |
+| v4.5.2        |         |        |
+| v4.5.1        |         |        |
 | v4.5.0        |         |        |
 | v4.4.5        |         |        |
 | v4.4.4        |         |        |
--- a/4
+++ b/4
@@ -1,2 +1,2 @@
-WAZUH-DOCKER_VERSION="4.5.0"
-REVISION="40500"
+WAZUH-DOCKER_VERSION="4.5.3"
+REVISION="40505"
--- a/build-docker-images/build-images.sh
+++ b/build-docker-images/build-images.sh
@@ -1,14 +1,8 @@
-WAZUH_IMAGE_VERSION=4.5.0
+WAZUH_IMAGE_VERSION=4.5.3
 WAZUH_VERSION=$(echo $WAZUH_IMAGE_VERSION | sed -e 's/\.//g')
 WAZUH_TAG_REVISION=1
 WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '\"tag_name\":' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2- | sed -e 's/\.//g')
-
-## If wazuh manager exists in apt dev repository, change variables, if not, exit 1
-if [ "$WAZUH_VERSION" -le "$WAZUH_CURRENT_VERSION" ]; then
-  IMAGE_VERSION=${WAZUH_IMAGE_VERSION}
-else
-  IMAGE_VERSION=${WAZUH_IMAGE_VERSION}
-fi
+IMAGE_VERSION=${WAZUH_IMAGE_VERSION}

 echo WAZUH_VERSION=$WAZUH_IMAGE_VERSION > .env
 echo WAZUH_IMAGE_VERSION=$IMAGE_VERSION >> .env
--- a/build-docker-images/wazuh-dashboard/Dockerfile
+++ b/build-docker-images/wazuh-dashboard/Dockerfile
@@ -102,6 +102,10 @@ RUN chown 1000:1000 /*.sh
 # Copy Install dir from builder to current image
 COPY --from=builder --chown=1000:1000 $INSTALL_DIR $INSTALL_DIR

+# Create custom directory
+RUN mkdir -p /usr/share/wazuh-dashboard/plugins/wazuh/public/assets/custom
+RUN chown 1000:1000 /usr/share/wazuh-dashboard/plugins/wazuh/public/assets/custom
+
 # Set workdir and user
 WORKDIR $INSTALL_DIR
 USER wazuh-dashboard
--- a/build-docker-images/wazuh-manager/Dockerfile
+++ b/build-docker-images/wazuh-manager/Dockerfile
@@ -24,8 +24,6 @@ RUN curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/${FILEBEAT_
    dpkg -i ${FILEBEAT_CHANNEL}-${FILEBEAT_VERSION}-amd64.deb && rm -f ${FILEBEAT_CHANNEL}-${FILEBEAT_VERSION}-amd64.deb && \
    curl -s https://packages.wazuh.com/4.x/filebeat/${WAZUH_FILEBEAT_MODULE} | tar -xvz -C /usr/share/filebeat/module

-RUN curl -L https://github.com/aelsabbahy/goss/releases/latest/download/goss-linux-amd64 -o /usr/local/bin/goss && chmod +rx /usr/local/bin/goss
-
 ARG S6_VERSION="v2.2.0.3"
 RUN curl --fail --silent -L https://github.com/just-containers/s6-overlay/releases/download/${S6_VERSION}/s6-overlay-amd64.tar.gz \
    -o /tmp/s6-overlay-amd64.tar.gz && \
--- a/build-docker-images/wazuh-manager/config/permanent_data.env
+++ b/build-docker-images/wazuh-manager/config/permanent_data.env
@@ -21,6 +21,8 @@ PERMANENT_DATA_EXCP[((i++))]="/var/ossec/integrations/slack"
 PERMANENT_DATA_EXCP[((i++))]="/var/ossec/integrations/slack.py"
 PERMANENT_DATA_EXCP[((i++))]="/var/ossec/integrations/virustotal"
 PERMANENT_DATA_EXCP[((i++))]="/var/ossec/integrations/virustotal.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/integrations/shuffle"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/integrations/shuffle.py"
 PERMANENT_DATA_EXCP[((i++))]="/var/ossec/active-response/bin/default-firewall-drop"
 PERMANENT_DATA_EXCP[((i++))]="/var/ossec/active-response/bin/disable-account"
 PERMANENT_DATA_EXCP[((i++))]="/var/ossec/active-response/bin/firewalld-drop"
--- a/multi-node/config/wazuh_cluster/wazuh_manager.conf
+++ b/multi-node/config/wazuh_cluster/wazuh_manager.conf
@@ -108,13 +108,13 @@
      <os>xenial</os>
      <os>bionic</os>
      <os>focal</os>
+      <os>jammy</os>
      <update_interval>1h</update_interval>
    </provider>

    <!-- Debian OS vulnerabilities -->
    <provider name="debian">
      <enabled>no</enabled>
-      <os>stretch</os>
      <os>buster</os>
      <os>bullseye</os>
      <update_interval>1h</update_interval>
@@ -127,6 +127,7 @@
      <os>6</os>
      <os>7</os>
      <os>8</os>
+      <os>9</os>
      <update_interval>1h</update_interval>
    </provider>

@@ -138,6 +139,18 @@
      <update_interval>1h</update_interval>
    </provider>

+    <!-- SUSE Linux Enterprise OS vulnerabilities -->
+    <provider name="suse">
+      <enabled>no</enabled>
+      <os>11-server</os>
+      <os>11-desktop</os>
+      <os>12-server</os>
+      <os>12-desktop</os>
+      <os>15-server</os>
+      <os>15-desktop</os>
+      <update_interval>1h</update_interval>
+    </provider>
+
    <!-- Arch OS vulnerabilities -->
    <provider name="arch">
      <enabled>no</enabled>
--- a/multi-node/config/wazuh_cluster/wazuh_worker.conf
+++ b/multi-node/config/wazuh_cluster/wazuh_worker.conf
@@ -108,13 +108,13 @@
      <os>xenial</os>
      <os>bionic</os>
      <os>focal</os>
+      <os>jammy</os>
      <update_interval>1h</update_interval>
    </provider>

    <!-- Debian OS vulnerabilities -->
    <provider name="debian">
      <enabled>no</enabled>
-      <os>stretch</os>
      <os>buster</os>
      <os>bullseye</os>
      <update_interval>1h</update_interval>
@@ -127,6 +127,7 @@
      <os>6</os>
      <os>7</os>
      <os>8</os>
+      <os>9</os>
      <update_interval>1h</update_interval>
    </provider>

@@ -138,6 +139,18 @@
      <update_interval>1h</update_interval>
    </provider>

+    <!-- SUSE Linux Enterprise OS vulnerabilities -->
+    <provider name="suse">
+      <enabled>no</enabled>
+      <os>11-server</os>
+      <os>11-desktop</os>
+      <os>12-server</os>
+      <os>12-desktop</os>
+      <os>15-server</os>
+      <os>15-desktop</os>
+      <update_interval>1h</update_interval>
+    </provider>
+
    <!-- Arch OS vulnerabilities -->
    <provider name="arch">
      <enabled>no</enabled>
--- a/multi-node/docker-compose.yml
+++ b/multi-node/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.7'

 services:
  wazuh.master:
-    image: wazuh/wazuh-manager:4.5.0
+    image: wazuh/wazuh-manager:4.5.3
    hostname: wazuh.master
    restart: always
    ulimits:
@@ -45,7 +45,7 @@ services:
      - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf

  wazuh.worker:
-    image: wazuh/wazuh-manager:4.5.0
+    image: wazuh/wazuh-manager:4.5.3
    hostname: wazuh.worker
    restart: always
    ulimits:
@@ -81,7 +81,7 @@ services:
      - ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf

  wazuh1.indexer:
-    image: wazuh/wazuh-indexer:4.5.0
+    image: wazuh/wazuh-indexer:4.5.3
    hostname: wazuh1.indexer
    restart: always
    ports:
@@ -107,7 +107,7 @@ services:
      - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml

  wazuh2.indexer:
-    image: wazuh/wazuh-indexer:4.5.0
+    image: wazuh/wazuh-indexer:4.5.3
    hostname: wazuh2.indexer
    restart: always
    environment:
@@ -129,7 +129,7 @@ services:
      - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml

  wazuh3.indexer:
-    image: wazuh/wazuh-indexer:4.5.0
+    image: wazuh/wazuh-indexer:4.5.3
    hostname: wazuh3.indexer
    restart: always
    environment:
@@ -151,7 +151,7 @@ services:
      - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml

  wazuh.dashboard:
-    image: wazuh/wazuh-dashboard:4.5.0
+    image: wazuh/wazuh-dashboard:4.5.3
    hostname: wazuh.dashboard
    restart: always
    ports:
@@ -169,6 +169,8 @@ services:
      - ./config/wazuh_indexer_ssl_certs/root-ca.pem:/usr/share/wazuh-dashboard/certs/root-ca.pem
      - ./config/wazuh_dashboard/opensearch_dashboards.yml:/usr/share/wazuh-dashboard/config/opensearch_dashboards.yml
      - ./config/wazuh_dashboard/wazuh.yml:/usr/share/wazuh-dashboard/data/wazuh/config/wazuh.yml
+      - wazuh-dashboard-config:/usr/share/wazuh-dashboard/data/wazuh/config
+      - wazuh-dashboard-custom:/usr/share/wazuh-dashboard/plugins/wazuh/public/assets/custom
    depends_on:
      - wazuh1.indexer
    links:
@@ -218,3 +220,5 @@ volumes:
  wazuh-indexer-data-1:
  wazuh-indexer-data-2:
  wazuh-indexer-data-3:
+  wazuh-dashboard-config:
+  wazuh-dashboard-custom:
--- a/single-node/config/wazuh_cluster/wazuh_manager.conf
+++ b/single-node/config/wazuh_cluster/wazuh_manager.conf
@@ -108,13 +108,13 @@
      <os>xenial</os>
      <os>bionic</os>
      <os>focal</os>
+      <os>jammy</os>
      <update_interval>1h</update_interval>
    </provider>

    <!-- Debian OS vulnerabilities -->
    <provider name="debian">
      <enabled>no</enabled>
-      <os>stretch</os>
      <os>buster</os>
      <os>bullseye</os>
      <update_interval>1h</update_interval>
@@ -127,6 +127,7 @@
      <os>6</os>
      <os>7</os>
      <os>8</os>
+      <os>9</os>
      <update_interval>1h</update_interval>
    </provider>

@@ -138,6 +139,18 @@
      <update_interval>1h</update_interval>
    </provider>

+    <!-- SUSE Linux Enterprise OS vulnerabilities -->
+    <provider name="suse">
+      <enabled>no</enabled>
+      <os>11-server</os>
+      <os>11-desktop</os>
+      <os>12-server</os>
+      <os>12-desktop</os>
+      <os>15-server</os>
+      <os>15-desktop</os>
+      <update_interval>1h</update_interval>
+    </provider>
+
    <!-- Arch OS vulnerabilities -->
    <provider name="arch">
      <enabled>no</enabled>
--- a/single-node/docker-compose.yml
+++ b/single-node/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.7'

 services:
  wazuh.manager:
-    image: wazuh/wazuh-manager:4.5.0
+    image: wazuh/wazuh-manager:4.5.3
    hostname: wazuh.manager
    restart: always
    ulimits:
@@ -46,7 +46,7 @@ services:
      - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf

  wazuh.indexer:
-    image: wazuh/wazuh-indexer:4.5.0
+    image: wazuh/wazuh-indexer:4.5.3
    hostname: wazuh.indexer
    restart: always
    ports:
@@ -71,7 +71,7 @@ services:
      - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml

  wazuh.dashboard:
-    image: wazuh/wazuh-dashboard:4.5.0
+    image: wazuh/wazuh-dashboard:4.5.3
    hostname: wazuh.dashboard
    restart: always
    ports:
@@ -90,6 +90,8 @@ services:
      - ./config/wazuh_indexer_ssl_certs/root-ca.pem:/usr/share/wazuh-dashboard/certs/root-ca.pem
      - ./config/wazuh_dashboard/opensearch_dashboards.yml:/usr/share/wazuh-dashboard/config/opensearch_dashboards.yml
      - ./config/wazuh_dashboard/wazuh.yml:/usr/share/wazuh-dashboard/data/wazuh/config/wazuh.yml
+      - wazuh-dashboard-config:/usr/share/wazuh-dashboard/data/wazuh/config
+      - wazuh-dashboard-custom:/usr/share/wazuh-dashboard/plugins/wazuh/public/assets/custom
    depends_on:
      - wazuh.indexer
    links:
@@ -109,3 +111,5 @@ volumes:
  filebeat_etc:
  filebeat_var:
  wazuh-indexer-data:
+  wazuh-dashboard-config:
+  wazuh-dashboard-custom:
Author	SHA1	Message	Date
Gonzalo Acuña	088b855f73	Merge pull request #997 from wazuh/990-persist-logo Persist the custom logo in the Wazuh dashboard	2023-09-18 14:14:30 -03:00
Gonzalo Acuña	41515e9c49	Merge pull request #998 from wazuh/258-shuffle-permanent-data Check the permanent_data.env file and include any missing files	2023-09-15 14:44:27 -03:00
vcerenu	0fbbf5aee2	add shuffle scripts into permanent data	2023-09-15 13:31:00 -03:00
vcerenu	37f565bb8a	add custom directory and persistence	2023-09-15 12:49:32 -03:00
vcerenu	2ac53b9b3d	add custom directory and persistence	2023-09-15 12:41:05 -03:00
Gonzalo Acuña	d1c252c6c0	Merge pull request #996 from wazuh/979-remove-goss-from-manager-image Remove goss install	2023-09-14 16:14:58 -03:00
vcerenu	e9f689dbfc	remove goss directory	2023-09-14 15:17:13 -03:00
vcerenu	be19c70082	remove goss install	2023-09-14 12:25:57 -03:00
Gonzalo Acuña	1fae0d3452	Merge pull request #982 from wazuh/merge-4.5.2-into-4.5.3 Merge `4.5.2` into `4.5.3`	2023-09-07 08:12:25 -03:00
David Correa Rodríguez	0a4c057492	Merge branch '4.5.2' into merge-4.5.2-into-4.5.3	2023-09-07 10:29:02 +02:00
David Jose Iglesias Lopez	2902a0ce0b	Merge pull request #977 from wazuh/bump-revision-40505 Bump revision to 40505	2023-09-04 11:49:42 +02:00
David Correa Rodríguez	c0fb4172f3	Bump revision to 40505	2023-09-04 11:11:37 +02:00
Gonzalo Acuña	8886e2347e	Merge pull request #968 from wazuh/951-fix-wazuh-dashboard-modules-persist Fixed Wazuh dashboard modules persistency	2023-08-30 15:06:24 -03:00
Gonzalo Acuña	f1d8565989	Merge pull request #971 from wazuh/bump-4.5.3 Bump to `4.5.3`	2023-08-29 08:28:50 -03:00
David Correa Rodríguez	e5abd5d24e	Bump to 4.5.3	2023-08-29 11:29:26 +02:00
David Correa Rodríguez	902b0d8e52	Fixed Wazuh dashboard modules persistency	2023-08-28 13:11:25 +02:00
Gonzalo Acuña	c0d97893a4	Merge pull request #960 from wazuh/merge-4.5.1-into-4.5.2 Merge 4.5.1 into 4.5.2	2023-08-24 12:31:06 -03:00
vcerenu	0826f2c176	change revision	2023-08-24 12:23:15 -03:00
vcerenu	d531b8dd72	Resolving conflicts	2023-08-24 12:06:35 -03:00
Gonzalo Acuña	41267d4ddf	Merge pull request #946 from wazuh/944-bump-revision-2 Revision update	2023-08-17 12:20:42 -03:00
Gonzalo Acuña	67f34fb8fe	Revision update	2023-08-17 12:17:12 -03:00
Gonzalo Acuña	865f7625f4	Merge pull request #945 from wazuh/944-bump-revision Revision update	2023-08-17 09:02:13 -03:00
Gonzalo Acuña	c56952eaa0	Revision update	2023-08-17 08:56:16 -03:00
Gonzalo Acuña	cb7d8785c6	Merge pull request #930 from wazuh/926-update-the-vulnerability-detector-default-configuration-block-with-missing-providers Update the vulnerability detector default configuration block with missing providers	2023-08-14 15:19:54 -03:00
vcerenu	f1001c2f25	add jammy version into VD	2023-08-11 15:45:26 -03:00
David Correa Rodríguez	216b5a6818	Merge pull request #935 from wazuh/merge-4.5.1-into-4.5.2 Merge `4.5.1` into `4.5.2`	2023-08-11 12:25:04 +02:00
David Correa Rodríguez	e19fa14013	Merge pull request #934 from wazuh/merge-4.5-into-4.5.1 Merge `4.5` into `4.5.1`	2023-08-11 11:58:49 +02:00
vcerenu	57c7eaa5af	remove stretch and add rhel 9 into VD	2023-08-10 16:46:21 -03:00
vcerenu	fbe073612c	add suse vd options	2023-08-10 09:19:59 -03:00
Gonzalo Acuña	32b1d88e36	Merge pull request #919 from wazuh/917-fix-conditional-block-in-build-imagesh-script Fixed conditional block in images building	2023-08-03 10:02:24 -03:00
David Correa Rodríguez	94be842afc	Restored `IMAGE_VERSION` variable	2023-08-03 11:51:01 +02:00
David Correa Rodríguez	d20bbe247c	Fixed conditional block in images building	2023-08-03 11:45:56 +02:00
Gonzalo Acuña	da82008a75	Merge pull request #894 from wazuh/bump-4.5.2 Bump to 4.5.2	2023-07-19 08:55:24 -03:00
vcerenu	54975ab099	Bump to 4.5.2	2023-07-19 08:43:17 -03:00
Carlos Bordon	1a75d4eb77	Merge pull request #885 from wazuh/merge-4.5.0-into-4.5.1 Merge 4.5.0 into 4.5.1	2023-07-11 11:34:52 -03:00
vcerenu	247555b1b6	resolving merge conflicts	2023-07-11 11:21:00 -03:00
Victor Ereñú	61c37a78de	Merge pull request #874 from wazuh/bump-4-5-1 Bump version 4.5.1	2023-06-26 14:07:42 -03:00
vcerenu	39208c513c	bump version 4.5.1	2023-06-26 13:35:29 -03:00
Gonzalo Acuña	2340db4079	Merge pull request #865 from wazuh/merge-4.4-into-4.4.5 Merge `4.4` into `4.4.5`	2023-06-14 14:50:59 -03:00
Gonzalo Acuña	9159eda943	Merge branch '4.4.5' into merge-4.4-into-4.4.5	2023-06-14 14:07:23 -03:00
Gonzalo Acuña	41196a5529	Bump to 4.4.5	2023-06-05 11:44:32 -03:00