From 4c3b485996e7590165cd4d1784a3becab1bb078e Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Wed, 16 Jun 2021 10:57:50 +0200 Subject: [PATCH 1/2] STAC-13308 Protocol inspection flag from env var --- config/config.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/config/config.go b/config/config.go index 1bd4eb17..f0656545 100644 --- a/config/config.go +++ b/config/config.go @@ -675,6 +675,10 @@ func mergeEnvironmentVariables(c *AgentConfig) *AgentConfig { c.EnableIncrementalPublishing = ok } + if ok, _ := isAffirmative(os.Getenv("STS_PROTOCOL_INSPECTION_ENABLED")); ok { + c.NetworkTracer.EnableProtocolInspection = ok + } + var patterns []string amountTopCPUPercentageUsage, amountTopIOReadUsage, amountTopIOWriteUsage, amountTopMemoryUsage := 0, 0, 0, 0 CPUPercentageUsageThreshold, memoryUsageThreshold := 0, 0 @@ -723,6 +727,8 @@ func mergeEnvironmentVariables(c *AgentConfig) *AgentConfig { c.NetworkTracerInitRetryDuration = time.Duration(durationS) * time.Second } + + if v, err := strconv.Atoi(os.Getenv("STS_NETWORK_TRACER_INIT_RETRY_AMOUNT")); err == nil { c.NetworkTracerInitRetryAmount = v } @@ -735,6 +741,11 @@ func mergeEnvironmentVariables(c *AgentConfig) *AgentConfig { setNetworkRelationFilters(c, true, v) } + if v := os.Getenv("STS_NETWORK_TRACER_INIT_RETRY_DURATION_SEC"); v != "" { + durationS, _ := strconv.Atoi(v) + c.NetworkTracerInitRetryDuration = time.Duration(durationS) * time.Second + } + return c } From 6f74a6d2808840ff66392ec6eec23d6b287855e7 Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Wed, 16 Jun 2021 11:03:08 +0200 Subject: [PATCH 2/2] STAC-13308 Remove mistake --- config/config.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/config/config.go b/config/config.go index f0656545..51dcd7ab 100644 --- a/config/config.go +++ b/config/config.go @@ -727,8 +727,6 @@ func mergeEnvironmentVariables(c *AgentConfig) *AgentConfig { c.NetworkTracerInitRetryDuration = time.Duration(durationS) * time.Second } - - if v, err := strconv.Atoi(os.Getenv("STS_NETWORK_TRACER_INIT_RETRY_AMOUNT")); err == nil { c.NetworkTracerInitRetryAmount = v } @@ -741,11 +739,6 @@ func mergeEnvironmentVariables(c *AgentConfig) *AgentConfig { setNetworkRelationFilters(c, true, v) } - if v := os.Getenv("STS_NETWORK_TRACER_INIT_RETRY_DURATION_SEC"); v != "" { - durationS, _ := strconv.Atoi(v) - c.NetworkTracerInitRetryDuration = time.Duration(durationS) * time.Second - } - return c }