Skip to content

Commit ac78fa0

Browse files
LaiskyLaisky
committed
ci: release v1.9.3
1 parent e95b76c commit ac78fa0

21 files changed

+437
-102
lines changed

‎.docker/Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
FROM registry:5000/gobase:1.12.6-alpine3.9 AS gobuild
1+
FROM registry:5000/gobase:1.12.7-alpine3.10 AS gobuild
2+
3+
# http proxy
4+
ENV HTTP_PROXY=http://172.16.4.26:17777
5+
ENV HTTPS_PROXY=http://172.16.4.26:17777
26

37
ENV GO111MODULE=on
48
WORKDIR /go-fluentd
@@ -12,7 +16,7 @@ RUN go build -a --ldflags '-extldflags "-static"' entrypoints/main.go
1216

1317

1418
# copy executable file and certs to a pure container
15-
FROM alpine:3.9
19+
FROM alpine:3.10
1620
COPY --from=gobuild /etc/ssl/certs /etc/ssl/certs
1721
COPY --from=gobuild /go-fluentd/main go-fluentd
1822

‎.docker/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ go mod download
1717
go mod vendor
1818

1919
# build base image
20-
docker build . -f ./.docker/gobase.Dockerfile -t registry:5000/gobase:1.12.6-alpine3.9
21-
docker push registry:5000/gobase:1.12.6-alpine3.9
20+
docker build . -f ./.docker/gobase.Dockerfile -t registry:5000/gobase:1.12.7-alpine3.10
21+
docker push registry:5000/gobase:1.12.7-alpine3.10
2222

2323
# build image
2424
docker build . -f ./.docker/Dockerfile -t registry:5000/go-fluentd:1.8.2

‎.docker/forward.Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
# cp /forward/settings.yml /data/Sit/go-fluentd/settings/.
55
FROM registry:5000/golang:1.12.6-stretch AS gobin
66

7+
# http proxy
8+
ENV HTTP_PROXY=http://172.16.4.26:17777
9+
ENV HTTPS_PROXY=http://172.16.4.26:17777
10+
711
ENV GO111MODULE=on
812
WORKDIR /go-fluentd
913
COPY go.mod .

‎.docker/gobase.Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# docker build . -f ./.docker/gobase.Dockerfile -t registry:5000/gobase:1.12.6-alpine3.9
2-
# docker push registry:5000/gobase:1.12.6-alpine3.9
3-
FROM golang:1.12.6-alpine3.9
1+
# docker build . -f ./.docker/gobase.Dockerfile -t registry:5000/gobase:1.12.7-alpine3.10
2+
# docker push registry:5000/gobase:1.12.7-alpine3.10
3+
FROM golang:1.12.7-alpine3.10
44

55
# http proxy
66
ENV HTTP_PROXY=http://172.16.4.26:17777

‎.docker/test.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# docker build . -f ./.docker/test.Dockerfile -t registry:5000/go-fluentd-test:v1
22
# docker push registry:5000/go-fluentd-test:v1
3-
FROM registry:5000/gobase:1.12.6-alpine3.9
3+
FROM registry:5000/gobase:1.12.7-alpine3.10
44
ENV GO111MODULE=on
55

66
WORKDIR /go-fluentd

‎.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ test:run:
4747
- public
4848
image: registry:5000/docker:latest
4949
script:
50-
- docker pull registry:5000/gobase:1.12.6-alpine3.9 # pull latest image
50+
- docker pull registry:5000/gobase:1.12.7-alpine3.10 # pull latest image
5151
- docker build . -f ./.docker/test.Dockerfile -t go-fluentd-test:$DOCKER_TAG
5252
retry: 1
5353

‎CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22
*CURRENT*
33
---
44

5+
- 2019-08-14 (Laisky) feat: support `@RANDOM_STRING`
6+
- 2019-08-14 (Laisky) build: upgrade to go 1.12.7
7+
- 2019-08-14 (Laisky) feat(paas-390): add wuling mapping
8+
- 2019-07-23 (Laisky) perf: upgrade go-utils to v1.5.3
9+
- 2019-07-17 (Laisky) fix: optimize regexp
10+
- 2019-07-17 (Laisky) docs: update example settings
11+
- 2019-06-26 (Laisky) build: upgrade go-utils to v1.5.1
512
- 2019-06-26 (Laisky) fix: go mod conflict
613
- 2019-06-21 (Laisky) build: upgrade to golang:1.12.6
714
- 2019-06-12 (Laisky) ci: disable vendor cache

