Skip to content

K
k3s
Commit 74604d12 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #52565 from crassirostris/sd-logging-update-plugin-0.6.7

Automatic merge from submit-queue. 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>.. [fluentd-gcp addon] Update Stackdriver plugin to version 0.6.7 A new gem among all fixes Java logging severity parsing and string timestamp parsing Also sync the buffer size with the gem guidelines, making it 1M instead of 2M. /cc @igorpeshansky
parents d83c8bc1 ae132a09
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 9 deletions
cluster/addons/fluentd-gcp/fluentd-gcp-configmap.yaml
View file @ 74604d12
...@@ -342,6 +342,8 @@ data: ...@@ -342,6 +342,8 @@ data:
<match kubernetes.**> <match kubernetes.**>
@type google_cloud @type google_cloud
# Try to detect JSON formatted log entries.
detect_json true
# Collect metrics in Prometheus registry about plugin activity. # Collect metrics in Prometheus registry about plugin activity.
enable_monitoring true enable_monitoring true
monitoring_type prometheus monitoring_type prometheus
...@@ -351,11 +353,11 @@ data: ...@@ -351,11 +353,11 @@ data:
# Set queue_full action to block because we want to pause gracefully # 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 # in case of the off-the-limits load instead of throwing an exception
buffer_queue_full_action block buffer_queue_full_action block
# Set the chunk limit conservatively to avoid exceeding the GCL limit # Set the chunk limit conservatively to avoid exceeding the recommended
# of 10MiB per write request. # chunk size of 5MB per write request.
buffer_chunk_limit 2M buffer_chunk_limit 1M
# Cap the combined memory usage of this buffer and the one below to # Cap the combined memory usage of this buffer and the one below to
# 2MiB/chunk * (6 + 2) chunks = 16 MiB # 1MiB/chunk * (6 + 2) chunks = 8 MiB
buffer_queue_limit 6 buffer_queue_limit 6
# Never wait more than 5 seconds before flushing logs in the non-error case. # Never wait more than 5 seconds before flushing logs in the non-error case.
flush_interval 5s flush_interval 5s
...@@ -372,13 +374,14 @@ data: ...@@ -372,13 +374,14 @@ data:
<match **> <match **>
@type google_cloud @type google_cloud
detect_json true
enable_monitoring true enable_monitoring true
monitoring_type prometheus monitoring_type prometheus
detect_subservice false detect_subservice false
buffer_type file buffer_type file
buffer_path /var/log/fluentd-buffers/kubernetes.system.buffer buffer_path /var/log/fluentd-buffers/kubernetes.system.buffer
buffer_queue_full_action block buffer_queue_full_action block
buffer_chunk_limit 2M buffer_chunk_limit 1M
buffer_queue_limit 2 buffer_queue_limit 2
flush_interval 5s flush_interval 5s
max_retry_wait 30 max_retry_wait 30
......
cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
View file @ 74604d12
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
name: fluentd-gcp-v2.0 name: fluentd-gcp-v2.0.9
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: fluentd-gcp k8s-app: fluentd-gcp
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
version: v2.0 version: v2.0.9
spec: spec:
updateStrategy: updateStrategy:
type: RollingUpdate type: RollingUpdate
...@@ -16,7 +16,7 @@ spec: ...@@ -16,7 +16,7 @@ spec:
labels: labels:
k8s-app: fluentd-gcp k8s-app: fluentd-gcp
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
version: v2.0 version: v2.0.9
# This annotation ensures that fluentd does not get evicted if the node # This annotation ensures that fluentd does not get evicted if the node
# supports critical pod annotation based priority scheme. # supports critical pod annotation based priority scheme.
# Note that this does not guarantee admission on the nodes (#40573). # Note that this does not guarantee admission on the nodes (#40573).
...@@ -27,7 +27,7 @@ spec: ...@@ -27,7 +27,7 @@ spec:
hostNetwork: true hostNetwork: true
containers: containers:
- name: fluentd-gcp - name: fluentd-gcp
image: gcr.io/google-containers/fluentd-gcp:2.0.8 image: gcr.io/google-containers/fluentd-gcp:2.0.9
env: env:
- name: FLUENTD_ARGS - name: FLUENTD_ARGS
value: --no-supervisor -q value: --no-supervisor -q
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment