From c9f1ca0f1f1d64845d116b661e74837bf70f0a12 Mon Sep 17 00:00:00 2001 From: Mischa Thompson Date: Wed, 16 Aug 2023 12:13:10 -0700 Subject: [PATCH] Fix support bundle generation (#4830) * Use the created HTTPClient, which uses the DialContextFunc defined in entrypoint * Change in memory address for support handler to regular listen address --- CHANGELOG.md | 2 ++ cmd/grafana-agent/entrypoint.go | 2 +- pkg/supportbundle/supportbundle.go | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 327c33f428c4..8fb8917e39e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -81,6 +81,8 @@ Main (unreleased) - Fix issue where Agent crashes when a blackbox modules config file is specified for blackbox integration. (@marctc) +- Fix issue where getting the support bundle failed due to using an HTTP Client that was not able to access the agent in-memory address. (@spartan0x117) + v0.35.4 (2023-08-14) -------------------- diff --git a/cmd/grafana-agent/entrypoint.go b/cmd/grafana-agent/entrypoint.go index fec04e2d5f90..dc372359c6e9 100644 --- a/cmd/grafana-agent/entrypoint.go +++ b/cmd/grafana-agent/entrypoint.go @@ -299,7 +299,7 @@ func (ep *Entrypoint) supportHandler(rw http.ResponseWriter, r *http.Request) { ep.mut.Lock() var ( enabledFeatures = ep.cfg.EnabledFeatures - httpSrvAddress = ep.cfg.ServerFlags.HTTP.InMemoryAddr + httpSrvAddress = ep.cfg.ServerFlags.HTTP.ListenAddress ) ep.mut.Unlock() diff --git a/pkg/supportbundle/supportbundle.go b/pkg/supportbundle/supportbundle.go index 381a2225a7c9..edf1b79234cb 100644 --- a/pkg/supportbundle/supportbundle.go +++ b/pkg/supportbundle/supportbundle.go @@ -119,7 +119,7 @@ func Export(ctx context.Context, enabledFeatures []string, cfg []byte, srvAddres return nil, fmt.Errorf("failed to read Agent logs instances: %s", err) } - resp, err = http.DefaultClient.Get("http://" + srvAddress + "/agent/api/v1/logs/targets") + resp, err = httpClient.Get("http://" + srvAddress + "/agent/api/v1/logs/targets") if err != nil { return nil, fmt.Errorf("failed to get Agent logs targets: %s", err) }