[bitnami/kibana] Release 7.17.18-debian-12-r6 (#63395)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
Bitnami Bot 2024-02-26 14:26:50 +01:00 committed by GitHub
parent 06aa5a6a60
commit 7a28294acf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 64 additions and 24 deletions

View File

@ -7,10 +7,10 @@ ARG TARGETARCH
LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
org.opencontainers.image.created="2024-02-21T12:01:50Z" \
org.opencontainers.image.created="2024-02-26T12:30:29Z" \
org.opencontainers.image.description="Application packaged by VMware, Inc" \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.ref.name="7.17.18-debian-12-r5" \
org.opencontainers.image.ref.name="7.17.18-debian-12-r6" \
org.opencontainers.image.title="kibana" \
org.opencontainers.image.vendor="VMware, Inc." \
org.opencontainers.image.version="7.17.18"
@ -27,7 +27,7 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
RUN install_packages ca-certificates curl libexpat1 libgcc-s1 libnss3 libstdc++6 procps
RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
COMPONENTS=( \
"yq-4.41.1-0-linux-${OS_ARCH}-debian-12" \
"yq-4.42.1-0-linux-${OS_ARCH}-debian-12" \
"kibana-7.17.18-1-linux-${OS_ARCH}-debian-12" \
) ; \
for COMPONENT in "${COMPONENTS[@]}"; do \

View File

@ -9,6 +9,6 @@
"arch": "amd64",
"distro": "debian-12",
"type": "NAMI",
"version": "4.41.1-0"
"version": "4.42.1-0"
}
}

View File

@ -83,6 +83,8 @@ export KIBANA_BASE_DIR="${BITNAMI_ROOT_DIR}/kibana"
export SERVER_BASE_DIR="$KIBANA_BASE_DIR"
export KIBANA_CONF_DIR="${SERVER_BASE_DIR}/config"
export SERVER_CONF_DIR="$KIBANA_CONF_DIR"
export KIBANA_DEFAULT_CONF_DIR="${SERVER_BASE_DIR}/config.default"
export SERVER_DEFAULT_CONF_DIR="$KIBANA_DEFAULT_CONF_DIR"
export KIBANA_LOGS_DIR="${SERVER_BASE_DIR}/logs"
export SERVER_LOGS_DIR="$KIBANA_LOGS_DIR"
export KIBANA_TMP_DIR="${SERVER_BASE_DIR}/tmp"
@ -91,6 +93,8 @@ export KIBANA_BIN_DIR="${SERVER_BASE_DIR}/bin"
export SERVER_BIN_DIR="$KIBANA_BIN_DIR"
export KIBANA_PLUGINS_DIR="${SERVER_BASE_DIR}/plugins"
export SERVER_PLUGINS_DIR="$KIBANA_PLUGINS_DIR"
export KIBANA_DEFAULT_PLUGINS_DIR="${SERVER_BASE_DIR}/plugins.default"
export SERVER_DEFAULT_PLUGINS_DIR="$KIBANA_DEFAULT_PLUGINS_DIR"
export KIBANA_DATA_DIR="${SERVER_VOLUME_DIR}/data"
export SERVER_DATA_DIR="$KIBANA_DATA_DIR"
export KIBANA_MOUNTED_CONF_DIR="${SERVER_VOLUME_DIR}/conf"

View File

