Apply Doc Cloud changes to version 1.1.0

Log different namespaces to different indexes. Add environment and region to host name.
adobe-platform · May 14, 2019 · 72a6b66 · 72a6b66
1 parent ec00d8f
commit 72a6b66
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 12 deletions.
diff --git 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.1.0
+version: 1.1.0-dc1
 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
@@ -1,5 +1,5 @@
 apiVersion: v1
-version: 1.1.0
+version: 1.1.0-dc1
 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/_helpers.tpl b/helm-chart/splunk-kubernetes-logging/templates/_helpers.tpl
@@ -86,11 +86,15 @@ else empty
 end;
 
 def set_namespace(value):
-if value == "default"
-then
-{{- $index := or .Values.splunk.hec.indexRoutingDefaultIndex .Values.global.splunk.hec.indexRoutingDefaultIndex | default "main" | quote}}
+if value == "preview"
+then "sign-preview-ue1"
+elif value == "stage"
+then "sign-stage-ue1"
+elif value == "prod"
+then "sign-prod-ue1"
+else
+{{- $index := or .Values.splunk.hec.indexName .Values.global.splunk.hec.indexName | default "main" | quote}}
 {{- printf " %s" $index -}}
-else value
 end;
 
 def extract_container_info:

diff --git 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 }}
@@ -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
         {{- if or .Values.splunk.hec.indexRouting .Values.global.splunk.hec.indexRouting }}

diff --git a/helm-chart/splunk-kubernetes-logging/values.yaml b/helm-chart/splunk-kubernetes-logging/values.yaml
@@ -18,6 +18,8 @@ global:
       indexRouting:
       # indexRoutingDefaultIndex tells which index to use for the default kubenetes namespace. Used with indexRouting. Default is main.
       indexRoutingDefaultIndex:
+    region:
+    environment:
 
 
 # logLevel is to set log level of the Splunk log collector. Avaiable values are:

diff --git a/helm-chart/splunk-kubernetes-metrics/Chart.yaml b/helm-chart/splunk-kubernetes-metrics/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-version: 1.1.0
+version: 1.1.0-dc1
 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
@@ -1,5 +1,5 @@
 apiVersion: v1
-version: 1.1.0
+version: 1.1.0-dc1
 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
@@ -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 }}