diff --git a/abra.sh b/abra.sh index b620a4b..6a1822d 100644 --- a/abra.sh +++ b/abra.sh @@ -5,7 +5,7 @@ export GRAFANA_SWARM_DASHBOARD_JSON_VERSION=v1 export GRAFANA_STACKS_DASHBOARD_JSON_VERSION=v1 export GRAFANA_TRAEFIK_DASHBOARD_JSON_VERSION=v1 export GRAFANA_CUSTOM_INI_VERSION=v2 -export PROMTAIL_YML_VERSION=v1 +export PROMTAIL_YML_VERSION=v2 export LOKI_YML_VERSION=v2 export PROMETHEUS_YML_VERSION=v1 diff --git a/compose.promtail.yml b/compose.promtail.yml index a03330b..0365923 100644 --- a/compose.promtail.yml +++ b/compose.promtail.yml @@ -15,6 +15,7 @@ services: secrets: - basic_auth_admin_password environment: + - DOMAIN - LOKI_PUSH_URL configs: diff --git a/promtail.yml.tmpl b/promtail.yml.tmpl index d8d5fac..f2fd940 100644 --- a/promtail.yml.tmpl +++ b/promtail.yml.tmpl @@ -10,6 +10,8 @@ clients: basic_auth: username: admin password: {{ secret "basic_auth_admin_password" }} + external_labels: + hostname: {{ env "DOMAIN" }} scrape_configs: - job_name: system