From c4076b7247eec0909017f08de923c147bc49cf72 Mon Sep 17 00:00:00 2001
From: openeuler_bot <673672685@qq.com>
Date: Thu, 5 Dec 2024 00:14:40 +0000
Subject: [PATCH 1/5] 24.03-lts update loki to 3.3.1

---
 loki/3.3.1/24.03-lts/Dockerfile        | 30 ++++++++++++++++++
 loki/3.3.1/24.03-lts/local-config.yaml | 42 ++++++++++++++++++++++++++
 loki/meta.yml                          |  4 ++-
 3 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 loki/3.3.1/24.03-lts/Dockerfile
 create mode 100644 loki/3.3.1/24.03-lts/local-config.yaml

diff --git a/loki/3.3.1/24.03-lts/Dockerfile b/loki/3.3.1/24.03-lts/Dockerfile
new file mode 100644
index 00000000..20abbd21
--- /dev/null
+++ b/loki/3.3.1/24.03-lts/Dockerfile
@@ -0,0 +1,30 @@
+ARG BASE=openeuler/openeuler:24.03-lts
+FROM ${BASE}
+
+ARG TARGETARCH
+ARG BUILDARCH
+ARG VERSION=3.3.1
+
+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/loki/3.3.1/24.03-lts/local-config.yaml b/loki/3.3.1/24.03-lts/local-config.yaml
new file mode 100644
index 00000000..b74d3561
--- /dev/null
+++ b/loki/3.3.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: 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/loki/meta.yml b/loki/meta.yml
index 4abc8204..ee1cefde 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-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.3.1-oe2403lts:
+  path: loki/3.3.1/24.03-lts/Dockerfile
\ No newline at end of file
-- 
Gitee


From a20ad6a073ca299abef0f72ab0500e8c78af6c33 Mon Sep 17 00:00:00 2001
From: openeuler_bot <673672685@qq.com>
Date: Thu, 5 Dec 2024 00:15:08 +0000
Subject: [PATCH 2/5] 22.03-lts-sp3 update loki to 3.3.1

---
 loki/3.3.1/22.03-lts-sp3/Dockerfile        | 30 ++++++++++++++++
 loki/3.3.1/22.03-lts-sp3/local-config.yaml | 42 ++++++++++++++++++++++
 loki/meta.yml                              |  4 ++-
 3 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 loki/3.3.1/22.03-lts-sp3/Dockerfile
 create mode 100644 loki/3.3.1/22.03-lts-sp3/local-config.yaml

diff --git a/loki/3.3.1/22.03-lts-sp3/Dockerfile b/loki/3.3.1/22.03-lts-sp3/Dockerfile
new file mode 100644
index 00000000..8cf35b9f
--- /dev/null
+++ b/loki/3.3.1/22.03-lts-sp3/Dockerfile
@@ -0,0 +1,30 @@
+ARG BASE=openeuler/openeuler:22.03-lts-sp3
+FROM ${BASE}
+
+ARG TARGETARCH
+ARG BUILDARCH
+ARG VERSION=3.3.1
+
+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/loki/3.3.1/22.03-lts-sp3/local-config.yaml b/loki/3.3.1/22.03-lts-sp3/local-config.yaml
new file mode 100644
index 00000000..b74d3561
--- /dev/null
+++ b/loki/3.3.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: 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/loki/meta.yml b/loki/meta.yml
index ee1cefde..86d2471b 100644
--- a/loki/meta.yml
+++ b/loki/meta.yml
@@ -9,4 +9,6 @@
 3.2.1-oe2403lts:
   path: loki/3.2.1/24.03-lts/Dockerfile
 3.3.1-oe2403lts:
-  path: loki/3.3.1/24.03-lts/Dockerfile
\ No newline at end of file
+  path: loki/3.3.1/24.03-lts/Dockerfile
+3.3.1-oe2203sp3:
+  path: loki/3.3.1/22.03-lts-sp3/Dockerfile
\ No newline at end of file
-- 
Gitee


From d7231726891444825e89856ec2d070722c1e3505 Mon Sep 17 00:00:00 2001
From: openeuler_bot <673672685@qq.com>
Date: Thu, 5 Dec 2024 00:15:39 +0000
Subject: [PATCH 3/5] 22.03-lts-sp4 update loki to 3.3.1

---
 loki/3.3.1/22.03-lts-sp4/Dockerfile        | 30 ++++++++++++++++
 loki/3.3.1/22.03-lts-sp4/local-config.yaml | 42 ++++++++++++++++++++++
 loki/meta.yml                              |  4 ++-
 3 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 loki/3.3.1/22.03-lts-sp4/Dockerfile
 create mode 100644 loki/3.3.1/22.03-lts-sp4/local-config.yaml

