Skip to content

[9.0] (backport #10004) Fix flaky integration tests for the monitoring endpoint #10017

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
swiatekm merged 1 commit into from
Sep 18, 2025
+38 −33
Merged

[9.0] (backport #10004) Fix flaky integration tests for the monitoring endpoint #10017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 19 additions & 16 deletions testing/integration/ess/monitoring_probe_preserve_text_cfg_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,13 @@
package ess

import (
"bytes"
"context"
"encoding/json"
"fmt"
"net/http"
"testing"
"time"

"github.com/gofrs/uuid/v5"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"

Expand Down Expand Up @@ -67,6 +65,7 @@ type MonitoringTextRunner struct {
suite.Suite
info *define.Info
agentFixture *atesting.Fixture
agentID string

ESHost string

Expand Down Expand Up @@ -121,11 +120,12 @@ func (runner *MonitoringTextRunner) SetupSuite() {
err = runner.agentFixture.WriteFileToWorkDir(ctx, defaultTextCfg, "elastic-agent.yml")
require.NoError(runner.T(), err)

policyResp, _, err := tools.InstallAgentWithPolicy(ctx, runner.T(), installOpts, runner.agentFixture, runner.info.KibanaClient, basePolicy)
policyResp, agentID, err := tools.InstallAgentWithPolicy(ctx, runner.T(), installOpts, runner.agentFixture, runner.info.KibanaClient, basePolicy)
require.NoError(runner.T(), err)

runner.policyID = policyResp.ID
runner.policyName = basePolicy.Name
runner.agentID = agentID

_, err = tools.InstallPackageFromDefaultFile(ctx, runner.info.KibanaClient, "system",
integration.PreinstalledPackages["system"], "testdata/system_integration_setup.json", uuid.Must(uuid.NewV4()).String(), policyResp.ID)
Expand All @@ -149,10 +149,10 @@ func (runner *MonitoringTextRunner) TestMonitoringLiveness() {
require.Equal(runner.T(), http.StatusOK, initResp.StatusCode)

// use the fleet override API to change the port that we're running on.
override := map[string]interface{}{
"name": runner.policyName,
"namespace": "default",
"overrides": map[string]interface{}{
overrideUpdateRequest := kibana.AgentPolicyUpdateRequest{
Name: runner.policyName,
Namespace: "default",
Overrides: map[string]interface{}{
"agent": map[string]interface{}{
"monitoring": map[string]interface{}{
"http": map[string]interface{}{
Expand All @@ -165,20 +165,23 @@ func (runner *MonitoringTextRunner) TestMonitoringLiveness() {
},
}

raw, err := json.Marshal(override)
policyResponse, err := runner.info.KibanaClient.UpdatePolicy(ctx, runner.policyID, overrideUpdateRequest)
require.NoError(runner.T(), err)
reader := bytes.NewBuffer(raw)
overrideEndpoint := fmt.Sprintf("/api/fleet/agent_policies/%s", runner.policyID)
statusCode, overrideResp, err := runner.info.KibanaClient.Request("PUT", overrideEndpoint, nil, nil, reader)
require.NoError(runner.T(), err)
require.Equal(runner.T(), http.StatusOK, statusCode, "non-200 status code; got response: %s", string(overrideResp))

// verify the new policy revision was applied
require.Eventually(
runner.T(),
tools.IsPolicyRevision(ctx, runner.T(), runner.info.KibanaClient, runner.agentID, policyResponse.Revision),
5*time.Minute, time.Second)

runner.AllComponentsHealthy(ctx)

updatedEndpoint := "http://localhost:6792/processes"
// second stage: ensure the HTTP config has updated
req, err = http.NewRequestWithContext(ctx, "GET", updatedEndpoint, nil)
require.NoError(runner.T(), err)
require.EventuallyWithT(runner.T(), func(collect *assert.CollectT) {
req, err = http.NewRequestWithContext(ctx, "GET", updatedEndpoint, nil)
require.NoError(collect, err)
}, time.Minute, time.Second)

initResp, err = client.Do(req)
require.NoError(runner.T(), err)
Expand Down
36 changes: 19 additions & 17 deletions testing/integration/ess/monitoring_probe_reload_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,14 @@
package ess

import (
"bytes"
"context"
"encoding/json"
"fmt"
"net/http"
"testing"
"time"

"github.com/gofrs/uuid/v5"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"

Expand All @@ -31,6 +30,7 @@ type MonitoringRunner struct {
suite.Suite
info *define.Info
agentFixture *atesting.Fixture
agentID string

ESHost string

Expand Down Expand Up @@ -81,11 +81,12 @@ func (runner *MonitoringRunner) SetupSuite() {
ctx, cancel := context.WithTimeout(context.Background(), 3*time.Minute)
defer cancel()

policyResp, _, err := tools.InstallAgentWithPolicy(ctx, runner.T(), installOpts, runner.agentFixture, runner.info.KibanaClient, basePolicy)
policyResp, agentID, err := tools.InstallAgentWithPolicy(ctx, runner.T(), installOpts, runner.agentFixture, runner.info.KibanaClient, basePolicy)
require.NoError(runner.T(), err)

runner.policyID = policyResp.ID
runner.policyName = basePolicy.Name
runner.agentID = agentID

_, err = tools.InstallPackageFromDefaultFile(ctx, runner.info.KibanaClient, "system",
integration.PreinstalledPackages["system"], "testdata/system_integration_setup.json", uuid.Must(uuid.NewV4()).String(), policyResp.ID)
Expand All @@ -107,12 +108,10 @@ func (runner *MonitoringRunner) TestMonitoringLiveness() {
_, err = client.Do(req)
require.Error(runner.T(), err)

// use the fleet override API to enable http monitoring.
// This tests both the http server itself, and tests that the agent reloader actually reloads the agent config.
override := map[string]interface{}{
"name": runner.policyName,
"namespace": "default",
"overrides": map[string]interface{}{
overrideUpdateRequest := kibana.AgentPolicyUpdateRequest{
Name: runner.policyName,
Namespace: "default",
Overrides: map[string]interface{}{
"agent": map[string]interface{}{
"monitoring": map[string]interface{}{
"http": map[string]interface{}{
Expand All @@ -125,19 +124,22 @@ func (runner *MonitoringRunner) TestMonitoringLiveness() {
},
}

raw, err := json.Marshal(override)
policyResponse, err := runner.info.KibanaClient.UpdatePolicy(ctx, runner.policyID, overrideUpdateRequest)
require.NoError(runner.T(), err)
reader := bytes.NewBuffer(raw)
overrideEndpoint := fmt.Sprintf("/api/fleet/agent_policies/%s", runner.policyID)
statusCode, overrideResp, err := runner.info.KibanaClient.Request("PUT", overrideEndpoint, nil, nil, reader)
require.NoError(runner.T(), err)
require.Equal(runner.T(), http.StatusOK, statusCode, "non-200 status code; got response: %s", string(overrideResp))

// verify the new policy revision was applied
require.Eventually(
runner.T(),
tools.IsPolicyRevision(ctx, runner.T(), runner.info.KibanaClient, runner.agentID, policyResponse.Revision),
5*time.Minute, time.Second)

runner.AllComponentsHealthy(ctx)

// check to make sure that we now have a liveness probe response
req, err = http.NewRequestWithContext(ctx, "GET", endpoint, nil)
require.NoError(runner.T(), err)
require.EventuallyWithT(runner.T(), func(collect *assert.CollectT) {
req, err = http.NewRequestWithContext(ctx, "GET", endpoint, nil)
require.NoError(collect, err)
}, time.Minute, time.Second)

// second check: the /liveness endpoint should now be responding
runner.CheckResponse(ctx, endpoint)
Expand Down
Loading