changelog and lint

grafana · Nov 29, 2023 · 405d7af · 405d7af
1 parent 2503033
commit 405d7af
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -39,6 +39,9 @@ Main (unreleased)
 
 - Fix issue with windows_exporter defaults not being set correctly. (@mattdurham)
 
+- Fix issue where `convert` command would generate incorrect Flow Mode config 
+  when provided `promtail` configuration that uses `docker_sd_configs` (@thampiotr) 
+
 v0.38.0 (2023-11-21)
 --------------------
 

diff --git a/converter/internal/promtailconvert/internal/build/docker_sd.go b/converter/internal/promtailconvert/internal/build/docker_sd.go
@@ -49,7 +49,6 @@ func (s *ScrapeConfigBuilder) AppendDockerPipeline() {
 			overrideHook,
 		))
 	}
-
 }
 
 func toLokiSourceDocker(sd *moby.DockerSDConfig, forwardTo []loki.LogsReceiver) *loki_docker.Arguments {
@@ -77,7 +76,6 @@ func toDiscoveryDocker(sdConfig *moby.DockerSDConfig) *docker.Arguments {
 		Filters:            toFlowDockerSDFilters(sdConfig.Filters),
 		HTTPClientConfig:   *common.ToHttpClientConfig(&sdConfig.HTTPClientConfig),
 	}
-
 }
 
 func toFlowDockerSDFilters(filters []moby.Filter) []docker.Filter {