diff --git a/loki/3.3.1/22.03-lts-sp4/Dockerfile b/loki/3.3.1/22.03-lts-sp4/Dockerfile
new file mode 100644
index 00000000..cd97e86b
--- /dev/null
+++ b/loki/3.3.1/22.03-lts-sp4/Dockerfile
@@ -0,0 +1,30 @@
+ARG BASE=openeuler/openeuler:22.03-lts-sp4
+FROM ${BASE}
+
+ARG TARGETARCH
+ARG BUILDARCH
+ARG VERSION=3.3.1
+
+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/loki/3.3.1/22.03-lts-sp4/local-config.yaml b/loki/3.3.1/22.03-lts-sp4/local-config.yaml
new file mode 100644
index 00000000..b74d3561
--- /dev/null
+++ b/loki/3.3.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: 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/loki/meta.yml b/loki/meta.yml
index 86d2471b..824440ab 100644
--- a/loki/meta.yml
+++ b/loki/meta.yml
@@ -11,4 +11,6 @@
 3.3.1-oe2403lts:
   path: loki/3.3.1/24.03-lts/Dockerfile
 3.3.1-oe2203sp3:
-  path: loki/3.3.1/22.03-lts-sp3/Dockerfile
\ No newline at end of file
+  path: loki/3.3.1/22.03-lts-sp3/Dockerfile
+3.3.1-oe2203sp4:
+  path: loki/3.3.1/22.03-lts-sp4/Dockerfile
\ No newline at end of file
-- 
Gitee


From f88e8c9bd8e3235aa2ae450b1a91f913244e9ac9 Mon Sep 17 00:00:00 2001
From: openeuler_bot <673672685@qq.com>
Date: Thu, 5 Dec 2024 00:16:10 +0000
Subject: [PATCH 4/5] 22.03-lts-sp1 update loki to 3.3.1

---
 loki/3.3.1/22.03-lts-sp1/Dockerfile        | 30 ++++++++++++++++
 loki/3.3.1/22.03-lts-sp1/local-config.yaml | 42 ++++++++++++++++++++++
 loki/meta.yml                              |  4 ++-
 3 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 loki/3.3.1/22.03-lts-sp1/Dockerfile
 create mode 100644 loki/3.3.1/22.03-lts-sp1/local-config.yaml

diff --git a/loki/3.3.1/22.03-lts-sp1/Dockerfile b/loki/3.3.1/22.03-lts-sp1/Dockerfile
new file mode 100644
index 00000000..7778c3e5
--- /dev/null
+++ b/loki/3.3.1/22.03-lts-sp1/Dockerfile
@@ -0,0 +1,30 @@
+ARG BASE=openeuler/openeuler:22.03-lts-sp1
+FROM ${BASE}
+
+ARG TARGETARCH
+ARG BUILDARCH
+ARG VERSION=3.3.1
+
+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/loki/3.3.1/22.03-lts-sp1/local-config.yaml b/loki/3.3.1/22.03-lts-sp1/local-config.yaml
new file mode 100644
index 00000000..b74d3561
--- /dev/null
+++ b/loki/3.3.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: 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/loki/meta.yml b/loki/meta.yml
index 824440ab..3e6856b4 100644
--- a/loki/meta.yml
+++ b/loki/meta.yml
@@ -13,4 +13,6 @@
 3.3.1-oe2203sp3:
   path: loki/3.3.1/22.03-lts-sp3/Dockerfile
 3.3.1-oe2203sp4:
-  path: loki/3.3.1/22.03-lts-sp4/Dockerfile
\ No newline at end of file
+  path: loki/3.3.1/22.03-lts-sp4/Dockerfile
+3.3.1-oe2203sp1:
+  path: loki/3.3.1/22.03-lts-sp1/Dockerfile
\ No newline at end of file
-- 
Gitee


From 9959ccb1d5b572d88a1dc18a9455d7a449e301b8 Mon Sep 17 00:00:00 2001
From: openeuler_bot <673672685@qq.com>
Date: Fri, 6 Dec 2024 06:16:44 +0000
Subject: [PATCH 5/5] update loki/3.3.1/24.03-lts/Dockerfile.

Signed-off-by: openeuler_bot <673672685@qq.com>
---
 loki/3.3.1/24.03-lts/Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/loki/3.3.1/24.03-lts/Dockerfile b/loki/3.3.1/24.03-lts/Dockerfile
index 20abbd21..9eec12e8 100644
--- a/loki/3.3.1/24.03-lts/Dockerfile
+++ b/loki/3.3.1/24.03-lts/Dockerfile
@@ -5,6 +5,8 @@ ARG TARGETARCH
 ARG BUILDARCH
 ARG VERSION=3.3.1
 
+RUN dnf -y install shadow-utils
+
 RUN if [ "$TARGETARCH" = "amd64" ]; then \
       BUILDARCH="x86_64"; \
     elif [ "$TARGETARCH" = "arm64" ]; then \
-- 
Gitee