Browse Source

Merge "Fluent-Logging: Update configuration"

Zuul 3 months ago
parent
commit
7c3b09b185
1 changed files with 75 additions and 27 deletions
  1. 75
    27
      global/software/charts/osh-infra/osh-infra-logging/fluent-logging.yaml

+ 75
- 27
global/software/charts/osh-infra/osh-infra-logging/fluent-logging.yaml View File

@@ -177,6 +177,36 @@ data:
177 177
             DB.Sync: Normal
178 178
             Buffer_Chunk_Size: 1M
179 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 210
         - kernel_record_modifier:
181 211
             header: filter
182 212
             Name: record_modifier
@@ -297,11 +327,15 @@ data:
297 327
             port: "#{ENV['ELASTICSEARCH_PORT']}"
298 328
             logstash_format: true
299 329
             logstash_prefix: journal
300
-            buffer_chunk_limit: 2M
301
-            buffer_queue_limit: 512
302
-            flush_interval: "10"
303
-            max_retry_wait: 300
304
-            disable_retry_limit: ""
330
+            buffer:
331
+              -
332
+                - header: buffer
333
+                  flush_thread_count: 8
334
+                  flush_interval: "15"
335
+                  chunk_limit_size: 8MB
336
+                  queue_limit_length: 256
337
+                  retry_max_interval: 30
338
+                  retry_forever: false
305 339
         - kernel_elasticsearch:
306 340
             header: match
307 341
             type: elasticsearch
@@ -313,11 +347,15 @@ data:
313 347
             port: "#{ENV['ELASTICSEARCH_PORT']}"
314 348
             logstash_format: true
315 349
             logstash_prefix: kernel
316
-            buffer_chunk_limit: 2M
317
-            buffer_queue_limit: 512
318
-            flush_interval: "10"
319
-            max_retry_wait: 300
320
-            disable_retry_limit: ""
350
+            buffer:
351
+              -
352
+                - header: buffer
353
+                  flush_thread_count: 8
354
+                  flush_interval: "15"
355
+                  chunk_limit_size: 8MB
356
+                  queue_limit_length: 256
357
+                  retry_max_interval: 30
358
+                  retry_forever: false
321 359
         - ceph_elasticsearch:
322 360
             header: match
323 361
             type: elasticsearch
@@ -329,12 +367,15 @@ data:
329 367
             port: "#{ENV['ELASTICSEARCH_PORT']}"
330 368
             logstash_format: true
331 369
             logstash_prefix: ceph
332
-            buffer_chunk_limit: 10M
333
-            buffer_queue_limit: 512
334
-            flush_interval: "10"
335
-            max_retry_wait: 300
336
-            disable_retry_limit: ""
337
-            num_threads: 8
370
+            buffer:
371
+              -
372
+                - header: buffer
373
+                  flush_thread_count: 8
374
+                  flush_interval: "15"
375
+                  chunk_limit_size: 8MB
376
+                  queue_limit_length: 256
377
+                  retry_max_interval: 30
378
+                  retry_forever: false
338 379
         - oslo_fluentd_elasticsearch:
339 380
             header: match
340 381
             type: elasticsearch
@@ -346,13 +387,15 @@ data:
346 387
             port: "#{ENV['ELASTICSEARCH_PORT']}"
347 388
             logstash_format: true
348 389
             logstash_prefix: openstack
349
-            buffer_type: memory
350
-            buffer_chunk_limit: 10M
351
-            buffer_queue_limit: 512
352
-            flush_interval: "10"
353
-            max_retry_wait: 300
354
-            request_timeout: 60
355
-            disable_retry_limit: ""
390
+            buffer:
391
+              -
392
+                - header: buffer
393
+                  flush_thread_count: 8
394
+                  flush_interval: "15"
395
+                  chunk_limit_size: 8MB
396
+                  queue_limit_length: 256
397
+                  retry_max_interval: 30
398
+                  retry_forever: false
356 399
             type_name: oslo_openstack_fluentd
357 400
         - elasticsearch:
358 401
             header: match
@@ -364,11 +407,16 @@ data:
364 407
             host: "#{ENV['ELASTICSEARCH_HOST']}"
365 408
             port: "#{ENV['ELASTICSEARCH_PORT']}"
366 409
             logstash_format: true
367
-            buffer_chunk_limit: 10M
368
-            buffer_queue_limit: 512
410
+            buffer:
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 419
             flush_interval: "10"
370
-            max_retry_wait: 300
371
-            disable_retry_limit: ""
372 420
       parsers:
373 421
         - syslog:
374 422
             header: parser

Loading…
Cancel
Save