Add possibility to configure log format #799

cmd/crowdsec/main.go

@@ -249,6 +249,7 @@ func LoadConfig(configFile string, disableAgent bool, disableAPI bool, quiet boo
 		cConfig.Common.LogDir, *cConfig.Common.LogLevel,
 		cConfig.Common.LogMaxSize, cConfig.Common.LogMaxFiles,
 		cConfig.Common.LogMaxAge, cConfig.Common.CompressLogs,
+	  	cConfig.Common.LogFormat,
 		cConfig.Common.ForceColorLogs); err != nil {
 		return nil, err
 	}

config/config.yaml

@@ -2,6 +2,7 @@ common:
   daemonize: true
   log_media: file
   log_level: info
+  log_format: text
   log_dir: /var/log/
   log_max_size: 20
   compress_logs: true
@@ -27,7 +28,7 @@ db_config:
   type: sqlite
   db_path: /var/lib/crowdsec/data/crowdsec.db
   #max_open_conns: 100
-  #user: 
+  #user:
   #password:
   #db_name:
   #host:

config/config_win.yaml

@@ -2,6 +2,7 @@ common:
   daemonize: false
   log_media: file
   log_level: info
+  log_format: text
   log_dir:  C:\ProgramData\CrowdSec\log\
 config_paths:
   config_dir:  C:\ProgramData\CrowdSec\config\
@@ -21,7 +22,7 @@ db_config:
   log_level: info
   type: sqlite
   db_path:  C:\ProgramData\CrowdSec\data\crowdsec.db
-  #user: 
+  #user:
   #password:
   #db_name:
   #host:

pkg/apiserver/apiserver_test.go

@@ -344,7 +344,7 @@
 	cfg.LogLevel = ptr.Of(log.DebugLevel)
 
 	// Configure logging
-	err := types.SetDefaultLoggerConfig(cfg.LogMedia, cfg.LogDir, *cfg.LogLevel, cfg.LogMaxSize, cfg.LogMaxFiles, cfg.LogMaxAge, cfg.CompressLogs, false)
+	err := types.SetDefaultLoggerConfig(cfg.LogMedia, cfg.LogDir, *cfg.LogLevel, cfg.LogMaxSize, cfg.LogMaxFiles, cfg.LogMaxAge, cfg.CompressLogs, cfg.LogFormat, false)
 	require.NoError(t, err)
 
 	api, err := NewServer(&cfg)
@@ -394,7 +394,7 @@
 	cfg.LogLevel = ptr.Of(log.ErrorLevel)
 
 	// Configure logging
 	err := types.SetDefaultLoggerConfig(cfg.LogMedia, cfg.LogDir, *cfg.LogLevel, cfg.LogMaxSize, cfg.LogMaxFiles, cfg.LogMaxAge, cfg.CompressLogs, false)
 	require.NoError(t, err)
 
 	api, err := NewServer(&cfg)

pkg/csconfig/common.go

@@ -17,7 +17,8 @@ type CommonCfg struct {
 	WorkingDir     string     `yaml:"working_dir,omitempty"` // TODO: This is just for backward compat. Remove this later
 	CompressLogs   *bool      `yaml:"compress_logs,omitempty"`
 	LogMaxSize     int        `yaml:"log_max_size,omitempty"`
-	LogMaxAge      int        `yaml:"log_max_age,omitempty"`
+  	LogFormat      string     `yaml:"log_format,omitempty"`
+  	LogMaxAge      int        `yaml:"log_max_age,omitempty"`
 	LogMaxFiles    int        `yaml:"log_max_files,omitempty"`
 	ForceColorLogs bool       `yaml:"force_color_logs,omitempty"`
 }

pkg/types/utils.go

@@ -14,7 +14,7 @@ var logFormatter log.Formatter
 var LogOutput *lumberjack.Logger //io.Writer
 var logLevel log.Level
 
-func SetDefaultLoggerConfig(cfgMode string, cfgFolder string, cfgLevel log.Level, maxSize int, maxFiles int, maxAge int, compress *bool, forceColors bool) error {
+func SetDefaultLoggerConfig(cfgMode string, cfgFolder string, cfgLevel log.Level, maxSize int, maxFiles int, maxAge int, compress *bool, LogFormat string, forceColors bool) error {
 	/*Configure logs*/
 	if cfgMode == "file" {
 		_maxsize := 500
@@ -33,6 +33,14 @@ func SetDefaultLoggerConfig(cfgMode string, cfgFolder string, cfgLevel log.Level
 		if compress != nil {
 			_compress = *compress
 		}
+
+		if LogFormat == "json" {
+			logFormatter = &log.JSONFormatter{TimestampFormat: time.RFC3339}
+		} else if LogFormat == "text" {
+			logFormatter = &log.TextFormatter{TimestampFormat: time.RFC3339, FullTimestamp: true, ForceColors: forceColors}
+		} else {
+			return fmt.Errorf("log format '%s' unknown", LogFormat)
+		}
 
 		LogOutput = &lumberjack.Logger{
 			Filename:   filepath.Join(cfgFolder, "crowdsec.log"),
@@ -47,7 +55,7 @@ func SetDefaultLoggerConfig(cfgMode string, cfgFolder string, cfgLevel log.Level
 	}
 	logLevel = cfgLevel
 	log.SetLevel(logLevel)
-	logFormatter = &log.TextFormatter{TimestampFormat: time.RFC3339, FullTimestamp: true, ForceColors: forceColors}
+
 	log.SetFormatter(logFormatter)
 	return nil
 }