summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Wilkerson <wilkers.steve@gmail.com>2019-03-07 11:47:50 -0600
committerDrew Walters <drewwalters96@gmail.com>2019-03-15 16:35:06 +0000
commit84beb29ddd82782c44636257758638caef5e214a (patch)
treeaf0a6fbfcf8a60b1b3fd82443f1eacb35b48fc55
parentbdd8bf0d9da4ff3a78f533638b9683488be79df6 (diff)
Fluent-logging: Update fluentbit input definitions
This updates the fluent-logging chart to match the input configs used in the upstream chart, primarily focused on moving from the sqlite db file tracking mechanism to the in memory mechanism instead. This also adds the appropriate fluentbit filter config for throttling the number of records being forwarded to fluentd Change-Id: I68ebf05b1b9fcf2a98b4717b74e3d13050446a09
Notes
Notes (review): Code-Review+2: Matt McEuen <matt.mceuen@att.com> Code-Review+1: Chris Wedgwood <cw@f00f.org> Code-Review+2: Drew Walters <drewwalters96@gmail.com> Workflow+1: Drew Walters <drewwalters96@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Fri, 15 Mar 2019 18:45:56 +0000 Reviewed-on: https://review.openstack.org/641742 Project: openstack/airship-treasuremap Branch: refs/heads/master
-rw-r--r--global/software/charts/osh-infra/osh-infra-logging/fluent-logging.yaml27
1 files changed, 7 insertions, 20 deletions
diff --git a/global/software/charts/osh-infra/osh-infra-logging/fluent-logging.yaml b/global/software/charts/osh-infra/osh-infra-logging/fluent-logging.yaml
index 1315171..9be19c4 100644
--- a/global/software/charts/osh-infra/osh-infra-logging/fluent-logging.yaml
+++ b/global/software/charts/osh-infra/osh-infra-logging/fluent-logging.yaml
@@ -150,9 +150,7 @@ data:
150 Name: tail 150 Name: tail
151 Tag: kernel 151 Tag: kernel
152 Path: /var/log/kern.log 152 Path: /var/log/kern.log
153 DB: /var/log/kern.db
154 Mem_Buf_Limit: 5MB 153 Mem_Buf_Limit: 5MB
155 DB.Sync: Normal
156 Buffer_Chunk_Size: 1M 154 Buffer_Chunk_Size: 1M
157 Buffer_Max_Size: 1M 155 Buffer_Max_Size: 1M
158 - kubelet: 156 - kubelet:
@@ -161,9 +159,7 @@ data:
161 Tag: journal.* 159 Tag: journal.*
162 Path: ${JOURNAL_PATH} 160 Path: ${JOURNAL_PATH}
163 Systemd_Filter: _SYSTEMD_UNIT=kubelet.service 161 Systemd_Filter: _SYSTEMD_UNIT=kubelet.service
164 DB: /var/log/kubelet.db
165 Mem_Buf_Limit: 5MB 162 Mem_Buf_Limit: 5MB
166 DB.Sync: Normal
167 Buffer_Chunk_Size: 1M 163 Buffer_Chunk_Size: 1M
168 Buffer_Max_Size: 1M 164 Buffer_Max_Size: 1M
169 - docker_daemon: 165 - docker_daemon:
@@ -172,9 +168,7 @@ data:
172 Tag: journal.* 168 Tag: journal.*
173 Path: ${JOURNAL_PATH} 169 Path: ${JOURNAL_PATH}
174 Systemd_Filter: _SYSTEMD_UNIT=docker.service 170 Systemd_Filter: _SYSTEMD_UNIT=docker.service
175 DB: /var/log/docker.db
176 Mem_Buf_Limit: 5MB 171 Mem_Buf_Limit: 5MB
177 DB.Sync: Normal
178 Buffer_Chunk_Size: 1M 172 Buffer_Chunk_Size: 1M
179 Buffer_Max_Size: 1M 173 Buffer_Max_Size: 1M
180 - libvirt: 174 - libvirt:
@@ -182,9 +176,7 @@ data:
182 Name: tail 176 Name: tail
183 Tag: libvirt 177 Tag: libvirt
184 Path: /var/log/libvirt/libvirtd.log 178 Path: /var/log/libvirt/libvirtd.log
185 DB: /var/log/libvirt.db
186 Mem_Buf_Limit: 5MB 179 Mem_Buf_Limit: 5MB
187 DB.Sync: Normal
188 Buffer_Chunk_Size: 1M 180 Buffer_Chunk_Size: 1M
189 Buffer_Max_Size: 1M 181 Buffer_Max_Size: 1M
190 - qemu: 182 - qemu:
@@ -192,9 +184,7 @@ data:
192 Name: tail 184 Name: tail
193 Tag: qemu 185 Tag: qemu
194 Path: /var/log/libvirt/qemu/*.log 186 Path: /var/log/libvirt/qemu/*.log
195 DB: /var/log/qemu.db
196 Mem_Buf_Limit: 5MB 187 Mem_Buf_Limit: 5MB
197 DB.Sync: Normal
198 Buffer_Chunk_Size: 1M 188 Buffer_Chunk_Size: 1M
199 Buffer_Max_Size: 1M 189 Buffer_Max_Size: 1M
200 - libvirt_record_modifier: 190 - libvirt_record_modifier:
@@ -236,10 +226,8 @@ data:
236 Name: tail 226 Name: tail
237 Tag: ceph.cluster.* 227 Tag: ceph.cluster.*
238 Path: /var/log/ceph/airship-ucp-ceph-mon/ceph.log 228 Path: /var/log/ceph/airship-ucp-ceph-mon/ceph.log
239 DB: /var/log/ceph.db
240 Parsers: syslog 229 Parsers: syslog
241 Mem_Buf_Limit: 5MB 230 Mem_Buf_Limit: 5MB
242 DB.Sync: Normal
243 Buffer_Chunk_Size: 1M 231 Buffer_Chunk_Size: 1M
244 Buffer_Max_Size: 1M 232 Buffer_Max_Size: 1M
245 - ceph_audit_logs: 233 - ceph_audit_logs:
@@ -247,10 +235,8 @@ data:
247 Name: tail 235 Name: tail
248 Tag: ceph.audit.* 236 Tag: ceph.audit.*
249 Path: /var/log/ceph/airship-ucp-ceph-mon/ceph.audit.log 237 Path: /var/log/ceph/airship-ucp-ceph-mon/ceph.audit.log
250 DB: /var/log/ceph.db
251 Parsers: syslog 238 Parsers: syslog
252 Mem_Buf_Limit: 5MB 239 Mem_Buf_Limit: 5MB
253 DB.Sync: Normal
254 Buffer_Chunk_Size: 1M 240 Buffer_Chunk_Size: 1M
255 Buffer_Max_Size: 1M 241 Buffer_Max_Size: 1M
256 - ceph_mon_logs: 242 - ceph_mon_logs:
@@ -258,10 +244,8 @@ data:
258 Name: tail 244 Name: tail
259 Tag: ceph.mon.* 245 Tag: ceph.mon.*
260 Path: /var/log/ceph/airship-ucp-ceph-mon/ceph-mon**.log 246 Path: /var/log/ceph/airship-ucp-ceph-mon/ceph-mon**.log
261 DB: /var/log/ceph.db
262 Parsers: syslog 247 Parsers: syslog
263 Mem_Buf_Limit: 5MB 248 Mem_Buf_Limit: 5MB
264 DB.Sync: Normal
265 Buffer_Chunk_Size: 1M 249 Buffer_Chunk_Size: 1M
266 Buffer_Max_Size: 1M 250 Buffer_Max_Size: 1M
267 - ceph_osd_logs: 251 - ceph_osd_logs:
@@ -269,10 +253,8 @@ data:
269 Name: tail 253 Name: tail
270 Tag: ceph.osd.* 254 Tag: ceph.osd.*
271 Path: /var/log/ceph/airship-ucp-ceph-osd/ceph-osd**.log 255 Path: /var/log/ceph/airship-ucp-ceph-osd/ceph-osd**.log
272 DB: /var/log/ceph.db
273 Parsers: syslog 256 Parsers: syslog
274 Mem_Buf_Limit: 5MB 257 Mem_Buf_Limit: 5MB
275 DB.Sync: Normal
276 Buffer_Chunk_Size: 1M 258 Buffer_Chunk_Size: 1M
277 Buffer_Max_Size: 1M 259 Buffer_Max_Size: 1M
278 - containers_tail: 260 - containers_tail:
@@ -281,8 +263,6 @@ data:
281 Tag: kube.* 263 Tag: kube.*
282 Path: /var/log/containers/*.log 264 Path: /var/log/containers/*.log
283 Parser: docker 265 Parser: docker
284 DB: /var/log/flb_kube.db
285 DB.Sync: Normal
286 Buffer_Chunk_Size: 1M 266 Buffer_Chunk_Size: 1M
287 Buffer_Max_Size: 1M 267 Buffer_Max_Size: 1M
288 Mem_Buf_Limit: 5MB 268 Mem_Buf_Limit: 5MB
@@ -295,6 +275,13 @@ data:
295 Name: kubernetes 275 Name: kubernetes
296 Match: kube.* 276 Match: kube.*
297 Merge_JSON_Log: On 277 Merge_JSON_Log: On
278 - throttle_filter:
279 header: filter
280 Name: throttle
281 Match: "**"
282 Rate: 1000
283 Window: 300
284 Interval: 1s
298 - fluentd_output: 285 - fluentd_output:
299 header: output 286 header: output
300 Name: forward 287 Name: forward