Merge pull request openshift#1567 from richm/fluentd-flush_thread_count

use default of 2 for flush_thread_count

Author: openshift-merge-robot

fluentd/configs.d/filter-pre-mux-client.conf

@@ -16,7 +16,7 @@
     @type file
     path '/var/lib/fluentd/buffer-mux-client'
     flush_interval "#{ENV['FORWARD_FLUSH_INTERVAL'] || '5s'}"
-    flush_thread_count "#{ENV['FORWARD_FLUSH_THREAD_COUNT'] || 1}"
+    flush_thread_count "#{ENV['FORWARD_FLUSH_THREAD_COUNT'] || 2}"
     flush_at_shutdown "#{ENV['FLUSH_AT_SHUTDOWN'] || 'false'}"
     queued_chunks_limit_size "#{ENV['BUFFER_QUEUE_LIMIT'] || '1024' }"
     chunk_limit_size "#{ENV['BUFFER_SIZE_LIMIT'] || '1m' }"

fluentd/configs.d/openshift/output-es-config.conf

@@ -31,7 +31,7 @@
         @type file
         path '/var/lib/fluentd/buffer-output-es-config'
         flush_interval "#{ENV['ES_FLUSH_INTERVAL'] || '1s'}"
-        flush_thread_count "#{ENV['ES_FLUSH_THREAD_COUNT'] || 1}"
+        flush_thread_count "#{ENV['ES_FLUSH_THREAD_COUNT'] || 2}"
         flush_at_shutdown "#{ENV['FLUSH_AT_SHUTDOWN'] || 'false'}"
         retry_max_interval "#{ENV['ES_RETRY_WAIT'] || '300'}"
         retry_forever true

fluentd/configs.d/openshift/output-es-ops-config.conf

@@ -31,7 +31,7 @@
         @type file
         path '/var/lib/fluentd/buffer-output-es-ops-config'
         flush_interval "#{ENV['OPS_FLUSH_INTERVAL'] || ENV['ES_FLUSH_INTERVAL'] || '1s'}"
-        flush_thread_count "#{ENV['OPS_FLUSH_THREAD_COUNT'] || ENV['ES_FLUSH_THREAD_COUNT'] || 1}"
+        flush_thread_count "#{ENV['OPS_FLUSH_THREAD_COUNT'] || ENV['ES_FLUSH_THREAD_COUNT'] || 2}"
         flush_at_shutdown "#{ENV['FLUSH_AT_SHUTDOWN'] || 'false'}"
         retry_max_interval "#{ENV['OPS_RETRY_WAIT'] || ENV['ES_RETRY_WAIT'] || '300'}"
         retry_forever true

fluentd/configs.d/openshift/output-es-ops-retry.conf

@@ -29,7 +29,7 @@
         @type file
         path '/var/lib/fluentd/es-ops-retry'
         flush_interval "#{ENV['OPS_FLUSH_INTERVAL'] || ENV['ES_FLUSH_INTERVAL'] || '1s'}"
-        flush_thread_count "#{ENV['OPS_FLUSH_THREAD_COUNT'] || ENV['ES_FLUSH_THREAD_COUNT'] || 1}"
+        flush_thread_count "#{ENV['OPS_FLUSH_THREAD_COUNT'] || ENV['ES_FLUSH_THREAD_COUNT'] || 2}"
         flush_at_shutdown "#{ENV['FLUSH_AT_SHUTDOWN'] || 'false'}"
         retry_max_interval "#{ENV['OPS_RETRY_WAIT'] || ENV['ES_RETRY_WAIT'] || '300'}"
         retry_forever true

fluentd/configs.d/openshift/output-es-retry.conf

@@ -29,7 +29,7 @@
         @type file
         path '/var/lib/fluentd/es-retry'
         flush_interval "#{ENV['ES_FLUSH_INTERVAL'] || '1s'}"
-        flush_thread_count "#{ENV['ES_FLUSH_THREAD_COUNT'] || 1}"
+        flush_thread_count "#{ENV['ES_FLUSH_THREAD_COUNT'] || 2}"
         flush_at_shutdown "#{ENV['FLUSH_AT_SHUTDOWN'] || 'false'}"
         retry_max_interval "#{ENV['ES_RETRY_WAIT'] || '300'}"
         retry_forever true

fluentd/configs.d/user/secure-forward.conf

@@ -16,6 +16,7 @@
 #     chunk_limit_size "#{ENV['BUFFER_SIZE_LIMIT'] || '1m' }"
 #     flush_interval "#{ENV['FORWARD_FLUSH_INTERVAL'] || '5s'}"
 #     flush_at_shutdown "#{ENV['FLUSH_AT_SHUTDOWN'] || 'false'}"
+#     flush_thread_count "#{ENV['FLUSH_THREAD_COUNT'] || 2}"
 #     retry_max_interval "#{ENV['FORWARD_RETRY_WAIT'] || '300'}"
 #     retry_forever true
 #     # the systemd journald 0.0.8 input plugin will just throw away records if the buffer