whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sync en zh example yaml (#19779)

Browse Source
This commit is contained in:
chentanjun
2020-03-23 11:30:45 +08:00
committed by GitHub
parent 7375753cae
commit 9a332233c0
9 changed files with 592 additions and 614 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/zh/examples/controllers/daemonset.yaml
+44 -42
View File
@@ -1,42 +1,44 @@
apiVersion: apps/v1 apiVersion: apps/v1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
name: fluentd-elasticsearch name: fluentd-elasticsearch
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: fluentd-logging k8s-app: fluentd-logging
spec: spec:
selector: selector:
matchLabels: matchLabels:
name: fluentd-elasticsearch name: fluentd-elasticsearch
template: template:
metadata: metadata:
labels: labels:
name: fluentd-elasticsearch name: fluentd-elasticsearch
spec: spec:
tolerations: tolerations:
- key: node-role.kubernetes.io/master # this toleration is to have the daemonset runnable on master nodes
effect: NoSchedule # remove it if your masters can't run pods
containers: - key: node-role.kubernetes.io/master
- name: fluentd-elasticsearch effect: NoSchedule
image: quay.io/fluentd_elasticsearch/fluentd:v2.5.2 containers:
resources: - name: fluentd-elasticsearch
limits: image: quay.io/fluentd_elasticsearch/fluentd:v2.5.2
memory: 200Mi resources:
requests: limits:
cpu: 100m memory: 200Mi
memory: 200Mi requests:
volumeMounts: cpu: 100m
- name: varlog memory: 200Mi
mountPath: /var/log volumeMounts:
- name: varlibdockercontainers - name: varlog
mountPath: /var/lib/docker/containers mountPath: /var/log
readOnly: true - name: varlibdockercontainers
terminationGracePeriodSeconds: 30 mountPath: /var/lib/docker/containers
volumes: readOnly: true
- name: varlog terminationGracePeriodSeconds: 30
hostPath: volumes:
path: /var/log - name: varlog
- name: varlibdockercontainers hostPath:
hostPath: path: /var/log
path: /var/lib/docker/containers - name: varlibdockercontainers
hostPath:
path: /var/lib/docker/containers
content/zh/examples/controllers/frontend.yaml
+21 -38
View File
@@ -1,38 +1,21 @@
apiVersion: apps/v1 apiVersion: apps/v1
kind: ReplicaSet kind: ReplicaSet
metadata: metadata:
name: frontend name: frontend
labels: labels:
app: guestbook app: guestbook
tier: frontend tier: frontend
spec: spec:
# modify replicas according to your case # modify replicas according to your case
replicas: 3 replicas: 3
selector: selector:
matchLabels: matchLabels:
tier: frontend tier: frontend
matchExpressions: template:
- {key: tier, operator: In, values: [frontend]} metadata:
template: labels:
metadata: tier: frontend
labels: spec:
app: guestbook containers:
tier: frontend - name: php-redis
spec: image: gcr.io/google_samples/gb-frontend:v3
containers:
- name: php-redis
image: gcr.io/google_samples/gb-frontend:v3
resources:
requests:
cpu: 100m
memory: 100Mi
env:
- name: GET_HOSTS_FROM
value: dns
# If your cluster config does not include a dns service, then to
# instead access environment variables to find service host
# info, comment out the 'value: dns' line above, and uncomment the
# line below.
# value: env
ports:
- containerPort: 80
content/zh/examples/controllers/nginx-deployment.yaml
+21 -21
View File
@@ -1,21 +1,21 @@
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: nginx-deployment name: nginx-deployment
labels: labels:
app: nginx app: nginx
spec: spec:
replicas: 3 replicas: 3
selector: selector:
matchLabels: matchLabels:
app: nginx app: nginx
template: template:
metadata: metadata:
labels: labels:
app: nginx app: nginx
spec: spec:
containers: containers:
- name: nginx - name: nginx
image: nginx:1.15.4 image: nginx:1.14.2
ports: ports:
- containerPort: 80 - containerPort: 80
content/zh/examples/debug/fluentd-gcp-configmap.yaml
+379 -379
View File
@@ -1,379 +1,379 @@
kind: ConfigMap apiVersion: v1
apiVersion: v1 kind: ConfigMap
data: data:
containers.input.conf: |- containers.input.conf: |-
# This configuration file for Fluentd is used # This configuration file for Fluentd is used
# to watch changes to Docker log files that live in the # to watch changes to Docker log files that live in the
# directory /var/lib/docker/containers/ and are symbolically # directory /var/lib/docker/containers/ and are symbolically
# linked to from the /var/log/containers directory using names that capture the # linked to from the /var/log/containers directory using names that capture the
# pod name and container name. These logs are then submitted to # pod name and container name. These logs are then submitted to
# Google Cloud Logging which assumes the installation of the cloud-logging plug-in. # Google Cloud Logging which assumes the installation of the cloud-logging plug-in.
# #
# Example # Example
# ======= # =======
# A line in the Docker log file might look like this JSON: # A line in the Docker log file might look like this JSON:
# #
# {"log":"2014/09/25 21:15:03 Got request with path wombat\\n", # {"log":"2014/09/25 21:15:03 Got request with path wombat\\n",
# "stream":"stderr", # "stream":"stderr",
# "time":"2014-09-25T21:15:03.499185026Z"} # "time":"2014-09-25T21:15:03.499185026Z"}
# #
# The record reformer is used to write the tag to focus on the pod name # The record reformer is used to write the tag to focus on the pod name
# and the Kubernetes container name. For example a Docker container's logs # and the Kubernetes container name. For example a Docker container's logs
# might be in the directory: # might be in the directory:
# /var/lib/docker/containers/997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b # /var/lib/docker/containers/997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b
# and in the file: # and in the file:
# 997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b-json.log # 997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b-json.log
# where 997599971ee6... is the Docker ID of the running container. # where 997599971ee6... is the Docker ID of the running container.
# The Kubernetes kubelet makes a symbolic link to this file on the host machine # The Kubernetes kubelet makes a symbolic link to this file on the host machine
# in the /var/log/containers directory which includes the pod name and the Kubernetes # in the /var/log/containers directory which includes the pod name and the Kubernetes
# container name: # container name:
# synthetic-logger-0.25lps-pod_default-synth-lgr-997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b.log # synthetic-logger-0.25lps-pod_default-synth-lgr-997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b.log
# -> # ->
# /var/lib/docker/containers/997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b/997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b-json.log # /var/lib/docker/containers/997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b/997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b-json.log
# The /var/log directory on the host is mapped to the /var/log directory in the container # The /var/log directory on the host is mapped to the /var/log directory in the container
# running this instance of Fluentd and we end up collecting the file: # running this instance of Fluentd and we end up collecting the file:
# /var/log/containers/synthetic-logger-0.25lps-pod_default-synth-lgr-997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b.log # /var/log/containers/synthetic-logger-0.25lps-pod_default-synth-lgr-997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b.log
# This results in the tag: # This results in the tag:
# var.log.containers.synthetic-logger-0.25lps-pod_default-synth-lgr-997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b.log # var.log.containers.synthetic-logger-0.25lps-pod_default-synth-lgr-997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b.log
# The record reformer is used is discard the var.log.containers prefix and # The record reformer is used is discard the var.log.containers prefix and
# the Docker container ID suffix and "kubernetes." is pre-pended giving the tag: # the Docker container ID suffix and "kubernetes." is pre-pended giving the tag:
# kubernetes.synthetic-logger-0.25lps-pod_default-synth-lgr # kubernetes.synthetic-logger-0.25lps-pod_default-synth-lgr
# Tag is then parsed by google_cloud plugin and translated to the metadata, # Tag is then parsed by google_cloud plugin and translated to the metadata,
# visible in the log viewer # visible in the log viewer
# Example: # Example:
# {"log":"[info:2016-02-16T16:04:05.930-08:00] Some log text here\n","stream":"stdout","time":"2016-02-17T00:04:05.931087621Z"} # {"log":"[info:2016-02-16T16:04:05.930-08:00] Some log text here\n","stream":"stdout","time":"2016-02-17T00:04:05.931087621Z"}
<source> <source>
type tail type tail
format json format json
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.%N%Z time_format %Y-%m-%dT%H:%M:%S.%N%Z
tag reform.* tag reform.*
read_from_head true read_from_head true
</source> </source>
<filter reform.**> <filter reform.**>
type parser type parser
format /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<log>.*)/ format /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<log>.*)/
reserve_data true reserve_data true
suppress_parse_error_log true suppress_parse_error_log true
key_name log key_name log
</filter> </filter>
<match reform.**> <match reform.**>
type record_reformer type record_reformer
enable_ruby true enable_ruby true
tag raw.kubernetes.${tag_suffix[4].split('-')[0..-2].join('-')} tag raw.kubernetes.${tag_suffix[4].split('-')[0..-2].join('-')}
</match> </match>
# Detect exceptions in the log output and forward them as one log entry. # Detect exceptions in the log output and forward them as one log entry.
<match raw.kubernetes.**> <match raw.kubernetes.**>
@type copy @type copy
<store> <store>
@type prometheus @type prometheus
<metric> <metric>
type counter type counter
name logging_line_count name logging_line_count
desc Total number of lines generated by application containers desc Total number of lines generated by application containers
<labels> <labels>
tag ${tag} tag ${tag}
</labels> </labels>
</metric> </metric>
</store> </store>
<store> <store>
@type detect_exceptions @type detect_exceptions
remove_tag_prefix raw remove_tag_prefix raw
message log message log
stream stream stream stream
multiline_flush_interval 5 multiline_flush_interval 5
max_bytes 500000 max_bytes 500000
max_lines 1000 max_lines 1000
</store> </store>
</match> </match>
system.input.conf: |- system.input.conf: |-
# Example: # Example:
# Dec 21 23:17:22 gke-foo-1-1-4b5cbd14-node-4eoj startupscript: Finished running startup script /var/run/google.startup.script # Dec 21 23:17:22 gke-foo-1-1-4b5cbd14-node-4eoj startupscript: Finished running startup script /var/run/google.startup.script
<source> <source>
type tail type tail
format syslog format syslog
path /var/log/startupscript.log path /var/log/startupscript.log
pos_file /var/log/gcp-startupscript.log.pos pos_file /var/log/gcp-startupscript.log.pos
tag startupscript tag startupscript
</source> </source>
# Examples: # Examples:
# time="2016-02-04T06:51:03.053580605Z" level=info msg="GET /containers/json" # time="2016-02-04T06:51:03.053580605Z" level=info msg="GET /containers/json"
# time="2016-02-04T07:53:57.505612354Z" level=error msg="HTTP Error" err="No such image: -f" statusCode=404 # time="2016-02-04T07:53:57.505612354Z" level=error msg="HTTP Error" err="No such image: -f" statusCode=404
<source> <source>
type tail type tail
format /^time="(?<time>[^)]*)" level=(?<severity>[^ ]*) msg="(?<message>[^"]*)"( err="(?<error>[^"]*)")?( statusCode=($<status_code>\d+))?/ format /^time="(?<time>[^)]*)" level=(?<severity>[^ ]*) msg="(?<message>[^"]*)"( err="(?<error>[^"]*)")?( statusCode=($<status_code>\d+))?/
path /var/log/docker.log path /var/log/docker.log
pos_file /var/log/gcp-docker.log.pos pos_file /var/log/gcp-docker.log.pos
tag docker tag docker
</source> </source>
# Example: # Example:
# 2016/02/04 06:52:38 filePurge: successfully removed file /var/etcd/data/member/wal/00000000000006d0-00000000010a23d1.wal # 2016/02/04 06:52:38 filePurge: successfully removed file /var/etcd/data/member/wal/00000000000006d0-00000000010a23d1.wal
<source> <source>
type tail type tail
# Not parsing this, because it doesn't have anything particularly useful to # Not parsing this, because it doesn't have anything particularly useful to
# parse out of it (like severities). # parse out of it (like severities).
format none format none
path /var/log/etcd.log path /var/log/etcd.log
pos_file /var/log/gcp-etcd.log.pos pos_file /var/log/gcp-etcd.log.pos
tag etcd tag etcd
</source> </source>
# Multi-line parsing is required for all the kube logs because very large log # Multi-line parsing is required for all the kube logs because very large log
# statements, such as those that include entire object bodies, get split into # statements, such as those that include entire object bodies, get split into
# multiple lines by glog. # multiple lines by glog.
# Example: # Example:
# I0204 07:32:30.020537 3368 server.go:1048] POST /stats/container/: (13.972191ms) 200 [[Go-http-client/1.1] 10.244.1.3:40537] # I0204 07:32:30.020537 3368 server.go:1048] POST /stats/container/: (13.972191ms) 200 [[Go-http-client/1.1] 10.244.1.3:40537]
<source> <source>
type tail type tail
format multiline format multiline
multiline_flush_interval 5s 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
path /var/log/kubelet.log path /var/log/kubelet.log
pos_file /var/log/gcp-kubelet.log.pos pos_file /var/log/gcp-kubelet.log.pos
tag kubelet tag kubelet
</source> </source>
# Example: # Example:
# I1118 21:26:53.975789 6 proxier.go:1096] Port "nodePort for kube-system/default-http-backend:http" (:31429/tcp) was open before and is still needed # I1118 21:26:53.975789 6 proxier.go:1096] Port "nodePort for kube-system/default-http-backend:http" (:31429/tcp) was open before and is still needed
<source> <source>
type tail type tail
format multiline format multiline
multiline_flush_interval 5s 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
path /var/log/kube-proxy.log path /var/log/kube-proxy.log
pos_file /var/log/gcp-kube-proxy.log.pos pos_file /var/log/gcp-kube-proxy.log.pos
tag kube-proxy tag kube-proxy
</source> </source>
# Example: # Example:
# I0204 07:00:19.604280 5 handlers.go:131] GET /api/v1/nodes: (1.624207ms) 200 [[kube-controller-manager/v1.1.3 (linux/amd64) kubernetes/6a81b50] 127.0.0.1:38266] # I0204 07:00:19.604280 5 handlers.go:131] GET /api/v1/nodes: (1.624207ms) 200 [[kube-controller-manager/v1.1.3 (linux/amd64) kubernetes/6a81b50] 127.0.0.1:38266]
<source> <source>
type tail type tail
format multiline format multiline
multiline_flush_interval 5s 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
path /var/log/kube-apiserver.log path /var/log/kube-apiserver.log
pos_file /var/log/gcp-kube-apiserver.log.pos pos_file /var/log/gcp-kube-apiserver.log.pos
tag kube-apiserver tag kube-apiserver
</source> </source>
# Example: # Example:
# 2017-02-09T00:15:57.992775796Z AUDIT: id="90c73c7c-97d6-4b65-9461-f94606ff825f" ip="104.132.1.72" method="GET" user="kubecfg" as="<self>" asgroups="<lookup>" namespace="default" uri="/api/v1/namespaces/default/pods" # 2017-02-09T00:15:57.992775796Z AUDIT: id="90c73c7c-97d6-4b65-9461-f94606ff825f" ip="104.132.1.72" method="GET" user="kubecfg" as="<self>" asgroups="<lookup>" namespace="default" uri="/api/v1/namespaces/default/pods"
# 2017-02-09T00:15:57.993528822Z AUDIT: id="90c73c7c-97d6-4b65-9461-f94606ff825f" response="200" # 2017-02-09T00:15:57.993528822Z AUDIT: id="90c73c7c-97d6-4b65-9461-f94606ff825f" response="200"
<source> <source>
type tail type tail
format multiline format multiline
multiline_flush_interval 5s multiline_flush_interval 5s
format_firstline /^\S+\s+AUDIT:/ format_firstline /^\S+\s+AUDIT:/
# Fields must be explicitly captured by name to be parsed into the record. # Fields must be explicitly captured by name to be parsed into the record.
# Fields may not always be present, and order may change, so this just looks # Fields may not always be present, and order may change, so this just looks
# for a list of key="\"quoted\" value" pairs separated by spaces. # for a list of key="\"quoted\" value" pairs separated by spaces.
# Unknown fields are ignored. # Unknown fields are ignored.
# Note: We can't separate query/response lines as format1/format2 because # Note: We can't separate query/response lines as format1/format2 because
# they don't always come one after the other for a given query. # they don't always come one after the other for a given query.
# TODO: Maybe add a JSON output mode to audit log so we can get rid of this? # TODO: Maybe add a JSON output mode to audit log so we can get rid of this?
format1 /^(?<time>\S+) AUDIT:(?: (?:id="(?<id>(?:[^"\\]|\\.)*)"|ip="(?<ip>(?:[^"\\]|\\.)*)"|method="(?<method>(?:[^"\\]|\\.)*)"|user="(?<user>(?:[^"\\]|\\.)*)"|groups="(?<groups>(?:[^"\\]|\\.)*)"|as="(?<as>(?:[^"\\]|\\.)*)"|asgroups="(?<asgroups>(?:[^"\\]|\\.)*)"|namespace="(?<namespace>(?:[^"\\]|\\.)*)"|uri="(?<uri>(?:[^"\\]|\\.)*)"|response="(?<response>(?:[^"\\]|\\.)*)"|\w+="(?:[^"\\]|\\.)*"))*/ format1 /^(?<time>\S+) AUDIT:(?: (?:id="(?<id>(?:[^"\\]|\\.)*)"|ip="(?<ip>(?:[^"\\]|\\.)*)"|method="(?<method>(?:[^"\\]|\\.)*)"|user="(?<user>(?:[^"\\]|\\.)*)"|groups="(?<groups>(?:[^"\\]|\\.)*)"|as="(?<as>(?:[^"\\]|\\.)*)"|asgroups="(?<asgroups>(?:[^"\\]|\\.)*)"|namespace="(?<namespace>(?:[^"\\]|\\.)*)"|uri="(?<uri>(?:[^"\\]|\\.)*)"|response="(?<response>(?:[^"\\]|\\.)*)"|\w+="(?:[^"\\]|\\.)*"))*/
time_format %FT%T.%L%Z time_format %FT%T.%L%Z
path /var/log/kube-apiserver-audit.log path /var/log/kube-apiserver-audit.log
pos_file /var/log/gcp-kube-apiserver-audit.log.pos pos_file /var/log/gcp-kube-apiserver-audit.log.pos
tag kube-apiserver-audit tag kube-apiserver-audit
</source> </source>
# Example: # Example:
# I0204 06:55:31.872680 5 servicecontroller.go:277] LB already exists and doesn't need update for service kube-system/kubernetes-dashboard # I0204 06:55:31.872680 5 servicecontroller.go:277] LB already exists and doesn't need update for service kube-system/kubernetes-dashboard
<source> <source>
type tail type tail
format multiline format multiline
multiline_flush_interval 5s 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
path /var/log/kube-controller-manager.log path /var/log/kube-controller-manager.log
pos_file /var/log/gcp-kube-controller-manager.log.pos pos_file /var/log/gcp-kube-controller-manager.log.pos
tag kube-controller-manager tag kube-controller-manager
</source> </source>
# Example: # Example:
# W0204 06:49:18.239674 7 reflector.go:245] pkg/scheduler/factory/factory.go:193: watch of *api.Service ended with: 401: The event in requested index is outdated and cleared (the requested history has been cleared [2578313/2577886]) [2579312] # W0204 06:49:18.239674 7 reflector.go:245] pkg/scheduler/factory/factory.go:193: watch of *api.Service ended with: 401: The event in requested index is outdated and cleared (the requested history has been cleared [2578313/2577886]) [2579312]
<source> <source>
type tail type tail
format multiline format multiline
multiline_flush_interval 5s 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
path /var/log/kube-scheduler.log path /var/log/kube-scheduler.log
pos_file /var/log/gcp-kube-scheduler.log.pos pos_file /var/log/gcp-kube-scheduler.log.pos
tag kube-scheduler tag kube-scheduler
</source> </source>
# Example: # Example:
# I1104 10:36:20.242766 5 rescheduler.go:73] Running Rescheduler # I1104 10:36:20.242766 5 rescheduler.go:73] Running Rescheduler
<source> <source>
type tail type tail
format multiline format multiline
multiline_flush_interval 5s 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
path /var/log/rescheduler.log path /var/log/rescheduler.log
pos_file /var/log/gcp-rescheduler.log.pos pos_file /var/log/gcp-rescheduler.log.pos
tag rescheduler tag rescheduler
</source> </source>
# Example: # Example:
# I0603 15:31:05.793605 6 cluster_manager.go:230] Reading config from path /etc/gce.conf # I0603 15:31:05.793605 6 cluster_manager.go:230] Reading config from path /etc/gce.conf
<source> <source>
type tail type tail
format multiline format multiline
multiline_flush_interval 5s 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
path /var/log/glbc.log path /var/log/glbc.log
pos_file /var/log/gcp-glbc.log.pos pos_file /var/log/gcp-glbc.log.pos
tag glbc tag glbc
</source> </source>
# Example: # Example:
# I0603 15:31:05.793605 6 cluster_manager.go:230] Reading config from path /etc/gce.conf # I0603 15:31:05.793605 6 cluster_manager.go:230] Reading config from path /etc/gce.conf
<source> <source>
type tail type tail
format multiline format multiline
multiline_flush_interval 5s 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
path /var/log/cluster-autoscaler.log path /var/log/cluster-autoscaler.log
pos_file /var/log/gcp-cluster-autoscaler.log.pos pos_file /var/log/gcp-cluster-autoscaler.log.pos
tag cluster-autoscaler tag cluster-autoscaler
</source> </source>
# Logs from systemd-journal for interesting services. # Logs from systemd-journal for interesting services.
<source> <source>
type systemd type systemd
filters [{ "_SYSTEMD_UNIT": "docker.service" }] filters [{ "_SYSTEMD_UNIT": "docker.service" }]
pos_file /var/log/gcp-journald-docker.pos pos_file /var/log/gcp-journald-docker.pos
read_from_head true read_from_head true
tag docker tag docker
</source> </source>
<source> <source>
type systemd type systemd
filters [{ "_SYSTEMD_UNIT": "kubelet.service" }] filters [{ "_SYSTEMD_UNIT": "kubelet.service" }]
pos_file /var/log/gcp-journald-kubelet.pos pos_file /var/log/gcp-journald-kubelet.pos
read_from_head true read_from_head true
tag kubelet tag kubelet
</source> </source>
monitoring.conf: |- monitoring.conf: |-
# Prometheus monitoring # Prometheus monitoring
<source> <source>
@type prometheus @type prometheus
port 80 port 80
</source> </source>
<source> <source>
@type prometheus_monitor @type prometheus_monitor
</source> </source>
output.conf: |- output.conf: |-
# We use 2 output stanzas - one to handle the container logs and one to handle # We use 2 output stanzas - one to handle the container logs and one to handle
# the node daemon logs, the latter of which explicitly sends its logs to the # the node daemon logs, the latter of which explicitly sends its logs to the
# compute.googleapis.com service rather than container.googleapis.com to keep # compute.googleapis.com service rather than container.googleapis.com to keep
# them separate since most users don't care about the node logs. # them separate since most users don't care about the node logs.
<match kubernetes.**> <match kubernetes.**>
@type copy @type copy
<store> <store>
@type google_cloud @type google_cloud
# Set the buffer type to file to improve the reliability and reduce the memory consumption # Set the buffer type to file to improve the reliability and reduce the memory consumption
buffer_type file buffer_type file
buffer_path /var/log/fluentd-buffers/kubernetes.containers.buffer buffer_path /var/log/fluentd-buffers/kubernetes.containers.buffer
# 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 GCL limit
# of 10MiB per write request. # of 10MiB per write request.
buffer_chunk_limit 2M buffer_chunk_limit 2M
# 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 # 2MiB/chunk * (6 + 2) chunks = 16 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
# Never wait longer than 30 seconds between retries. # Never wait longer than 30 seconds between retries.
max_retry_wait 30 max_retry_wait 30
# Disable the limit on the number of retries (retry forever). # Disable the limit on the number of retries (retry forever).
disable_retry_limit disable_retry_limit
# Use multiple threads for processing. # Use multiple threads for processing.
num_threads 2 num_threads 2
</store> </store>
<store> <store>
@type prometheus @type prometheus
<metric> <metric>
type counter type counter
name logging_entry_count name logging_entry_count
desc Total number of log entries generated by either an application container or a system component desc Total number of log entries generated by either an application container or a system component
<labels> <labels>
tag ${tag} tag ${tag}
component container component container
</labels> </labels>
</metric> </metric>
</store> </store>
</match> </match>
# Keep a smaller buffer here since these logs are less important than the user's # Keep a smaller buffer here since these logs are less important than the user's
# container logs. # container logs.
<match **> <match **>
@type copy @type copy
<store> <store>
@type google_cloud @type google_cloud
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 2M buffer_chunk_limit 2M
buffer_queue_limit 2 buffer_queue_limit 2
flush_interval 5s flush_interval 5s
max_retry_wait 30 max_retry_wait 30
disable_retry_limit disable_retry_limit
num_threads 2 num_threads 2
</store> </store>
<store> <store>
@type prometheus @type prometheus
<metric> <metric>
type counter type counter
name logging_entry_count name logging_entry_count
desc Total number of log entries generated by either an application container or a system component desc Total number of log entries generated by either an application container or a system component
<labels> <labels>
tag ${tag} tag ${tag}
component system component system
</labels> </labels>
</metric> </metric>
</store> </store>
</match> </match>
metadata: metadata:
name: fluentd-gcp-config name: fluentd-gcp-config
labels: labels:
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
content/zh/examples/podpreset/allow-db-merged.yaml
+31 -37
View File
@@ -1,37 +1,31 @@
apiVersion: v1 apiVersion: v1
kind: Pod kind: Pod
metadata: metadata:
name: website name: website
labels: labels:
app: website app: website
role: frontend role: frontend
annotations: annotations:
podpreset.admission.kubernetes.io/podpreset-allow-database: "resource version" podpreset.admission.kubernetes.io/podpreset-allow-database: "resource version"
spec: spec:
containers: containers:
- name: website - name: website
image: nginx image: nginx
volumeMounts: volumeMounts:
- mountPath: /cache - mountPath: /cache
name: cache-volume name: cache-volume
- mountPath: /etc/app/config.json ports:
readOnly: true - containerPort: 80
name: secret-volume env:
ports: - name: DB_PORT
- containerPort: 80 value: "6379"
env: - name: duplicate_key
- name: DB_PORT value: FROM_ENV
value: "6379" - name: expansion
- name: duplicate_key value: $(REPLACE_ME)
value: FROM_ENV envFrom:
- name: expansion - configMapRef:
value: $(REPLACE_ME) name: etcd-env-config
envFrom: volumes:
- configMapRef: - name: cache-volume
name: etcd-env-config emptyDir: {}
volumes:
- name: cache-volume
emptyDir: {}
- name: secret-volume
secret:
secretName: config-details
content/zh/examples/podpreset/allow-db.yaml
+24 -30
View File
@@ -1,30 +1,24 @@
apiVersion: settings.k8s.io/v1alpha1 apiVersion: settings.k8s.io/v1alpha1
kind: PodPreset kind: PodPreset
metadata: metadata:
name: allow-database name: allow-database
spec: spec:
selector: selector:
matchLabels: matchLabels:
role: frontend role: frontend
env: env:
- name: DB_PORT - name: DB_PORT
value: "6379" value: "6379"
- name: duplicate_key - name: duplicate_key
value: FROM_ENV value: FROM_ENV
- name: expansion - name: expansion
value: $(REPLACE_ME) value: $(REPLACE_ME)
envFrom: envFrom:
- configMapRef: - configMapRef:
name: etcd-env-config name: etcd-env-config
volumeMounts: volumeMounts:
- mountPath: /cache - mountPath: /cache
name: cache-volume name: cache-volume
- mountPath: /etc/app/config.json volumes:
readOnly: true - name: cache-volume
name: secret-volume emptyDir: {}
volumes:
- name: cache-volume
emptyDir: {}
- name: secret-volume
secret:
secretName: config-details
content/zh/examples/service/access/hello-service.yaml
+12 -12
View File
@@ -1,12 +1,12 @@
kind: Service apiVersion: v1
apiVersion: v1 kind: Service
metadata: metadata:
name: hello name: hello
spec: spec:
selector: selector:
app: hello app: hello
tier: backend tier: backend
ports: ports:
- protocol: TCP - protocol: TCP
port: 80 port: 80
targetPort: http targetPort: http
content/zh/examples/service/networking/ingress.yaml
+9 -9
View File
@@ -1,9 +1,9 @@
apiVersion: extensions/v1beta1 apiVersion: networking.k8s.io/v1beta1
kind: Ingress kind: Ingress
metadata: metadata:
name: test-ingress name: test-ingress
spec: spec:
backend: backend:
serviceName: testsvc serviceName: testsvc
servicePort: 80 servicePort: 80
content/zh/examples/service/networking/nginx-secure-app.yaml
+51 -46
View File
@@ -1,46 +1,51 @@
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: my-nginx name: my-nginx
labels: labels:
run: my-nginx run: my-nginx
spec: spec:
type: NodePort type: NodePort
ports: ports:
- port: 8080 - port: 8080
targetPort: 80 targetPort: 80
protocol: TCP protocol: TCP
name: http name: http
- port: 443 - port: 443
protocol: TCP protocol: TCP
name: https name: https
selector: selector:
run: my-nginx run: my-nginx
--- ---
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: my-nginx name: my-nginx
spec: spec:
selector: selector:
matchLabels: matchLabels:
run: my-nginx run: my-nginx
replicas: 1 replicas: 1
template: template:
metadata: metadata:
labels: labels:
run: my-nginx run: my-nginx
spec: spec:
volumes: volumes:
- name: secret-volume - name: secret-volume
secret: secret:
secretName: nginxsecret secretName: nginxsecret
containers: - name: configmap-volume
- name: nginxhttps configMap:
image: bprashanth/nginxhttps:1.0 name: nginxconfigmap
ports: containers:
- containerPort: 443 - name: nginxhttps
- containerPort: 80 image: bprashanth/nginxhttps:1.0
volumeMounts: ports:
- mountPath: /etc/nginx/ssl - containerPort: 443
name: secret-volume - containerPort: 80
volumeMounts:
- mountPath: /etc/nginx/ssl
name: secret-volume
- mountPath: /etc/nginx/conf.d
name: configmap-volume