mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 11:50:44 +00:00
added fluent-plugin-detect-exceptions plugin to fluentd-es-image
added configmap changes raised fluentd-es-configmap version fixed missing version match raised image version
This commit is contained in:
parent
4989087fbf
commit
316abc7fe0
@ -105,7 +105,7 @@ data:
|
|||||||
path /var/log/containers/*.log
|
path /var/log/containers/*.log
|
||||||
pos_file /var/log/es-containers.log.pos
|
pos_file /var/log/es-containers.log.pos
|
||||||
time_format %Y-%m-%dT%H:%M:%S.%NZ
|
time_format %Y-%m-%dT%H:%M:%S.%NZ
|
||||||
tag kubernetes.*
|
tag raw.kubernetes.*
|
||||||
read_from_head true
|
read_from_head true
|
||||||
format multi_format
|
format multi_format
|
||||||
<pattern>
|
<pattern>
|
||||||
@ -118,6 +118,16 @@ data:
|
|||||||
time_format %Y-%m-%dT%H:%M:%S.%N%:z
|
time_format %Y-%m-%dT%H:%M:%S.%N%:z
|
||||||
</pattern>
|
</pattern>
|
||||||
</source>
|
</source>
|
||||||
|
# Detect exceptions in the log output and forward them as one log entry.
|
||||||
|
<match raw.kubernetes.**>
|
||||||
|
@type detect_exceptions
|
||||||
|
remove_tag_prefix raw
|
||||||
|
message log
|
||||||
|
stream stream
|
||||||
|
multiline_flush_interval 5
|
||||||
|
max_bytes 500000
|
||||||
|
max_lines 1000
|
||||||
|
</match>
|
||||||
system.input.conf: |-
|
system.input.conf: |-
|
||||||
# Example:
|
# Example:
|
||||||
# 2015-12-21 23:17:22,066 [salt.state ][INFO ] Completed state [net.ipv4.ip_forward] at time 23:17:22.066081
|
# 2015-12-21 23:17:22,066 [salt.state ][INFO ] Completed state [net.ipv4.ip_forward] at time 23:17:22.066081
|
||||||
@ -367,7 +377,7 @@ data:
|
|||||||
num_threads 2
|
num_threads 2
|
||||||
</match>
|
</match>
|
||||||
metadata:
|
metadata:
|
||||||
name: fluentd-es-config-v0.1.1
|
name: fluentd-es-config-v0.1.2
|
||||||
namespace: kube-system
|
namespace: kube-system
|
||||||
labels:
|
labels:
|
||||||
addonmanager.kubernetes.io/mode: Reconcile
|
addonmanager.kubernetes.io/mode: Reconcile
|
||||||
|
@ -48,24 +48,24 @@ roleRef:
|
|||||||
apiVersion: apps/v1beta2
|
apiVersion: apps/v1beta2
|
||||||
kind: DaemonSet
|
kind: DaemonSet
|
||||||
metadata:
|
metadata:
|
||||||
name: fluentd-es-v2.0.2
|
name: fluentd-es-v2.0.3
|
||||||
namespace: kube-system
|
namespace: kube-system
|
||||||
labels:
|
labels:
|
||||||
k8s-app: fluentd-es
|
k8s-app: fluentd-es
|
||||||
version: v2.0.2
|
version: v2.0.3
|
||||||
kubernetes.io/cluster-service: "true"
|
kubernetes.io/cluster-service: "true"
|
||||||
addonmanager.kubernetes.io/mode: Reconcile
|
addonmanager.kubernetes.io/mode: Reconcile
|
||||||
spec:
|
spec:
|
||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
k8s-app: fluentd-es
|
k8s-app: fluentd-es
|
||||||
version: v2.0.2
|
version: v2.0.3
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
k8s-app: fluentd-es
|
k8s-app: fluentd-es
|
||||||
kubernetes.io/cluster-service: "true"
|
kubernetes.io/cluster-service: "true"
|
||||||
version: v2.0.2
|
version: v2.0.3
|
||||||
# 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).
|
||||||
@ -75,7 +75,7 @@ spec:
|
|||||||
serviceAccountName: fluentd-es
|
serviceAccountName: fluentd-es
|
||||||
containers:
|
containers:
|
||||||
- name: fluentd-es
|
- name: fluentd-es
|
||||||
image: gcr.io/google-containers/fluentd-elasticsearch:v2.0.2
|
image: gcr.io/google-containers/fluentd-elasticsearch:v2.0.3
|
||||||
env:
|
env:
|
||||||
- name: FLUENTD_ARGS
|
- name: FLUENTD_ARGS
|
||||||
value: --no-supervisor -q
|
value: --no-supervisor -q
|
||||||
@ -112,4 +112,4 @@ spec:
|
|||||||
path: /usr/lib64
|
path: /usr/lib64
|
||||||
- name: config-volume
|
- name: config-volume
|
||||||
configMap:
|
configMap:
|
||||||
name: fluentd-es-config-v0.1.1
|
name: fluentd-es-config-v0.1.2
|
||||||
|
@ -5,6 +5,7 @@ gem 'activesupport', '~>4.2.6'
|
|||||||
gem 'fluent-plugin-kubernetes_metadata_filter', '~>0.27.0'
|
gem 'fluent-plugin-kubernetes_metadata_filter', '~>0.27.0'
|
||||||
gem 'fluent-plugin-elasticsearch', '~>1.9.5'
|
gem 'fluent-plugin-elasticsearch', '~>1.9.5'
|
||||||
gem 'fluent-plugin-systemd', '~>0.0.8'
|
gem 'fluent-plugin-systemd', '~>0.0.8'
|
||||||
|
gem 'fluent-plugin-detect-exceptions', '~>0.0.8'
|
||||||
gem 'fluent-plugin-prometheus', '~>0.3.0'
|
gem 'fluent-plugin-prometheus', '~>0.3.0'
|
||||||
gem 'fluent-plugin-multi-format-parser', '~>0.1.1'
|
gem 'fluent-plugin-multi-format-parser', '~>0.1.1'
|
||||||
gem 'oj', '~>2.18.1'
|
gem 'oj', '~>2.18.1'
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
PREFIX = gcr.io/google-containers
|
PREFIX = gcr.io/google-containers
|
||||||
IMAGE = fluentd-elasticsearch
|
IMAGE = fluentd-elasticsearch
|
||||||
TAG = v2.0.2
|
TAG = v2.0.3
|
||||||
|
|
||||||
build:
|
build:
|
||||||
docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) .
|
docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) .
|
||||||
|
Loading…
Reference in New Issue
Block a user