From eac661ff0b2f85c1baeb0e2d2bf52a7770a1fd0c Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Mon, 20 Nov 2023 09:52:18 +0100 Subject: [PATCH] packaging: fix grafana-agent-flow.river (#5802) (#5809) * packaging: fix grafana-agent-flow.river (#5802) Add needed label in default `grafana-agent-flow.river` default configuration used in downstream packages. * Update CHANGELOG.md --- CHANGELOG.md | 2 ++ packaging/grafana-agent-flow/grafana-agent-flow.river | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c4b5dc5b418..06c54181de8e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -108,6 +108,8 @@ v0.38.0-rc.0 (2023-11-16) ### Bugfixes +- Fix default configuration file `grafana-agent-flow.river` used in downstream packages. (@bricewge) + - Set exit code 1 on grafana-agentctl non-runnable command. (@fgouteroux) - Fixed an issue where `loki.process` validation for stage `metric.counter` was diff --git a/packaging/grafana-agent-flow/grafana-agent-flow.river b/packaging/grafana-agent-flow/grafana-agent-flow.river index b965ff0599e1..4d74fc7aa9cb 100644 --- a/packaging/grafana-agent-flow/grafana-agent-flow.river +++ b/packaging/grafana-agent-flow/grafana-agent-flow.river @@ -5,14 +5,14 @@ logging { level = "warn" } -prometheus.exporter.unix { +prometheus.exporter.unix "default" { include_exporter_metrics = true disable_collectors = ["mdadm"] } prometheus.scrape "default" { targets = concat( - prometheus.exporter.unix.targets, + prometheus.exporter.unix.default.targets, [{ // Self-collect metrics job = "agent",