Merge pull request #215 from StackVista/STAC-23272

[STAC-23272] cleanup: remove no more used configs

Author: Andreagit97

DockerFiles/agent/stackstate-docker.yaml

@@ -1,7 +1,6 @@
 log_level: debug
 
 
-process_agent_enabled: true
 incremental_publishing_enabled: true
 process_config:
   enabled: 'true'

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 \\
@@ -30,8 +28,6 @@ docker run \\
     -v /etc:/host/etc \\
     -e STS_NETWORK_TRACING_ENABLED=true \\
     -e STS_PROTOCOL_INSPECTION_ENABLED=true \\
-    -e STS_PROCESS_AGENT_ENABLED=true \\
     europe-west4-docker.pkg.dev/stackstate-sandbox-390311/dev/stackstate-process-agent:dev
 
 EOF
-

cmd/agent/main.go

@@ -15,7 +15,6 @@ func main() {
 	flag.StringVar(&opts.pidfilePath, "pid", "", "Path to set pidfile for process")
 	flag.BoolVar(&opts.info, "info", false, "Show info about running process agent and exit")
 	flag.BoolVar(&opts.version, "version", false, "Print the version and exit")
-	flag.StringVar(&opts.check, "check", "", "Run a specific check and print the results. Choose from: process, connections, realtime")
 	flag.Parse()
 
 	// Set up a default config before parsing config so we log errors nicely.

cmd/agent/main_common.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"compress/gzip"
 	"context"
-	"encoding/json"
 	"fmt"
 	"net/http"
 	_ "net/http/pprof"
@@ -18,7 +17,6 @@ import (
 	"github.com/DataDog/datadog-agent/pkg/pidfile"
 	"github.com/DataDog/datadog-agent/pkg/process/util"
 	containers "github.com/DataDog/datadog-agent/pkg/process/util/containers"
-	"github.com/StackVista/stackstate-process-agent/checks"
 	"github.com/StackVista/stackstate-process-agent/config"
 	"github.com/StackVista/stackstate-process-agent/pkg/debug"
 	"github.com/StackVista/stackstate-receiver-go-client/pkg/httpclient"
@@ -34,7 +32,6 @@ var opts struct {
 	pidfilePath string
 	debug       bool
 	version     bool
-	check       string
 	info        bool
 }
 
@@ -70,22 +67,13 @@ func versionString() string {
 	return buf.String()
 }
 
-const (
-	agent6DisabledMessage = `process-agent not enabled.
-Set env var STS_PROCESS_AGENT_ENABLED=true or add
-process_config:
-  enabled: "true"
-to your stackstate.yaml file.
-Exiting.`
-)
-
 func runAgent(exit chan bool) {
 	if opts.version {
 		fmt.Println(versionString())
 		os.Exit(0)
 	}
 
-	if opts.check == "" && !opts.info && opts.pidfilePath != "" {
+	if !opts.info && opts.pidfilePath != "" {
 		err := pidfile.WritePID(opts.pidfilePath)
 		if err != nil {
 			log.Errorf("Error while writing PID file, exiting: %v", err)
@@ -143,19 +131,6 @@ func runAgent(exit chan bool) {
 	batcher := transactionbatcher.NewTransactionalBatcher(
 		cfg.HostName, cfg.BatcherMaxBufferSize, fwd, manager, cfg.BatcherLogPayloads)
 
-	// Exit if agent is not enabled and we're not debugging a check.
-	if !cfg.Enabled && opts.check == "" {
-		if yamlConf != nil {
-			log.Infof(agent6DisabledMessage)
-		}
-
-		// a sleep is necessary to ensure that supervisor registers this process as "STARTED"
-		// If the exit is "too quick", we enter a BACKOFF->FATAL loop even though this is an expected exit
-		// http://supervisord.org/subprocess.html#process-states
-		time.Sleep(5 * time.Second)
-		return
-	}
-
 	// update docker socket path in info
 	dockerSock, err := util.GetDockerSocketPath()
 	if err != nil {
@@ -166,15 +141,6 @@ func runAgent(exit chan bool) {
 	updateDockerSocket(dockerSock)
 
 	log.Debug("Running process-agent with DEBUG logging enabled")
-	if opts.check != "" {
-		err := debugCheckResults(cfg, opts.check)
-		if err != nil {
-			fmt.Println(err)
-			os.Exit(1)
-		}
-
-		os.Exit(0)
-	}
 
 	if opts.info {
 		// using the debug port to get info to work
@@ -245,66 +211,3 @@ func makeClientHost(cfg *config.AgentConfig) *httpclient.ClientHost {
 
 	return host
 }
-
-func debugCheckResults(cfg *config.AgentConfig, check string) error {
-	sysInfo, err := checks.CollectSystemInfo()
-	if err != nil {
-		return err
-	}
-
-	if check == checks.Connections.Name() {
-		// Connections check requires process-check to have occurred first (for process creation ts)
-		checks.Process.Init(cfg, sysInfo)
-		checks.Process.Run(cfg, 0, time.Now())
-	}
-
-	names := make([]string, 0, len(checks.All))
-	for _, ch := range checks.All {
-		if ch.Name() == check {
-			err = ch.Init(cfg, sysInfo)
-			if err != nil {
-				return fmt.Errorf("error initializing check %s: %w", ch.Name(), err)
-			}
-			return printResults(cfg, ch)
-		}
-		names = append(names, ch.Name())
-	}
-	return fmt.Errorf("invalid check '%s', choose from: %v", check, names)
-}
-
-func printResults(cfg *config.AgentConfig, ch checks.Check) error {
-	// Run the check once to prime the cache.
-	if _, err := ch.Run(cfg, 0, time.Now()); err != nil {
-		return fmt.Errorf("collection error: %s", err)
-	}
-
-	if ch.Name() == checks.Connections.Name() {
-		fmt.Printf("Waiting 5 seconds to allow for active connections to transmit data\n")
-		time.Sleep(5 * time.Second)
-	}
-
-	fmt.Printf("-----------------------------\n\n")
-	fmt.Printf("\nResults for check %v\n", ch)
-	fmt.Printf("-----------------------------\n\n")
-
-	result, err := ch.Run(cfg, 1, time.Now())
-	if err != nil {
-		return fmt.Errorf("collection error: %s", err)
-	}
-
-	for _, m := range result.CollectorMessages {
-		b, err := json.MarshalIndent(m, "", "  ")
-		if err != nil {
-			return fmt.Errorf("marshal error: %s", err)
-		}
-		fmt.Println(string(b))
-	}
-	for _, m := range result.Metrics {
-		b, err := json.MarshalIndent(m, "", "  ")
-		if err != nil {
-			return fmt.Errorf("marshal error: %s", err)
-		}
-		fmt.Println(string(b))
-	}
-	return nil
-}

conf-dev.yaml

@@ -13,7 +13,6 @@ sts_url: http://localhost:7077/stsAgent
 # Use this when running process agent with branch deploy
 #sts_url: https://<branch-name>.test.stackstate.io/stsAgent
 api_key: API_KEY
-process_agent_enabled: true
 incremental_publishing_enabled: true
 local_run: true
 process_config:

config/config.go

@@ -60,14 +60,12 @@ type APIEndpoint struct {
 // AgentConfig is the global config for the process-agent. This information
 // is sourced from config files and the environment variables.
 type AgentConfig struct {
-	Enabled                  bool
 	HostName                 string
 	APIEndpoints             []APIEndpoint
 	SkipSSLValidation        bool
 	SkipKubeletTLSVerify     bool
 	LogFile                  string
 	LogLevel                 string
-	LogToConsole             bool
 	QueueSize                int
 	Blacklist                []*regexp.Regexp
 	Scrubber                 *DataScrubber
@@ -183,13 +181,11 @@ func NewDefaultAgentConfig() *AgentConfig {
 	}
 
 	ac := &AgentConfig{
-		Enabled:                  true, // We'll always run inside of a container.
 		APIEndpoints:             []APIEndpoint{{Endpoint: u}},
 		SkipSSLValidation:        false,
 		SkipKubeletTLSVerify:     false,
 		LogFile:                  defaultLogFilePath,
 		LogLevel:                 "info",
-		LogToConsole:             false,
 		QueueSize:                20,
 		MaxProcFDs:               200,
 		MaxPerMessage:            maxMessageBatch,
@@ -321,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
 	}
 
@@ -349,13 +346,6 @@ func NewAgentConfig(agentYaml *YamlAgentConfig) (*AgentConfig, error) {
 // mergeEnvironmentVariables applies overrides from environment variables to the process agent configuration
 func mergeEnvironmentVariables(c *AgentConfig) *AgentConfig {
 	var err error
-	if enabled, err := isAffirmative(os.Getenv("STS_PROCESS_AGENT_ENABLED")); enabled {
-		c.Enabled = true
-		c.EnabledChecks = processChecks
-	} else if !enabled && err == nil {
-		c.Enabled = false
-	}
-
 	if v := os.Getenv("STS_HOSTNAME"); v != "" {
 		log.Info("overriding hostname from env DD_HOSTNAME value")
 		c.HostName = v
@@ -379,25 +369,10 @@ func mergeEnvironmentVariables(c *AgentConfig) *AgentConfig {
 		c.APIEndpoints[0].APIKey = vals[0]
 	}
 
-	// Support LOG_LEVEL and DD_LOG_LEVEL but prefer DD_LOG_LEVEL
-	if v := os.Getenv("LOG_LEVEL"); v != "" {
-		c.LogLevel = v
-	}
 	if v := os.Getenv("STS_LOG_LEVEL"); v != "" {
 		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 {
@@ -449,20 +424,7 @@ func mergeEnvironmentVariables(c *AgentConfig) *AgentConfig {
 			log.Infof("overriding API endpoint from env")
 			c.APIEndpoints[0].Endpoint = u
 		}
-		if site := os.Getenv("STS_SITE"); site != "" {
-			log.Infof("Using 'process_dd_url' (%s) and ignoring 'site' (%s)", v, site)
-		}
 		log.Infof("Overriding process api endpoint with environment variable `STS_PROCESS_AGENT_URL`: %s", u)
-	} else if v := os.Getenv("STS_STS_URL"); v != "" {
-		// check if we don't already have a api endpoint configured, specific process configuration takes precedence.
-		u, err := url.Parse(v)
-		if err != nil {
-			log.Warnf("STS_STS_URL is invalid: %s", err)
-		} else {
-			log.Infof("overriding API endpoint from env STS_STS_URL")
-			c.APIEndpoints[0].Endpoint = u
-		}
-		log.Infof("Overriding process api endpoint with environment variable `STS_STS_URL`: %s", u)
 	}
 
 	// Process Arguments Scrubbing
@@ -617,10 +579,6 @@ func mergeEnvironmentVariables(c *AgentConfig) *AgentConfig {
 	}
 
 	// STS
-	if v, err := strconv.Atoi(os.Getenv("STS_CONTAINER_CHECK_INTERVAL")); err == nil {
-		c.CheckIntervals["container"] = time.Duration(v) * time.Second
-	}
-
 	if v, err := strconv.Atoi(os.Getenv("STS_PROCESS_CHECK_INTERVAL")); err == nil {
 		c.CheckIntervals["process"] = time.Duration(v) * time.Second
 	}