[8.x](backport #5648) [testing/integration]: fix TestLogIngestionFlee…

…tManaged (#5751) * [testing/integration]: fix TestLogIngestionFleetManaged (#5648) fix TestLogIngestionFleetManaged --------- Co-authored-by: Paolo Chilà <[email protected]> Co-authored-by: Blake Rouse <[email protected]> (cherry picked from commit 26f3d59) # Conflicts: # go.mod # go.sum * Update go.mod * Update go.sum * Fix notice. --------- Co-authored-by: VihasMakwana <[email protected]> Co-authored-by: Pierre HILBERT <[email protected]> Co-authored-by: Blake Rouse <[email protected]>
elastic · Oct 10, 2024 · 7812e99 · 7812e99
1 parent 582a260
commit 7812e99
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 10 deletions.
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -1264,11 +1264,11 @@ SOFTWARE
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/elastic-agent-libs
-Version: v0.11.0
+Version: v0.12.1-0.20241009140206-6634efed32ab
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.11.0/LICENSE:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.12.1-0.20241009140206-6634efed32ab/LICENSE:
 
                                  Apache License
                            Version 2.0, January 2004
@@ -1475,11 +1475,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-l
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/elastic-agent-system-metrics
-Version: v0.11.2
+Version: v0.11.3
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].2/LICENSE.txt:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].3/LICENSE.txt:
 
                                  Apache License
                            Version 2.0, January 2004

