From 359709d7b56d8af4b570c8c737b87941d7a23b91 Mon Sep 17 00:00:00 2001
From: jihaofeng <1343277221@qq.com>
Date: Mon, 23 Sep 2024 14:45:24 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]prometheus=E7=9A=84confd?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/prometheus/Dockerfile                       | 2 +-
 docker/prometheus/confd/templates/prometheus.tmpl  | 6 +++---
 docker/prometheus/confd/templates/supervisord.tmpl | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker/prometheus/Dockerfile b/docker/prometheus/Dockerfile
index f7f97b8..486885b 100644
--- a/docker/prometheus/Dockerfile
+++ b/docker/prometheus/Dockerfile
@@ -39,8 +39,8 @@ RUN architecture=$(uname -m); \
 
 RUN mkdir /etc/prometheus/
 
-COPY ./confd/ /etc/confd/
 COPY prometheus.yml /etc/prometheus/prometheus.yml
+COPY ./confd/ /etc/confd/
 COPY ./supervisord/ /etc/supervisord/
 
 CMD [ "supervisord", "-c", "/etc/supervisord/supervisord.conf" ]
diff --git a/docker/prometheus/confd/templates/prometheus.tmpl b/docker/prometheus/confd/templates/prometheus.tmpl
index 8f899b0..1b695de 100644
--- a/docker/prometheus/confd/templates/prometheus.tmpl
+++ b/docker/prometheus/confd/templates/prometheus.tmpl
@@ -1,14 +1,14 @@
 global:
-  scrape_interval:  {{ printf "%s%s" (trim (getv "/time/global_scrape_interval") "\"") (trim (getv "/time/global_scrape_interval_unit") "\"") }}
+  scrape_interval:  {{ getv "/time/global_scrape_interval"}}{{ getv "/time/global_scrape_interval_unit"}}
 
 scrape_configs:
   - job_name: 'node_exporter'
-    scrape_interval: {{ printf "%s%s" (trim (getv "/time/node_exporter_scrape_interval") "\"") (trim (getv "/time/node_exporter_scrape_interval_unit") "\"") }}
+    scrape_interval: {{ getv "/time/node_exporter_scrape_interval"}}{{ getv "/time/node_exporter_scrape_interval_unit" }}
     static_configs:
       - targets: [ 'node-exporter:9100' ]
 
   - job_name: 'opcua_exporter'
-    scrape_interval: {{ printf "%s%s" (trim (getv "/time/opcua_scrape_interval") "\"") (trim (getv "/time/opcua_scrape_interval_unit") "\"") }}
+    scrape_interval: {{ getv "/time/opcua_scrape_interval"}}{{ getv "/time/opcua_scrape_interval_unit" }}
     static_configs:
       - targets: [ 'opcua-exporter:8191' ]
 {{ if getv "/remote_write/state" }}
diff --git a/docker/prometheus/confd/templates/supervisord.tmpl b/docker/prometheus/confd/templates/supervisord.tmpl
index a27b884..e7bce46 100644
--- a/docker/prometheus/confd/templates/supervisord.tmpl
+++ b/docker/prometheus/confd/templates/supervisord.tmpl
@@ -11,7 +11,7 @@ stderr_logfile=/var/log/confd.err.log
 stdout_logfile=/var/log/confd.out.log
 
 [program:prometheus]
-command=/usr/local/bin/prometheus --config.file=/etc/prometheus/prometheus.yml --storage.tsdb.retention.time={{ getv "/time/storage_interval" ~ getv "/time/storage_interval_unit" }}
+command=/usr/local/bin/prometheus --config.file=/etc/prometheus/prometheus.yml --storage.tsdb.retention.time={{ getv "/time/storage_interval"}}{{ getv "/time/storage_interval_unit")}}
 autostart=true
 autorestart=true
 stderr_logfile=/var/log/prometheus.err.log