diff --git a/bitnami/logstash/9.2/debian-12/Dockerfile b/bitnami/logstash/9.2/debian-12/Dockerfile index a240727a3c92..83cf8444e8b5 100644 --- a/bitnami/logstash/9.2/debian-12/Dockerfile +++ b/bitnami/logstash/9.2/debian-12/Dockerfile @@ -9,7 +9,7 @@ ARG LOGSTASH_PLUGINS ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2026-01-13T18:24:26Z" \ + org.opencontainers.image.created="2026-01-28T15:59:12Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/logstash/README.md" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/logstash" \ @@ -30,8 +30,8 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \ DOWNLOADS_URL=${SECRET_DOWNLOADS_URL:-${DOWNLOADS_URL}} ; \ mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \ COMPONENTS=( \ - "yq-4.50.1-0-linux-${OS_ARCH}-debian-12" \ - "java-17.0.17-15-0-linux-${OS_ARCH}-debian-12" \ + "yq-4.50.1-1-linux-${OS_ARCH}-debian-12" \ + "java-17.0.18-10-1-linux-${OS_ARCH}-debian-12" \ "logstash-9.2.4-0-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ @@ -54,7 +54,7 @@ RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/logstash/postunpack.sh ENV APP_VERSION="9.2.4" \ BITNAMI_APP_NAME="logstash" \ - IMAGE_REVISION="0" \ + IMAGE_REVISION="1" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/java/bin:/opt/bitnami/logstash/bin:$PATH" diff --git a/bitnami/logstash/9.2/debian-12/prebuildfs/opt/bitnami/scripts/liblog.sh b/bitnami/logstash/9.2/debian-12/prebuildfs/opt/bitnami/scripts/liblog.sh index 1e18ef9866fa..f873cf875a99 100644 --- a/bitnami/logstash/9.2/debian-12/prebuildfs/opt/bitnami/scripts/liblog.sh +++ b/bitnami/logstash/9.2/debian-12/prebuildfs/opt/bitnami/scripts/liblog.sh @@ -24,9 +24,9 @@ CYAN='\033[38;5;6m' stderr_print() { # 'is_boolean_yes' is defined in libvalidations.sh, but depends on this file so we cannot source it local bool="${BITNAMI_QUIET:-false}" - # comparison is performed without regard to the case of alphabetic characters - shopt -s nocasematch - if ! [[ "$bool" = 1 || "$bool" =~ ^(yes|true)$ ]]; then + # converts the string to lowercase + local bool_val="${bool,,}" + if ! [[ "$bool_val" = 1 || "$bool_val" =~ ^(yes|true)$ ]]; then printf "%b\\n" "${*}" >&2 fi } @@ -40,9 +40,9 @@ stderr_print() { ######################### log() { local color_bool="${BITNAMI_COLOR:-true}" - # comparison is performed without regard to the case of alphabetic characters - shopt -s nocasematch - if [[ "$color_bool" = 1 || "$color_bool" =~ ^(yes|true)$ ]]; then + # converts the string to lowercase + local color_bool_val="${color_bool,,}" + if [[ "$color_bool_val" = 1 || "$color_bool_val" =~ ^(yes|true)$ ]]; then stderr_print "${CYAN}${MODULE:-} ${MAGENTA}$(date "+%T.%2N ")${RESET}${*}" else stderr_print "${MODULE:-} $(date "+%T.%2N ")${*}" @@ -58,9 +58,9 @@ log() { info() { local msg_color="" local color_bool="${BITNAMI_COLOR:-true}" - # comparison is performed without regard to the case of alphabetic characters - shopt -s nocasematch - if [[ "$color_bool" = 1 || "$color_bool" =~ ^(yes|true)$ ]];then + # converts the string to lowercase + local color_bool_val="${color_bool,,}" + if [[ "$color_bool_val" = 1 || "$color_bool_val" =~ ^(yes|true)$ ]]; then msg_color="$GREEN" fi log "${msg_color}INFO ${RESET} ==> ${*}" @@ -75,9 +75,9 @@ info() { warn() { local msg_color="" local color_bool="${BITNAMI_COLOR:-true}" - # comparison is performed without regard to the case of alphabetic characters - shopt -s nocasematch - if [[ "$color_bool" = 1 || "$color_bool" =~ ^(yes|true)$ ]];then + # converts the string to lowercase + local color_bool_val="${color_bool,,}" + if [[ "$color_bool_val" = 1 || "$color_bool_val" =~ ^(yes|true)$ ]]; then msg_color="$YELLOW" fi log "${msg_color}WARN ${RESET} ==> ${*}" @@ -92,9 +92,9 @@ warn() { error() { local msg_color="" local color_bool="${BITNAMI_COLOR:-true}" - # comparison is performed without regard to the case of alphabetic characters - shopt -s nocasematch - if [[ "$color_bool" = 1 || "$color_bool" =~ ^(yes|true)$ ]];then + # converts the string to lowercase + local color_bool_val="${color_bool,,}" + if [[ "$color_bool_val" = 1 || "$color_bool_val" =~ ^(yes|true)$ ]]; then msg_color="$RED" fi log "${msg_color}ERROR${RESET} ==> ${*}" @@ -111,9 +111,9 @@ error() { debug() { local msg_color="" local color_bool="${BITNAMI_COLOR:-true}" - # comparison is performed without regard to the case of alphabetic characters - shopt -s nocasematch - if [[ "$color_bool" = 1 || "$color_bool" =~ ^(yes|true)$ ]] ;then + # converts the string to lowercase + local color_bool_val="${color_bool,,}" + if [[ "$color_bool_val" = 1 || "$color_bool_val" =~ ^(yes|true)$ ]]; then msg_color="$MAGENTA" fi local debug_bool="${BITNAMI_DEBUG:-false}" diff --git a/bitnami/logstash/9.2/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/logstash/9.2/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh index 6b392b1d1e5c..bbd31b26bb2c 100644 --- a/bitnami/logstash/9.2/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh +++ b/bitnami/logstash/9.2/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh @@ -52,9 +52,9 @@ is_positive_int() { ######################### is_boolean_yes() { local -r bool="${1:-}" - # comparison is performed without regard to the case of alphabetic characters - shopt -s nocasematch - if [[ "$bool" = 1 || "$bool" =~ ^(yes|true)$ ]]; then + # converts the string to lowercase + local bool_val="${bool,,}" + if [[ "$bool_val" = 1 || "$bool_val" =~ ^(yes|true)$ ]]; then true else false diff --git a/bitnami/logstash/9.2/debian-12/rootfs/opt/bitnami/scripts/liblogstash.sh b/bitnami/logstash/9.2/debian-12/rootfs/opt/bitnami/scripts/liblogstash.sh index 0d1c6f683967..55050d6020e4 100644 --- a/bitnami/logstash/9.2/debian-12/rootfs/opt/bitnami/scripts/liblogstash.sh +++ b/bitnami/logstash/9.2/debian-12/rootfs/opt/bitnami/scripts/liblogstash.sh @@ -97,20 +97,11 @@ logstash_create_sample_pipeline_config_file() { local outputs="" # Parse inputs if is_boolean_yes "$LOGSTASH_ENABLE_BEATS_INPUT"; then - # Newer versions of the logstash-input-beats use ssl_enabled instead of ssl - if [[ $(logstash_major_version) -eq 7 ]]; then - inputs+=$'\n'"beats { - ssl => false - host => \"${LOGSTASH_BIND_ADDRESS}\" - port => ${LOGSTASH_BEATS_PORT_NUMBER} -}" - else - inputs+=$'\n'"beats { + inputs+=$'\n'"beats { ssl_enabled => false host => \"${LOGSTASH_BIND_ADDRESS}\" port => ${LOGSTASH_BEATS_PORT_NUMBER} }" - fi fi if is_boolean_yes "$LOGSTASH_ENABLE_GELF_INPUT"; then inputs+=$'\n'"gelf { @@ -119,20 +110,11 @@ logstash_create_sample_pipeline_config_file() { }" fi if is_boolean_yes "$LOGSTASH_ENABLE_HTTP_INPUT"; then - # Newer versions of the logstash-input-http use ssl_enabled instead of ssl - if [[ $(logstash_major_version) -eq 7 ]]; then - inputs+=$'\n'"http { - ssl => false - host => \"${LOGSTASH_BIND_ADDRESS}\" - port => ${LOGSTASH_HTTP_PORT_NUMBER} -}" - else - inputs+=$'\n'"http { + inputs+=$'\n'"http { ssl_enabled => false host => \"${LOGSTASH_BIND_ADDRESS}\" port => ${LOGSTASH_HTTP_PORT_NUMBER} }" - fi fi if is_boolean_yes "$LOGSTASH_ENABLE_TCP_INPUT"; then inputs+=$'\n'"tcp {