Skip to content
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.

Sign up for GitHub

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

add multiline for filebeat #281

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add multiline for filebeat #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions assets/filebeat/filebeat.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@
{{if eq .Format "json"}}
json.keys_under_root: true
{{end}}
{{if .MultilinePattern}}
multiline.pattern: '{{ .MultilinePattern }}'
multiline.negate: true
multiline.match: after
multiline.max_lines: {{ .MultiLineMax }}
{{end}}
fields:
{{range $key, $value := .CustomFields}}
{{ $key }}: {{ $value }}
Expand Down
74 changes: 47 additions & 27 deletions pilot/pilot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"path"
"path/filepath"
"sort"
"strconv"
"strings"
"sync"
"text/template"
Expand Down Expand Up @@ -172,16 +173,18 @@ func (p *Pilot) watch() error {

// LogConfig log configuration
type LogConfig struct {
Name string
HostDir string
ContainerDir string
Format string
FormatConfig map[string]string
File string
Tags map[string]string
Target string
EstimateTime bool
Stdout bool
Name string
HostDir string
ContainerDir string
Format string
FormatConfig map[string]string
File string
Tags map[string]string
Target string
EstimateTime bool
Stdout bool
MultilinePattern string
MultiLineMax int

CustomFields map[string]string
CustomConfigs map[string]string
Expand Down Expand Up @@ -556,6 +559,19 @@ func (p *Pilot) parseLogConfig(name string, info *LogInfoNode, jsonLogPath strin
return nil, fmt.Errorf("parse tags for %s error: %v", name, err)
}

var multilinePattern string
var multiLineMax int
if _multilinePattern := info.get("multilinepattern"); _multilinePattern != "" {
multilinePattern = _multilinePattern
_multiLineMax, err := strconv.Atoi(info.get("multilinemax"))
if err != nil {
return nil, fmt.Errorf("parse multilinemax for %s error: %v", info.get("multilinemax"), err)
} else if _multiLineMax <= 0 {
_multiLineMax = 100
}
multiLineMax = _multiLineMax
}

target := info.get("target")
// add default index or topic
if _, ok := tagMap["index"]; !ok {
Expand Down Expand Up @@ -602,15 +618,17 @@ func (p *Pilot) parseLogConfig(name string, info *LogInfoNode, jsonLogPath strin
}

return &LogConfig{
Name: name,
HostDir: filepath.Join(p.baseDir, filepath.Dir(jsonLogPath)),
File: logFile,
Format: format.value,
Tags: tagMap,
FormatConfig: map[string]string{"time_format": "%Y-%m-%dT%H:%M:%S.%NZ"},
Target: target,
EstimateTime: false,
Stdout: true,
Name: name,
HostDir: filepath.Join(p.baseDir, filepath.Dir(jsonLogPath)),
File: logFile,
Format: format.value,
Tags: tagMap,
FormatConfig: map[string]string{"time_format": "%Y-%m-%dT%H:%M:%S.%NZ"},
Target: target,
EstimateTime: false,
Stdout: true,
MultilinePattern: multilinePattern,
MultiLineMax: multiLineMax,
}, nil
}

Expand All @@ -630,14 +648,16 @@ func (p *Pilot) parseLogConfig(name string, info *LogInfoNode, jsonLogPath strin
}

cfg := &LogConfig{
Name: name,
ContainerDir: containerDir,
Format: format.value,
File: file,
Tags: tagMap,
HostDir: filepath.Join(p.baseDir, hostDir),
FormatConfig: formatConfig,
Target: target,
Name: name,
ContainerDir: containerDir,
Format: format.value,
File: file,
Tags: tagMap,
HostDir: filepath.Join(p.baseDir, hostDir),
FormatConfig: formatConfig,
Target: target,
MultilinePattern: multilinePattern,
MultiLineMax: multiLineMax,
}

if formatConfig["time_key"] == "" {
Expand Down