From 3801944fac0ef8df77ea406d91dec26d674c3c92 Mon Sep 17 00:00:00 2001
From: root <root@docker-lxc.local>
Date: Mon, 20 Nov 2023 21:25:54 -0600
Subject: [PATCH] using environment variables

---
 README.md                    | 8 ++++++++
 docker-compose.yml           | 7 ++++++-
 promtail/promtail-config.yml | 6 +++---
 telegraf/telegraf.conf       | 2 +-
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 83bfa4e..9a440b5 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,10 @@
 # docker-observation
+
 Various tools to monitor Docker containers
+
+## Environment Variables
+
+- `DOCKER_INFLUXDB_INIT_ORG`
+- `INFLUX_WRITE_TOKEN`
+- `INFLUX_HOST`
+- `LOKI_HOST`
diff --git a/docker-compose.yml b/docker-compose.yml
index 8eaeb1c..a3838f2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,8 +13,13 @@ services:
   promtail:
     image: grafana/promtail
     restart: unless-stopped
+    env_file:
+      - .env
     volumes:
       - ./promtail:/etc/promtail
       - /var/run/docker.sock:/var/run/docker.sock
       - /var/log:/var/log:ro
-    command: -config.file=/etc/promtail/promtail-config.yml
+    command: [
+      "-config.file=/etc/promtail/promtail-config.yml",
+      "-config.expand-env=true"
+    ]
diff --git a/promtail/promtail-config.yml b/promtail/promtail-config.yml
index fcb76a3..26a1fbc 100644
--- a/promtail/promtail-config.yml
+++ b/promtail/promtail-config.yml
@@ -6,7 +6,7 @@ positions:
   filename: /tmp/positions.yaml
 
 clients:
-  - url: http://loki:3100/loki/api/v1/push
+  - url: http://${LOKI_HOST}:3100/loki/api/v1/push
 
 scrape_configs:
   - job_name: flog_scrape
@@ -19,5 +19,5 @@ scrape_configs:
         target_label: 'container'
       - source_labels: ['__meta_docker_container_log_stream']
         target_label: 'logstream'
-      # - target_label: 'host'
-      #   replacement: 'docker-lxc'
+      - target_label: 'host'
+        replacement: '${HOSTNAME}'
diff --git a/telegraf/telegraf.conf b/telegraf/telegraf.conf
index 9d1c6bf..074c1ac 100644
--- a/telegraf/telegraf.conf
+++ b/telegraf/telegraf.conf
@@ -80,7 +80,7 @@
   ## Multiple URLs can be specified for a single cluster, only ONE of the
   ## urls will be written to each interval.
   ##   ex: urls = ["https://us-west-2-1.aws.cloud2.influxdata.com"]
-  urls = ["http://influxdb:8086"]
+  urls = ["http://${INFLUX_HOST}:8086"]
 
   ## Token for authentication.
   token = "$INFLUX_WRITE_TOKEN"