updated the host field

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: 

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.3
 description: Collect logs, objects (metadata), and metrics with Splunk.
 home: https://github.com/splunk/splunk-connect-for-kubernetes/tree/master/helm-chart
 sources:

helm-chart/splunk-kubernetes-logging/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-version: 1.0.1
+version: 1.0.3
 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

helm-chart/splunk-kubernetes-logging/templates/configMap.yaml

@@ -90,7 +90,7 @@ data:
         expression /^(?<log>{{ $logDef.timestampExtraction.regexp }}.*)$/
         time_key time
         time_type string
-        time_format {{ $logDef.timestampExtraction.format }} 
+        time_format {{ $logDef.timestampExtraction.format }}
         {{- else }}
         @type none
         message_key log
@@ -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 }}
@@ -207,7 +215,7 @@ data:
         hec_port {{ . }}
         {{- end }}
         hec_token "#{ENV['SPLUNK_HEC_TOKEN']}"
-        host "#{ENV['SPLUNK_HEC_HOST']}"
+        host "#{ENV['SPLUNK_HEC_HOST']}{{ "," }}{{ .Values.global.splunk.environment }}{{ "," }}{{ .Values.global.splunk.region }}"
         source_key source
         sourcetype_key sourcetype
         {{- with or .Values.splunk.hec.indexName .Values.global.splunk.hec.indexName }}

helm-chart/splunk-kubernetes-logging/values.yaml

@@ -14,6 +14,8 @@ global:
     hec:
       protocol: https
       insecureSSL: false
+    region:
+    environment:
 
 
 # logLevel is to set log level of the Splunk log collector. Avaiable values are:
@@ -85,7 +87,7 @@ journalLogPath: /run/log/journal
 #     journald:
 #       unit: docker.service
 # ```
-#   
+#
 # For `file` logs, `path` is required for specifying where is the log files. Log files are expected in `/var/log`, example:
 # ```
 # docker:

helm-chart/splunk-kubernetes-metrics/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-version: 1.0.1
+version: 1.0.3
 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

helm-chart/splunk-kubernetes-objects/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-version: 1.0.1
+version: 1.0.3
 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

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 }}