Skip to content

logkit update export 导出到kodo的分片策略时,设置时间和大小值 #725

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 23, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions sender/pandora/pandora.go
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ func NewSender(conf conf.MapConf) (pandoraSender sender.Sender, err error) {
prefix, _ := conf.GetStringOr(sender.KeyPandoraKodoFilePrefix, "logkitauto/date=$(year)-$(mon)-$(day)/hour=$(hour)/min=$(min)/$(sec)")
compress, _ := conf.GetBoolOr(sender.KeyPandoraKodoGzip, false)
kodoRotateStrategy, _ := conf.GetStringOr(sender.KeyPandoraKodoRotateStrategy, "interval")
kodoRotateSize, _ := conf.GetIntOr(sender.KeyPandoraKodoRotateSize, 500*1024)
kodoRotateSize, _ := conf.GetIntOr(sender.KeyPandoraKodoRotateSize, pipeline.DefaultLogkitRotateSize)
kodoRotateSize = kodoRotateSize * 1024
kodoRotateInterval, _ := conf.GetIntOr(sender.KeyPandoraKodoRotateInterval, 10*60)
kodoFileRetention, _ := conf.GetIntOr(sender.KeyPandoraKodoFileRetention, 0)
Expand Down Expand Up @@ -522,6 +522,11 @@ func newPandoraSender(opt *PandoraOption) (s *Sender, err error) {
Format: s.opt.format,
Compress: s.opt.kodoCompress,
AutoExportKodoTokens: s.opt.tokens.KodoTokens,
RotateStrategy: s.opt.kodoRotateStrategy,
RotateSize: s.opt.kodoRotateSize,
RotateInterval: s.opt.kodoRotateInterval,
RotateSizeType: "B",
RotateNumber: s.opt.kodoRotateSize,
},
ToTSDB: s.opt.enableTsdb,
AutoExportToTSDBInput: pipeline.AutoExportToTSDBInput{
Expand Down Expand Up @@ -1049,8 +1054,10 @@ func (s *Sender) schemaFreeSend(datas []Data) (se error) {
Format: s.opt.format,
Compress: s.opt.kodoCompress,
RotateStrategy: s.opt.kodoRotateStrategy,
RotateInterval: s.opt.kodoRotateInterval,
RotateSize: s.opt.kodoRotateSize,
RotateInterval: s.opt.kodoRotateInterval,
RotateSizeType: "B",
RotateNumber: s.opt.kodoRotateSize,
AutoExportKodoTokens: s.opt.tokens.KodoTokens,
},
ToTSDB: s.opt.enableTsdb,
Expand Down
132 changes: 122 additions & 10 deletions vendor/github.com/qiniu/pandora-go-sdk/pipeline/api.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

55 changes: 50 additions & 5 deletions vendor/github.com/qiniu/pandora-go-sdk/pipeline/models.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 12 additions & 3 deletions vendor/github.com/qiniu/pandora-go-sdk/pipeline/schemafree.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading