From 8ea5fe7f95d2ef2985b5b171f864943ecb094f13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20G=C3=B3mez=20Gracia?= Date: Wed, 24 Apr 2024 17:36:51 +0200 Subject: [PATCH] [bitnami/grafana-loki] Remove Grafana Loki 2.x.x (#65657) Signed-off-by: Gonzalo Gomez Gracia --- bitnami/grafana-loki/2/debian-12/Dockerfile | 57 --------------- .../2/debian-12/examples/loki.yaml | 70 ------------------- .../opt/bitnami/.bitnami_components.json | 8 --- .../opt/bitnami/licenses/licenses.txt | 2 - .../prebuildfs/usr/sbin/install_packages | 27 ------- .../debian-12/prebuildfs/usr/sbin/run-script | 24 ------- .../grafana-loki/2/debian-12/tags-info.yaml | 4 -- 7 files changed, 192 deletions(-) delete mode 100644 bitnami/grafana-loki/2/debian-12/Dockerfile delete mode 100644 bitnami/grafana-loki/2/debian-12/examples/loki.yaml delete mode 100644 bitnami/grafana-loki/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json delete mode 100644 bitnami/grafana-loki/2/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt delete mode 100755 bitnami/grafana-loki/2/debian-12/prebuildfs/usr/sbin/install_packages delete mode 100755 bitnami/grafana-loki/2/debian-12/prebuildfs/usr/sbin/run-script delete mode 100644 bitnami/grafana-loki/2/debian-12/tags-info.yaml diff --git a/bitnami/grafana-loki/2/debian-12/Dockerfile b/bitnami/grafana-loki/2/debian-12/Dockerfile deleted file mode 100644 index 90e1f409978e..000000000000 --- a/bitnami/grafana-loki/2/debian-12/Dockerfile +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -FROM docker.io/bitnami/minideb:bookworm - -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-04-23T16:24:59Z" \ - org.opencontainers.image.description="Application packaged by VMware, Inc" \ - org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/grafana-loki/README.md" \ - org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.9.7-debian-12-r1" \ - org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/grafana-loki" \ - org.opencontainers.image.title="grafana-loki" \ - org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.9.7" - -ENV HOME="/" \ - OS_ARCH="${TARGETARCH:-amd64}" \ - OS_FLAVOUR="debian-12" \ - OS_NAME="linux" - -COPY prebuildfs / -SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] -# Install required system packages and dependencies -RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ - COMPONENTS=( \ - "grafana-loki-2.9.7-0-linux-${OS_ARCH}-debian-12" \ - ) ; \ - for COMPONENT in "${COMPONENTS[@]}"; do \ - if [ ! -f "${COMPONENT}.tar.gz" ]; then \ - curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ - curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi ; \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ - rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ - done -RUN apt-get autoremove --purge -y curl && \ - apt-get update && apt-get upgrade -y && \ - apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives -RUN chmod g+rwX /opt/bitnami -RUN mkdir -p /bitnami/grafana-loki/data /bitnami/grafana-loki/loki /bitnami/grafana-loki/wal && chmod -R g+rwX /bitnami/grafana-loki && ln -s /bitnami/grafana-loki/loki /loki && ln -s /bitnami/grafana-loki/data /data && ln -s /bitnami/grafana-loki/wal /wal -RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true - -ENV APP_VERSION="2.9.7" \ - BITNAMI_APP_NAME="grafana-loki" \ - PATH="/opt/bitnami/grafana-loki/bin:$PATH" - -EXPOSE 3100 - -USER 1001 -ENTRYPOINT [ "loki" ] -CMD [ "-config.file=/bitnami/grafana-loki/conf/loki.yaml" ] diff --git a/bitnami/grafana-loki/2/debian-12/examples/loki.yaml b/bitnami/grafana-loki/2/debian-12/examples/loki.yaml deleted file mode 100644 index 807095ae0235..000000000000 --- a/bitnami/grafana-loki/2/debian-12/examples/loki.yaml +++ /dev/null @@ -1,70 +0,0 @@ -# This is a configuration to deploy Loki depending only on a storage solution -# for example, an S3-compatible API like MinIO. -# The ring configuration is based on the gossip memberlist and the index is shipped to storage -# via Single Store (boltdb-shipper) - -auth_enabled: false - -server: - http_listen_port: 3100 - -distributor: - ring: - kvstore: - store: memberlist - -ingester: - lifecycler: - ring: - kvstore: - store: memberlist - replication_factor: 1 - final_sleep: 0s - chunk_idle_period: 5m - chunk_retain_period: 30s - -memberlist: - abort_if_cluster_join_fails: false - - # Expose this port on all distributor, ingester - # and querier replicas. - bind_port: 7946 - - # You can use a headless k8s service for all distributor, - # ingester and querier components. - join_members: - - loki-gossip-ring.loki.svc.cluster.local:7946 - - max_join_backoff: 1m - max_join_retries: 10 - min_join_backoff: 1s - -schema_config: - configs: - - from: 2020-05-15 - store: boltdb-shipper - object_store: s3 - schema: v11 - index: - prefix: index_ - period: 24h - -storage_config: - boltdb_shipper: - active_index_directory: /loki/index - cache_location: /loki/index_cache - shared_store: s3 - - aws: - s3: s3://access_key:secret_access_key@custom_endpoint/bucket_name - s3forcepathstyle: true - -limits_config: - enforce_metric_name: false - reject_old_samples: true - reject_old_samples_max_age: 168h - -compactor: - working_directory: /data/compactor - shared_store: s3 - compaction_interval: 5m diff --git a/bitnami/grafana-loki/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/grafana-loki/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json deleted file mode 100644 index 768e5d703733..000000000000 --- a/bitnami/grafana-loki/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "grafana-loki": { - "arch": "amd64", - "distro": "debian-12", - "type": "NAMI", - "version": "2.9.7-0" - } -} \ No newline at end of file diff --git a/bitnami/grafana-loki/2/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/grafana-loki/2/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt deleted file mode 100644 index 76956b38e82c..000000000000 --- a/bitnami/grafana-loki/2/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt +++ /dev/null @@ -1,2 +0,0 @@ -Bitnami containers ship with software bundles. You can find the licenses under: -/opt/bitnami/[name-of-bundle]/licenses/[bundle-version].txt diff --git a/bitnami/grafana-loki/2/debian-12/prebuildfs/usr/sbin/install_packages b/bitnami/grafana-loki/2/debian-12/prebuildfs/usr/sbin/install_packages deleted file mode 100755 index acbc3173208c..000000000000 --- a/bitnami/grafana-loki/2/debian-12/prebuildfs/usr/sbin/install_packages +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 -set -eu - -n=0 -max=2 -export DEBIAN_FRONTEND=noninteractive - -until [ $n -gt $max ]; do - set +e - ( - apt-get update -qq && - apt-get install -y --no-install-recommends "$@" - ) - CODE=$? - set -e - if [ $CODE -eq 0 ]; then - break - fi - if [ $n -eq $max ]; then - exit $CODE - fi - echo "apt failed, retrying" - n=$(($n + 1)) -done -apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives diff --git a/bitnami/grafana-loki/2/debian-12/prebuildfs/usr/sbin/run-script b/bitnami/grafana-loki/2/debian-12/prebuildfs/usr/sbin/run-script deleted file mode 100755 index 4ca0f897277e..000000000000 --- a/bitnami/grafana-loki/2/debian-12/prebuildfs/usr/sbin/run-script +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 -set -u - -if [ $# -eq 0 ]; then - >&2 echo "No arguments provided" - exit 1 -fi - -script=$1 -exit_code="${2:-96}" -fail_if_not_present="${3:-n}" - -if test -f "$script"; then - sh $script - - if [ $? -ne 0 ]; then - exit $((exit_code)) - fi -elif [ "$fail_if_not_present" = "y" ]; then - >&2 echo "script not found: $script" - exit 127 -fi diff --git a/bitnami/grafana-loki/2/debian-12/tags-info.yaml b/bitnami/grafana-loki/2/debian-12/tags-info.yaml deleted file mode 100644 index 70a601673d63..000000000000 --- a/bitnami/grafana-loki/2/debian-12/tags-info.yaml +++ /dev/null @@ -1,4 +0,0 @@ -rolling-tags: -- "2" -- 2-debian-12 -- 2.9.7