From fee154dbc53b86d6a7f5f17398ff8c60f5d7bc53 Mon Sep 17 00:00:00 2001
From: John Lancaster <32917998+jsl12@users.noreply.github.com>
Date: Sat, 24 Feb 2024 15:50:56 -0600
Subject: [PATCH] fixed for updated telegraf

---
 README.md                    | 1 -
 docker-compose.yml           | 4 +---
 promtail/promtail-config.yml | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index e1ee3a7..261c4d5 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,6 @@ Various tools to monitor Docker containers
 
 | Environment Variable       | Description                                     |
 | -------------------------- | ----------------------------------------------- |
-| `HOSTNAME`                 | Hostname for identifying log lines              |
 | `DOCKER_GUID`              | Group ID number for the `docker` user group     |
 | `DOCKER_INFLUXDB_INIT_ORG` | Organization name for InfluxDB                  |
 | `INFLUX_WRITE_TOKEN`       | InfluxDB write token                            |
diff --git a/docker-compose.yml b/docker-compose.yml
index ef13ec2..c830b9c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,7 +14,7 @@ services:
     image: telegraf
     restart: unless-stopped
     uts: host
-    user: root:${DOCKER_GUID}
+    user: telegraf:${DOCKER_GUID}
     env_file:
       - .env
     volumes:
@@ -27,8 +27,6 @@ services:
     uts: host
     env_file:
       - .env
-    environment:
-      - DOCKER_HOST=${HOSTNAME}
     volumes:
       - ./promtail:/etc/promtail
       - /var/run/docker.sock:/var/run/docker.sock
diff --git a/promtail/promtail-config.yml b/promtail/promtail-config.yml
index b5a49e7..3de335c 100644
--- a/promtail/promtail-config.yml
+++ b/promtail/promtail-config.yml
@@ -20,7 +20,7 @@ scrape_configs:
       - source_labels: ['__meta_docker_container_log_stream']
         target_label: 'logstream'
       - target_label: 'host'
-        replacement: '${DOCKER_HOST}'
+        replacement: '${HOSTNAME}'
     pipeline_stages:
       - match:
           selector: '{container="appdaemon"}'