Revert "Revert "Fix log level value reported by Agent to Fleet (elast…

…ic#4838)" (elastic#4938)" This reverts commit 2b2e8d0.
pchila · Jun 17, 2024 · f8b1a52 · f8b1a52
1 parent c929f79
commit f8b1a52
Show file tree

Hide file tree

Showing 3 changed files with 279 additions and 128 deletions.
diff --git a/internal/pkg/agent/application/gateway/fleet/fleet_gateway.go b/internal/pkg/agent/application/gateway/fleet/fleet_gateway.go
@@ -329,6 +329,10 @@ func (f *FleetGateway) execute(ctx context.Context) (*fleetapi.CheckinResponse,
 	// convert components into checkin components structure
 	components := f.convertToCheckinComponents(state.Components)
 
+	f.log.Debugf("correcting agent loglevel from %s to %s using coordinator state", ecsMeta.Elastic.Agent.LogLevel, state.LogLevel.String())
+	// Fix loglevel with the current log level used by coordinator
+	ecsMeta.Elastic.Agent.LogLevel = state.LogLevel.String()
+
 	// checkin
 	cmd := fleetapi.NewCheckinCmd(f.agentInfo, f.client)
 	req := &fleetapi.CheckinRequest{

diff --git a/internal/pkg/agent/application/info/agent_metadata_test.go b/internal/pkg/agent/application/info/agent_metadata_test.go
@@ -29,6 +29,10 @@ func TestECSMetadata(t *testing.T) {
 	metadata, err := agentInfo.ECSMetadata(l)
 	require.NoError(t, err)
 
+	if assert.NotNil(t, metadata.Elastic, "metadata.Elastic must not be nil") {
+		assert.NotNil(t, metadata.Elastic.Agent, "metadata.Elastic.Agent must not be nil")
+	}
+
 	sysInfo, err := sysinfo.Host()
 	require.NoError(t, err)