cleanup: log to console by default

Signed-off-by: Andrea Terzolo <andreaterzolo3@gmail.com>

Author: Andreagit97

build.sh

@@ -19,8 +19,6 @@ docker run \\
     --privileged \\
     -e STS_API_KEY=none \\
     -e STS_PROCESS_AGENT_URL=none \\
-    -e STS_CLUSTER_AGENT_ENABLED=true \\
-    -e STS_LOG_TO_CONSOLE=true \\
     -v /sys/kernel/debug:/sys/kernel/debug \\
     -e HOST_ETC=/host/etc \\
     -e HOST_SYS=/host/sys \\

config/config.go

@@ -66,7 +66,6 @@ type AgentConfig struct {
 	SkipKubeletTLSVerify     bool
 	LogFile                  string
 	LogLevel                 string
-	LogToConsole             bool
 	QueueSize                int
 	Blacklist                []*regexp.Regexp
 	Scrubber                 *DataScrubber
@@ -187,7 +186,6 @@ func NewDefaultAgentConfig() *AgentConfig {
 		SkipKubeletTLSVerify:     false,
 		LogFile:                  defaultLogFilePath,
 		LogLevel:                 "info",
-		LogToConsole:             false,
 		QueueSize:                20,
 		MaxProcFDs:               200,
 		MaxPerMessage:            maxMessageBatch,
@@ -319,7 +317,8 @@ func NewAgentConfig(agentYaml *YamlAgentConfig) (*AgentConfig, error) {
 	}
 
 	// (Re)configure the logging from our configuration
-	if err := NewLoggerLevel(cfg.LogLevel, cfg.LogFile, cfg.LogToConsole); err != nil {
+	// We always log to stdout
+	if err := NewLoggerLevel(cfg.LogLevel, cfg.LogFile, true); err != nil {
 		return nil, err
 	}
 
@@ -374,17 +373,6 @@ func mergeEnvironmentVariables(c *AgentConfig) *AgentConfig {
 		c.LogLevel = v
 	}
 
-	// Logging to console
-	if enabled, err := isAffirmative(os.Getenv("STS_LOGS_STDOUT")); err == nil {
-		c.LogToConsole = enabled
-	}
-	if enabled, err := isAffirmative(os.Getenv("LOG_TO_CONSOLE")); err == nil {
-		c.LogToConsole = enabled
-	}
-	if enabled, err := isAffirmative(os.Getenv("STS_LOG_TO_CONSOLE")); err == nil {
-		c.LogToConsole = enabled
-	}
-
 	if proxyURL := os.Getenv("HTTPS_PROXY"); proxyURL != "" {
 		c.HTTPSProxy, err = url.Parse(proxyURL)
 		if err != nil {

config/yaml_config.go

@@ -20,10 +20,8 @@ type YamlAgentConfig struct {
 	SkipKubeletTLSVerify bool   `yaml:"skip_kubelet_tls_verify"`
 	SkipSSLValidation    bool   `yaml:"skip_ssl_validation"`
 	// Used for local debugging (default: false)
-	LocalRun bool `yaml:"local_run"`
-	// Whether the process-agent should output logs to console
-	LogToConsole bool   `yaml:"log_to_console"`
-	LogLevel     string `yaml:"log_level"`
+	LocalRun bool   `yaml:"local_run"`
+	LogLevel string `yaml:"log_level"`
 	// Incremental publishing: send only changes to server, instead of snapshots
 	IncrementalPublishingEnabled string `yaml:"incremental_publishing_enabled"`
 	// Periodically resend all data to allow downstream to recover from any lost data
@@ -203,21 +201,13 @@ func mergeYamlConfig(agentConf *AgentConfig, yc *YamlAgentConfig) (*AgentConfig,
 	// Debug purpose only
 	agentConf.LocalRun = yc.LocalRun
 
-	if yc.LogToConsole {
-		agentConf.LogToConsole = true
-	}
 	if yc.Process.LogFile != "" {
 		agentConf.LogFile = yc.Process.LogFile
 	}
 	if yc.LogLevel != "" {
 		agentConf.LogLevel = yc.LogLevel
 	}
 
-	// (Re)configure the logging from our configuration
-	if err := NewLoggerLevel(agentConf.LogLevel, agentConf.LogFile, agentConf.LogToConsole); err != nil {
-		return nil, err
-	}
-
 	if yc.StsURL != "" {
 		defaultURL, err := url.Parse(yc.StsURL)
 		if err == nil {

docker-compose.yaml

@@ -103,7 +103,6 @@ services:
       HOST_PROC: "/host/proc"
       HOST_SYS: "/host/sys"
       STS_LOG_LEVEL: "debug"
-      STS_LOG_TO_CONSOLE: "true"
 #    healthcheck:
 #      test: curl --fail -s http://localhost:5000/ || exit 1
 #      interval: 1m30s