Skip to content
This repository was archived by the owner on Aug 17, 2023. It is now read-only.

Commit f724059

Browse files
author
Jonathan Chauncey
committed
fix(boot): Move from old type declaration to @type
1 parent 2ab194a commit f724059

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

  • rootfs/opt/fluentd/sbin

rootfs/opt/fluentd/sbin/boot

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ cat << EOF >> $FLUENTD_CONF
2727
# Example:
2828
# Dec 21 23:17:22 gke-foo-1-1-4b5cbd14-node-4eoj startupscript: Finished running startup script /var/run/google.startup.script
2929
<source>
30-
type tail
30+
@type tail
3131
format syslog
3232
path /var/log/startupscript.log
3333
pos_file /var/log/startupscript.log.pos
@@ -38,7 +38,7 @@ cat << EOF >> $FLUENTD_CONF
3838
# time="2016-02-04T06:51:03.053580605Z" level=info msg="GET /containers/json"
3939
# time="2016-02-04T07:53:57.505612354Z" level=error msg="HTTP Error" err="No such image: -f" statusCode=404
4040
<source>
41-
type tail
41+
@type tail
4242
format /^time="(?<time>[^)]*)" level=(?<severity>[^ ]*) msg="(?<message>[^"]*)"( err="(?<error>[^"]*)")?( statusCode=($<status_code>\d+))?/
4343
time_format %Y-%m-%dT%H:%M:%S.%NZ
4444
path /var/log/docker.log
@@ -49,7 +49,7 @@ cat << EOF >> $FLUENTD_CONF
4949
# Example:
5050
# 2016/02/04 06:52:38 filePurge: successfully removed file /var/etcd/data/member/wal/00000000000006d0-00000000010a23d1.wal
5151
<source>
52-
type tail
52+
@type tail
5353
# Not parsing this, because it doesn't have anything particularly useful to
5454
# parse out of it (like severities).
5555
format none
@@ -65,7 +65,7 @@ cat << EOF >> $FLUENTD_CONF
6565
# Example:
6666
# 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]
6767
<source>
68-
type tail
68+
@type tail
6969
format multiline
7070
format_firstline /^\w\d{4}/
7171
format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
@@ -78,7 +78,7 @@ cat << EOF >> $FLUENTD_CONF
7878
# Example:
7979
# 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]
8080
<source>
81-
type tail
81+
@type tail
8282
format multiline
8383
format_firstline /^\w\d{4}/
8484
format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
@@ -91,7 +91,7 @@ cat << EOF >> $FLUENTD_CONF
9191
# Example:
9292
# I0204 06:55:31.872680 5 servicecontroller.go:277] LB already exists and doesn't need update for service kube-system/kube-ui
9393
<source>
94-
type tail
94+
@type tail
9595
format multiline
9696
format_firstline /^\w\d{4}/
9797
format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
@@ -104,7 +104,7 @@ cat << EOF >> $FLUENTD_CONF
104104
# Example:
105105
# 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]
106106
<source>
107-
type tail
107+
@type tail
108108
format multiline
109109
format_firstline /^\w\d{4}/
110110
format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/

0 commit comments

Comments
 (0)