diff --git a/go.mod b/go.mod
@@ -14,8 +14,8 @@ require (
 	github.com/dolmen-go/contextio v0.0.0-20200217195037-68fc5150bcd5
 	github.com/elastic/elastic-agent-autodiscover v0.9.0
 	github.com/elastic/elastic-agent-client/v7 v7.16.0
-	github.com/elastic/elastic-agent-libs v0.11.0
-	github.com/elastic/elastic-agent-system-metrics v0.11.2
+	github.com/elastic/elastic-agent-libs v0.12.1-0.20241009140206-6634efed32ab
+	github.com/elastic/elastic-agent-system-metrics v0.11.3
 	github.com/elastic/elastic-transport-go/v8 v8.6.0
 	github.com/elastic/go-elasticsearch/v8 v8.15.0
 	github.com/elastic/go-licenser v0.4.2

diff --git a/go.sum b/go.sum
@@ -242,10 +242,10 @@ github.com/elastic/elastic-agent-autodiscover v0.9.0 h1:+iWIKh0u3e8I+CJa3FfWe9h0
 github.com/elastic/elastic-agent-autodiscover v0.9.0/go.mod h1:5iUxLHhVdaGSWYTveSwfJEY4RqPXTG13LPiFoxcpFd4=
 github.com/elastic/elastic-agent-client/v7 v7.16.0 h1:yKGq2+CxAuW8Kh0EoNl202tqAyQKfBcPRawVKs2Jve0=
 github.com/elastic/elastic-agent-client/v7 v7.16.0/go.mod h1:6h+f9QdIr3GO2ODC0Y8+aEXRwzbA5W4eV4dd/67z7nI=
-github.com/elastic/elastic-agent-libs v0.11.0 h1:m9rnNE3BkBF2XJoqubqEbu/kbtKEBZ7pHCjDlxfVRH0=
-github.com/elastic/elastic-agent-libs v0.11.0/go.mod h1:5CR02awPrBr+tfmjBBK+JI+dMmHNQjpVY24J0wjbC7M=
-github.com/elastic/elastic-agent-system-metrics v0.11.2 h1:UjSBcY6U3H3venB5zAPEFNjAb4Bb38EiVqaA4zALEnM=
-github.com/elastic/elastic-agent-system-metrics v0.11.2/go.mod h1:saqLKe9fuyuAo6IADAnnuy1kaBI7VNlxfwMo8KzSRyQ=
+github.com/elastic/elastic-agent-libs v0.12.1-0.20241009140206-6634efed32ab h1:7XHtHd5w4BV48ToCKGE4NYA0kpI+hv+7S08kdiTjpac=
+github.com/elastic/elastic-agent-libs v0.12.1-0.20241009140206-6634efed32ab/go.mod h1:5CR02awPrBr+tfmjBBK+JI+dMmHNQjpVY24J0wjbC7M=
+github.com/elastic/elastic-agent-system-metrics v0.11.3 h1:LDzRwP8kxvsYEtMDgMSKZs1TgPcSEukit+/EAP5Y28A=
+github.com/elastic/elastic-agent-system-metrics v0.11.3/go.mod h1:saqLKe9fuyuAo6IADAnnuy1kaBI7VNlxfwMo8KzSRyQ=
 github.com/elastic/elastic-transport-go/v8 v8.6.0 h1:Y2S/FBjx1LlCv5m6pWAF2kDJAHoSjSRSJCApolgfthA=
 github.com/elastic/elastic-transport-go/v8 v8.6.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk=
 github.com/elastic/go-docappender/v2 v2.3.0 h1:Vr+l36jM+sE/LHp0JFxSIbHlWTSk8CpBblYWZZ/I1KA=

diff --git a/testing/integration/logs_ingestion_test.go b/testing/integration/logs_ingestion_test.go
@@ -27,6 +27,7 @@ import (
 
 	"github.com/elastic/elastic-agent-libs/kibana"
 	"github.com/elastic/elastic-agent/pkg/control/v2/client"
+	"github.com/elastic/elastic-agent/pkg/control/v2/cproto"
 	atesting "github.com/elastic/elastic-agent/pkg/testing"
 	"github.com/elastic/elastic-agent/pkg/testing/define"
 	"github.com/elastic/elastic-agent/pkg/testing/tools"
@@ -77,6 +78,13 @@ func TestLogIngestionFleetManaged(t *testing.T) {
 				"enabled": true,
 			},
 		},
+		Overrides: map[string]interface{}{
+			"agent": map[string]interface{}{
+				"monitoring": map[string]interface{}{
+					"metrics_period": "1s",
+				},
+			},
+		},
 	}
 
 	installOpts := atesting.InstallOpts{
@@ -100,6 +108,9 @@ func TestLogIngestionFleetManaged(t *testing.T) {
 	// 3. Ensure installation is correct.
 	require.NoError(t, installtest.CheckSuccess(ctx, agentFixture, installOpts.BasePath, &installtest.CheckOpts{Privileged: installOpts.Privileged}))
 
+	// 4. Ensure healthy state at startup
+	checkHealthAtStartup(t, ctx, agentFixture)
+
 	t.Run("Monitoring logs are shipped", func(t *testing.T) {
 		testMonitoringLogsAreShipped(t, ctx, info, agentFixture, policy)
 	})
@@ -127,6 +138,34 @@ func startMockES(t *testing.T) string {
 	return s.URL
 }
 
+// checkHealthAtStartup ensures all the beats and agent are healthy and working before we continue
+func checkHealthAtStartup(t *testing.T, ctx context.Context, agentFixture *atesting.Fixture) {
+	// because we need to separately fetch the PIDs, wait until everything is healthy before we look for running beats
+	compDebugName := ""
+	require.Eventually(t, func() bool {
+		allHealthy := true
+		status, err := agentFixture.ExecStatus(ctx)
+		if err != nil {
+			t.Logf("agent status returned an error: %v", err)
+			return false
+		}
+		t.Logf("Received agent status:\n%+v\n", status) // this can be re-marshaled to JSON if we prefer that notation
+		for _, comp := range status.Components {
+			// make sure the components include the expected integrations
+			for _, v := range comp.Units {
+				if v.State != int(cproto.State_HEALTHY) {
+					allHealthy = false
+				}
+			}
+			if comp.State != int(cproto.State_HEALTHY) {
+				compDebugName = comp.Name
+				allHealthy = false
+			}
+		}
+		return allHealthy
+	}, 3*time.Minute, 3*time.Second, "install never became healthy: components did not return a healthy state: %s", compDebugName)
+}
+
 func testMonitoringLogsAreShipped(
 	t *testing.T,
 	ctx context.Context,