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.

Sign up for GitHub

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

Jump to bottom

Bump sumologic fluentd output plugin and override sumo_client with helm version #597

Merged
merged 6 commits into from
Apr 29, 2020
Merged

Bump sumologic fluentd output plugin and override sumo_client with helm version #597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c6cac8d
Bump fluent-plugin-sumologic_output to 1.7.0
Apr 27, 2020
1435869
Add template for sumo client purposes
Apr 27, 2020
e74737f
Update config to set sumo_client property
Apr 27, 2020
3789238
Fix double quotation
Apr 27, 2020
b27a15e
Generate new 'fluentd-sumologic.yaml.tmpl'
Apr 27, 2020
d092563
Use newest (1.7.1) version of sumologic_output fluentd plugin
Apr 28, 2020
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 deploy/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ RUN gem install fluent-plugin-s3
RUN gem install fluent-plugin-systemd -v 1.0.2 \
&& gem install fluent-plugin-record-modifier -v 2.0.1 \
&& gem install fluent-plugin-kubernetes_metadata_filter -v 2.4.1 \
&& gem install fluent-plugin-sumologic_output -v 1.6.1 \
&& gem install fluent-plugin-sumologic_output -v 1.7.1 \
&& gem install fluent-plugin-concat -v 2.4.0 \
&& gem install fluent-plugin-rewrite-tag-filter -v 2.2.0 \
&& gem install fluent-plugin-prometheus -v 1.6.1
Expand Down
1 change: 1 addition & 0 deletions deploy/helm/sumologic/conf/events/events.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
<match kubernetes.**>
@type sumologic
@id sumologic.endpoint.events
sumo_client {{ include "sumologic.sumo_client" . | quote }}
endpoint "#{ENV['SUMO_ENDPOINT_EVENTS']}"
data_type logs
disable_cookies true
Expand Down
1 change: 1 addition & 0 deletions deploy/helm/sumologic/conf/logs/logs.source.containers.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
<match containers.**>
@type sumologic
@id sumologic.endpoint.logs
sumo_client {{ include "sumologic.sumo_client" . | quote }}
@log_level {{ .Values.fluentd.logs.output.pluginLogLevel }}
{{- .Values.fluentd.logs.containers.outputConf | nindent 6 }}
<buffer>
Expand Down
1 change: 1 addition & 0 deletions deploy/helm/sumologic/conf/logs/logs.source.default.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<match **>
@type sumologic
@id sumologic.endpoint.logs.default
sumo_client {{ include "sumologic.sumo_client" . | quote }}
{{- .Values.fluentd.logs.default.outputConf | nindent 4 }}
<buffer>
{{- if or .Values.fluentd.persistence.enabled (eq .Values.fluentd.buffer.type "file") }}
Expand Down
2 changes: 2 additions & 0 deletions deploy/helm/sumologic/conf/logs/logs.source.systemd.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<match **>
@type sumologic
@id sumologic.endpoint.logs.kubelet
sumo_client {{ include "sumologic.sumo_client" . | quote }}
{{- .Values.fluentd.logs.kubelet.outputConf | nindent 6 }}
<buffer>
{{- if or .Values.fluentd.persistence.enabled (eq .Values.fluentd.buffer.type "file") }}
Expand Down Expand Up @@ -63,6 +64,7 @@
<match **>
@type sumologic
@id sumologic.endpoint.logs.systemd
sumo_client {{ include "sumologic.sumo_client" . | quote }}
{{- .Values.fluentd.logs.systemd.outputConf | nindent 6 }}
<buffer>
{{- if or .Values.fluentd.persistence.enabled (eq .Values.fluentd.buffer.type "file") }}
Expand Down
8 changes: 8 additions & 0 deletions deploy/helm/sumologic/conf/metrics/metrics.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<match prometheus.metrics.apiserver**>
@type sumologic
@id sumologic.endpoint.metrics.apiserver
sumo_client {{ include "sumologic.sumo_client" . | quote }}
endpoint "#{ENV['SUMO_ENDPOINT_METRICS_APISERVER']}"
{{- .Values.fluentd.metrics.outputConf | nindent 6 }}
<buffer>
Expand All @@ -56,6 +57,7 @@
<match prometheus.metrics.kubelet**>
@type sumologic
@id sumologic.endpoint.metrics.kubelet
sumo_client {{ include "sumologic.sumo_client" . | quote }}
endpoint "#{ENV['SUMO_ENDPOINT_METRICS_KUBELET']}"
{{- .Values.fluentd.metrics.outputConf | nindent 6 }}
<buffer>
Expand All @@ -71,6 +73,7 @@
<match prometheus.metrics.container**>
@type sumologic
@id sumologic.endpoint.metrics.container
sumo_client {{ include "sumologic.sumo_client" . | quote }}
endpoint "#{ENV['SUMO_ENDPOINT_METRICS_KUBELET']}"
{{- .Values.fluentd.metrics.outputConf | nindent 6 }}
<buffer>
Expand All @@ -86,6 +89,7 @@
<match prometheus.metrics.controller-manager**>
@type sumologic
@id sumologic.endpoint.metrics.kube.controller.manager
sumo_client {{ include "sumologic.sumo_client" . | quote }}
endpoint "#{ENV['SUMO_ENDPOINT_METRICS_KUBE_CONTROLLER_MANAGER']}"
{{- .Values.fluentd.metrics.outputConf | nindent 6 }}
<buffer>
Expand All @@ -101,6 +105,7 @@
<match prometheus.metrics.scheduler**>
@type sumologic
@id sumologic.endpoint.metrics.kube.scheduler
sumo_client {{ include "sumologic.sumo_client" . | quote }}
endpoint "#{ENV['SUMO_ENDPOINT_METRICS_KUBE_SCHEDULER']}"
{{- .Values.fluentd.metrics.outputConf | nindent 6 }}
<buffer>
Expand All @@ -116,6 +121,7 @@
<match prometheus.metrics.state**>
@type sumologic
@id sumologic.endpoint.metrics.kube.state
sumo_client {{ include "sumologic.sumo_client" . | quote }}
endpoint "#{ENV['SUMO_ENDPOINT_METRICS_KUBE_STATE']}"
{{- .Values.fluentd.metrics.outputConf | nindent 6 }}
<buffer>
Expand All @@ -131,6 +137,7 @@
<match prometheus.metrics.node**>
@type sumologic
@id sumologic.endpoint.metrics.node.exporter
sumo_client {{ include "sumologic.sumo_client" . | quote }}
endpoint "#{ENV['SUMO_ENDPOINT_METRICS_NODE_EXPORTER']}"
{{- .Values.fluentd.metrics.outputConf | nindent 6 }}
<buffer>
Expand All @@ -146,6 +153,7 @@
<match prometheus.metrics**>
@type sumologic
@id sumologic.endpoint.metrics
sumo_client {{ include "sumologic.sumo_client" . | quote }}
endpoint "#{ENV['SUMO_ENDPOINT_METRICS']}"
{{- .Values.fluentd.metrics.outputConf | nindent 6 }}
<buffer>
Expand Down
7 changes: 7 additions & 0 deletions deploy/helm/sumologic/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,13 @@ heritage: "{{ .Release.Service }}"
{{- end -}}
{{- end -}}

