Skip to content

Commit aa80337

Browse files
vsinghal13vsinghal13
authored
Merge pull request #322 from SumoLogic/vsinghal-file-buffer
FluentD file buffer
2 parents 203dfed + f89649c commit aa80337

File tree

9 files changed

+170
-33
lines changed

9 files changed

+170
-33
lines changed

‎deploy/helm/sumologic/conf/buffer.output.conf‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
<buffer>
2-
@type memory
3-
compress gzip
4-
flush_interval "#{ENV['FLUSH_INTERVAL']}"
5-
flush_thread_count "#{ENV['NUM_THREADS']}"
6-
chunk_limit_size "#{ENV['CHUNK_LIMIT_SIZE']}"
7-
total_limit_size "#{ENV['TOTAL_LIMIT_SIZE']}"
8-
</buffer>
1+
compress gzip
2+
flush_interval "#{ENV['FLUSH_INTERVAL']}"
3+
flush_thread_count "#{ENV['NUM_THREADS']}"
4+
chunk_limit_size "#{ENV['CHUNK_LIMIT_SIZE']}"
5+
total_limit_size "#{ENV['TOTAL_LIMIT_SIZE']}"

‎deploy/helm/sumologic/conf/events/events.conf‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,13 @@
3030
verify_ssl "#{ENV['VERIFY_SSL']}"
3131
proxy_uri "#{ENV['PROXY_URI']}"
3232
<buffer>
33+
{{- if eq .Values.sumologic.fluentd.buffer "file" }}
34+
@type file
35+
path /fluentd/buffer/events
36+
{{- else }}
3337
@type memory
34-
compress gzip
35-
flush_interval "#{ENV['FLUSH_INTERVAL']}"
36-
flush_thread_count "#{ENV['NUM_THREADS']}"
37-
chunk_limit_size "#{ENV['CHUNK_LIMIT_SIZE']}"
38-
total_limit_size "#{ENV['TOTAL_LIMIT_SIZE']}"
38+
{{- end }}
39+
@include buffer.output.conf
3940
</buffer>
4041
</match>
4142
{{- if .Values.sumologic.fluentdLogLevel }}

‎deploy/helm/sumologic/conf/logs/logs.output.conf‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,4 @@ verify_ssl "#{ENV['VERIFY_SSL']}"
55
log_format "#{ENV['LOG_FORMAT']}"
66
add_timestamp "#{ENV['ADD_TIMESTAMP']}"
77
timestamp_key "#{ENV['TIMESTAMP_KEY']}"
8-
proxy_uri "#{ENV['PROXY_URI']}"
9-
@include buffer.output.conf
8+
proxy_uri "#{ENV['PROXY_URI']}"

‎deploy/helm/sumologic/conf/logs/logs.source.containers.conf‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,14 @@
5555
@type sumologic
5656
@id sumologic.endpoint.logs
5757
@include logs.output.conf
58+
<buffer>
59+
{{- if eq .Values.sumologic.fluentd.buffer "file" }}
60+
@type file
61+
path /fluentd/buffer/logs.containers
62+
{{- else }}
63+
@type memory
64+
{{- end }}
65+
@include buffer.output.conf
66+
</buffer>
5867
</match>
5968
</label>

‎deploy/helm/sumologic/conf/logs/logs.source.systemd.conf‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,15 @@
1717
@type sumologic
1818
@id sumologic.endpoint.logs.kubelet
1919
@include logs.output.conf
20+
<buffer>
21+
{{- if eq .Values.sumologic.fluentd.buffer "file" }}
22+
@type file
23+
path /fluentd/buffer/logs.kubelet
24+
{{- else }}
25+
@type memory
26+
{{- end }}
27+
@include buffer.output.conf
28+
</buffer>
2029
</match>
2130
</label>
2231
<match host.**>
@@ -43,5 +52,14 @@
4352
@type sumologic
4453
@id sumologic.endpoint.logs.systemd
4554
@include logs.output.conf
55+
<buffer>
56+
{{- if eq .Values.sumologic.fluentd.buffer "file" }}
57+
@type file
58+
path /fluentd/buffer/logs.systemd
59+
{{- else }}
60+
@type memory
61+
{{- end }}
62+
@include buffer.output.conf
63+
</buffer>
4664
</match>
4765
</label>

