fix: Remove depricated entry_parser from scrapeconfig (#2752)

docs/sources/clients/promtail/configuration.md

@@ -259,12 +259,12 @@ backoff_config:
 # Use map like {"foo": "bar"} to add a label foo with
 # value bar.
 # These can also be specified from command line:
-# -client.external-labels=k1=v1,k2=v2 
+# -client.external-labels=k1=v1,k2=v2
 # (or --client.external-labels depending on your OS)
-# labels supplied by the command line are applied 
+# labels supplied by the command line are applied
 # to all clients configured in the `clients` section.
 # NOTE: values defined in the config file will replace values
-# defined on the command line for a given client if the 
+# defined on the command line for a given client if the
 # label keys are the same.
 external_labels:
   [ <labelname>: <labelvalue> ... ]
@@ -299,10 +299,6 @@ of targets using a specified discovery method:
 # Name to identify this scrape config in the Promtail UI.
 job_name: <string>
 
-# Describes how to parse log lines. Supported values [cri docker raw]
-# Deprecated in favor of pipeline_stages using the cri or docker stages.
-[entry_parser: <string> | default = "docker"]
-
 # Describes how to transform logs from targets.
 [pipeline_stages: <pipeline_stages>]
 

docs/sources/design-documents/labels.md

@@ -92,7 +92,7 @@ Our pipelined config might look like this:
 ```yaml
 scrape_configs:
 - job_name: system
-  entry_parsers:
+  pipeline_stages:
     - json:
         timestamp:
           source: time
@@ -153,7 +153,7 @@ There is an alternative configuration that could be used here to accomplish the
 ```yaml
 scrape_configs:
 - job_name: system
-  entry_parsers:
+  pipeline_stages:
     - json:
         timestamp:
           source: time
@@ -195,7 +195,7 @@ For example, the config above might be simplified to:
 ```yaml
 scrape_configs:
 - job_name: system
-  entry_parsers:
+  pipeline_stages:
     - docker:
 ```
 
@@ -204,7 +204,7 @@ or
 ```yaml
 scrape_configs:
 - job_name: system
-  entry_parsers:
+  pipeline_stages:
     - cri:
 ```
 
@@ -213,7 +213,7 @@ Which could still easily be extended to extract additional labels:
 ```yaml
 scrape_configs:
 - job_name: system
-  entry_parsers:
+  pipeline_stages:
     - docker:
     - regex:
         expr: '.*level=(?P<level>[a-zA-Z]+).*'
@@ -227,7 +227,7 @@ An even further simplification would be to attempt to autodetect the log format,
 ```yaml
 scrape_configs:
 - job_name: system
-  entry_parsers:
+  pipeline_stages:
     - auto:
 ```
 

pkg/promtail/promtail_test.go

@@ -31,7 +31,6 @@ import (
 
 	"github.com/grafana/loki/pkg/logentry/stages"
 	"github.com/grafana/loki/pkg/logproto"
-	"github.com/grafana/loki/pkg/promtail/api"
 	"github.com/grafana/loki/pkg/promtail/client"
 	"github.com/grafana/loki/pkg/promtail/config"
 	"github.com/grafana/loki/pkg/promtail/positions"
@@ -603,7 +602,6 @@ func buildTestConfig(t *testing.T, positionsFileName string, logDirName string)
 
 	scrapeConfig := scrapeconfig.Config{
 		JobName:                "",
-		EntryParser:            api.Raw,
 		PipelineStages:         pipeline,
 		RelabelConfigs:         nil,
 		ServiceDiscoveryConfig: serviceConfig,

pkg/promtail/scrapeconfig/scrapeconfig.go

@@ -12,13 +12,11 @@ import (
 	"github.com/prometheus/prometheus/pkg/relabel"
 
 	"github.com/grafana/loki/pkg/logentry/stages"
-	"github.com/grafana/loki/pkg/promtail/api"
 )
 
 // Config describes a job to scrape.
 type Config struct {
 	JobName                string                           `yaml:"job_name,omitempty"`
-	EntryParser            api.EntryParser                  `yaml:"entry_parser"`
 	PipelineStages         stages.PipelineStages            `yaml:"pipeline_stages,omitempty"`
 	JournalConfig          *JournalTargetConfig             `yaml:"journal,omitempty"`
 	SyslogConfig           *SyslogTargetConfig              `yaml:"syslog,omitempty"`
@@ -82,7 +80,11 @@ type PushTargetConfig struct {
 
 // DefaultScrapeConfig is the default Config.
 var DefaultScrapeConfig = Config{
-	EntryParser: api.Docker,
+	PipelineStages: []interface{}{
+		map[interface{}]interface{}{
+			stages.StageTypeDocker: nil,
+		},
+	},
 }
 
 // HasServiceDiscoveryConfig checks to see if the service discovery used for

pkg/promtail/scrapeconfig/scrapeconfig_test.go

@@ -11,15 +11,15 @@ var testYaml = `
 pipeline_stages:
   - regex:
       expr: "./*"
-  - json: 
+  - json:
       timestamp:
         source: time
         format: RFC3339
       labels:
         stream:
           source: json_key_name.json_sub_key_name
       output:
-        source: log     
+        source: log
 job_name: kubernetes-pods-name
 kubernetes_sd_configs:
 - role: pod

pkg/promtail/targets/file/filetargetmanager.go

@@ -87,30 +87,6 @@ func NewFileTargetManager(
 			return nil, err
 		}
 
-		// Backwards compatibility with old EntryParser config
-		if pipeline.Size() == 0 {
-			switch cfg.EntryParser {
-			case api.CRI:
-				level.Warn(logger).Log("msg", "WARNING!!! entry_parser config is deprecated, please change to pipeline_stages")
-				cri, err := stages.NewCRI(logger, registerer)
-				if err != nil {
-					return nil, err
-				}
-				pipeline.AddStage(cri)
-			case api.Docker:
-				level.Warn(logger).Log("msg", "WARNING!!! entry_parser config is deprecated, please change to pipeline_stages")
-				docker, err := stages.NewDocker(logger, registerer)
-				if err != nil {
-					return nil, err
-				}
-				pipeline.AddStage(docker)
-			case api.Raw:
-				level.Warn(logger).Log("msg", "WARNING!!! entry_parser config is deprecated, please change to pipeline_stages")
-			default:
-
-			}
-		}
-
 		// Add Source value to the static config target groups for unique identification
 		// within scrape pool. Also, default target label to localhost if target is not
 		// defined in promtail config.