From 88b428593e26b4457a4cdc883781f91961d13234 Mon Sep 17 00:00:00 2001 From: Fede Tux Date: Thu, 11 Jul 2024 11:37:43 -0300 Subject: [PATCH] Adding logstash version to .env --- integrations/docker/.env | 5 ++++- integrations/docker/compose.amazon-security-lake.yml | 2 ++ integrations/docker/compose.indexer-elastic.yml | 4 +++- integrations/docker/compose.indexer-opensearch.yml | 4 +++- integrations/docker/compose.indexer-splunk.yml | 4 ++-- integrations/docker/compose.manager-elastic.yml | 6 ++++-- integrations/docker/compose.manager-opensearch.yml | 7 ++++--- integrations/docker/compose.manager-splunk.yml | 3 ++- integrations/logstash/Dockerfile | 3 ++- 9 files changed, 26 insertions(+), 12 deletions(-) diff --git a/integrations/docker/.env b/integrations/docker/.env index b5c14e4d905b7..6594092b0ef16 100644 --- a/integrations/docker/.env +++ b/integrations/docker/.env @@ -38,4 +38,7 @@ WAZUH_DASHBOARD_VERSION=2.12.0 WAZUH_CERTS_GENERATOR_VERSION=0.0.1 # Splunk version: -SPLUNK_VERSION=9.0.4 \ No newline at end of file +SPLUNK_VERSION=9.0.4 + +# Logstash version: +LOGSTASH_OSS_VERSION=8.9.0 \ No newline at end of file diff --git a/integrations/docker/compose.amazon-security-lake.yml b/integrations/docker/compose.amazon-security-lake.yml index da8b55f75937b..f97ab2637eaf6 100644 --- a/integrations/docker/compose.amazon-security-lake.yml +++ b/integrations/docker/compose.amazon-security-lake.yml @@ -83,6 +83,8 @@ services: image: wazuh/indexer-security-lake-integration build: context: ../logstash + args: + - LOGSTASH_OSS_VERSION=${LOGSTASH_OSS_VERSION} container_name: wazuh.integration.security.lake depends_on: - wazuh.indexer diff --git a/integrations/docker/compose.indexer-elastic.yml b/integrations/docker/compose.indexer-elastic.yml index 4ca0dc045e03b..2ab81793a9436 100644 --- a/integrations/docker/compose.indexer-elastic.yml +++ b/integrations/docker/compose.indexer-elastic.yml @@ -241,9 +241,11 @@ services: depends_on: es01: condition: service_healthy - image: logstash-oss:8.6.2 + image: logstash-oss:${LOGSTASH_OSS_VERSION} build: context: ../logstash + args: + - LOGSTASH_OSS_VERSION=${LOGSTASH_OSS_VERSION} environment: LOG_LEVEL: info MONITORING_ENABLED: false diff --git a/integrations/docker/compose.indexer-opensearch.yml b/integrations/docker/compose.indexer-opensearch.yml index d4e2c24a4b061..59af469a35944 100644 --- a/integrations/docker/compose.indexer-opensearch.yml +++ b/integrations/docker/compose.indexer-opensearch.yml @@ -173,12 +173,14 @@ services: - 'OPENSEARCH_HOSTS="https://opensearch.node:9200"' logstash: - image: logstash-oss:${STACK_VERSION} + image: logstash-oss:${LOGSTASH_OSS_VERSION} depends_on: opensearch.node: condition: service_healthy build: context: ../logstash + args: + - LOGSTASH_OSS_VERSION=${LOGSTASH_OSS_VERSION} environment: STACK_VERSION: ${STACK_VERSION} LOG_LEVEL: info diff --git a/integrations/docker/compose.indexer-splunk.yml b/integrations/docker/compose.indexer-splunk.yml index 156e716ce1dc5..ccb4f3fd665c2 100644 --- a/integrations/docker/compose.indexer-splunk.yml +++ b/integrations/docker/compose.indexer-splunk.yml @@ -165,9 +165,9 @@ services: depends_on: splunk: condition: service_healthy - image: logstash-oss:${STACK_VERSION} + image: logstash-oss:${LOGSTASH_OSS_VERSION} environment: - STACK_VERSION: ${STACK_VERSION} + LOGSTASH_OSS_VERSION: ${LOGSTASH_OSS_VERSION} LOG_LEVEL: info MONITORING_ENABLED: false volumes: diff --git a/integrations/docker/compose.manager-elastic.yml b/integrations/docker/compose.manager-elastic.yml index 29915f2c966ee..2496e6297ce4c 100644 --- a/integrations/docker/compose.manager-elastic.yml +++ b/integrations/docker/compose.manager-elastic.yml @@ -105,11 +105,13 @@ services: condition: service_healthy wazuh-certs-generator: condition: service_completed_successfully - image: logstash-oss:${STACK_VERSION} + image: logstash-oss:${LOGSTASH_OSS_VERSION} build: context: ../logstash + args: + - LOGSTASH_OSS_VERSION=${LOGSTASH_OSS_VERSION} environment: - STACK_VERSION=${STACK_VERSION} + LOGSTASH_OSS_VERSION=${LOGSTASH_OSS_VERSION} LOG_LEVEL: info MONITORING_ENABLED: false volumes: diff --git a/integrations/docker/compose.manager-opensearch.yml b/integrations/docker/compose.manager-opensearch.yml index 9550707498c59..e6008ea59e858 100644 --- a/integrations/docker/compose.manager-opensearch.yml +++ b/integrations/docker/compose.manager-opensearch.yml @@ -105,12 +105,13 @@ services: condition: service_healthy wazuh-certs-generator: condition: service_completed_successfully - image: logstash-oss:${STACK_VERSION} + image: logstash-oss:${LOGSTASH_OSS_VERSION} build: - dockerfile: ../elastic/Dockerfile context: ../logstash + args: + - LOGSTASH_OSS_VERSION=${LOGSTASH_OSS_VERSION} environment: - STACK_VERSION: ${STACK_VERSION} + LOGSTASH_OSS_VERSION: ${LOGSTASH_OSS_VERSION} LOG_LEVEL: info MONITORING_ENABLED: false volumes: diff --git a/integrations/docker/compose.manager-splunk.yml b/integrations/docker/compose.manager-splunk.yml index 27ac606c23653..9bce4180f434f 100644 --- a/integrations/docker/compose.manager-splunk.yml +++ b/integrations/docker/compose.manager-splunk.yml @@ -107,8 +107,9 @@ services: condition: service_completed_successfully image: logstash-oss:${STACK_VERSION} build: - dockerfile: ../logstash/Dockerfile context: ../logstash + args: + - LOGSTASH_OSS_VERSION=${LOGSTASH_OSS_VERSION} environment: STACK_VERSION: ${STACK_VERSION} LOG_LEVEL: info diff --git a/integrations/logstash/Dockerfile b/integrations/logstash/Dockerfile index 3848c8b757d9a..0c487bc7b2ca1 100644 --- a/integrations/logstash/Dockerfile +++ b/integrations/logstash/Dockerfile @@ -1,4 +1,5 @@ -FROM opensearchproject/logstash-oss-with-opensearch-output-plugin:latest +ARG LOGSTASH_OSS_VERSION +FROM opensearchproject/logstash-oss-with-opensearch-output-plugin:${LOGSTASH_OSS_VERSION} ENV LOGSTASH_KEYSTORE_PASS "SecretPassword" ENV LS_PATH "/usr/share/logstash"