‎controllor.go

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@ func (c *Controllor) initRecvs(env string) []recvs.AcceptorRecvItf {
119119
Topics: []string{utils.Settings.GetString("settings.acceptor.recvs.plugins." + name + ".topics." + env)},
120120
Group: utils.Settings.GetString("settings.acceptor.recvs.plugins." + name + ".groups." + env),
121121
Tag: utils.Settings.GetString("settings.acceptor.recvs.plugins." + name + ".tags." + env),
122-
IsJsonFormat: utils.Settings.GetBool("settings.acceptor.recvs.plugins." + name + ".is_json_format"),
122+
IsJSONFormat: utils.Settings.GetBool("settings.acceptor.recvs.plugins." + name + ".is_json_format"),
123123
TagKey: utils.Settings.GetString("settings.acceptor.recvs.plugins." + name + ".tag_key"),
124-
JsonTagKey: utils.Settings.GetString("settings.acceptor.recvs.plugins." + name + ".json_tag_key"),
124+
JSONTagKey: utils.Settings.GetString("settings.acceptor.recvs.plugins." + name + ".json_tag_key"),
125125
RewriteTag: recvs.GetKafkaRewriteTag(utils.Settings.GetString("settings.acceptor.recvs.plugins."+name+".rewrite_tag"), env),
126126
NConsumer: utils.Settings.GetInt("settings.acceptor.recvs.plugins." + name + ".nconsumer"),
127127
KafkaCommitCfg: &recvs.KafkaCommitCfg{
@@ -311,14 +311,25 @@ func (c *Controllor) initPostPipeline(env string, waitCommitChan chan<- int64) *
311311
switch utils.Settings.GetString("settings.post_filters.plugins." + name + ".type") {
312312
case "es-dispatcher":
313313
fs = append(fs, postFilters.NewESDispatcherFilter(&postFilters.ESDispatcherFilterCfg{
314-
Tags: libs.LoadTagsAppendEnv(env, utils.Settings.GetStringSlice("settings.post_filters.plugins.es_dispatcher.tags")),
315-
TagKey: utils.Settings.GetString("settings.post_filters.plugins.es_dispatcher.tag_key"),
316-
ReTagMap: postFilters.LoadReTagMap(env, utils.Settings.Get("settings.post_filters.plugins.es_dispatcher.rewrite_tag_map")),
314+
Tags: libs.LoadTagsAppendEnv(env, utils.Settings.GetStringSlice("settings.post_filters.plugins."+name+".tags")),
315+
TagKey: utils.Settings.GetString("settings.post_filters.plugins." + name + ".tag_key"),
316+
ReTagMap: postFilters.LoadReTagMap(env, utils.Settings.Get("settings.post_filters.plugins."+name+".rewrite_tag_map")),
317317
}))
318318
case "tag-rewriter":
319319
fs = append(fs, postFilters.NewForwardTagRewriterFilter(&postFilters.ForwardTagRewriterFilterCfg{ // wechat mini program
320-
Tag: utils.Settings.GetString("settings.post_filters.plugins.forward_tag_rewriter.tag") + "." + env,
321-
TagKey: utils.Settings.GetString("settings.post_filters.plugins.forward_tag_rewriter.tag_key"),
320+
Tag: utils.Settings.GetString("settings.post_filters.plugins."+name+".tag") + "." + env,
321+
TagKey: utils.Settings.GetString("settings.post_filters.plugins." + name + ".tag_key"),
322+
}))
323+
case "fields":
324+
fs = append(fs, postFilters.NewFieldsFilter(&postFilters.FieldsFilterCfg{
325+
Tags: libs.LoadTagsAppendEnv(env, utils.Settings.GetStringSlice("settings.post_filters.plugins."+name+".tags")),
326+
IncludeFields: utils.Settings.GetStringSlice("settings.post_filters.plugins." + name + ".include_fields"),
327+
ExcludeFields: utils.Settings.GetStringSlice("settings.post_filters.plugins." + name + ".exclude_fields"),
328+
NewFieldTemplates: utils.Settings.GetStringMapString("settings.post_filters.plugins." + name + ".new_fields"),
329+
}))
330+
case "custom-bigdata":
331+
fs = append(fs, postFilters.NewCustomBigDataFilter(&postFilters.CustomBigDataFilterCfg{
332+
Tags: libs.LoadTagsAppendEnv(env, utils.Settings.GetStringSlice("settings.post_filters.plugins."+name+".tags")),
322333
}))
323334
default:
324335
utils.Logger.Panic("unknown post_filter type",
@@ -336,6 +347,13 @@ func (c *Controllor) initPostPipeline(env string, waitCommitChan chan<- int64) *
336347
utils.Logger.Panic("post_filter configuration error")
337348
}
338349

350+
fs = append(fs,
351+
postFilters.NewDefaultFilter(&postFilters.DefaultFilterCfg{
352+
MsgKey: utils.Settings.GetString("settings.post_filters.plugins.default.msg_key"),
353+
MaxLen: utils.Settings.GetInt("settings.post_filters.plugins.default.max_len"),
354+
}),
355+
)
356+
339357
return postFilters.NewPostPipeline(&postFilters.PostPipelineCfg{
340358
MsgPool: c.msgPool,
341359
CommittedChan: waitCommitChan,

0 commit comments

Comments
 (0)