From ec7fffb8f9fa844634110a265f4bf730f4ecf102 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Tue, 27 Jun 2023 17:09:55 +0200
Subject: [PATCH] [bitnami/kibana] Release 8.8.1-debian-11-r6 (#39125)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/kibana/8/debian-11/Dockerfile         |  6 ++---
 bitnami/kibana/8/debian-11/docker-compose.yml |  3 +++
 .../opt/bitnami/.bitnami_components.json      |  2 +-
 .../opt/bitnami/scripts/libbitnami.sh         |  2 ++
 .../prebuildfs/opt/bitnami/scripts/libfile.sh |  2 ++
 .../prebuildfs/opt/bitnami/scripts/libfs.sh   |  2 ++
 .../prebuildfs/opt/bitnami/scripts/libhook.sh |  2 ++
 .../prebuildfs/opt/bitnami/scripts/liblog.sh  |  2 ++
 .../prebuildfs/opt/bitnami/scripts/libnet.sh  |  2 ++
 .../prebuildfs/opt/bitnami/scripts/libos.sh   |  2 ++
 .../opt/bitnami/scripts/libpersistence.sh     |  2 ++
 .../opt/bitnami/scripts/libservice.sh         | 24 +++++++++++++++----
 .../opt/bitnami/scripts/libvalidations.sh     |  2 ++
 .../opt/bitnami/scripts/libversion.sh         |  2 ++
 .../opt/bitnami/scripts/libwebserver.sh       |  2 ++
 .../prebuildfs/usr/sbin/install_packages      |  2 ++
 .../rootfs/opt/bitnami/scripts/kibana-env.sh  |  2 ++
 .../opt/bitnami/scripts/kibana/entrypoint.sh  |  2 ++
 .../opt/bitnami/scripts/kibana/postunpack.sh  |  2 ++
 .../rootfs/opt/bitnami/scripts/kibana/run.sh  |  2 ++
 .../opt/bitnami/scripts/kibana/setup.sh       |  2 ++
 .../rootfs/opt/bitnami/scripts/libkibana.sh   |  2 ++
 bitnami/kibana/docker-compose.yml             |  3 +++
 23 files changed, 65 insertions(+), 9 deletions(-)

diff --git a/bitnami/kibana/8/debian-11/Dockerfile b/bitnami/kibana/8/debian-11/Dockerfile
index 236221938ee2..bfe10d0edbc8 100644
--- a/bitnami/kibana/8/debian-11/Dockerfile
+++ b/bitnami/kibana/8/debian-11/Dockerfile
@@ -6,10 +6,10 @@ FROM docker.io/bitnami/minideb:bullseye
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-06-23T19:06:20Z" \
+      org.opencontainers.image.created="2023-06-27T14:35:23Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="8.8.1-debian-11-r5" \
+      org.opencontainers.image.ref.name="8.8.1-debian-11-r6" \
       org.opencontainers.image.title="kibana" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="8.8.1"
@@ -26,7 +26,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl libgcc-s1 libnss3 libstdc++6 procps
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "yq-4.34.1-0-linux-${OS_ARCH}-debian-11" \
+      "yq-4.34.1-2-linux-${OS_ARCH}-debian-11" \
       "kibana-8.8.1-0-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
diff --git a/bitnami/kibana/8/debian-11/docker-compose.yml b/bitnami/kibana/8/debian-11/docker-compose.yml
index 75f230788269..257f6016a600 100644
--- a/bitnami/kibana/8/debian-11/docker-compose.yml
+++ b/bitnami/kibana/8/debian-11/docker-compose.yml
@@ -1,3 +1,6 @@
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
+
 version: "2"
 services:
   elasticsearch:
diff --git a/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 7dd6a3c2b8d7..bdf714effe2e 100644
--- a/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -9,6 +9,6 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "4.34.1-0"
+        "version": "4.34.1-2"
     }
 }
\ No newline at end of file
diff --git a/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh
index 4242023f9415..184de8a117e2 100644
--- a/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh
+++ b/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 #
 # Bitnami custom library
 
