From eb8c962c4ac121d13f5c23d86a31a5e61ff5b4c4 Mon Sep 17 00:00:00 2001
From: Petru Paler <petru@paler.net>
Date: Tue, 8 Aug 2023 15:21:14 +0100
Subject: [PATCH] Only use node as a label, and try harder to set it.

---
 services/vector.hcl | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/services/vector.hcl b/services/vector.hcl
index 06ab5ed..b49c9e4 100644
--- a/services/vector.hcl
+++ b/services/vector.hcl
@@ -95,8 +95,10 @@ if length(result) > 0 {
             inputs = [
               "vector_raw",
               "glusterfs_raw",
+              "journald_raw",
             ]
             source = '''
+del(.host)
 .node = "[[env "attr.unique.hostname" ]]"
             '''
 
@@ -105,7 +107,6 @@ if length(result) > 0 {
             inputs = [
               "docker_transformed",
               "nomadify_hostname",
-              "journald_raw",
             ]
             endpoint = "http://[[ range service "loki" ]][[ .Address ]]:[[ .Port ]][[ end ]]"
             encoding.codec = "json"
@@ -115,9 +116,7 @@ if length(result) > 0 {
             remove_label_fields = true
             healthcheck.enabled = true
               [sinks.loki.labels]
-              job_name = "{{job_name}}"
               node = "{{node}}"
-              frontend_name = "{{frontend_name}}"
         EOH
       }
       kill_timeout = "30s"