github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 07:47:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #61773 from crassirostris/fluentd-partial-success

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 60465, 61773, 61371, 61146). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Enable partial success in fluentd-gcp

Enable partial success in fluentd-gcp. This will allow to reduce amount of lost data in case of invalid (e.g. too big) entries: instead of dropping the whole request, only failed entries will be dropped.

```release-note
[fluentd-gcp addon] Partial success option is enabled in fluentd.
```

/assign @x13n 
/cc @bmoyles0117
This commit is contained in:
Kubernetes Submit Queue 2018-03-28 01:34:48 -07:00 committed by GitHub
commit 70463ec4e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cluster/addons/fluentd-gcp/fluentd-gcp-configmap.yaml
View File

@ -402,6 +402,8 @@ data:
# the necessary resource types when this label is set. # the necessary resource types when this label is set.
"logging.googleapis.com/k8s_compatibility": "true" "logging.googleapis.com/k8s_compatibility": "true"
} }
# Only drop failed entries partially, instead of dropping the whole request.
partial_success true
</match> </match>
# Keep a smaller buffer here since these logs are less important than the user's # Keep a smaller buffer here since these logs are less important than the user's
@ -430,9 +432,10 @@ data:
# the necessary resource types when this label is set. # the necessary resource types when this label is set.
"logging.googleapis.com/k8s_compatibility": "true" "logging.googleapis.com/k8s_compatibility": "true"
} }
partial_success true
</match> </match>
metadata: metadata:
name: fluentd-gcp-config-v1.2.4 name: fluentd-gcp-config-v1.2.5
namespace: kube-system namespace: kube-system
labels: labels:
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile

2
cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
View File

@ -108,4 +108,4 @@ spec:
path: /var/lib/docker/containers path: /var/lib/docker/containers
- name: config-volume - name: config-volume
configMap: configMap:
name: fluentd-gcp-config-v1.2.4 name: fluentd-gcp-config-v1.2.5