From 8dd3a7644f4ec116dac4085ea2e057f0acf39458 Mon Sep 17 00:00:00 2001
From: Edward Welch <edward.welch@grafana.com>
Date: Mon, 6 May 2019 15:33:53 -0400
Subject: [PATCH] fixing capitalization on CRI stage and some lints
---
pkg/logentry/pipeline.go | 2 +-
pkg/logentry/stages/extensions.go | 4 ++--
pkg/logentry/stages/extensions_test.go | 2 +-
pkg/logentry/stages/json_test.go | 1 +
pkg/logentry/stages/regex_test.go | 1 +
pkg/logentry/stages/util_test.go | 1 +
pkg/promtail/targets/filetargetmanager.go | 2 +-
7 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/pkg/logentry/pipeline.go b/pkg/logentry/pipeline.go
index 372c1db5..5c0c1931 100644
--- a/pkg/logentry/pipeline.go
+++ b/pkg/logentry/pipeline.go
@@ -60,7 +60,7 @@ func NewPipeline(logger log.Logger, stgs PipelineStages, plObserverMicroSeconds
}
st = append(st, docker)
case "cri":
- cri, err := stages.NewCri(logger)
+ cri, err := stages.NewCRI(logger)
if err != nil {
return nil, errors.Wrap(err, "invalid cri stage config")
}
diff --git a/pkg/logentry/stages/extensions.go b/pkg/logentry/stages/extensions.go
index 184457a1..a99c2be5 100644
--- a/pkg/logentry/stages/extensions.go
+++ b/pkg/logentry/stages/extensions.go
@@ -23,8 +23,8 @@ func NewDocker(logger log.Logger) (Stage, error) {
return NewJSON(logger, config)
}
-// NewCri creates a CRI format specific pipeline stage
-func NewCri(logger log.Logger) (Stage, error) {
+// NewCRI creates a CRI format specific pipeline stage
+func NewCRI(logger log.Logger) (Stage, error) {
config := map[string]interface{}{
"expression": "^(?s)(?P<time>\\S+?) (?P<stream>stdout|stderr) (?P<flags>\\S+?) (?P<content>.*)$",
"timestamp": map[string]interface{}{
diff --git a/pkg/logentry/stages/extensions_test.go b/pkg/logentry/stages/extensions_test.go
index 4781d339..da61e720 100644
--- a/pkg/logentry/stages/extensions_test.go
+++ b/pkg/logentry/stages/extensions_test.go
@@ -139,7 +139,7 @@ func TestNewCri(t *testing.T) {
tt := tt
t.Run(tName, func(t *testing.T) {
t.Parallel()
- p, err := NewCri(util.Logger)
+ p, err := NewCRI(util.Logger)
if err != nil {
t.Fatalf("failed to create CRI parser: %s", err)
}
diff --git a/pkg/logentry/stages/json_test.go b/pkg/logentry/stages/json_test.go
index bc9951d2..1d797dbc 100644
--- a/pkg/logentry/stages/json_test.go
+++ b/pkg/logentry/stages/json_test.go
@@ -20,6 +20,7 @@ var cfg = `json:
output:
source: log`
+// nolint
func TestYamlMapStructure(t *testing.T) {
t.Parallel()
diff --git a/pkg/logentry/stages/regex_test.go b/pkg/logentry/stages/regex_test.go
index 4ca753e1..17c9de91 100644
--- a/pkg/logentry/stages/regex_test.go
+++ b/pkg/logentry/stages/regex_test.go
@@ -23,6 +23,7 @@ var regexCfg = `regex:
output:
source: log`
+// nolint
func TestRegexMapStructure(t *testing.T) {
t.Parallel()
diff --git a/pkg/logentry/stages/util_test.go b/pkg/logentry/stages/util_test.go
index e43ba516..26bd2f76 100644
--- a/pkg/logentry/stages/util_test.go
+++ b/pkg/logentry/stages/util_test.go
@@ -8,6 +8,7 @@ import (
"github.com/stretchr/testify/assert"
)
+// nolint
func mustParseTime(layout, value string) time.Time {
t, err := time.Parse(layout, value)
if err != nil {
diff --git a/pkg/promtail/targets/filetargetmanager.go b/pkg/promtail/targets/filetargetmanager.go
index 6ab04031..a3a53039 100644
--- a/pkg/promtail/targets/filetargetmanager.go
+++ b/pkg/promtail/targets/filetargetmanager.go
@@ -92,7 +92,7 @@ func NewFileTargetManager(
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)
+ cri, err := stages.NewCRI(logger)
if err != nil {
return nil, err
}
--
GitLab