Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
ae132a09
Commit
ae132a09
authored
Sep 15, 2017
by
Mik Vyatskov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[fluentd-gcp] Update Stackdriver plugin to version 0.6.7
parent
87a1b5f6
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
11 deletions
+14
-11
fluentd-gcp-configmap.yaml
cluster/addons/fluentd-gcp/fluentd-gcp-configmap.yaml
+9
-6
fluentd-gcp-ds.yaml
cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
+5
-5
No files found.
cluster/addons/fluentd-gcp/fluentd-gcp-configmap.yaml
View file @
ae132a09
...
@@ -364,6 +364,8 @@ data:
...
@@ -364,6 +364,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
...
@@ -373,11 +375,11 @@ data:
...
@@ -373,11 +375,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 10Mi
B per write request.
#
chunk size of 5M
B per write request.
buffer_chunk_limit
2
M
buffer_chunk_limit
1
M
# 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
...
@@ -394,13 +396,14 @@ data:
...
@@ -394,13 +396,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
2
M
buffer_chunk_limit
1
M
buffer_queue_limit 2
buffer_queue_limit 2
flush_interval 5s
flush_interval 5s
max_retry_wait 30
max_retry_wait 30
...
@@ -408,7 +411,7 @@ data:
...
@@ -408,7 +411,7 @@ data:
num_threads 2
num_threads 2
</match>
</match>
metadata
:
metadata
:
name
:
fluentd-gcp-config-v1.2.
0
name
:
fluentd-gcp-config-v1.2.
2
namespace
:
kube-system
namespace
:
kube-system
labels
:
labels
:
addonmanager.kubernetes.io/mode
:
Reconcile
addonmanager.kubernetes.io/mode
:
Reconcile
cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
View file @
ae132a09
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
...
@@ -117,7 +117,7 @@ spec:
...
@@ -117,7 +117,7 @@ spec:
path
:
/usr/lib64
path
:
/usr/lib64
-
name
:
config-volume
-
name
:
config-volume
configMap
:
configMap
:
name
:
fluentd-gcp-config-v1.2.
0
name
:
fluentd-gcp-config-v1.2.
2
-
name
:
ssl-certs
-
name
:
ssl-certs
hostPath
:
hostPath
:
path
:
/etc/ssl/certs
path
:
/etc/ssl/certs
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment