From aa55b304265758f0a6c0ee92d700f7bab4542cfe Mon Sep 17 00:00:00 2001
From: Steve Wilkerson <wilkers.steve@gmail.com>
Date: Fri, 16 Nov 2018 10:57:34 -0600
Subject: [PATCH] osh-infra: update fluentbit config, sequence logging group

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
---
 .../osh-infra/osh-infra-logging/chart-group.yaml       |  1 +
 .../osh-infra/osh-infra-logging/fluent-logging.yaml    | 10 ++++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/global/software/charts/osh-infra/osh-infra-logging/chart-group.yaml b/global/software/charts/osh-infra/osh-infra-logging/chart-group.yaml
index 0a1065777..d97f88a7d 100644
--- a/global/software/charts/osh-infra/osh-infra-logging/chart-group.yaml
+++ b/global/software/charts/osh-infra/osh-infra-logging/chart-group.yaml
@@ -9,6 +9,7 @@ metadata:
   storagePolicy: cleartext
 data:
   description: OSH Infra Logging
+  sequenced: True
   chart_group:
     - elasticsearch
     - fluent-logging
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 b223a87fd..f047d6e3c 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
@@ -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