From fd8652376454146119922953933f66c02603958d Mon Sep 17 00:00:00 2001 From: Paschalis Tsilias Date: Fri, 5 Jan 2024 16:51:54 +0200 Subject: [PATCH] Add CHANGELOG entry and docs Signed-off-by: Paschalis Tsilias --- CHANGELOG.md | 4 ++++ docs/sources/flow/reference/components/loki.source.docker.md | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d008e4ab023..766f57c13549 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -81,8 +81,12 @@ Main (unreleased) - Add `max_cache_size` to `prometheus.relabel` to allow configurability instead of hard coded 100,000. (@mattdurham) - Add support for `http_sd_config` within a `scrape_config` for prometheus to flow config conversion. (@erikbaranowski) + - `discovery.lightsail` now supports additional parameters for configuring HTTP client settings. (@ptodev) +- `loki.source.docker` now deduplicates targets which report the same container + ID. (@tpaschalis) + ### Bugfixes - Update `pyroscope.ebpf` to fix a logical bug causing to profile to many kthreads instead of regular processes https://github.com/grafana/pyroscope/pull/2778 (@korniltsev) diff --git a/docs/sources/flow/reference/components/loki.source.docker.md b/docs/sources/flow/reference/components/loki.source.docker.md index cbf77163d646..7787294911f5 100644 --- a/docs/sources/flow/reference/components/loki.source.docker.md +++ b/docs/sources/flow/reference/components/loki.source.docker.md @@ -131,6 +131,11 @@ fully qualified name) to store its _positions file_. The positions file stores the read offsets so that if there is a component or Agent restart, `loki.source.docker` can pick up tailing from the same spot. +In case the targets Argument contains multiple targets with the same container +ID, for example as a result of `discovery.docker` picking up multiple exposed +ports or networks, `loki.source.docker` will deduplicate these, keeping only +the first of each container ID instances. + ## Example This example collects log entries from the files specified in the `targets`