Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Doccloud #1

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion helm-chart/splunk-connect-for-kubernetes/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion helm-chart/splunk-kubernetes-logging/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 9 additions & 1 deletion helm-chart/splunk-kubernetes-logging/templates/configMap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -207,7 +215,7 @@ data:
hec_port {{ . }}
{{- end }}
hec_token "#{ENV['SPLUNK_HEC_TOKEN']}"
host "#{ENV['SPLUNK_HEC_HOST']}"
host {{ .Values.splunk.region }} {{ "," }}{{. Values.splunk.environment }}
source_key source
sourcetype_key sourcetype
{{- with or .Values.splunk.hec.indexName .Values.global.splunk.hec.indexName }}
Expand Down
2 changes: 1 addition & 1 deletion helm-chart/splunk-kubernetes-metrics/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion helm-chart/splunk-kubernetes-objects/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down