From 70ed705e70f97217649d7189acd6e37fed33384f Mon Sep 17 00:00:00 2001 From: openeuler_bot <673672685@qq.com> Date: Fri, 22 Nov 2024 00:07:27 +0000 Subject: [PATCH 1/4] 24.03-lts update grafana-agent to 0.43.4 --- grafana-agent/0.43.4/24.03-lts/Dockerfile | 14 ++++++++++++++ grafana-agent/0.43.4/24.03-lts/agent.yaml | 17 +++++++++++++++++ grafana-agent/meta.yml | 4 +++- 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 grafana-agent/0.43.4/24.03-lts/Dockerfile create mode 100644 grafana-agent/0.43.4/24.03-lts/agent.yaml diff --git a/grafana-agent/0.43.4/24.03-lts/Dockerfile b/grafana-agent/0.43.4/24.03-lts/Dockerfile new file mode 100644 index 00000000..b0c5130d --- /dev/null +++ b/grafana-agent/0.43.4/24.03-lts/Dockerfile @@ -0,0 +1,14 @@ +ARG BASE=openeuler/openeuler:24.03-lts +FROM ${BASE} + +ARG TARGETARCH +ARG VERSION=0.43.4 + +RUN curl -fSL --output grafana-agent.rpm https://github.com/grafana/agent/releases/download/v${VERSION}/grafana-agent-${VERSION}-1.${TARGETARCH}.rpm && \ + yum -y install grafana-agent.rpm && \ + rm -rf grafana-agent.rpm + +COPY agent.yaml /etc/agent/agent.yaml + +ENTRYPOINT ["grafana-agent"] +CMD ["--config.file=/etc/agent/agent.yaml", "--metrics.wal-directory=/etc/agent/data"] diff --git a/grafana-agent/0.43.4/24.03-lts/agent.yaml b/grafana-agent/0.43.4/24.03-lts/agent.yaml new file mode 100644 index 00000000..5aae63db --- /dev/null +++ b/grafana-agent/0.43.4/24.03-lts/agent.yaml @@ -0,0 +1,17 @@ +server: + log_level: info + +metrics: + global: + scrape_interval: 1m + configs: + - name: test + host_filter: false + scrape_configs: + - job_name: local_scrape + static_configs: + - targets: ['127.0.0.1:12345'] + labels: + cluster: 'localhost' + remote_write: + - url: http://localhost:9009/api/prom/push \ No newline at end of file diff --git a/grafana-agent/meta.yml b/grafana-agent/meta.yml index 9cbb1f84..ba2e0c47 100644 --- a/grafana-agent/meta.yml +++ b/grafana-agent/meta.yml @@ -11,4 +11,6 @@ 0.43.3-oe2203sp4: path: grafana-agent/0.43.3/22.03-lts-sp4/Dockerfile 0.43.3-oe2403lts: - path: grafana-agent/0.43.3/24.03-lts/Dockerfile \ No newline at end of file + path: grafana-agent/0.43.3/24.03-lts/Dockerfile +0.43.4-oe2403lts: + path: grafana-agent/0.43.4/24.03-lts/Dockerfile \ No newline at end of file -- Gitee From c0d4f329758e0c6675a8989ac295c4f4d77d9442 Mon Sep 17 00:00:00 2001 From: openeuler_bot <673672685@qq.com> Date: Fri, 22 Nov 2024 00:07:57 +0000 Subject: [PATCH 2/4] 22.03-lts-sp3 update grafana-agent to 0.43.4 --- grafana-agent/0.43.4/22.03-lts-sp3/Dockerfile | 14 ++++++++++++++ grafana-agent/0.43.4/22.03-lts-sp3/agent.yaml | 17 +++++++++++++++++ grafana-agent/meta.yml | 4 +++- 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 grafana-agent/0.43.4/22.03-lts-sp3/Dockerfile create mode 100644 grafana-agent/0.43.4/22.03-lts-sp3/agent.yaml diff --git a/grafana-agent/0.43.4/22.03-lts-sp3/Dockerfile b/grafana-agent/0.43.4/22.03-lts-sp3/Dockerfile new file mode 100644 index 00000000..e0ed6cf0 --- /dev/null +++ b/grafana-agent/0.43.4/22.03-lts-sp3/Dockerfile @@ -0,0 +1,14 @@ +ARG BASE=openeuler/openeuler:22.03-lts-sp3 +FROM ${BASE} + +ARG TARGETARCH +ARG VERSION=0.43.4 + +RUN curl -fSL --output grafana-agent.rpm https://github.com/grafana/agent/releases/download/v${VERSION}/grafana-agent-${VERSION}-1.${TARGETARCH}.rpm && \ + yum -y install grafana-agent.rpm && \ + rm -rf grafana-agent.rpm + +COPY agent.yaml /etc/agent/agent.yaml + +ENTRYPOINT ["grafana-agent"] +CMD ["--config.file=/etc/agent/agent.yaml", "--metrics.wal-directory=/etc/agent/data"] diff --git a/grafana-agent/0.43.4/22.03-lts-sp3/agent.yaml b/grafana-agent/0.43.4/22.03-lts-sp3/agent.yaml new file mode 100644 index 00000000..5aae63db --- /dev/null +++ b/grafana-agent/0.43.4/22.03-lts-sp3/agent.yaml @@ -0,0 +1,17 @@ +server: + log_level: info + +metrics: + global: + scrape_interval: 1m + configs: + - name: test + host_filter: false + scrape_configs: + - job_name: local_scrape + static_configs: + - targets: ['127.0.0.1:12345'] + labels: + cluster: 'localhost' + remote_write: + - url: http://localhost:9009/api/prom/push \ No newline at end of file diff --git a/grafana-agent/meta.yml b/grafana-agent/meta.yml index ba2e0c47..5d8a3350 100644 --- a/grafana-agent/meta.yml +++ b/grafana-agent/meta.yml @@ -13,4 +13,6 @@ 0.43.3-oe2403lts: path: grafana-agent/0.43.3/24.03-lts/Dockerfile 0.43.4-oe2403lts: - path: grafana-agent/0.43.4/24.03-lts/Dockerfile \ No newline at end of file + path: grafana-agent/0.43.4/24.03-lts/Dockerfile +0.43.4-oe2203sp3: + path: grafana-agent/0.43.4/22.03-lts-sp3/Dockerfile \ No newline at end of file -- Gitee From d8942fe4e89961aa33422393a016d336d644aa15 Mon Sep 17 00:00:00 2001 From: openeuler_bot <673672685@qq.com> Date: Fri, 22 Nov 2024 00:08:28 +0000 Subject: [PATCH 3/4] 22.03-lts-sp4 update grafana-agent to 0.43.4 --- grafana-agent/0.43.4/22.03-lts-sp4/Dockerfile | 14 ++++++++++++++ grafana-agent/0.43.4/22.03-lts-sp4/agent.yaml | 17 +++++++++++++++++ grafana-agent/meta.yml | 4 +++- 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 grafana-agent/0.43.4/22.03-lts-sp4/Dockerfile create mode 100644 grafana-agent/0.43.4/22.03-lts-sp4/agent.yaml diff --git a/grafana-agent/0.43.4/22.03-lts-sp4/Dockerfile b/grafana-agent/0.43.4/22.03-lts-sp4/Dockerfile new file mode 100644 index 00000000..1906798a --- /dev/null +++ b/grafana-agent/0.43.4/22.03-lts-sp4/Dockerfile @@ -0,0 +1,14 @@ +ARG BASE=openeuler/openeuler:22.03-lts-sp4 +FROM ${BASE} + +ARG TARGETARCH +ARG VERSION=0.43.4 + +RUN curl -fSL --output grafana-agent.rpm https://github.com/grafana/agent/releases/download/v${VERSION}/grafana-agent-${VERSION}-1.${TARGETARCH}.rpm && \ + yum -y install grafana-agent.rpm && \ + rm -rf grafana-agent.rpm + +COPY agent.yaml /etc/agent/agent.yaml + +ENTRYPOINT ["grafana-agent"] +CMD ["--config.file=/etc/agent/agent.yaml", "--metrics.wal-directory=/etc/agent/data"] diff --git a/grafana-agent/0.43.4/22.03-lts-sp4/agent.yaml b/grafana-agent/0.43.4/22.03-lts-sp4/agent.yaml new file mode 100644 index 00000000..5aae63db --- /dev/null +++ b/grafana-agent/0.43.4/22.03-lts-sp4/agent.yaml @@ -0,0 +1,17 @@ +server: + log_level: info + +metrics: + global: + scrape_interval: 1m + configs: + - name: test + host_filter: false + scrape_configs: + - job_name: local_scrape + static_configs: + - targets: ['127.0.0.1:12345'] + labels: + cluster: 'localhost' + remote_write: + - url: http://localhost:9009/api/prom/push \ No newline at end of file diff --git a/grafana-agent/meta.yml b/grafana-agent/meta.yml index 5d8a3350..05e2188d 100644 --- a/grafana-agent/meta.yml +++ b/grafana-agent/meta.yml @@ -15,4 +15,6 @@ 0.43.4-oe2403lts: path: grafana-agent/0.43.4/24.03-lts/Dockerfile 0.43.4-oe2203sp3: - path: grafana-agent/0.43.4/22.03-lts-sp3/Dockerfile \ No newline at end of file + path: grafana-agent/0.43.4/22.03-lts-sp3/Dockerfile +0.43.4-oe2203sp4: + path: grafana-agent/0.43.4/22.03-lts-sp4/Dockerfile \ No newline at end of file -- Gitee From 4855944a4409cf113535065c47365fffc04c5647 Mon Sep 17 00:00:00 2001 From: openeuler_bot <673672685@qq.com> Date: Fri, 22 Nov 2024 00:09:00 +0000 Subject: [PATCH 4/4] 22.03-lts-sp1 update grafana-agent to 0.43.4 --- grafana-agent/0.43.4/22.03-lts-sp1/Dockerfile | 14 ++++++++++++++ grafana-agent/0.43.4/22.03-lts-sp1/agent.yaml | 17 +++++++++++++++++ grafana-agent/meta.yml | 4 +++- 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 grafana-agent/0.43.4/22.03-lts-sp1/Dockerfile create mode 100644 grafana-agent/0.43.4/22.03-lts-sp1/agent.yaml diff --git a/grafana-agent/0.43.4/22.03-lts-sp1/Dockerfile b/grafana-agent/0.43.4/22.03-lts-sp1/Dockerfile new file mode 100644 index 00000000..b1bbb88a --- /dev/null +++ b/grafana-agent/0.43.4/22.03-lts-sp1/Dockerfile @@ -0,0 +1,14 @@ +ARG BASE=openeuler/openeuler:22.03-lts-sp1 +FROM ${BASE} + +ARG TARGETARCH +ARG VERSION=0.43.4 + +RUN curl -fSL --output grafana-agent.rpm https://github.com/grafana/agent/releases/download/v${VERSION}/grafana-agent-${VERSION}-1.${TARGETARCH}.rpm && \ + yum -y install grafana-agent.rpm && \ + rm -rf grafana-agent.rpm + +COPY agent.yaml /etc/agent/agent.yaml + +ENTRYPOINT ["grafana-agent"] +CMD ["--config.file=/etc/agent/agent.yaml", "--metrics.wal-directory=/etc/agent/data"] diff --git a/grafana-agent/0.43.4/22.03-lts-sp1/agent.yaml b/grafana-agent/0.43.4/22.03-lts-sp1/agent.yaml new file mode 100644 index 00000000..5aae63db --- /dev/null +++ b/grafana-agent/0.43.4/22.03-lts-sp1/agent.yaml @@ -0,0 +1,17 @@ +server: + log_level: info + +metrics: + global: + scrape_interval: 1m + configs: + - name: test + host_filter: false + scrape_configs: + - job_name: local_scrape + static_configs: + - targets: ['127.0.0.1:12345'] + labels: + cluster: 'localhost' + remote_write: + - url: http://localhost:9009/api/prom/push \ No newline at end of file diff --git a/grafana-agent/meta.yml b/grafana-agent/meta.yml index 05e2188d..cc32e61d 100644 --- a/grafana-agent/meta.yml +++ b/grafana-agent/meta.yml @@ -17,4 +17,6 @@ 0.43.4-oe2203sp3: path: grafana-agent/0.43.4/22.03-lts-sp3/Dockerfile 0.43.4-oe2203sp4: - path: grafana-agent/0.43.4/22.03-lts-sp4/Dockerfile \ No newline at end of file + path: grafana-agent/0.43.4/22.03-lts-sp4/Dockerfile +0.43.4-oe2203sp1: + path: grafana-agent/0.43.4/22.03-lts-sp1/Dockerfile \ No newline at end of file -- Gitee