{{/*
Returns sumologic version string
*/}}
{{- define "sumologic.sumo_client" -}}
k8s_{{ .Chart.Version }}
{{- end -}}

{{/*
Get configuration value, otherwise returns default

Expand Down
13 changes: 13 additions & 0 deletions deploy/kubernetes/fluentd-sumologic.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ data:
<match prometheus.metrics.apiserver**>
@type sumologic
@id sumologic.endpoint.metrics.apiserver
sumo_client "k8s_1.0.0-beta.2"
endpoint "#{ENV['SUMO_ENDPOINT_METRICS_APISERVER']}"
@include metrics.output.conf
<buffer>
Expand All @@ -106,6 +107,7 @@ data:
<match prometheus.metrics.kubelet**>
@type sumologic
@id sumologic.endpoint.metrics.kubelet
sumo_client "k8s_1.0.0-beta.2"
endpoint "#{ENV['SUMO_ENDPOINT_METRICS_KUBELET']}"
@include metrics.output.conf
<buffer>
Expand All @@ -116,6 +118,7 @@ data:
<match prometheus.metrics.container**>
@type sumologic
@id sumologic.endpoint.metrics.container
sumo_client "k8s_1.0.0-beta.2"
endpoint "#{ENV['SUMO_ENDPOINT_METRICS_KUBELET']}"
@include metrics.output.conf
<buffer>
Expand All @@ -126,6 +129,7 @@ data:
<match prometheus.metrics.controller-manager**>
@type sumologic
@id sumologic.endpoint.metrics.kube.controller.manager
sumo_client "k8s_1.0.0-beta.2"
endpoint "#{ENV['SUMO_ENDPOINT_METRICS_KUBE_CONTROLLER_MANAGER']}"
@include metrics.output.conf
<buffer>
Expand All @@ -136,6 +140,7 @@ data:
<match prometheus.metrics.scheduler**>
@type sumologic
@id sumologic.endpoint.metrics.kube.scheduler
sumo_client "k8s_1.0.0-beta.2"
endpoint "#{ENV['SUMO_ENDPOINT_METRICS_KUBE_SCHEDULER']}"
@include metrics.output.conf
<buffer>
Expand All @@ -146,6 +151,7 @@ data:
<match prometheus.metrics.state**>
@type sumologic
@id sumologic.endpoint.metrics.kube.state
sumo_client "k8s_1.0.0-beta.2"
endpoint "#{ENV['SUMO_ENDPOINT_METRICS_KUBE_STATE']}"
@include metrics.output.conf
<buffer>
Expand All @@ -156,6 +162,7 @@ data:
<match prometheus.metrics.node**>
@type sumologic
@id sumologic.endpoint.metrics.node.exporter
sumo_client "k8s_1.0.0-beta.2"
endpoint "#{ENV['SUMO_ENDPOINT_METRICS_NODE_EXPORTER']}"
@include metrics.output.conf
<buffer>
Expand All @@ -166,6 +173,7 @@ data:
<match prometheus.metrics**>
@type sumologic
@id sumologic.endpoint.metrics
sumo_client "k8s_1.0.0-beta.2"
endpoint "#{ENV['SUMO_ENDPOINT_METRICS']}"
@include metrics.output.conf
<buffer>
Expand Down Expand Up @@ -279,6 +287,7 @@ data:
<match containers.**>
@type sumologic
@id sumologic.endpoint.logs
sumo_client "k8s_1.0.0-beta.2"
@log_level error
@include logs.output.conf
<buffer>
Expand All @@ -292,6 +301,7 @@ data:
<match **>
@type sumologic
@id sumologic.endpoint.logs.default
sumo_client "k8s_1.0.0-beta.2"
@include logs.output.conf
<buffer>
@type memory
Expand Down Expand Up @@ -320,6 +330,7 @@ data:
<match **>
@type sumologic
@id sumologic.endpoint.logs.kubelet
sumo_client "k8s_1.0.0-beta.2"
@include logs.output.conf
<buffer>
@type memory
Expand Down Expand Up @@ -353,6 +364,7 @@ data:
<match **>
@type sumologic
@id sumologic.endpoint.logs.systemd
sumo_client "k8s_1.0.0-beta.2"
@include logs.output.conf
<buffer>
@type memory
Expand Down Expand Up @@ -400,6 +412,7 @@ data:
<match kubernetes.**>
@type sumologic
@id sumologic.endpoint.events
sumo_client "k8s_1.0.0-beta.2"
endpoint "#{ENV['SUMO_ENDPOINT_EVENTS']}"
data_type logs
disable_cookies true
Expand Down