@ -19,6 +19,25 @@ set -o pipefail
print_welcome_page
# We add the copy from default config in the entrypoint to not break users
# bypassing the setup.sh logic. If the file already exists do not overwrite (in
# case someone mounts a configuration file in /opt/bitnami/elasticsearch/conf)
debug "Copying files from $SERVER_DEFAULT_CONF_DIR to $SERVER_CONF_DIR"
cp -nr "$SERVER_DEFAULT_CONF_DIR"/. "$SERVER_CONF_DIR"
if ! is_dir_empty "$SERVER_DEFAULT_PLUGINS_DIR"; then
debug "Copying plugins from $SERVER_DEFAULT_PLUGINS_DIR to $SERVER_PLUGINS_DIR"
# Copy the plugins installed by default to the plugins directory
# If there is already a plugin with the same name in the plugins folder do nothing
for plugin_path in "${SERVER_DEFAULT_PLUGINS_DIR}"/*; do
plugin_name="$(basename "$plugin_path")"
plugin_moved_path="${SERVER_PLUGINS_DIR}/${plugin_name}"
if ! [[ -d "$plugin_moved_path" ]]; then
cp -r "$plugin_path" "$plugin_moved_path"
fi
done
fi
if [[ "$1" = "/opt/bitnami/scripts/kibana/run.sh" ]]; then
info "** Starting Kibana setup **"
/opt/bitnami/scripts/kibana/setup.sh

View File

@ -16,7 +16,7 @@ set -o pipefail
# Load environment
. /opt/bitnami/scripts/kibana-env.sh
for dir in "$SERVER_TMP_DIR" "$SERVER_LOGS_DIR" "$SERVER_CONF_DIR" "$SERVER_PLUGINS_DIR" "$SERVER_VOLUME_DIR" "$SERVER_DATA_DIR" "$SERVER_INITSCRIPTS_DIR"; do
for dir in "$SERVER_TMP_DIR" "$SERVER_LOGS_DIR" "$SERVER_CONF_DIR" "$SERVER_DEFAULT_CONF_DIR" "$SERVER_PLUGINS_DIR" "$SERVER_DEFAULT_PLUGINS_DIR" "$SERVER_VOLUME_DIR" "$SERVER_DATA_DIR" "$SERVER_INITSCRIPTS_DIR"; do
ensure_dir_exists "$dir"
chmod -R ug+rwX "$dir"
done
@ -24,3 +24,18 @@ done
kibana_conf_set "path.data" "$SERVER_DATA_DIR"
# For backwards compatibility, create a symlink to the default path
! is_dir_empty "${SERVER_BASE_DIR}/data" || rm -rf "${SERVER_BASE_DIR}/data" && ln -s "$SERVER_DATA_DIR" "${SERVER_BASE_DIR}/data"
# Copy all initially generated configuration files to the default directory
# (this is to avoid breaking when entrypoint is being overridden)
cp -r "${SERVER_CONF_DIR}/"* "$SERVER_DEFAULT_CONF_DIR"
chmod o+rX -R "$SERVER_DEFAULT_CONF_DIR"
if ! is_dir_empty "$SERVER_PLUGINS_DIR"; then
# Move all initially installed plugins to the default plugins directory.
for plugin_path in "${SERVER_PLUGINS_DIR}"/*; do
plugin_name="$(basename "$plugin_path")"
plugin_moved_path="${SERVER_DEFAULT_PLUGINS_DIR}/${plugin_name}"
mv "$plugin_path" "$plugin_moved_path"
done
chmod o+rX -R "$SERVER_DEFAULT_PLUGINS_DIR"
fi

View File

@ -178,25 +178,27 @@ docker run -d --name myapp \
#### Read-only environment variables
| Name | Description | Value |
|---------------------------|-----------------------------------------------------------------------------------------------|---------------------------------|
| `SERVER_FLAVOR` | Server flavor. Valid values: `kibana` or `opensearch-dashboards`. | `kibana` |
| `BITNAMI_VOLUME_DIR` | Directory where to mount volumes | `/bitnami` |
| `KIBANA_VOLUME_DIR` | Kibana persistence directory | `${BITNAMI_VOLUME_DIR}/kibana` |
| `KIBANA_BASE_DIR` | Kibana installation directory | `${BITNAMI_ROOT_DIR}/kibana` |
| `KIBANA_CONF_DIR` | Kibana configuration directory | `${SERVER_BASE_DIR}/config` |
| `KIBANA_LOGS_DIR` | Kibana logs directory | `${SERVER_BASE_DIR}/logs` |
| `KIBANA_TMP_DIR` | Kibana temporary directory | `${SERVER_BASE_DIR}/tmp` |
| `KIBANA_BIN_DIR` | Kibana executable directory | `${SERVER_BASE_DIR}/bin` |
| `KIBANA_PLUGINS_DIR` | Kibana plugins directory | `${SERVER_BASE_DIR}/plugins` |
| `KIBANA_DATA_DIR` | Kibana data directory | `${SERVER_VOLUME_DIR}/data` |
| `KIBANA_MOUNTED_CONF_DIR` | Directory for including custom configuration files (that override the default generated ones) | `${SERVER_VOLUME_DIR}/conf` |
| `KIBANA_CONF_FILE` | Path to Kibana configuration file | `${SERVER_CONF_DIR}/kibana.yml` |
| `KIBANA_LOG_FILE` | Path to the Kibana log file | `${SERVER_LOGS_DIR}/kibana.log` |
| `KIBANA_PID_FILE` | Path to the Kibana pid file | `${SERVER_TMP_DIR}/kibana.pid` |
| `KIBANA_INITSCRIPTS_DIR` | Path to the Kibana container init scripts directory | `/docker-entrypoint-initdb.d` |
| `KIBANA_DAEMON_USER` | Kibana system user | `kibana` |
| `KIBANA_DAEMON_GROUP` | Kibana system group | `kibana` |
| Name | Description | Value |
|------------------------------|-----------------------------------------------------------------------------------------------|--------------------------------------|
| `SERVER_FLAVOR` | Server flavor. Valid values: `kibana` or `opensearch-dashboards`. | `kibana` |
| `BITNAMI_VOLUME_DIR` | Directory where to mount volumes | `/bitnami` |
| `KIBANA_VOLUME_DIR` | Kibana persistence directory | `${BITNAMI_VOLUME_DIR}/kibana` |
| `KIBANA_BASE_DIR` | Kibana installation directory | `${BITNAMI_ROOT_DIR}/kibana` |
| `KIBANA_CONF_DIR` | Kibana configuration directory | `${SERVER_BASE_DIR}/config` |
| `KIBANA_DEFAULT_CONF_DIR` | Kibana default configuration directory | `${SERVER_BASE_DIR}/config.default` |
| `KIBANA_LOGS_DIR` | Kibana logs directory | `${SERVER_BASE_DIR}/logs` |
| `KIBANA_TMP_DIR` | Kibana temporary directory | `${SERVER_BASE_DIR}/tmp` |
| `KIBANA_BIN_DIR` | Kibana executable directory | `${SERVER_BASE_DIR}/bin` |
| `KIBANA_PLUGINS_DIR` | Kibana plugins directory | `${SERVER_BASE_DIR}/plugins` |
| `KIBANA_DEFAULT_PLUGINS_DIR` | Kibana default plugins directory | `${SERVER_BASE_DIR}/plugins.default` |
| `KIBANA_DATA_DIR` | Kibana data directory | `${SERVER_VOLUME_DIR}/data` |
| `KIBANA_MOUNTED_CONF_DIR` | Directory for including custom configuration files (that override the default generated ones) | `${SERVER_VOLUME_DIR}/conf` |
| `KIBANA_CONF_FILE` | Path to Kibana configuration file | `${SERVER_CONF_DIR}/kibana.yml` |
| `KIBANA_LOG_FILE` | Path to the Kibana log file | `${SERVER_LOGS_DIR}/kibana.log` |
| `KIBANA_PID_FILE` | Path to the Kibana pid file | `${SERVER_TMP_DIR}/kibana.pid` |
| `KIBANA_INITSCRIPTS_DIR` | Path to the Kibana container init scripts directory | `/docker-entrypoint-initdb.d` |
| `KIBANA_DAEMON_USER` | Kibana system user | `kibana` |
| `KIBANA_DAEMON_GROUP` | Kibana system group | `kibana` |
When you start the kibana image, you can adjust the configuration of the instance by passing one or more environment variables on the `docker run` command line.