From 3d6dafccd76544e7619ed31081ca98db99b23e51 Mon Sep 17 00:00:00 2001
From: Colin Murphy <colmurph@adobe.com>
Date: Thu, 28 Feb 2019 20:22:47 -0500
Subject: [PATCH] Customize for Doc Cloud.

Use Kubernetes mounted ca_file.
Filter out blank lines.
---
 README.md                                                 | 2 +-
 helm-chart/splunk-connect-for-kubernetes/Chart.yaml       | 2 +-
 helm-chart/splunk-kubernetes-logging/Chart.yaml           | 2 +-
 .../splunk-kubernetes-logging/templates/configMap.yaml    | 8 ++++++++
 helm-chart/splunk-kubernetes-metrics/Chart.yaml           | 2 +-
 helm-chart/splunk-kubernetes-objects/Chart.yaml           | 2 +-
 .../splunk-kubernetes-objects/templates/configMap.yaml    | 4 +---
 7 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 3c9b4b5b..3526bbd3 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ Helm, maintained by the CNCF, allows the Kubernetes administrator to install, up
 To install and configure defaults with Helm:
 
 ```
-$ helm install --name my-release -f my_values.yaml https://github.com/splunk/splunk-connect-for-kubernetes/releases/download/v1.0.1/splunk-connect-for-kubernetes-1.0.1.tgz
+$ helm install --name my-release -f my_values.yaml https://github.com/adobe-platform/splunk-connect-for-kubernetes/releases/download/v1.0.2/splunk-connect-for-kubernetes-1.0.2.tgz
 ```
 
 To learn more about using and modifying charts, see: 
diff --git a/helm-chart/splunk-connect-for-kubernetes/Chart.yaml b/helm-chart/splunk-connect-for-kubernetes/Chart.yaml
index 4903b1b8..ffa88c5d 100644
--- a/helm-chart/splunk-connect-for-kubernetes/Chart.yaml
+++ b/helm-chart/splunk-connect-for-kubernetes/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: splunk-connect-for-kubernetes
-version: 1.0.1
+version: 1.0.2
 description: Collect logs, objects (metadata), and metrics with Splunk.
 home: https://github.com/splunk/splunk-connect-for-kubernetes/tree/master/helm-chart
 sources:
diff --git a/helm-chart/splunk-kubernetes-logging/Chart.yaml b/helm-chart/splunk-kubernetes-logging/Chart.yaml
index 1c53be5b..1f73d3ec 100644
--- a/helm-chart/splunk-kubernetes-logging/Chart.yaml
+++ b/helm-chart/splunk-kubernetes-logging/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-version: 1.0.1
+version: 1.0.2
 name: splunk-kubernetes-logging
 description: Collect logs with Splunk.
 home: https://github.com/splunk/splunk-connect-for-kubernetes/tree/master/helm-chart/charts/splunk-kubernetes-logging
diff --git a/helm-chart/splunk-kubernetes-logging/templates/configMap.yaml b/helm-chart/splunk-kubernetes-logging/templates/configMap.yaml
index 48e4d856..8effcf4a 100644
--- a/helm-chart/splunk-kubernetes-logging/templates/configMap.yaml
+++ b/helm-chart/splunk-kubernetes-logging/templates/configMap.yaml
@@ -138,6 +138,14 @@ data:
 
   output.conf: |-
     <label @SPLUNK>
+      # filter to  remove empty lines
+      <filter tail.containers.**>
+        @type grep
+        <exclude>
+         key log
+         pattern ^$
+        </exclude>
+      </filter>
       # = filters for container logs =
       {{- range $name, $logDef := .Values.logs }}
       {{- if and $logDef.from.pod $logDef.multiline }}
diff --git a/helm-chart/splunk-kubernetes-metrics/Chart.yaml b/helm-chart/splunk-kubernetes-metrics/Chart.yaml
index 5b6f18f0..2a797c52 100644
--- a/helm-chart/splunk-kubernetes-metrics/Chart.yaml
+++ b/helm-chart/splunk-kubernetes-metrics/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-version: 1.0.1
+version: 1.0.2
 name: splunk-kubernetes-metrics
 description: Collect metrics with Splunk.
 home: https://github.com/splunk/splunk-connect-for-kubernetes/tree/master/helm-chart/charts/splunk-kubernetes-metrics
diff --git a/helm-chart/splunk-kubernetes-objects/Chart.yaml b/helm-chart/splunk-kubernetes-objects/Chart.yaml
index b52868b2..fe392f87 100644
--- a/helm-chart/splunk-kubernetes-objects/Chart.yaml
+++ b/helm-chart/splunk-kubernetes-objects/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-version: 1.0.1
+version: 1.0.2
 name: splunk-kubernetes-objects
 description: Collect Kubernetes objects with Splunk.
 home: https://github.com/splunk/splunk-connect-for-kubernetes/tree/master/helm-chart/charts/splunk-kubernetes-objects
diff --git a/helm-chart/splunk-kubernetes-objects/templates/configMap.yaml b/helm-chart/splunk-kubernetes-objects/templates/configMap.yaml
index 3b9031ae..d05ad6d4 100644
--- a/helm-chart/splunk-kubernetes-objects/templates/configMap.yaml
+++ b/helm-chart/splunk-kubernetes-objects/templates/configMap.yaml
@@ -36,9 +36,7 @@ data:
       {{- if $.Values.kubernetes.clientKey }}
       client_key /fluentd/etc/splunk/k8s_client_key
       {{- end }}
-      {{- if $.Values.kubernetes.caFile }}
-      ca_file /fluentd/etc/splunk/k8s_ca_file
-      {{- end }}
+      ca_file /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
       {{- with $.Values.kubernetes.bearerTokenFile }}
       bearer_token_file {{ . }}
       {{- end }}