From d352019385bace5d881380cace9bc5321c7deee0 Mon Sep 17 00:00:00 2001 From: rafabailon Date: Tue, 31 Oct 2023 10:09:45 +0100 Subject: [PATCH 1/7] Rename Kibana as Dashboard --- build-docker-images/wazuh-dashboard/config/wazuh.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-docker-images/wazuh-dashboard/config/wazuh.yml b/build-docker-images/wazuh-dashboard/config/wazuh.yml index 3fab9b09..8e5f9447 100644 --- a/build-docker-images/wazuh-dashboard/config/wazuh.yml +++ b/build-docker-images/wazuh-dashboard/config/wazuh.yml @@ -16,7 +16,7 @@ # https://documentation.wazuh.com/current/installation-guide/index.html # # Also, you can check our repository: -# https://github.com/wazuh/wazuh-kibana-app +# https://github.com/wazuh/wazuh-dashboard-plugins # # ------------------------------- Index patterns ------------------------------- # From fa956c53e701c1dd3896abd968c869ee0b435fde Mon Sep 17 00:00:00 2001 From: vcerenu Date: Thu, 2 Nov 2023 12:07:17 -0300 Subject: [PATCH 2/7] bump revision number --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index f8af68ee..fb0d7073 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-DOCKER_VERSION="4.7.0" -REVISION="40701" +REVISION="40702" From 2ccd5dc431291bd9caaf944479051a20a3dd1fc6 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 13 Nov 2023 09:33:37 -0300 Subject: [PATCH 3/7] change revision number --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index fb0d7073..ce652074 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-DOCKER_VERSION="4.7.0" -REVISION="40702" +REVISION="40703" From 20a3f170d8d64486220fcedc01e37b7cfc80085f Mon Sep 17 00:00:00 2001 From: c-bordon Date: Tue, 14 Nov 2023 14:28:35 -0300 Subject: [PATCH 4/7] Updated Filebeat module version to 0.3 --- build-docker-images/README.md | 2 +- build-docker-images/wazuh-manager/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-docker-images/README.md b/build-docker-images/README.md index 605776c3..567f2379 100644 --- a/build-docker-images/README.md +++ b/build-docker-images/README.md @@ -24,7 +24,7 @@ $ build-docker-images/build-images.sh -h Usage: build-docker-images/build-images.sh [OPTIONS] -d, --dev [Optional] Set the development stage you want to build, example rc1 or beta1, not used by default. - -f, --filebeat-module [Optional] Set Filebeat module version. By default 0.2. + -f, --filebeat-module [Optional] Set Filebeat module version. By default 0.3. -r, --revision [Optional] Package revision. By default 1 -v, --version [Optional] Set the Wazuh version should be builded. By default, 4.7.0. -h, --help Show this help. diff --git a/build-docker-images/wazuh-manager/Dockerfile b/build-docker-images/wazuh-manager/Dockerfile index 878a07a2..5e748801 100644 --- a/build-docker-images/wazuh-manager/Dockerfile +++ b/build-docker-images/wazuh-manager/Dockerfile @@ -22,7 +22,7 @@ RUN apt-get update && \ RUN curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/${FILEBEAT_CHANNEL}-${FILEBEAT_VERSION}-amd64.deb &&\ 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 + curl -s https://packages-dev.wazuh.com/pre-release/filebeat/${WAZUH_FILEBEAT_MODULE} | tar -xvz -C /usr/share/filebeat/module 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 \ From 56ccf81185fe0b967441076def0db06883b05489 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Tue, 14 Nov 2023 14:29:46 -0300 Subject: [PATCH 5/7] Fixed wrong file --- build-docker-images/build-images.sh | 2 +- build-docker-images/wazuh-manager/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index 76258dff..62969466 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -15,7 +15,7 @@ IMAGE_VERSION=${WAZUH_IMAGE_VERSION} WAZUH_IMAGE_VERSION="4.7.0" WAZUH_TAG_REVISION="1" WAZUH_DEV_STAGE="" -FILEBEAT_MODULE_VERSION="0.2" +FILEBEAT_MODULE_VERSION="0.3" # ----------------------------------------------------------------------------- diff --git a/build-docker-images/wazuh-manager/Dockerfile b/build-docker-images/wazuh-manager/Dockerfile index 5e748801..878a07a2 100644 --- a/build-docker-images/wazuh-manager/Dockerfile +++ b/build-docker-images/wazuh-manager/Dockerfile @@ -22,7 +22,7 @@ RUN apt-get update && \ RUN curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/${FILEBEAT_CHANNEL}-${FILEBEAT_VERSION}-amd64.deb &&\ dpkg -i ${FILEBEAT_CHANNEL}-${FILEBEAT_VERSION}-amd64.deb && rm -f ${FILEBEAT_CHANNEL}-${FILEBEAT_VERSION}-amd64.deb && \ - curl -s https://packages-dev.wazuh.com/pre-release/filebeat/${WAZUH_FILEBEAT_MODULE} | tar -xvz -C /usr/share/filebeat/module + curl -s https://packages.wazuh.com/4.x/filebeat/${WAZUH_FILEBEAT_MODULE} | tar -xvz -C /usr/share/filebeat/module 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 \ From 423fc248ef43b88329f665f7f25dc812ed5b8f86 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Tue, 21 Nov 2023 15:05:17 -0300 Subject: [PATCH 6/7] Removed report dependencies from Wazuh dashboard image --- build-docker-images/wazuh-dashboard/Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-docker-images/wazuh-dashboard/Dockerfile b/build-docker-images/wazuh-dashboard/Dockerfile index 44430b10..8ca7f77b 100644 --- a/build-docker-images/wazuh-dashboard/Dockerfile +++ b/build-docker-images/wazuh-dashboard/Dockerfile @@ -80,9 +80,6 @@ ENV PATTERN="" \ WAZUH_MONITORING_SHARDS="" \ WAZUH_MONITORING_REPLICAS="" -# Install dependencies -RUN apt update && apt install -y libnss3-dev fonts-liberation libfontconfig1 - # Create wazuh-dashboard user and group RUN getent group $GROUP || groupadd -r -g 1000 $GROUP RUN useradd --system \ From f8eb0b5f1d27190f4df37539087f82be8b8c9567 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Thu, 23 Nov 2023 07:47:39 -0300 Subject: [PATCH 7/7] change revision number --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index ce652074..ab38abe8 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-DOCKER_VERSION="4.7.0" -REVISION="40703" +REVISION="40704"