From 8f98e4c8ae5b3d121295cbfe2c5bce2a418d53cf Mon Sep 17 00:00:00 2001
From: Danny Kopping <danny.kopping@grafana.com>
Date: Mon, 1 Mar 2021 09:06:15 +0200
Subject: [PATCH] Remove default docker pipeline stage - this is undocumented
 and unexpected behaviour

Signed-off-by: Danny Kopping <danny.kopping@grafana.com>
---
 pkg/promtail/scrapeconfig/scrapeconfig.go     |  6 +-----
 .../scrapeconfig/scrapeconfig_test.go         | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/pkg/promtail/scrapeconfig/scrapeconfig.go b/pkg/promtail/scrapeconfig/scrapeconfig.go
index b9cff0a25ced..881bc1506d0e 100644
--- a/pkg/promtail/scrapeconfig/scrapeconfig.go
+++ b/pkg/promtail/scrapeconfig/scrapeconfig.go
@@ -240,11 +240,7 @@ type PushTargetConfig struct {
 
 // DefaultScrapeConfig is the default Config.
 var DefaultScrapeConfig = Config{
-	PipelineStages: []interface{}{
-		map[interface{}]interface{}{
-			stages.StageTypeDocker: nil,
-		},
-	},
+	PipelineStages: stages.PipelineStages{},
 }
 
 // HasServiceDiscoveryConfig checks to see if the service discovery used for
diff --git a/pkg/promtail/scrapeconfig/scrapeconfig_test.go b/pkg/promtail/scrapeconfig/scrapeconfig_test.go
index fc304eb04546..2756c21acea1 100644
--- a/pkg/promtail/scrapeconfig/scrapeconfig_test.go
+++ b/pkg/promtail/scrapeconfig/scrapeconfig_test.go
@@ -80,6 +80,18 @@ relabel_configs:
   target_label: __path__
 `
 
+var noPipelineStagesYaml = `
+job_name: kubernetes-pods-name
+static_configs:
+- targets:
+    - localhost
+  labels:
+    job: varlogs
+    __path__: /var/log/*log
+kubernetes_sd_configs:
+- role: pod
+`
+
 func TestLoadSmallConfig(t *testing.T) {
 	var config Config
 	err := yaml.Unmarshal([]byte(smallYaml), &config)
@@ -109,6 +121,15 @@ func TestLoadSmallConfig(t *testing.T) {
 	require.Equal(t, expected, config)
 }
 
+// bugfix: https://github.com/grafana/loki/issues/3403
+func TestEmptyPipelineStagesConfig(t *testing.T) {
+	var config Config
+	err := yaml.Unmarshal([]byte(noPipelineStagesYaml), &config)
+	require.Nil(t, err)
+
+	require.Zero(t, len(config.PipelineStages))
+}
+
 func TestLoadConfig(t *testing.T) {
 	var config Config
 	err := yaml.Unmarshal([]byte(testYaml), &config)