Skip to content

Commit

Permalink
Merge pull request #1087 from openshift-cherrypick-robot/cherry-pick-…
Browse files Browse the repository at this point in the history
…1077-to-es5.x

[es5.x] bug 1565909. Modify the default operation to be create to avoid delet…
  • Loading branch information
openshift-merge-robot committed Apr 19, 2018
2 parents e479234 + a999f87 commit 6743a22
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions fluentd/configs.d/openshift/output-es-config.conf
Expand Up @@ -28,6 +28,8 @@
buffer_chunk_limit "#{ENV['BUFFER_SIZE_LIMIT'] || '8m' }"
buffer_queue_full_action "#{ENV['BUFFER_QUEUE_FULL_ACTION'] || 'block'}"

write_operation 'create'

# 2 ^ 31
request_timeout 2147483648
</store>
2 changes: 2 additions & 0 deletions fluentd/configs.d/openshift/output-es-ops-config.conf
Expand Up @@ -28,6 +28,8 @@
buffer_chunk_limit "#{ENV['BUFFER_SIZE_LIMIT'] || '8m' }"
buffer_queue_full_action "#{ENV['BUFFER_QUEUE_FULL_ACTION'] || 'block'}"

write_operation 'create'

# 2 ^ 31
request_timeout 2147483648
</store>

0 comments on commit 6743a22

Please sign in to comment.