From 1f3521c63752315cc361d5cfbb2eecee3a339e3a Mon Sep 17 00:00:00 2001 From: openeuler_bot <673672685@qq.com> Date: Fri, 18 Oct 2024 00:12:16 +0000 Subject: [PATCH 1/5] 24.03-lts update loki to 3.2.1 --- loki/3.2.1/24.03-lts/Dockerfile | 34 +++++++++++++++++++++ loki/3.2.1/24.03-lts/local-config.yaml | 42 ++++++++++++++++++++++++++ loki/meta.yml | 4 ++- 3 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 loki/3.2.1/24.03-lts/Dockerfile create mode 100644 loki/3.2.1/24.03-lts/local-config.yaml diff --git a/loki/3.2.1/24.03-lts/Dockerfile b/loki/3.2.1/24.03-lts/Dockerfile new file mode 100644 index 00000000..e1848157 --- /dev/null +++ b/loki/3.2.1/24.03-lts/Dockerfile @@ -0,0 +1,34 @@ +ARG BASE=openeuler/openeuler:24.03-lts +FROM ${BASE} + +ARG TARGETARCH +ARG BUILDARCH +ARG VERSION=3.2.1 + +RUN yum -y update && \ + yum -y install wget && \ + yum clean all + +RUN if [ "$TARGETARCH" = "amd64" ]; then \ + BUILDARCH="x86_64"; \ + elif [ "$TARGETARCH" = "arm64" ]; then \ + BUILDARCH="aarch64"; \ + fi && \ + wget -O grafana-logcli.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/logcli-${VERSION}.${BUILDARCH}.rpm && \ + wget -O grafana-loki.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/loki-${VERSION}.${BUILDARCH}.rpm && \ + wget -O 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/loki/3.2.1/24.03-lts/local-config.yaml b/loki/3.2.1/24.03-lts/local-config.yaml new file mode 100644 index 00000000..119b9395 --- /dev/null +++ b/loki/3.2.1/24.03-lts/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: v12 + 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/loki/meta.yml b/loki/meta.yml index 7482ed00..b746e40f 100644 --- a/loki/meta.yml +++ b/loki/meta.yml @@ -1,2 +1,4 @@ 2.9.5-oe2203sp3: - path: loki/2.9.5/22.03-lts-sp3/Dockerfile \ No newline at end of file + path: loki/2.9.5/22.03-lts-sp3/Dockerfile +3.2.1-oe2403lts: + path: loki/3.2.1/24.03-lts/Dockerfile \ No newline at end of file -- Gitee From 726ffdfe8f0591ea9e51e146b635e2a702e46315 Mon Sep 17 00:00:00 2001 From: openeuler_bot <673672685@qq.com> Date: Fri, 18 Oct 2024 00:12:42 +0000 Subject: [PATCH 2/5] 22.03-lts-sp3 update loki to 3.2.1 --- loki/3.2.1/22.03-lts-sp3/Dockerfile | 34 ++++++++++++++++++ loki/3.2.1/22.03-lts-sp3/local-config.yaml | 42 ++++++++++++++++++++++ loki/meta.yml | 4 ++- 3 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 loki/3.2.1/22.03-lts-sp3/Dockerfile create mode 100644 loki/3.2.1/22.03-lts-sp3/local-config.yaml diff --git a/loki/3.2.1/22.03-lts-sp3/Dockerfile b/loki/3.2.1/22.03-lts-sp3/Dockerfile new file mode 100644 index 00000000..42b49275 --- /dev/null +++ b/loki/3.2.1/22.03-lts-sp3/Dockerfile @@ -0,0 +1,34 @@ +ARG BASE=openeuler/openeuler:22.03-lts-sp3 +FROM ${BASE} + +ARG TARGETARCH +ARG BUILDARCH +ARG VERSION=3.2.1 + +RUN yum -y update && \ + yum -y install wget && \ + yum clean all + +RUN if [ "$TARGETARCH" = "amd64" ]; then \ + BUILDARCH="x86_64"; \ + elif [ "$TARGETARCH" = "arm64" ]; then \ + BUILDARCH="aarch64"; \ + fi && \ + wget -O grafana-logcli.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/logcli-${VERSION}.${BUILDARCH}.rpm && \ + wget -O grafana-loki.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/loki-${VERSION}.${BUILDARCH}.rpm && \ + wget -O 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/loki/3.2.1/22.03-lts-sp3/local-config.yaml b/loki/3.2.1/22.03-lts-sp3/local-config.yaml new file mode 100644 index 00000000..119b9395 --- /dev/null +++ b/loki/3.2.1/22.03-lts-sp3/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: v12 + 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/loki/meta.yml b/loki/meta.yml index b746e40f..a46474c3 100644 --- a/loki/meta.yml +++ b/loki/meta.yml @@ -1,4 +1,6 @@ 2.9.5-oe2203sp3: path: loki/2.9.5/22.03-lts-sp3/Dockerfile 3.2.1-oe2403lts: - path: loki/3.2.1/24.03-lts/Dockerfile \ No newline at end of file + path: loki/3.2.1/24.03-lts/Dockerfile +3.2.1-oe2203sp3: + path: loki/3.2.1/22.03-lts-sp3/Dockerfile \ No newline at end of file -- Gitee From 81ef210924ce2ea9b157064acef08e523266e243 Mon Sep 17 00:00:00 2001 From: openeuler_bot <673672685@qq.com> Date: Fri, 18 Oct 2024 00:13:07 +0000 Subject: [PATCH 3/5] 22.03-lts-sp4 update loki to 3.2.1 --- loki/3.2.1/22.03-lts-sp4/Dockerfile | 34 ++++++++++++++++++ loki/3.2.1/22.03-lts-sp4/local-config.yaml | 42 ++++++++++++++++++++++ loki/meta.yml | 4 ++- 3 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 loki/3.2.1/22.03-lts-sp4/Dockerfile create mode 100644 loki/3.2.1/22.03-lts-sp4/local-config.yaml diff --git a/loki/3.2.1/22.03-lts-sp4/Dockerfile b/loki/3.2.1/22.03-lts-sp4/Dockerfile new file mode 100644 index 00000000..f1f1be8a --- /dev/null +++ b/loki/3.2.1/22.03-lts-sp4/Dockerfile @@ -0,0 +1,34 @@ +ARG BASE=openeuler/openeuler:22.03-lts-sp4 +FROM ${BASE} + +ARG TARGETARCH +ARG BUILDARCH +ARG VERSION=3.2.1 + +RUN yum -y update && \ + yum -y install wget && \ + yum clean all + +RUN if [ "$TARGETARCH" = "amd64" ]; then \ + BUILDARCH="x86_64"; \ + elif [ "$TARGETARCH" = "arm64" ]; then \ + BUILDARCH="aarch64"; \ + fi && \ + wget -O grafana-logcli.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/logcli-${VERSION}.${BUILDARCH}.rpm && \ + wget -O grafana-loki.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/loki-${VERSION}.${BUILDARCH}.rpm && \ + wget -O 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/loki/3.2.1/22.03-lts-sp4/local-config.yaml b/loki/3.2.1/22.03-lts-sp4/local-config.yaml new file mode 100644 index 00000000..119b9395 --- /dev/null +++ b/loki/3.2.1/22.03-lts-sp4/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: v12 + 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/loki/meta.yml b/loki/meta.yml index a46474c3..8e7ea700 100644 --- a/loki/meta.yml +++ b/loki/meta.yml @@ -3,4 +3,6 @@ 3.2.1-oe2403lts: path: loki/3.2.1/24.03-lts/Dockerfile 3.2.1-oe2203sp3: - path: loki/3.2.1/22.03-lts-sp3/Dockerfile \ No newline at end of file + path: loki/3.2.1/22.03-lts-sp3/Dockerfile +3.2.1-oe2203sp4: + path: loki/3.2.1/22.03-lts-sp4/Dockerfile \ No newline at end of file -- Gitee From e413ef4a3e7c65f41e221b61de19e7fb49b6ecf4 Mon Sep 17 00:00:00 2001 From: openeuler_bot <673672685@qq.com> Date: Fri, 18 Oct 2024 00:13:35 +0000 Subject: [PATCH 4/5] 22.03-lts-sp1 update loki to 3.2.1 --- loki/3.2.1/22.03-lts-sp1/Dockerfile | 34 ++++++++++++++++++ loki/3.2.1/22.03-lts-sp1/local-config.yaml | 42 ++++++++++++++++++++++ loki/meta.yml | 4 ++- 3 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 loki/3.2.1/22.03-lts-sp1/Dockerfile create mode 100644 loki/3.2.1/22.03-lts-sp1/local-config.yaml diff --git a/loki/3.2.1/22.03-lts-sp1/Dockerfile b/loki/3.2.1/22.03-lts-sp1/Dockerfile new file mode 100644 index 00000000..cebd423f --- /dev/null +++ b/loki/3.2.1/22.03-lts-sp1/Dockerfile @@ -0,0 +1,34 @@ +ARG BASE=openeuler/openeuler:22.03-lts-sp1 +FROM ${BASE} + +ARG TARGETARCH +ARG BUILDARCH +ARG VERSION=3.2.1 + +RUN yum -y update && \ + yum -y install wget && \ + yum clean all + +RUN if [ "$TARGETARCH" = "amd64" ]; then \ + BUILDARCH="x86_64"; \ + elif [ "$TARGETARCH" = "arm64" ]; then \ + BUILDARCH="aarch64"; \ + fi && \ + wget -O grafana-logcli.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/logcli-${VERSION}.${BUILDARCH}.rpm && \ + wget -O grafana-loki.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/loki-${VERSION}.${BUILDARCH}.rpm && \ + wget -O 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/loki/3.2.1/22.03-lts-sp1/local-config.yaml b/loki/3.2.1/22.03-lts-sp1/local-config.yaml new file mode 100644 index 00000000..119b9395 --- /dev/null +++ b/loki/3.2.1/22.03-lts-sp1/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: v12 + 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/loki/meta.yml b/loki/meta.yml index 8e7ea700..5450039a 100644 --- a/loki/meta.yml +++ b/loki/meta.yml @@ -5,4 +5,6 @@ 3.2.1-oe2203sp3: path: loki/3.2.1/22.03-lts-sp3/Dockerfile 3.2.1-oe2203sp4: - path: loki/3.2.1/22.03-lts-sp4/Dockerfile \ No newline at end of file + path: loki/3.2.1/22.03-lts-sp4/Dockerfile +3.2.1-oe2203sp1: + path: loki/3.2.1/22.03-lts-sp1/Dockerfile \ No newline at end of file -- Gitee From aa82ae65ac09bfa7f295f116be4bccb5d02511eb Mon Sep 17 00:00:00 2001 From: openeuler_bot <673672685@qq.com> Date: Fri, 18 Oct 2024 00:14:02 +0000 Subject: [PATCH 5/5] 20.03-lts-sp4 update loki to 3.2.1 --- loki/3.2.1/20.03-lts-sp4/Dockerfile | 34 ++++++++++++++++++ loki/3.2.1/20.03-lts-sp4/local-config.yaml | 42 ++++++++++++++++++++++ loki/meta.yml | 4 ++- 3 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 loki/3.2.1/20.03-lts-sp4/Dockerfile create mode 100644 loki/3.2.1/20.03-lts-sp4/local-config.yaml diff --git a/loki/3.2.1/20.03-lts-sp4/Dockerfile b/loki/3.2.1/20.03-lts-sp4/Dockerfile new file mode 100644 index 00000000..c4ac9687 --- /dev/null +++ b/loki/3.2.1/20.03-lts-sp4/Dockerfile @@ -0,0 +1,34 @@ +ARG BASE=openeuler/openeuler:20.03-lts-sp4 +FROM ${BASE} + +ARG TARGETARCH +ARG BUILDARCH +ARG VERSION=3.2.1 + +RUN yum -y update && \ + yum -y install wget && \ + yum clean all + +RUN if [ "$TARGETARCH" = "amd64" ]; then \ + BUILDARCH="x86_64"; \ + elif [ "$TARGETARCH" = "arm64" ]; then \ + BUILDARCH="aarch64"; \ + fi && \ + wget -O grafana-logcli.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/logcli-${VERSION}.${BUILDARCH}.rpm && \ + wget -O grafana-loki.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/loki-${VERSION}.${BUILDARCH}.rpm && \ + wget -O 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/loki/3.2.1/20.03-lts-sp4/local-config.yaml b/loki/3.2.1/20.03-lts-sp4/local-config.yaml new file mode 100644 index 00000000..119b9395 --- /dev/null +++ b/loki/3.2.1/20.03-lts-sp4/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: v12 + 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/loki/meta.yml b/loki/meta.yml index 5450039a..bf3ae577 100644 --- a/loki/meta.yml +++ b/loki/meta.yml @@ -7,4 +7,6 @@ 3.2.1-oe2203sp4: path: loki/3.2.1/22.03-lts-sp4/Dockerfile 3.2.1-oe2203sp1: - path: loki/3.2.1/22.03-lts-sp1/Dockerfile \ No newline at end of file + path: loki/3.2.1/22.03-lts-sp1/Dockerfile +3.2.1-oe2003sp4: + path: loki/3.2.1/20.03-lts-sp4/Dockerfile \ No newline at end of file -- Gitee