8000 logger: refactor logger configuration by NDStrahilevitz · Pull Request #2971 · aquasecurity/tracee · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

logger: refactor logger configuration #2971

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

Merged
merged 2 commits into from
Apr 7, 2023
Merged

logger: refactor logger configuration #2971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef90ed0
logger: refactor logger configuration
NDStrahilevitz Mar 21, 2023
a3effcb
integration: fix new container test
NDStrahilevitz Apr 4, 2023
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
22 changes: 4 additions & 18 deletions cmd/tracee-ebpf/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,6 @@ import (
"github.com/aquasecurity/tracee/pkg/logger"
)

func init() {
// Avoiding to override package-level logger
// when it's already set by logger environment variables
if !logger.IsSetFromEnv() {
// Logger Setup
logger.Init(
&logger.LoggerConfig{
Writer: os.Stderr,
Level: logger.InfoLevel,
Encoder: logger.NewJSONEncoder(logger.NewProductionConfig().EncoderConfig),
Aggregate: false,
},
)
}

initialize.SetLibbpfgoCallbacks()
}

var version string

func main() {
Expand All @@ -47,12 +29,16 @@ func main() {
return cli.ShowAppHelp(c) // no args, only flags supported
}

// Logger Setup
logger.Init(logger.NewDefaultLoggingConfig())

flags.PrintAndExitIfHelp(c, false)

if c.Bool("list") {
cmd.PrintEventList(false) // list events
return nil
}
initialize.SetLibbpfgoCallbacks()

runner, err := urfave.GetTraceeRunner(c, version, false)
if err != nil {
Expand Down
19 changes: 3 additions & 16 deletions cmd/tracee-rules/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,6 @@ import (
"github.com/aquasecurity/tracee/types/detect"
)

func init() {
// Avoiding to override package-level logger
// when it's already set by logger environment variables
if !logger.IsSetFromEnv() {
// Logger Setup
logger.Init(
&logger.LoggerConfig{
Writer: os.Stderr,
Level: logger.InfoLevel,
Encoder: logger.NewJSONEncoder(logger.NewProductionConfig().EncoderConfig),
Aggregate: false,
},
)
}
}

const (
signatureBufferFlag = "sig-buffer"
)
Expand All @@ -49,6 +33,9 @@ func main() {
Usage: "A rule engine for Runtime Security",
Action: func(c *cli.Context) error {

// Logger Setup
logger.Init(logger.NewDefaultLoggingConfig())

// Capabilities command line flags

// if the user is not root, we will bypass capabilities raising,
Expand Down
22 changes: 4 additions & 18 deletions cmd/tracee/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,6 @@ import (
"github.com/aquasecurity/tracee/types/detect"
)

func init() {
// Avoiding to override package-level logger
// when it's already set by logger environment variables
if !logger.IsSetFromEnv() {
// Logger Setup
logger.Init(
&logger.LoggerConfig{
Writer: os.Stderr,
Level: logger.InfoLevel,
Encoder: logger.NewJSONEncoder(logger.NewProductionConfig().EncoderConfig),
Aggregate: false,
},
)
}

initialize.SetLibbpfgoCallbacks()
}

var version string

func main() {
Expand All @@ -51,6 +33,8 @@ func main() {
return cli.ShowAppHelp(c) // no args, only flags supported
}

logger.Init(logger.NewDefaultLoggingConfig())

flags.PrintAndExitIfHelp(c, true)

// Rego command line flags
Expand Down Expand Up @@ -82,6 +66,8 @@ func main() {
return nil
}

initialize.SetLibbpfgoCallbacks()

runner, err := urfave.GetTraceeRunner(c, version, true)
if err != nil {
return err
Expand Down
35 changes: 19 additions & 16 deletions pkg/cmd/flags/logger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func InvalidLogOption(opt string) error {
return errfmt.Errorf("invalid log option: %s, use '--log help' for more info", opt)
}

func PrepareLogger(logOptions []string) (*logger.LoggerConfig, error) {
func PrepareLogger(logOptions []string) (logger.LoggingConfig, error) {
var (
agg bool
interval = logger.DefaultFlushInterval
Expand All @@ -45,12 +45,12 @@ func PrepareLogger(logOptions []string) (*logger.LoggerConfig, error) {
vals := strings.Split(opt, ":")

if len(vals) == 1 || vals[1] == "" {
return nil, InvalidLogOption(opt)
return logger.LoggingConfig{}, InvalidLogOption(opt)
}

w, err = createFile(vals[1])
if err != nil {
return nil, err
return logger.LoggingConfig{}, err
}

continue
Expand All @@ -61,22 +61,22 @@ func PrepareLogger(logOptions []string) (*logger.LoggerConfig, error) {
if !strings.HasSuffix(opt, "aggregate") {
vals := strings.Split(opt, ":")
if len(vals) != 2 || len(vals[1]) <= 1 {
return nil, InvalidLogOption(opt)
return logger.LoggingConfig{}, InvalidLogOption(opt)
}

// handle only seconds and minutes
timeSuffix := vals[1][len(vals[1])-1:][0]
if timeSuffix != 's' && timeSuffix != 'm' {
return nil, InvalidLogOption(opt)
return logger.LoggingConfig{}, InvalidLogOption(opt)
}
prevByte := vals[1][len(vals[1])-2:][0]
if timeSuffix == 's' && !unicode.IsDigit(rune(prevByte)) {
return nil, InvalidLogOption(opt)
return logger.LoggingConfig{}, InvalidLogOption(opt)
}

interval, err = time.ParseDuration(vals[1])
if err != nil {
return nil, InvalidLogOption(opt)
return logger.LoggingConfig{}, InvalidLogOption(opt)
}
}
agg = true
Expand All @@ -95,21 +95,24 @@ func PrepareLogger(logOptions []string) (*logger.LoggerConfig, error) {
case "fatal":
lvl = logger.FatalLevel
default:
return nil, InvalidLogOption(opt)
return logger.LoggingConfig{}, InvalidLogOption(opt)
}
}

cfg := &logger.LoggerConfig{
Writer: w,
Level: lvl,
Aggregate: agg,
FlushInterval: interval,
loggerCfg := logger.LoggerConfig{
Writer: w,
Level: lvl,
}
if lvl == logger.DebugLevel {
cfg.Encoder = logger.NewJSONEncoder(logger.NewDevelopmentEncoderConfig())
loggerCfg.Encoder = logger.NewJSONEncoder(logger.NewDevelopmentEncoderConfig())
} else {
cfg.Encoder = logger.NewJSONEncoder(logger.NewProductionEncoderConfig())
loggerCfg.Encoder = logger.NewJSONEncoder(logger.NewProductionEncoderConfig())
}

return cfg, nil
llogger := logger.NewLogger(loggerCfg)
return logger.LoggingConfig{
Logger: llogger,
Aggregate: agg,
FlushInterval: interval,
}, nil
}
Loading
0