diff --git a/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh b/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh
index 41ebaf7464f6..63759c777f3b 100644
--- a/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh
+++ b/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 #
 # Library for managing files
 
diff --git a/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh
index eb52f7644785..96b22f99710c 100644
--- a/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh
+++ b/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 #
 # Library for file system actions
 
diff --git a/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh b/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh
index 9694852a7d25..dadd06149e00 100644
--- a/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh
+++ b/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 #
 # Library to use for scripts expected to be used as Kubernetes lifecycle hooks
 
diff --git a/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh b/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh
index c7c0f6d4422a..2a9e76a4d725 100644
--- a/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh
+++ b/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 #
 # Library for logging functions
 
diff --git a/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh b/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh
index 8bbf165e3e2a..b47c69a56825 100644
--- a/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh
+++ b/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 #
 # Library for network functions
 
diff --git a/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
index 6d9ca8546eef..c0500acee78d 100644
--- a/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
+++ b/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 #
 # Library for operating system actions
 
diff --git a/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh b/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh
index 99df69681c27..af6af64d6dd0 100644
--- a/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh
+++ b/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 #
 # Bitnami persistence library
 # Used for bringing persistence capabilities to applications that don't have clear separation of data and logic
diff --git a/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
index d70cf0779ec8..107f54e6b5c9 100644
--- a/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 #
 # Library for managing services
 
