[9.2] (backport #11539) Ensure we don't report output status in tests where it's irrelevant (#11567)

* Ensure we don't report output status in tests where it's irrelevant (#11539)

* Ensure we don't report output status in tests where it's irrelevant

* Extract common parameters in TestBeatDiagnostics

(cherry picked from commit b8a142f)

# Conflicts:
#	testing/integration/ess/beat_receivers_test.go

* Fix conflicts

---------

Co-authored-by: Mikołaj Świątek <[email protected]>

Author: mergify[bot]

testing/integration/ess/beat_receivers_test.go

@@ -713,6 +713,8 @@ outputs:
     type: elasticsearch
     hosts: [http://localhost:9200]
     api_key: placeholder
+    status_reporting:
+      enabled: false
 agent.monitoring.enabled: false
 `
 
@@ -847,6 +849,8 @@ outputs:
     hosts: [http://localhost:9200]
     api_key: placeholder
     indices: [] # not supported by the elasticsearch exporter
+    status_reporting:
+      enabled: false
 `
 
 	// this is the context for the whole test, with a global timeout defined
@@ -943,6 +947,8 @@ outputs:
     type: elasticsearch
     hosts: [http://localhost:9200]
     api_key: placeholder
+    status_reporting:
+      enabled: false
 agent.monitoring.enabled: false
 `
 
@@ -1030,6 +1036,8 @@ outputs:
     type: elasticsearch
     hosts: [http://localhost:9200]
     api_key: placeholder
+    status_reporting:
+      enabled: false
 agent.monitoring.enabled: false
 `
 	err = fixture.Configure(ctx, []byte(configNoComponents))

testing/integration/ess/diagnostics_test.go

@@ -348,6 +348,8 @@ outputs:
     type: elasticsearch
     hosts: [http://localhost:9200]
     api_key: placeholder
+    status_reporting:
+      enabled: false
 agent.monitoring.enabled: false
 `
 
@@ -359,13 +361,25 @@ agent.monitoring.enabled: false
 
 	ctx, cancel := testcontext.WithDeadline(t, context.Background(), time.Now().Add(10*time.Minute))
 	defer cancel()
+	expectedComponentState := map[string]integrationtest.ComponentState{
+		"filestream-default": {
+			State: integrationtest.NewClientState(client.Healthy),
+			Units: map[integrationtest.ComponentUnitKey]integrationtest.ComponentUnitState{
+				integrationtest.ComponentUnitKey{UnitType: client.UnitTypeOutput, UnitID: "filestream-default"}: {
+					State: integrationtest.NewClientState(client.Healthy),
+				},
+				integrationtest.ComponentUnitKey{UnitType: client.UnitTypeInput, UnitID: "filestream-default-filestream-filebeat"}: {
+					State: integrationtest.NewClientState(client.Healthy),
+				},
+			},
+		},
+	}
+	expectedAgentState := integrationtest.NewClientState(client.Healthy)
 
 	testCases := []struct {
 		name                         string
 		runtime                      string
 		expectedCompDiagnosticsFiles []string
-		expectedAgentState           *client.State
-		expectedComponentState       map[string]integrationtest.ComponentState
 	}{
 		{
 			name:    "filebeat process",
@@ -377,20 +391,6 @@ agent.monitoring.enabled: false
 				"beat-rendered-config.yml",
 				"global_processors.txt",
 			),
-			expectedAgentState: integrationtest.NewClientState(client.Healthy),
-			expectedComponentState: map[string]integrationtest.ComponentState{
-				"filestream-default": {
-					State: integrationtest.NewClientState(client.Healthy),
-					Units: map[integrationtest.ComponentUnitKey]integrationtest.ComponentUnitState{
-						integrationtest.ComponentUnitKey{UnitType: client.UnitTypeOutput, UnitID: "filestream-default"}: {
-							State: integrationtest.NewClientState(client.Healthy),
-						},
-						integrationtest.ComponentUnitKey{UnitType: client.UnitTypeInput, UnitID: "filestream-default-filestream-filebeat"}: {
-							State: integrationtest.NewClientState(client.Healthy),
-						},
-					},
-				},
-			},
 		},
 		{
 			name:    "filebeat receiver",
@@ -400,7 +400,6 @@ agent.monitoring.enabled: false
 				"beat_metrics.json",
 				"input_metrics.json",
 			},
-			expectedAgentState: integrationtest.NewClientState(client.Degraded),
 		},
 	}
 
@@ -443,8 +442,8 @@ agent.monitoring.enabled: false
 			}
 			err = f.Run(ctx, integrationtest.State{
 				Configure:  configBuffer.String(),
-				AgentState: tc.expectedAgentState,
-				Components: tc.expectedComponentState,
+				AgentState: expectedAgentState,
+				Components: expectedComponentState,
 				After:      testDiagnosticsFactory(t, filebeatSetup, expDiagFiles, tc.expectedCompDiagnosticsFiles, f, []string{"diagnostics", "collect"}),
 			})
 			assert.NoError(t, err)
@@ -475,6 +474,8 @@ outputs:
     type: elasticsearch
     hosts: [http://localhost:9200]
     api_key: placeholder
+    status_reporting:
+      enabled: false
 agent.monitoring.enabled: false
 `