From 41f2e8840c50d642b0628c0230d00d86261328c6 Mon Sep 17 00:00:00 2001 From: David Lougheed Date: Tue, 28 Jan 2025 09:18:25 -0500 Subject: [PATCH 1/4] feat: support structured logging WIP --- lib/logs/promtail-config.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lib/logs/promtail-config.yaml b/lib/logs/promtail-config.yaml index fe6d644c..e6b1f85d 100644 --- a/lib/logs/promtail-config.yaml +++ b/lib/logs/promtail-config.yaml @@ -15,6 +15,18 @@ scrape_configs: job: docker host: docker agent: promtail + - json: + expressions: + output: event + timestamp: timestamp + level: level + logger: logger + http: + - labels: + level: + - timestamp: + source: timestamp + format: RFC3339 docker_sd_configs: - host: unix:///var/run/docker.sock refresh_interval: 5s From 195b8f5c227097af1a40bb867b625bab0b35bce9 Mon Sep 17 00:00:00 2001 From: David Lougheed Date: Wed, 12 Mar 2025 15:02:29 -0400 Subject: [PATCH 2/4] add network to promtail config --- lib/logs/promtail-config.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/logs/promtail-config.yaml b/lib/logs/promtail-config.yaml index e6b1f85d..29801809 100644 --- a/lib/logs/promtail-config.yaml +++ b/lib/logs/promtail-config.yaml @@ -22,6 +22,7 @@ scrape_configs: level: level logger: logger http: + network: - labels: level: - timestamp: From 5d5f0eb635a1f8ed9cefb967acf928a44d07a8e4 Mon Sep 17 00:00:00 2001 From: David Lougheed Date: Wed, 12 Mar 2025 17:13:02 -0400 Subject: [PATCH 3/4] rm unspecified labels --- lib/logs/promtail-config.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/logs/promtail-config.yaml b/lib/logs/promtail-config.yaml index 29801809..91729fa0 100644 --- a/lib/logs/promtail-config.yaml +++ b/lib/logs/promtail-config.yaml @@ -21,8 +21,6 @@ scrape_configs: timestamp: timestamp level: level logger: logger - http: - network: - labels: level: - timestamp: From b7c2f9f4d493601c38fb27d184027b437c3b61f2 Mon Sep 17 00:00:00 2001 From: David Lougheed Date: Wed, 12 Mar 2025 17:13:28 -0400 Subject: [PATCH 4/4] add logger label --- lib/logs/promtail-config.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/logs/promtail-config.yaml b/lib/logs/promtail-config.yaml index 91729fa0..384a5939 100644 --- a/lib/logs/promtail-config.yaml +++ b/lib/logs/promtail-config.yaml @@ -23,6 +23,7 @@ scrape_configs: logger: logger - labels: level: + logger: - timestamp: source: timestamp format: RFC3339