From 07b7789d39cd9c8db43a1aab2c5bc93d5f993b9b Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 10 Nov 2022 11:09:26 +0100 Subject: [PATCH] [bitnami/logstash] Release 7.17.7-debian-11-r5 (#13239) Signed-off-by: Bitnami Containers Signed-off-by: Bitnami Containers --- bitnami/logstash/7/debian-11/Dockerfile | 3 ++- .../rootfs/opt/bitnami/scripts/liblogstash.sh | 27 +++++++++++++++++++ .../opt/bitnami/scripts/logstash-env.sh | 2 ++ .../bitnami/scripts/logstash/postunpack.sh | 8 +++++- .../opt/bitnami/scripts/logstash/setup.sh | 2 ++ 5 files changed, 40 insertions(+), 2 deletions(-) diff --git a/bitnami/logstash/7/debian-11/Dockerfile b/bitnami/logstash/7/debian-11/Dockerfile index 16790a98392b..7ac8b3c6b240 100644 --- a/bitnami/logstash/7/debian-11/Dockerfile +++ b/bitnami/logstash/7/debian-11/Dockerfile @@ -1,11 +1,12 @@ FROM docker.io/bitnami/minideb:bullseye ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security" +ARG LOGSTASH_PLUGINS ARG TARGETARCH LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \ org.opencontainers.image.description="Application packaged by Bitnami" \ - org.opencontainers.image.ref.name="7.17.7-debian-11-r4" \ + org.opencontainers.image.ref.name="7.17.7-debian-11-r5" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/logstash" \ org.opencontainers.image.title="logstash" \ org.opencontainers.image.vendor="VMware, Inc." \ diff --git a/bitnami/logstash/7/debian-11/rootfs/opt/bitnami/scripts/liblogstash.sh b/bitnami/logstash/7/debian-11/rootfs/opt/bitnami/scripts/liblogstash.sh index 57b37a22e026..3ee3d7ac0127 100644 --- a/bitnami/logstash/7/debian-11/rootfs/opt/bitnami/scripts/liblogstash.sh +++ b/bitnami/logstash/7/debian-11/rootfs/opt/bitnami/scripts/liblogstash.sh @@ -349,3 +349,30 @@ logstash_stop() { debug "Stopping Logstash" stop_service_using_pid "$LOGSTASH_PID_FILE" } + +######################## +# Install Logstash plugins +# Globals: +# LOGSTASH_* +# Arguments: +# None +# Returns: +# None +######################### +logstash_install_plugins() { + read -r -a plugins_list <<<"$(tr ',;' ' ' <<<"$LOGSTASH_PLUGINS")" + + # Skip if there isn't any plugin to install + [[ -z "${plugins_list[*]:-}" ]] && return + + # Install plugins + info "Installing plugins: ${plugins_list[*]}" + for plugin in "${plugins_list[@]}"; do + debug "Installing plugin: ${plugin}" + if [[ "${BITNAMI_DEBUG:-false}" = true ]]; then + logstash-plugin install "$plugin" + else + logstash-plugin install "$plugin" >/dev/null 2>&1 + fi + done +} diff --git a/bitnami/logstash/7/debian-11/rootfs/opt/bitnami/scripts/logstash-env.sh b/bitnami/logstash/7/debian-11/rootfs/opt/bitnami/scripts/logstash-env.sh index e0f16b335943..cd1c4b47edbf 100644 --- a/bitnami/logstash/7/debian-11/rootfs/opt/bitnami/scripts/logstash-env.sh +++ b/bitnami/logstash/7/debian-11/rootfs/opt/bitnami/scripts/logstash-env.sh @@ -27,6 +27,7 @@ logstash_env_vars=( LOGSTASH_EXPOSE_API LOGSTASH_API_PORT_NUMBER LOGSTASH_PIPELINE_CONF_STRING + LOGSTASH_PLUGINS LOGSTASH_EXTRA_FLAGS LOGSTASH_HEAP_SIZE LOGSTASH_MAX_ALLOWED_MEMORY_PERCENTAGE @@ -88,6 +89,7 @@ export LOGSTASH_EXPOSE_API="${LOGSTASH_EXPOSE_API:-no}" export LOGSTASH_API_PORT_NUMBER="${LOGSTASH_API_PORT_NUMBER:-9600}" LOGSTASH_PIPELINE_CONF_STRING="${LOGSTASH_PIPELINE_CONF_STRING:-"${LOGSTASH_CONF_STRING:-}"}" export LOGSTASH_PIPELINE_CONF_STRING="${LOGSTASH_PIPELINE_CONF_STRING:-}" +export LOGSTASH_PLUGINS="${LOGSTASH_PLUGINS:-}" LOGSTASH_EXTRA_FLAGS="${LOGSTASH_EXTRA_FLAGS:-"${LOGSTASH_EXTRA_ARGS:-}"}" export LOGSTASH_EXTRA_FLAGS="${LOGSTASH_EXTRA_FLAGS:-}" export LOGSTASH_HEAP_SIZE="${LOGSTASH_HEAP_SIZE:-1024m}" diff --git a/bitnami/logstash/7/debian-11/rootfs/opt/bitnami/scripts/logstash/postunpack.sh b/bitnami/logstash/7/debian-11/rootfs/opt/bitnami/scripts/logstash/postunpack.sh index da56f0a58794..003403ab842c 100755 --- a/bitnami/logstash/7/debian-11/rootfs/opt/bitnami/scripts/logstash/postunpack.sh +++ b/bitnami/logstash/7/debian-11/rootfs/opt/bitnami/scripts/logstash/postunpack.sh @@ -17,11 +17,15 @@ set -o pipefail info "Creating Logstash daemon user" ensure_user_exists "$LOGSTASH_DAEMON_USER" --group "$LOGSTASH_DAEMON_GROUP" -for dir in "$LOGSTASH_CONF_DIR" "$LOGSTASH_PIPELINE_CONF_DIR" "$LOGSTASH_MOUNTED_CONF_DIR" "$LOGSTASH_MOUNTED_PIPELINE_CONF_DIR" "$LOGSTASH_VOLUME_DIR" "$LOGSTASH_DATA_DIR"; do +for dir in "$LOGSTASH_BASE_DIR/vendor/bundle/jruby" "$LOGSTASH_CONF_DIR" "$LOGSTASH_PIPELINE_CONF_DIR" "$LOGSTASH_MOUNTED_CONF_DIR" "$LOGSTASH_MOUNTED_PIPELINE_CONF_DIR" "$LOGSTASH_VOLUME_DIR" "$LOGSTASH_DATA_DIR"; do ensure_dir_exists "$dir" configure_permissions_ownership "$dir" -d "775" -f "664" -u "$LOGSTASH_DAEMON_USER" -g "root" done +for file in "$LOGSTASH_BASE_DIR/Gemfile" "$LOGSTASH_BASE_DIR/Gemfile.lock"; do + configure_permissions_ownership "$file" -f "664" -u "$LOGSTASH_DAEMON_USER" -g "root" +done + info "Configuring paths" logstash_yml_set "$LOGSTASH_CONF_FILE" '"path.data"' "$LOGSTASH_DATA_DIR" @@ -46,3 +50,5 @@ appender.json_console.layout.eventEol = true rootLogger.level = \${sys:ls.log.level} rootLogger.appenderRef.console.ref = \${sys:ls.log.format}_console EOF + +logstash_install_plugins diff --git a/bitnami/logstash/7/debian-11/rootfs/opt/bitnami/scripts/logstash/setup.sh b/bitnami/logstash/7/debian-11/rootfs/opt/bitnami/scripts/logstash/setup.sh index d52f0e32ce8f..06e0571e2124 100755 --- a/bitnami/logstash/7/debian-11/rootfs/opt/bitnami/scripts/logstash/setup.sh +++ b/bitnami/logstash/7/debian-11/rootfs/opt/bitnami/scripts/logstash/setup.sh @@ -21,3 +21,5 @@ am_i_root && ensure_user_exists "$LOGSTASH_DAEMON_USER" --group "$LOGSTASH_DAEMO # Ensure Logstash is initialized logstash_initialize +# Install Logstash plugins +logstash_install_plugins