0ct0pu5/crowdsec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

unify loggers and improve the log message about groks when they're not called by name

Browse source
This commit is contained in:
Thibault bui Koechlin 2020-05-27 11:51:49 +02:00
parent 0d03ecc2cb
commit 8b6332f950
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/leakybucket/manager.go
View file

@ -191,7 +191,9 @@ func LoadBucket(g *BucketFactory) error {
var err error var err error
if g.Debug { if g.Debug {
var clog = logrus.New() var clog = logrus.New()
clog.SetFormatter(&log.TextFormatter{FullTimestamp: true}) if types.ConfigureLogger(clog) != err {
log.Fatalf("While creating bucket-specific logger : %s", err)
}
clog.SetLevel(log.DebugLevel) clog.SetLevel(log.DebugLevel)
g.logger = clog.WithFields(log.Fields{ g.logger = clog.WithFields(log.Fields{
"cfg": g.BucketName, "cfg": g.BucketName,

17
pkg/parser/node.go
View file

@ -252,10 +252,15 @@ func (n *Node) process(p *types.Event, ctx UnixParserCtx) (bool, error) {
//return false, nil //return false, nil
} }
} }
var groklabel string
if n.Grok.RegexpName == "" {
groklabel = fmt.Sprintf("%5.5s...", n.Grok.RegexpValue)
} else {
groklabel = n.Grok.RegexpName
}
grok := n.Grok.RunTimeRegexp.Parse(gstr) grok := n.Grok.RunTimeRegexp.Parse(gstr)
if len(grok) > 0 { if len(grok) > 0 {
clog.Debugf("+ Grok '%s' returned %d entries to merge in Parsed", n.Grok.RegexpName, len(grok)) clog.Debugf("+ Grok '%s' returned %d entries to merge in Parsed", groklabel, len(grok))
//We managed to grok stuff, merged into parse //We managed to grok stuff, merged into parse
for k, v := range grok { for k, v := range grok {
clog.Debugf("\t.Parsed['%s'] = '%s'", k, v) clog.Debugf("\t.Parsed['%s'] = '%s'", k, v)
@ -268,7 +273,7 @@ func (n *Node) process(p *types.Event, ctx UnixParserCtx) (bool, error) {
} }
} else { } else {
//grok failed, node failed //grok failed, node failed
clog.Debugf("+ Grok '%s' didn't return data on '%s'", n.Grok.RegexpName, gstr) clog.Debugf("+ Grok '%s' didn't return data on '%s'", groklabel, gstr)
//clog.Tracef("on '%s'", gstr) //clog.Tracef("on '%s'", gstr)
NodeState = false NodeState = false
} }
@ -336,6 +341,9 @@ func (n *Node) compile(pctx *UnixParserCtx) error {
that will be used only for processing this node ;) */ that will be used only for processing this node ;) */
if n.Debug { if n.Debug {
var clog = logrus.New() var clog = logrus.New()
if types.ConfigureLogger(clog) != err {
log.Fatalf("While creating bucket-specific logger : %s", err)
}
clog.SetLevel(log.DebugLevel) clog.SetLevel(log.DebugLevel)
n.logger = clog.WithFields(log.Fields{ n.logger = clog.WithFields(log.Fields{
"id": n.rn, "id": n.rn,
@ -411,6 +419,9 @@ func (n *Node) compile(pctx *UnixParserCtx) error {
/* compile leafs if present */ /* compile leafs if present */
if len(n.SuccessNodes) > 0 { if len(n.SuccessNodes) > 0 {
for idx := range n.SuccessNodes { for idx := range n.SuccessNodes {
if n.SuccessNodes[idx].Name == "" {
n.SuccessNodes[idx].Name = fmt.Sprintf("child-%s", n.Name)
}
/*propagate debug/stats to child nodes*/ /*propagate debug/stats to child nodes*/
if !n.SuccessNodes[idx].Debug && n.Debug { if !n.SuccessNodes[idx].Debug && n.Debug {
n.SuccessNodes[idx].Debug = true n.SuccessNodes[idx].Debug = true