@@ -104,8 +106,6 @@ generate_cron_conf() {
     local schedule="* * * * *"
     local clean="true"
 
-    local clean="true"
-
     # Parse optional CLI flags
     shift 2
     while [[ "$#" -gt 0 ]]; do
@@ -131,7 +131,12 @@ generate_cron_conf() {
 
     mkdir -p /etc/cron.d
     if "$clean"; then
-        echo "${schedule} ${run_as} ${cmd}" > /etc/cron.d/"$service_name"
+        cat > "/etc/cron.d/${service_name}" <<EOF
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
+
+${schedule} ${run_as} ${cmd}
+EOF
     else
         echo "${schedule} ${run_as} ${cmd}" >> /etc/cron.d/"$service_name"
     fi
@@ -187,7 +192,10 @@ generate_monit_conf() {
 
     is_boolean_yes "$disabled" && conf_suffix=".disabled"
     mkdir -p "$monit_conf_dir"
-    cat >"${monit_conf_dir}/${service_name}.conf${conf_suffix:-}" <<EOF
+    cat > "${monit_conf_dir}/${service_name}.conf${conf_suffix:-}" <<EOF
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
+
 check process ${service_name}
   with pidfile "${pid_file}"
   start program = "${start_command}" with timeout 90 seconds
@@ -246,7 +254,10 @@ generate_logrotate_conf() {
     done
 
     mkdir -p "$logrotate_conf_dir"
-    cat <<EOF | sed '/^\s*$/d' >"${logrotate_conf_dir}/${service_name}"
+    cat <<EOF | sed '/^\s*$/d' > "${logrotate_conf_dir}/${service_name}"
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
+
 ${log_path} {
   ${period}
   rotate ${rotations}
@@ -391,6 +402,9 @@ generate_systemd_conf() {
     fi
     # Generate the Systemd unit
     cat > "$service_file" <<EOF
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
+
 [Unit]
 Description=Bitnami service for ${name}
 # Starting/stopping the main bitnami service should cause the same effect for this service
diff --git a/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh
index 2d7aaa943513..3c6a4109c2c5 100644
--- a/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh
+++ b/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 #
 # Validation functions library
 
diff --git a/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh
index ad2f0eee48df..6ca71ac7bdbb 100644
--- a/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh
+++ b/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 #
 # Library for managing versions strings
 
diff --git a/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh
index 94745ebe419e..8023f9b0549a 100644
--- a/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh
+++ b/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 #
 # Bitnami web server handler library
 
diff --git a/bitnami/kibana/8/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/kibana/8/debian-11/prebuildfs/usr/sbin/install_packages
index 77857a1a57f2..acbc3173208c 100755
--- a/bitnami/kibana/8/debian-11/prebuildfs/usr/sbin/install_packages
+++ b/bitnami/kibana/8/debian-11/prebuildfs/usr/sbin/install_packages
@@ -1,4 +1,6 @@
 #!/bin/sh
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 set -eu
 
 n=0
diff --git a/bitnami/kibana/8/debian-11/rootfs/opt/bitnami/scripts/kibana-env.sh b/bitnami/kibana/8/debian-11/rootfs/opt/bitnami/scripts/kibana-env.sh
index 0c7e047b7564..b99f46dab5c7 100644
--- a/bitnami/kibana/8/debian-11/rootfs/opt/bitnami/scripts/kibana-env.sh
+++ b/bitnami/kibana/8/debian-11/rootfs/opt/bitnami/scripts/kibana-env.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 #
 # Environment configuration for kibana
 
diff --git a/bitnami/kibana/8/debian-11/rootfs/opt/bitnami/scripts/kibana/entrypoint.sh b/bitnami/kibana/8/debian-11/rootfs/opt/bitnami/scripts/kibana/entrypoint.sh
index 3e39ede8d7c3..72c0a8c9c54a 100755
--- a/bitnami/kibana/8/debian-11/rootfs/opt/bitnami/scripts/kibana/entrypoint.sh
+++ b/bitnami/kibana/8/debian-11/rootfs/opt/bitnami/scripts/kibana/entrypoint.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 
 # shellcheck disable=SC1091
 
diff --git a/bitnami/kibana/8/debian-11/rootfs/opt/bitnami/scripts/kibana/postunpack.sh b/bitnami/kibana/8/debian-11/rootfs/opt/bitnami/scripts/kibana/postunpack.sh
index 2828a720c611..f5dd8e893418 100755
--- a/bitnami/kibana/8/debian-11/rootfs/opt/bitnami/scripts/kibana/postunpack.sh
+++ b/bitnami/kibana/8/debian-11/rootfs/opt/bitnami/scripts/kibana/postunpack.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 
 # shellcheck disable=SC1091
 
diff --git a/bitnami/kibana/8/debian-11/rootfs/opt/bitnami/scripts/kibana/run.sh b/bitnami/kibana/8/debian-11/rootfs/opt/bitnami/scripts/kibana/run.sh
index d572585b68ec..9b1668ed4359 100755
--- a/bitnami/kibana/8/debian-11/rootfs/opt/bitnami/scripts/kibana/run.sh
+++ b/bitnami/kibana/8/debian-11/rootfs/opt/bitnami/scripts/kibana/run.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 
 # shellcheck disable=SC1091
 
diff --git a/bitnami/kibana/8/debian-11/rootfs/opt/bitnami/scripts/kibana/setup.sh b/bitnami/kibana/8/debian-11/rootfs/opt/bitnami/scripts/kibana/setup.sh
index 663109ef51fd..8f13694f018e 100755
--- a/bitnami/kibana/8/debian-11/rootfs/opt/bitnami/scripts/kibana/setup.sh
+++ b/bitnami/kibana/8/debian-11/rootfs/opt/bitnami/scripts/kibana/setup.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 
 # shellcheck disable=SC1091
 
diff --git a/bitnami/kibana/8/debian-11/rootfs/opt/bitnami/scripts/libkibana.sh b/bitnami/kibana/8/debian-11/rootfs/opt/bitnami/scripts/libkibana.sh
index d4ae5813bfca..c87bf763ffa9 100644
--- a/bitnami/kibana/8/debian-11/rootfs/opt/bitnami/scripts/libkibana.sh
+++ b/bitnami/kibana/8/debian-11/rootfs/opt/bitnami/scripts/libkibana.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 #
 # Bitnami Kibana library
 
diff --git a/bitnami/kibana/docker-compose.yml b/bitnami/kibana/docker-compose.yml
index 75f230788269..257f6016a600 100644
--- a/bitnami/kibana/docker-compose.yml
+++ b/bitnami/kibana/docker-compose.yml
@@ -1,3 +1,6 @@
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
+
 version: "2"
 services:
   elasticsearch: