Skip to content

Commit 7a9788b

Browse files
authored
Merge pull request kubernetes#85838 from like-inspur/master
optimize some log config
2 parents c7a65ca + 597816c commit 7a9788b

File tree

3 files changed

+25
-1
lines changed

3 files changed

+25
-1
lines changed

cluster/addons/fluentd-elasticsearch/es-statefulset.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,16 @@ spec:
8686
- containerPort: 9300
8787
name: transport
8888
protocol: TCP
89+
livenessProbe:
90+
tcpSocket:
91+
port: transport
92+
initialDelaySeconds: 5
93+
timeoutSeconds: 10
94+
readinessProbe:
95+
tcpSocket:
96+
port: transport
97+
initialDelaySeconds: 5
98+
timeoutSeconds: 10
8999
volumeMounts:
90100
- name: elasticsearch-logging
91101
mountPath: /data

cluster/addons/fluentd-elasticsearch/fluentd-es-configmap.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ data:
473473
retry_forever
474474
retry_max_interval 30
475475
chunk_limit_size 2M
476-
queue_limit_length 8
476+
total_limit_size 500M
477477
overflow_action block
478478
</buffer>
479479
</match>

cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,20 @@ spec:
8989
readOnly: true
9090
- name: config-volume
9191
mountPath: /etc/fluent/config.d
92+
ports:
93+
- containerPort: 24231
94+
name: prometheus
95+
protocol: TCP
96+
livenessProbe:
97+
tcpSocket:
98+
port: prometheus
99+
initialDelaySeconds: 5
100+
timeoutSeconds: 10
101+
readinessProbe:
102+
tcpSocket:
103+
port: prometheus
104+
initialDelaySeconds: 5
105+
timeoutSeconds: 10
92106
terminationGracePeriodSeconds: 30
93107
volumes:
94108
- name: varlog

0 commit comments

Comments
 (0)