github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 01:06:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #22539 from a-robinson/newf

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-03-05 08:26:59 -08:00
commit 0a21fa06d9
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,7 +31,7 @@ ENV DO_NOT_INSTALL_CATCH_ALL_CONFIG true
RUN apt-get -q update && \ RUN apt-get -q update && \
apt-get install -y curl && \ apt-get install -y curl && \
apt-get clean && \ apt-get clean && \
curl -s https://storage.googleapis.com/signals-agents/logging/google-fluentd-install.sh | sudo bash curl -s https://dl.google.com/cloudagents/install-logging-agent.sh | bash
# Install the record reformer plugin. # Install the record reformer plugin.
RUN /usr/sbin/google-fluentd-gem install fluent-plugin-record-reformer RUN /usr/sbin/google-fluentd-gem install fluent-plugin-record-reformer

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

@ -28,7 +28,7 @@
.PHONY: kbuild kpush .PHONY: kbuild kpush
TAG = 1.17 TAG = 1.18
# Rules for building the test image for deployment to Dockerhub with user kubernetes. # Rules for building the test image for deployment to Dockerhub with user kubernetes.

4
cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf
View File

@ -120,6 +120,7 @@
<source> <source>
type tail type tail
format multiline format multiline
multiline_flush_interval 5s
format_firstline /^\w\d{4}/ format_firstline /^\w\d{4}/
format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/ format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
time_format %m%d %H:%M:%S.%N time_format %m%d %H:%M:%S.%N
@ -133,6 +134,7 @@
<source> <source>
type tail type tail
format multiline format multiline
multiline_flush_interval 5s
format_firstline /^\w\d{4}/ format_firstline /^\w\d{4}/
format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/ format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
time_format %m%d %H:%M:%S.%N time_format %m%d %H:%M:%S.%N
@ -146,6 +148,7 @@
<source> <source>
type tail type tail
format multiline format multiline
multiline_flush_interval 5s
format_firstline /^\w\d{4}/ format_firstline /^\w\d{4}/
format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/ format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
time_format %m%d %H:%M:%S.%N time_format %m%d %H:%M:%S.%N
@ -159,6 +162,7 @@
<source> <source>
type tail type tail
format multiline format multiline
multiline_flush_interval 5s
format_firstline /^\w\d{4}/ format_firstline /^\w\d{4}/
format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/ format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
time_format %m%d %H:%M:%S.%N time_format %m%d %H:%M:%S.%N

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

@ -9,7 +9,7 @@ spec:
dnsPolicy: Default dnsPolicy: Default
containers: containers:
- name: fluentd-cloud-logging - name: fluentd-cloud-logging
image: gcr.io/google_containers/fluentd-gcp:1.17 image: gcr.io/google_containers/fluentd-gcp:1.18
resources: resources:
limits: limits:
memory: 200Mi memory: 200Mi