Skip to content

Commit

Permalink
0.9.8: Set buffer_queue_full_action to for tail plugins so that we wo…
Browse files Browse the repository at this point in the history
…n't drop messages anymore

This is safe since fluent/fluentd#1396 is included starting v0.14.12 according to https://github.com/fluent/fluentd/blob/master/ChangeLog#L36
  • Loading branch information
mumoshu committed Mar 17, 2017
1 parent 6ed8bd0 commit 0e87322
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
KUBE_FLUENTD_VERSION ?= 0.9.7
KUBE_FLUENTD_VERSION ?= 0.9.8
FLUENTD_VERSION ?= 0.14.13

REPOSITORY ?= mumoshu/kube-fluentd
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@ Based on:

## Supported tags

* `latest`/`0.14.13-0.9.7` (Fluentd v0.14.13)
* `latest`/`0.14.13-0.9.8` (Fluentd v0.14.13)

Naming convention for images is `$FLUENTD_VERSION`-`$KUBE_FLUENTD_VERSION`

## Changelog

* `0.9.8`
* Set buffer_queue_full_action to `block` for tail plugins so that we won't drop messages anymore
* `0.9.7`
* fluentd.conf is customizable via environment variables (#3, thanks to @cw-hayashi)
* `0.9.6`
Expand Down
4 changes: 2 additions & 2 deletions rootfs/etc/confd/templates/fluent.conf.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@
buffer_path /var/log/fluentd-buffers/kubernetes.containers.buffer
# Set queue_full action to block because we want to pause gracefully
# in case of the off-the-limits load instead of throwing an exception
buffer_queue_full_action drop_oldest_chunk
buffer_queue_full_action block
# Set the chunk limit conservatively to avoid exceeding the GCL limit
# of 10MiB per write request.
buffer_chunk_limit {{getv "/fluentd/out/kubesys/buffer/chunk/limit"}}
Expand Down Expand Up @@ -221,7 +221,7 @@
detect_subservice false
buffer_type file
buffer_path /var/log/fluentd-buffers/kubernetes.system.buffer
buffer_queue_full_action drop_oldest_chunk
buffer_queue_full_action block
buffer_chunk_limit {{getv "/fluentd/out/kubeuser/buffer/chunk/limit"}}
buffer_queue_limit {{getv "/fluentd/out/kubeuser/buffer/queue/limit"}}
flush_interval 5s
Expand Down

0 comments on commit 0e87322

Please sign in to comment.