summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Wilkerson <wilkers.steve@gmail.com>2019-01-14 16:16:21 -0600
committerKaspars Skels <kaspars.skels@gmail.com>2019-01-17 18:18:52 +0000
commit452203ac993887dc365ac6551a838788c66643fa (patch)
tree4b58a5f47a42537f17901d6c7847837e63d60867
parent31dfbac91d72dc98273024023f9f55eb62280cbe (diff)
Fluent-Logging: Update configuration
This updates the configuration for the fluent-logging chart to include inputs for libvirt and qemu, as well as updates the output configurations to include the appropriate buffer configuration overrides Change-Id: Id908ea875b07004202795dac68df7e9727ae9771
Notes
Notes (review): Code-Review+1: Evgeniy L <eli@mirantis.com> Code-Review+1: Drew Walters <drewwalters96@gmail.com> Code-Review+2: Aaron Sheffield <ajs@sheffieldfamily.net> Code-Review+2: Kaspars Skels <kaspars.skels@gmail.com> Workflow+1: Kaspars Skels <kaspars.skels@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Thu, 17 Jan 2019 22:47:01 +0000 Reviewed-on: https://review.openstack.org/630781 Project: openstack/airship-treasuremap Branch: refs/heads/master
-rw-r--r--global/software/charts/osh-infra/osh-infra-logging/fluent-logging.yaml102
1 files changed, 75 insertions, 27 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 f047d6e..1315171 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
@@ -177,6 +177,36 @@ data:
177 DB.Sync: Normal 177 DB.Sync: Normal
178 Buffer_Chunk_Size: 1M 178 Buffer_Chunk_Size: 1M
179 Buffer_Max_Size: 1M 179 Buffer_Max_Size: 1M
180 - libvirt:
181 header: input
182 Name: tail
183 Tag: libvirt
184 Path: /var/log/libvirt/libvirtd.log
185 DB: /var/log/libvirt.db
186 Mem_Buf_Limit: 5MB
187 DB.Sync: Normal
188 Buffer_Chunk_Size: 1M
189 Buffer_Max_Size: 1M
190 - qemu:
191 header: input
192 Name: tail
193 Tag: qemu
194 Path: /var/log/libvirt/qemu/*.log
195 DB: /var/log/qemu.db
196 Mem_Buf_Limit: 5MB
197 DB.Sync: Normal
198 Buffer_Chunk_Size: 1M
199 Buffer_Max_Size: 1M
200 - libvirt_record_modifier:
201 header: filter
202 Name: record_modifier
203 Match: libvirt
204 Record: hostname ${HOSTNAME}
205 - qemu_record_modifier:
206 header: filter
207 Name: record_modifier
208 Match: qemu
209 Record: hostname ${HOSTNAME}
180 - kernel_record_modifier: 210 - kernel_record_modifier:
181 header: filter 211 header: filter
182 Name: record_modifier 212 Name: record_modifier
@@ -297,11 +327,15 @@ data:
297 port: "#{ENV['ELASTICSEARCH_PORT']}" 327 port: "#{ENV['ELASTICSEARCH_PORT']}"
298 logstash_format: true 328 logstash_format: true
299 logstash_prefix: journal 329 logstash_prefix: journal
300 buffer_chunk_limit: 2M 330 buffer:
301 buffer_queue_limit: 512 331 -
302 flush_interval: "10" 332 - header: buffer
303 max_retry_wait: 300 333 flush_thread_count: 8
304 disable_retry_limit: "" 334 flush_interval: "15"
335 chunk_limit_size: 8MB
336 queue_limit_length: 256
337 retry_max_interval: 30
338 retry_forever: false
305 - kernel_elasticsearch: 339 - kernel_elasticsearch:
306 header: match 340 header: match
307 type: elasticsearch 341 type: elasticsearch
@@ -313,11 +347,15 @@ data:
313 port: "#{ENV['ELASTICSEARCH_PORT']}" 347 port: "#{ENV['ELASTICSEARCH_PORT']}"
314 logstash_format: true 348 logstash_format: true
315 logstash_prefix: kernel 349 logstash_prefix: kernel
316 buffer_chunk_limit: 2M 350 buffer:
317 buffer_queue_limit: 512 351 -
318 flush_interval: "10" 352 - header: buffer
319 max_retry_wait: 300 353 flush_thread_count: 8
320 disable_retry_limit: "" 354 flush_interval: "15"
355 chunk_limit_size: 8MB
356 queue_limit_length: 256
357 retry_max_interval: 30
358 retry_forever: false
321 - ceph_elasticsearch: 359 - ceph_elasticsearch:
322 header: match 360 header: match
323 type: elasticsearch 361 type: elasticsearch
@@ -329,12 +367,15 @@ data:
329 port: "#{ENV['ELASTICSEARCH_PORT']}" 367 port: "#{ENV['ELASTICSEARCH_PORT']}"
330 logstash_format: true 368 logstash_format: true
331 logstash_prefix: ceph 369 logstash_prefix: ceph
332 buffer_chunk_limit: 10M 370 buffer:
333 buffer_queue_limit: 512 371 -
334 flush_interval: "10" 372 - header: buffer
335 max_retry_wait: 300 373 flush_thread_count: 8
336 disable_retry_limit: "" 374 flush_interval: "15"
337 num_threads: 8 375 chunk_limit_size: 8MB
376 queue_limit_length: 256
377 retry_max_interval: 30
378 retry_forever: false
338 - oslo_fluentd_elasticsearch: 379 - oslo_fluentd_elasticsearch:
339 header: match 380 header: match
340 type: elasticsearch 381 type: elasticsearch
@@ -346,13 +387,15 @@ data:
346 port: "#{ENV['ELASTICSEARCH_PORT']}" 387 port: "#{ENV['ELASTICSEARCH_PORT']}"
347 logstash_format: true 388 logstash_format: true
348 logstash_prefix: openstack 389 logstash_prefix: openstack
349 buffer_type: memory 390 buffer:
350 buffer_chunk_limit: 10M 391 -
351 buffer_queue_limit: 512 392 - header: buffer
352 flush_interval: "10" 393 flush_thread_count: 8
353 max_retry_wait: 300 394 flush_interval: "15"
354 request_timeout: 60 395 chunk_limit_size: 8MB
355 disable_retry_limit: "" 396 queue_limit_length: 256
397 retry_max_interval: 30
398 retry_forever: false
356 type_name: oslo_openstack_fluentd 399 type_name: oslo_openstack_fluentd
357 - elasticsearch: 400 - elasticsearch:
358 header: match 401 header: match
@@ -364,11 +407,16 @@ data:
364 host: "#{ENV['ELASTICSEARCH_HOST']}" 407 host: "#{ENV['ELASTICSEARCH_HOST']}"
365 port: "#{ENV['ELASTICSEARCH_PORT']}" 408 port: "#{ENV['ELASTICSEARCH_PORT']}"
366 logstash_format: true 409 logstash_format: true
367 buffer_chunk_limit: 10M 410 buffer:
368 buffer_queue_limit: 512 411 -
412 - header: buffer
413 flush_thread_count: 8
414 flush_interval: "15"
415 chunk_limit_size: 8MB
416 queue_limit_length: 256
417 retry_max_interval: 30
418 retry_forever: false
369 flush_interval: "10" 419 flush_interval: "10"
370 max_retry_wait: 300
371 disable_retry_limit: ""
372 parsers: 420 parsers:
373 - syslog: 421 - syslog:
374 header: parser 422 header: parser