mirrors/crowdsec
1
0
Fork 0
mirror of https://github.com/crowdsecurity/crowdsec.git synced 2025-05-11 04:15:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor changes to specific logs (#900)

Browse source 
- Minor changes to specific logs
- Fix LAPI to not push signals to CAPI when disabled #907
This commit is contained in:
ThinkChaos 2021-08-25 12:30:05 -04:00 • committed by GitHub
parent 488f28e3a3
commit 448a227079
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 29 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pkg/parser/unix_parser.go
View file

@ -3,6 +3,7 @@ package parser
import (
"fmt"
"io/ioutil"
"path"
"github.com/crowdsecurity/crowdsec/pkg/csconfig"
@ -36,7 +37,7 @@ func Init(c map[string]interface{}) (*UnixParserCtx, error) {
}
r.DataFolder = c["data"].(string)
for _, f := range files {
if err := r.Grok.AddFromFile(c["patterns"].(string) + f.Name()); err != nil {
if err := r.Grok.AddFromFile(path.Join(c["patterns"].(string), f.Name())); err != nil {
log.Errorf("failed to load pattern %s : %v", f.Name(), err)
return nil, err
}
@ -48,14 +49,15 @@ func Init(c map[string]interface{}) (*UnixParserCtx, error) {
func LoadParsers(cConfig *csconfig.Config, parsers *Parsers) (*Parsers, error) {
var err error
log.Infof("Loading grok library %s", cConfig.Crowdsec.ConfigDir+string("/patterns/"))
patternsDir := path.Join(cConfig.Crowdsec.ConfigDir, "patterns/")
log.Infof("Loading grok library %s", patternsDir)
/* load base regexps for two grok parsers */
parsers.Ctx, err = Init(map[string]interface{}{"patterns": cConfig.Crowdsec.ConfigDir + string("/patterns/"),
parsers.Ctx, err = Init(map[string]interface{}{"patterns": patternsDir,
"data": cConfig.Crowdsec.DataDir})
if err != nil {
return parsers, fmt.Errorf("failed to load parser patterns : %v", err)
}
parsers.Povfwctx, err = Init(map[string]interface{}{"patterns": cConfig.Crowdsec.ConfigDir + string("/patterns/"),
parsers.Povfwctx, err = Init(map[string]interface{}{"patterns": patternsDir,
"data": cConfig.Crowdsec.DataDir})
if err != nil {
return parsers, fmt.Errorf("failed to load postovflw parser patterns : %v", err)