From 6284d2233e148990ca6156649b247c3ad7fbd4a0 Mon Sep 17 00:00:00 2001
From: Steven Sheehy <ssheehy@firescope.com>
Date: Tue, 5 Mar 2019 12:17:31 -0600
Subject: [PATCH 1/3] Allow blank log lines for CRI

Signed-off-by: Steven Sheehy <ssheehy@firescope.com>
---
 pkg/promtail/api/entry_parser.go      | 4 ++--
 pkg/promtail/api/entry_parser_test.go | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/promtail/api/entry_parser.go b/pkg/promtail/api/entry_parser.go
index f7ea32f9b62f4..b501cc20aa500 100644
--- a/pkg/promtail/api/entry_parser.go
+++ b/pkg/promtail/api/entry_parser.go
@@ -21,7 +21,7 @@ const (
 )
 
 var (
-	criPattern = regexp.MustCompile(`^(?s)(?P<time>\S+?) (?P<stream>stdout|stderr) (?P<flags>\S+?) (?P<content>.+)$`)
+	criPattern = regexp.MustCompile(`^(?s)(?P<time>\S+?) (?P<stream>stdout|stderr) (?P<flags>\S+?) (?P<content>.*)$`)
 )
 
 // String returns a string representation of the EntryParser.
@@ -71,7 +71,7 @@ func (e EntryParser) Wrap(next EntryHandler) EntryHandler {
 		return EntryHandlerFunc(func(labels model.LabelSet, _ time.Time, line string) error {
 			parts := criPattern.FindStringSubmatch(line)
 			if parts == nil || len(parts) < 5 {
-				return fmt.Errorf("Line did not match the CRI log format")
+				return fmt.Errorf("Line did not match the CRI log format: '%s'", line)
 			}
 
 			timestamp, err := time.Parse(time.RFC3339Nano, parts[1])
diff --git a/pkg/promtail/api/entry_parser_test.go b/pkg/promtail/api/entry_parser_test.go
index 0dd6312f72eba..d88d41a17712d 100644
--- a/pkg/promtail/api/entry_parser_test.go
+++ b/pkg/promtail/api/entry_parser_test.go
@@ -34,10 +34,10 @@ var criTestCases = []TestCase{
 	{"", true, Entry{}},
 	{TestTimeStr, true, Entry{}},
 	{TestTimeStr + " stdout", true, Entry{}},
-	{TestTimeStr + " stderr F", true, Entry{}},
 	{TestTimeStr + " invalid F message", true, Entry{}},
 	{"2019-01-01 01:00:00.000000001 stdout F message", true, Entry{}},
 	{" " + TestTimeStr + " stdout F message", true, Entry{}},
+	{TestTimeStr + " stdout F ", false, NewEntry(TestTime, "", "stdout")},
 	{TestTimeStr + " stdout F message", false, NewEntry(TestTime, "message", "stdout")},
 	{TestTimeStr + " stderr P message", false, NewEntry(TestTime, "message", "stderr")},
 	{TestTimeStr + " stderr P message1\nmessage2", false, NewEntry(TestTime, "message1\nmessage2", "stderr")},

From c366665a6766ece046cefdd3e69ba241e74e58ac Mon Sep 17 00:00:00 2001
From: Steven Sheehy <ssheehy@firescope.com>
Date: Tue, 5 Mar 2019 12:19:27 -0600
Subject: [PATCH 2/3] Fix fullnameOverride in Helm chart

Signed-off-by: Steven Sheehy <ssheehy@firescope.com>
---
 production/helm/templates/loki/_helpers.tpl     | 6 +++---
 production/helm/templates/promtail/_helpers.tpl | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/production/helm/templates/loki/_helpers.tpl b/production/helm/templates/loki/_helpers.tpl
index 2e333aae60f88..71fca849b7d8b 100644
--- a/production/helm/templates/loki/_helpers.tpl
+++ b/production/helm/templates/loki/_helpers.tpl
@@ -12,10 +12,10 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 If release name contains chart name it will be used as a full name.
 */}}
 {{- define "loki.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- if .Values.loki.fullnameOverride -}}
+{{- .Values.loki.fullnameOverride | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- $name := default .Chart.Name .Values.loki.nameOverride -}}
 {{- if contains $name .Release.Name -}}
 {{- .Release.Name | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
diff --git a/production/helm/templates/promtail/_helpers.tpl b/production/helm/templates/promtail/_helpers.tpl
index dcbe0ea260dbc..92f1d483baa6b 100644
--- a/production/helm/templates/promtail/_helpers.tpl
+++ b/production/helm/templates/promtail/_helpers.tpl
@@ -12,8 +12,8 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 If release name contains chart name it will be used as a full name.
 */}}
 {{- define "promtail.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- if .Values.promtail.fullnameOverride -}}
+{{- .Values.promtail.fullnameOverride | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
 {{- $name := default .Chart.Name .Values.promtail.nameOverride -}}
 {{- if contains $name .Release.Name -}}

From a915399bc61ec2f0905d957ff03c54e18be0eb0a Mon Sep 17 00:00:00 2001
From: Steven Sheehy <ssheehy@firescope.com>
Date: Tue, 5 Mar 2019 12:28:30 -0600
Subject: [PATCH 3/3] Add entryParser option to helm chart

Signed-off-by: Steven Sheehy <ssheehy@firescope.com>
---
 production/helm/Chart.yaml                        | 4 ++--
 production/helm/templates/promtail/configmap.yaml | 4 +++-
 production/helm/values.yaml                       | 2 ++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/production/helm/Chart.yaml b/production/helm/Chart.yaml
index 3ec1773e637b6..071080c8bf5aa 100644
--- a/production/helm/Chart.yaml
+++ b/production/helm/Chart.yaml
@@ -1,5 +1,5 @@
 name: loki
-version: 0.0.1
+version: 0.1.0
 appVersion: 0.0.1
 kubeVersion: "^1.10.0-0"
 description: "Loki: like Prometheus, but for logs."
@@ -10,4 +10,4 @@ sources:
 maintainers:
   - name: Loki Maintainers
     email: lokiproject@googlegroups.com
-engine: gotpl
\ No newline at end of file
+engine: gotpl
diff --git a/production/helm/templates/promtail/configmap.yaml b/production/helm/templates/promtail/configmap.yaml
index 9f09bbb5b82ef..c1b996ec07a01 100644
--- a/production/helm/templates/promtail/configmap.yaml
+++ b/production/helm/templates/promtail/configmap.yaml
@@ -11,6 +11,7 @@ data:
   promtail.yaml: |
     scrape_configs:
       - job_name: kubernetes-pods
+        entry_parser: {{ .Values.promtail.entryParser }}
         kubernetes_sd_configs:
         - role: pod
         relabel_configs:
@@ -49,6 +50,7 @@ data:
           - __meta_kubernetes_pod_container_name
           target_label: __path__
       - job_name: kubernetes-pods-app
+        entry_parser: {{ .Values.promtail.entryParser }}
         kubernetes_sd_configs:
         - role: pod
         relabel_configs:
@@ -89,4 +91,4 @@ data:
           source_labels:
           - __meta_kubernetes_pod_uid
           - __meta_kubernetes_pod_container_name
-          target_label: __path__
\ No newline at end of file
+          target_label: __path__
diff --git a/production/helm/values.yaml b/production/helm/values.yaml
index dee4dc5e3b295..943e182849bc0 100644
--- a/production/helm/values.yaml
+++ b/production/helm/values.yaml
@@ -97,6 +97,8 @@ promtail:
   nameOverride: promtail
   deploymentStrategy: RollingUpdate
 
+  entryParser: docker
+
   image:
     repository: grafana/promtail
     tag: master