From 0df58ba96fecfd2bc54838f14baac3af0a0859e1 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Wed, 24 May 2023 23:07:20 +0200
Subject: [PATCH] [bitnami/logstash] Release 8.7.1-debian-11-r8 (#35131)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/logstash/8/debian-11/Dockerfile           |  6 +++---
 .../opt/bitnami/.bitnami_components.json          |  2 +-
 .../rootfs/opt/bitnami/scripts/liblogstash.sh     | 15 +++++++--------
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/bitnami/logstash/8/debian-11/Dockerfile b/bitnami/logstash/8/debian-11/Dockerfile
index 72c564505702..679b44990487 100644
--- a/bitnami/logstash/8/debian-11/Dockerfile
+++ b/bitnami/logstash/8/debian-11/Dockerfile
@@ -5,10 +5,10 @@ ARG LOGSTASH_PLUGINS
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-05-21T18:36:12Z" \
+      org.opencontainers.image.created="2023-05-24T20:35:32Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="8.7.1-debian-11-r7" \
+      org.opencontainers.image.ref.name="8.7.1-debian-11-r8" \
       org.opencontainers.image.title="logstash" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="8.7.1"
@@ -25,7 +25,7 @@ RUN install_packages ca-certificates curl procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
       "java-17.0.7-7-2-linux-${OS_ARCH}-debian-11" \
-      "yq-4.33.3-1-linux-${OS_ARCH}-debian-11" \
+      "yq-4.34.1-0-linux-${OS_ARCH}-debian-11" \
       "logstash-8.7.1-1-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
diff --git a/bitnami/logstash/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/logstash/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 5c9975b78676..1f6ad9e9ff65 100644
--- a/bitnami/logstash/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/logstash/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -15,6 +15,6 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "4.33.3-1"
+        "version": "4.34.1-0"
     }
 }
\ No newline at end of file
diff --git a/bitnami/logstash/8/debian-11/rootfs/opt/bitnami/scripts/liblogstash.sh b/bitnami/logstash/8/debian-11/rootfs/opt/bitnami/scripts/liblogstash.sh
index 3ee3d7ac0127..88b790b5e03e 100644
--- a/bitnami/logstash/8/debian-11/rootfs/opt/bitnami/scripts/liblogstash.sh
+++ b/bitnami/logstash/8/debian-11/rootfs/opt/bitnami/scripts/liblogstash.sh
@@ -282,19 +282,18 @@ logstash_initialize() {
     # Skip further configuration if Logstash pipeline configuration was passed as a string
     [[ -n "$LOGSTASH_PIPELINE_CONF_STRING" ]] && return
 
-    if [[ -n "$LOGSTASH_PIPELINE_CONF_FILENAME" && -e "${LOGSTASH_MOUNTED_PIPELINE_CONF_DIR}/${LOGSTASH_PIPELINE_CONF_FILENAME}" ]]; then
-        info "Detected mounted '${LOGSTASH_PIPELINE_CONF_FILENAME}' pipeline configuration file"
-        cp -L "${LOGSTASH_MOUNTED_PIPELINE_CONF_DIR}/${LOGSTASH_PIPELINE_CONF_FILENAME}" "$LOGSTASH_PIPELINE_CONF_DIR"
-    elif ! is_mounted_dir_empty "$LOGSTASH_MOUNTED_PIPELINE_CONF_DIR"; then
+    if ! is_mounted_dir_empty "$LOGSTASH_MOUNTED_PIPELINE_CONF_DIR"; then
         info "Detected mounted pipeline configuration files"
-        cp -Lr "$LOGSTASH_MOUNTED_PIPELINE_CONF_DIR"/*.conf "$LOGSTASH_PIPELINE_CONF_DIR"
+        cp -Lr "$LOGSTASH_MOUNTED_PIPELINE_CONF_DIR"/* "$LOGSTASH_PIPELINE_CONF_DIR"
     elif [[ -e "${LOGSTASH_MOUNTED_CONF_DIR}/${LOGSTASH_PIPELINE_CONF_FILENAME}" ]]; then
         # Support for legacy configuration before configurations were separated into 'config' and 'pipeline'
         warn "Detected mounted '${LOGSTASH_MOUNTED_CONF_DIR}/${LOGSTASH_PIPELINE_CONF_FILENAME}' pipeline configuration file in legacy directory."
-        warn "Support for this configuration may be deprecated in a future version of this image. Please mount the file to '${LOGSTASH_MOUNTED_PIPELINE_CONF_DIR}/${LOGSTASH_PIPELINE_CONF_FILENAME}' instead."
-        cp -Lr "$LOGSTASH_MOUNTED_CONF_DIR"/*.conf "$LOGSTASH_PIPELINE_CONF_DIR"
-    else
+        warn "Support for this configuration may be deprecated in a future version of this image. Please mount the pipeline files to '${LOGSTASH_MOUNTED_PIPELINE_CONF_DIR}' instead."
+        cp -Lr "${LOGSTASH_MOUNTED_CONF_DIR}/${LOGSTASH_PIPELINE_CONF_FILENAME}" "$LOGSTASH_PIPELINE_CONF_DIR"
+    elif is_dir_empty "$LOGSTASH_PIPELINE_CONF_DIR"; then
         logstash_create_sample_pipeline_config_file
+    else
+        info "Detected existing files in '${LOGSTASH_PIPELINE_CONF_DIR}', skipping sample pipeline generation"
     fi
 }