From 3352de445869288c16b6379a030b1d928deb8e0d Mon Sep 17 00:00:00 2001 From: Marc Tuduri Date: Fri, 8 Apr 2022 16:15:56 +0200 Subject: [PATCH 1/2] Add ActiveTargets method to promtail --- clients/pkg/promtail/promtail.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/clients/pkg/promtail/promtail.go b/clients/pkg/promtail/promtail.go index 3362a7414ef..ea82e7fddfb 100644 --- a/clients/pkg/promtail/promtail.go +++ b/clients/pkg/promtail/promtail.go @@ -11,6 +11,7 @@ import ( "github.com/grafana/loki/clients/pkg/promtail/config" "github.com/grafana/loki/clients/pkg/promtail/server" "github.com/grafana/loki/clients/pkg/promtail/targets" + "github.com/grafana/loki/clients/pkg/promtail/targets/target" util_log "github.com/grafana/loki/pkg/util/log" ) @@ -127,3 +128,8 @@ func (p *Promtail) Shutdown() { // todo work out the stop. p.client.Stop() } + +// ActiveTargets returns active targets per jobs from the target manager +func (p *Promtail) ActiveTargets() map[string][]target.Target { + return p.targetManagers.ActiveTargets() +} From 36715fdd3d4278104fcc76976d9acd682b5740a6 Mon Sep 17 00:00:00 2001 From: Marc Tuduri Date: Fri, 8 Apr 2022 16:21:59 +0200 Subject: [PATCH 2/2] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b3198268e3c..a42fd7f8b90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ ##### Changes * [5686](https://github.com/grafana/loki/pull/5686) **ssncferreira**: Move promtail StreamLagLabels config to upper level config.Config +* [5839](https://github.com/grafana/loki/pull/5839) **marctc**: Add ActiveTargets method to promtail #### Fluent Bit * [5711](https://github.com/grafana/loki/pull/5711) **MichelHollands**: Update fluent-bit output name