github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #40353 from Crassirostris/fluentd-config-timestamp-fix

Browse Source 
Automatic merge from submit-queue

Fix fluentd-gcp configuration to handle different timezones on the node

Fix https://github.com/kubernetes/kubernetes/issues/40226

Probably a bug in the fluentd configuration
This commit is contained in:
Kubernetes Submit Queue 2017-01-26 09:21:35 -08:00 committed by GitHub
commit 2de4223cba
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,23 +2,23 @@
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
name: fluentd-gcp-v1.34 name: fluentd-gcp-v1.35
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"
version: v1.34 version: v1.35
spec: spec:
template: template:
metadata: metadata:
labels: labels:
k8s-app: fluentd-gcp k8s-app: fluentd-gcp
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
version: v1.34 version: v1.35
spec: spec:
containers: containers:
- name: fluentd-gcp - name: fluentd-gcp
image: gcr.io/google_containers/fluentd-gcp:1.34 image: gcr.io/google_containers/fluentd-gcp:1.35
# If fluentd consumes its own logs, the following situation may happen: # If fluentd consumes its own logs, the following situation may happen:
# fluentd fails to send a chunk to the server => writes it to the log => # fluentd fails to send a chunk to the server => writes it to the log =>
# tries to send this message to the server => fails to send a chunk and so on. # tries to send this message to the server => fails to send a chunk and so on.

2
cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
View File

@ -26,7 +26,7 @@
.PHONY: build push .PHONY: build push
PREFIX=gcr.io/google_containers PREFIX=gcr.io/google_containers
TAG = 1.34 TAG = 1.35
build: build:
docker build --pull -t $(PREFIX)/fluentd-gcp:$(TAG) . docker build --pull -t $(PREFIX)/fluentd-gcp:$(TAG) .

2
cluster/addons/fluentd-gcp/fluentd-gcp-image/fluent.conf
View File

@ -54,7 +54,7 @@
time_key time time_key time
path /var/log/containers/*.log path /var/log/containers/*.log
pos_file /var/log/gcp-containers.log.pos pos_file /var/log/gcp-containers.log.pos
time_format %Y-%m-%dT%H:%M:%S.%NZ time_format %Y-%m-%dT%H:%M:%S.%N%Z
tag reform.* tag reform.*
read_from_head true read_from_head true
</source> </source>

2
cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
View File

@ -10,7 +10,7 @@ spec:
dnsPolicy: Default dnsPolicy: Default
containers: containers:
- name: fluentd-cloud-logging - name: fluentd-cloud-logging
image: gcr.io/google_containers/fluentd-gcp:1.34 image: gcr.io/google_containers/fluentd-gcp:1.35
# If fluentd consumes its own logs, the following situation may happen: # If fluentd consumes its own logs, the following situation may happen:
# fluentd fails to send a chunk to the server => writes it to the log => # fluentd fails to send a chunk to the server => writes it to the log =>
# tries to send this message to the server => fails to send a chunk and so on. # tries to send this message to the server => fails to send a chunk and so on.