airship/treasuremap
Code Issues Proposed changes

osh-infra: update fluentbit config, sequence logging group

Browse Source 
This corrects some erroneous configuration in the fluent-logging
chart. This also updates the chart group to be sequenced, as
fluent-logging depends on Elasticsearch to be up prior to running
the template jobs

Change-Id: I5ac52a86008a5c91ac0a6fd0081fd60ec977d5ce
This commit is contained in:
Steve Wilkerson 2018-11-16 10:57:34 -06:00 committed by Kaspars Skels
parent 4b75ae25ab
commit aa55b30426
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
global/software/charts/osh-infra/osh-infra-logging/chart-group.yaml
View File

@ -9,6 +9,7 @@ metadata:
storagePolicy: cleartext
data:
description: OSH Infra Logging
sequenced: True
chart_group:
- elasticsearch
- fluent-logging

10
global/software/charts/osh-infra/osh-infra-logging/fluent-logging.yaml
View File

@ -298,7 +298,7 @@ data:
logstash_format: true
logstash_prefix: journal
buffer_chunk_limit: 2M
buffer_queue_limit: 8
buffer_queue_limit: 512
flush_interval: "10"
max_retry_wait: 300
disable_retry_limit: ""
@ -314,7 +314,7 @@ data:
logstash_format: true
logstash_prefix: kernel
buffer_chunk_limit: 2M
buffer_queue_limit: 8
buffer_queue_limit: 512
flush_interval: "10"
max_retry_wait: 300
disable_retry_limit: ""
@ -330,7 +330,7 @@ data:
logstash_format: true
logstash_prefix: ceph
buffer_chunk_limit: 10M
buffer_queue_limit: 32
buffer_queue_limit: 512
flush_interval: "10"
max_retry_wait: 300
disable_retry_limit: ""
@ -353,7 +353,6 @@ data:
max_retry_wait: 300
request_timeout: 60
disable_retry_limit: ""
num_threads: 8
type_name: oslo_openstack_fluentd
- elasticsearch:
header: match
@ -366,11 +365,10 @@ data:
port: "#{ENV['ELASTICSEARCH_PORT']}"
logstash_format: true
buffer_chunk_limit: 10M
buffer_queue_limit: 32g
buffer_queue_limit: 512
flush_interval: "10"
max_retry_wait: 300
disable_retry_limit: ""
num_threads: 8
parsers:
- syslog:
header: parser