From 96b9887dec56697eac7fa1ba09365b358749923a Mon Sep 17 00:00:00 2001 From: openeuler_bot Date: Fri, 12 Sep 2025 00:05:28 +0000 Subject: [PATCH] 24.03-lts-sp2 update loki to 3.5.5 --- Cloud/loki/3.5.5/24.03-lts-sp2/Dockerfile | 32 ++++++++++++++ .../3.5.5/24.03-lts-sp2/local-config.yaml | 42 +++++++++++++++++++ Cloud/loki/README.md | 1 + Cloud/loki/doc/image-info.yml | 1 + Cloud/loki/meta.yml | 4 +- 5 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 Cloud/loki/3.5.5/24.03-lts-sp2/Dockerfile create mode 100644 Cloud/loki/3.5.5/24.03-lts-sp2/local-config.yaml diff --git a/Cloud/loki/3.5.5/24.03-lts-sp2/Dockerfile b/Cloud/loki/3.5.5/24.03-lts-sp2/Dockerfile new file mode 100644 index 00000000..ca809444 --- /dev/null +++ b/Cloud/loki/3.5.5/24.03-lts-sp2/Dockerfile @@ -0,0 +1,32 @@ +ARG BASE=openeuler/openeuler:24.03-lts-sp2 +FROM ${BASE} + +ARG TARGETARCH +ARG BUILDARCH +ARG VERSION=3.5.5 + +RUN dnf install -y shadow-utils && dnf clean all + +RUN if [ "$TARGETARCH" = "amd64" ]; then \ + BUILDARCH="x86_64"; \ + elif [ "$TARGETARCH" = "arm64" ]; then \ + BUILDARCH="aarch64"; \ + fi && \ + curl -fSL --output grafana-logcli.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/logcli-${VERSION}.${BUILDARCH}.rpm && \ + curl -fSL --output grafana-loki.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/loki-${VERSION}.${BUILDARCH}.rpm && \ + curl -fSL --output grafana-promtail.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/promtail-${VERSION}.${BUILDARCH}.rpm && \ + yum -y install grafana-loki.rpm grafana-promtail.rpm grafana-logcli.rpm && \ + rm -rf grafana-loki.rpm grafana-promtail.rpm grafana-logcli.rpm + +COPY local-config.yaml /etc/loki/local-config.yaml + +RUN groupadd -g 10001 loki && \ + adduser -u 10001 -g loki loki && \ + mkdir -p /loki/rules && \ + mkdir -p /loki/rules-temp && \ + chown -R loki:loki /etc/loki /loki + +USER 10001 +EXPOSE 3100 +ENTRYPOINT [ "loki" ] +CMD ["-config.file=/etc/loki/local-config.yaml"] diff --git a/Cloud/loki/3.5.5/24.03-lts-sp2/local-config.yaml b/Cloud/loki/3.5.5/24.03-lts-sp2/local-config.yaml new file mode 100644 index 00000000..b74d3561 --- /dev/null +++ b/Cloud/loki/3.5.5/24.03-lts-sp2/local-config.yaml @@ -0,0 +1,42 @@ +auth_enabled: false + +server: + http_listen_port: 3100 + +common: + instance_addr: 127.0.0.1 + path_prefix: /loki + storage: + filesystem: + chunks_directory: /loki/chunks + rules_directory: /loki/rules + replication_factor: 1 + ring: + kvstore: + store: inmemory + +schema_config: + configs: + - from: 2020-10-24 + store: tsdb + object_store: filesystem + schema: v13 + index: + prefix: index_ + period: 24h + +ruler: + alertmanager_url: http://localhost:9093 + +# By default, Loki will send anonymous, but uniquely-identifiable usage and configuration +# analytics to Grafana Labs. These statistics are sent to https://stats.grafana.org/ +# +# Statistics help us better understand how Loki is used, and they show us performance +# levels for most users. This helps us prioritize features and documentation. +# For more information on what's sent, look at +# https://github.com/grafana/loki/blob/main/pkg/usagestats/stats.go +# Refer to the buildReport method to see what goes into a report. +# +# If you would like to disable reporting, uncomment the following lines: +#analytics: +# reporting_enabled: false \ No newline at end of file diff --git a/Cloud/loki/README.md b/Cloud/loki/README.md index 56d4eec6..835c929b 100644 --- a/Cloud/loki/README.md +++ b/Cloud/loki/README.md @@ -17,6 +17,7 @@ Learn more on [Loki Website](https://grafana.com/oss/loki/)⁠. The tag of each `loki` docker image is consist of the version of `loki` and the version of basic image. The details are as follows | Tag | Currently | Architectures | |----------|-------------|------------------| +|[3.5.5-oe2403sp2](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Cloud/loki/3.5.5/24.03-lts-sp2/Dockerfile) | loki 3.5.5 on openEuler 24.03-LTS-SP2 | amd64, arm64 | |[2.9.5-oe2203sp3](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Cloud/loki/2.9.5/22.03-lts-sp3/Dockerfile)| Grafana Loki 2.9.5 on openEuler 22.03-LTS-SP3 | amd64, arm64 | |[3.2.1-oe2203sp1](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Cloud/loki/3.2.1/22.03-lts-sp1/Dockerfile)| Grafana Loki 3.2.1 on openEuler 22.03-LTS-SP1 | amd64, arm64 | |[3.2.1-oe2203sp3](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Cloud/loki/3.2.1/22.03-lts-sp3/Dockerfile)| Grafana Loki 3.2.1 on openEuler 22.03-LTS-SP3 | amd64, arm64 | diff --git a/Cloud/loki/doc/image-info.yml b/Cloud/loki/doc/image-info.yml index 32cf903b..996508af 100644 --- a/Cloud/loki/doc/image-info.yml +++ b/Cloud/loki/doc/image-info.yml @@ -11,6 +11,7 @@ tags: | | Tag | Currently | Architectures | |----------|-------------|------------------| + |[3.5.5-oe2403sp2](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Cloud/loki/3.5.5/24.03-lts-sp2/Dockerfile) | loki 3.5.5 on openEuler 24.03-LTS-SP2 | amd64, arm64 | |[2.9.5-oe2203sp3](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Cloud/loki/2.9.5/22.03-lts-sp3/Dockerfile)| Grafana Loki 2.9.5 on openEuler 22.03-LTS-SP3 | amd64, arm64 | |[3.2.1-oe2203sp1](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Cloud/loki/3.2.1/22.03-lts-sp1/Dockerfile)| Grafana Loki 3.2.1 on openEuler 22.03-LTS-SP1 | amd64, arm64 | |[3.2.1-oe2203sp3](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Cloud/loki/3.2.1/22.03-lts-sp3/Dockerfile)| Grafana Loki 3.2.1 on openEuler 22.03-LTS-SP3 | amd64, arm64 | diff --git a/Cloud/loki/meta.yml b/Cloud/loki/meta.yml index 3832c7ec..d5ae0238 100644 --- a/Cloud/loki/meta.yml +++ b/Cloud/loki/meta.yml @@ -27,4 +27,6 @@ 3.5.0-oe2403sp1: path: 3.5.0/24.03-lts-sp1/Dockerfile 3.5.3-oe2403sp1: - path: 3.5.3/24.03-lts-sp1/Dockerfile \ No newline at end of file + path: 3.5.3/24.03-lts-sp1/Dockerfile +3.5.5-oe2403sp2: + path: 3.5.5/24.03-lts-sp2/Dockerfile \ No newline at end of file -- Gitee