Make request diagnostics optional

elastic · Jun 17, 2024 · 6670bf0 · 6670bf0
1 parent 891be9a
commit 6670bf0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/internal/pkg/api/openapi.gen.go b/internal/pkg/api/openapi.gen.go
diff --git a/internal/pkg/config/output.go b/internal/pkg/config/output.go
@@ -267,7 +267,9 @@ func (c *Elasticsearch) DiagRequests(ctx context.Context) []byte {
 		if u.Scheme == "" {
 			u.Scheme = c.Protocol
 		}
+		ctx, cancel := context.WithTimeout(ctx, time.Second*30) // TODO(michel-laterman): Configurable timeout; should this be part of config, or part of a diagnostics action?
 		req, err := http.NewRequestWithContext(ctx, http.MethodGet, u.String(), nil)
+		cancel()
 		if err != nil {
 			zerolog.Ctx(ctx).Warn().Err(err).Str("host", host).Msg("Unable to create request to host")
 			res.WriteString(fmt.Sprintf("Unable to create request to host %q: %v\n", host, err))

diff --git a/internal/pkg/server/agent.go b/internal/pkg/server/agent.go
@@ -139,7 +139,7 @@ func (a *Agent) Run(ctx context.Context) error {
 		}
 		return cfg.Output.Elasticsearch.TLS.DiagCerts()()
 	})
-	a.agent.RegisterDiagnosticHook("fleet-server output request diag", "fleet-server output request trace diagnostics", "fleet-server-output-request.txt", "text/plain", func() []byte {
+	a.agent.RegisterOptionalDiagnosticHook("CONN", "fleet-server output request diag", "fleet-server output request trace diagnostics", "fleet-server-output-request.txt", "text/plain", func() []byte {
 		if a.srv == nil {
 			log.Warn().Msg("Diagnostics hook failure fleet-server is nil.")
 			return []byte(`Diagnostics hook failure fleet-server is nil`)

diff --git a/model/openapi.yml b/model/openapi.yml
@@ -557,6 +557,7 @@ components:
             type: string
             enum:
               - CPU
+              - CONN
     actionPolicyReassign:
       description: The POLICY_REASSIGN action data.
       type: object

diff --git a/pkg/api/types.gen.go b/pkg/api/types.gen.go