‎deploy/helm/sumologic/conf/metrics/metrics.conf‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,47 +22,120 @@
2222
@id sumologic.endpoint.metrics.apiserver
2323
endpoint "#{ENV['SUMO_ENDPOINT_METRICS_APISERVER']}"
2424
@include metrics.output.conf
25+
<buffer>
26+
{{- if eq .Values.sumologic.fluentd.buffer "file" }}
27+
@type file
28+
path /fluentd/buffer/metrics.apiserver
29+
{{- else }}
30+
@type memory
31+
{{- end }}
32+
@include buffer.output.conf
33+
</buffer>
34+
2535
</match>
2636
<match prometheus.metrics.kubelet**>
2737
@type sumologic
2838
@id sumologic.endpoint.metrics.kubelet
2939
endpoint "#{ENV['SUMO_ENDPOINT_METRICS_KUBELET']}"
3040
@include metrics.output.conf
41+
<buffer>
42+
{{- if eq .Values.sumologic.fluentd.buffer "file" }}
43+
@type file
44+
path /fluentd/buffer/metrics.kubelet
45+
{{- else }}
46+
@type memory
47+
{{- end }}
48+
@include buffer.output.conf
49+
</buffer>
3150
</match>
3251
<match prometheus.metrics.container**>
3352
@type sumologic
3453
@id sumologic.endpoint.metrics.container
3554
endpoint "#{ENV['SUMO_ENDPOINT_METRICS_KUBELET']}"
3655
@include metrics.output.conf
56+
<buffer>
57+
{{- if eq .Values.sumologic.fluentd.buffer "file" }}
58+
@type file
59+
path /fluentd/buffer/metrics.container
60+
{{- else }}
61+
@type memory
62+
{{- end }}
63+
@include buffer.output.conf
64+
</buffer>
3765
</match>
3866
<match prometheus.metrics.controller-manager**>
3967
@type sumologic
4068
@id sumologic.endpoint.metrics.kube.controller.manager
4169
endpoint "#{ENV['SUMO_ENDPOINT_METRICS_KUBE_CONTROLLER_MANAGER']}"
4270
@include metrics.output.conf
71+
<buffer>
72+
{{- if eq .Values.sumologic.fluentd.buffer "file" }}
73+
@type file
74+
path /fluentd/buffer/metrics.controller
75+
{{- else }}
76+
@type memory
77+
{{- end }}
78+
@include buffer.output.conf
79+
</buffer>
4380
</match>
4481
<match prometheus.metrics.scheduler**>
4582
@type sumologic
4683
@id sumologic.endpoint.metrics.kube.scheduler
4784
endpoint "#{ENV['SUMO_ENDPOINT_METRICS_KUBE_SCHEDULER']}"
4885
@include metrics.output.conf
86+
<buffer>
87+
{{- if eq .Values.sumologic.fluentd.buffer "file" }}
88+
@type file
89+
path /fluentd/buffer/metrics.scheduler
90+
{{- else }}
91+
@type memory
92+
{{- end }}
93+
@include buffer.output.conf
94+
</buffer>
4995
</match>
5096
<match prometheus.metrics.state**>
5197
@type sumologic
5298
@id sumologic.endpoint.metrics.kube.state
5399
endpoint "#{ENV['SUMO_ENDPOINT_METRICS_KUBE_STATE']}"
54100
@include metrics.output.conf
101+
<buffer>
102+
{{- if eq .Values.sumologic.fluentd.buffer "file" }}
103+
@type file
104+
path /fluentd/buffer/metrics.state
105+
{{- else }}
106+
@type memory
107+
{{- end }}
108+
@include buffer.output.conf
109+
</buffer>
55110
</match>
56111
<match prometheus.metrics.node**>
57112
@type sumologic
58113
@id sumologic.endpoint.metrics.node.exporter
59114
endpoint "#{ENV['SUMO_ENDPOINT_METRICS_NODE_EXPORTER']}"
60115
@include metrics.output.conf
116+
<buffer>
117+
{{- if eq .Values.sumologic.fluentd.buffer "file" }}
118+
@type file
119+
path /fluentd/buffer/metrics.node
120+
{{- else }}
121+
@type memory
122+
{{- end }}
123+
@include buffer.output.conf
124+
</buffer>
61125
</match>
62126
<match prometheus.metrics**>
63127
@type sumologic
64128
@id sumologic.endpoint.metrics
65129
endpoint "#{ENV['SUMO_ENDPOINT_METRICS']}"
66130
@include metrics.output.conf
131+
<buffer>
132+
{{- if eq .Values.sumologic.fluentd.buffer "file" }}
133+
@type file
134+
path /fluentd/buffer/metrics.all
135+
{{- else }}
136+
@type memory
137+
{{- end }}
138+
@include buffer.output.conf
139+
</buffer>
67140
</match>
68141
</label>

‎deploy/helm/sumologic/conf/metrics/metrics.output.conf‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
data_type metrics
22
metric_data_format prometheus
3-
disable_cookies true
4-
@include buffer.output.conf
3+
disable_cookies true

‎deploy/helm/sumologic/values.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,11 @@ sumologic:
159159
# watchResourceEventsOverrides:
160160
# pods: "v1"
161161
# events: "events.k8s.io/v1beta1"
162+
163+
164+
fluentd:
165+
## Option to specify the Fluentd buffer as file/memory.
166+
buffer: "memory"
162167

163168
k8sMetadataFilter:
164169
## Option to control the enabling of metadata filter plugin watch.

0 commit comments

Comments
 (0)