improve logging

cmd/fleet/main.go

@@ -106,7 +106,7 @@ func initLogger(cfg *config.Config, version, commit string) (*logger.Logger, err
 		Str("exe", os.Args[0]).
 		Strs("args", os.Args[1:]).
 		Msg("Boot fleet-server")
-	log.Debug().Strs("env", os.Environ()).Msg("environment")
+	log.Debug().Strs("env", os.Environ()).Msg("environment variables")
 
 	return l, err
 }
@@ -832,7 +832,7 @@ func (f *FleetServer) runSubsystems(ctx context.Context, cfg *config.Config, g *
 		return dl.Migrate(ctx, bulker)
 	})
 	if err = loggedMigration(); err != nil {
-		return fmt.Errorf("failed to run subsystems: %w", err)
+		return fmt.Errorf("failed to run migrations: %w", err)
 	}
 
 	// Run scheduler for periodic GC/cleanup

internal/pkg/dl/migration.go

@@ -61,11 +61,16 @@ func migrate(ctx context.Context, bulker bulk.Bulk, fn migrationBodyFn) (int, er
 	for {
 		name, index, body, err := fn()
 		if err != nil {
-			return updatedDocs, fmt.Errorf(": %w", err)
+			return updatedDocs,
+				fmt.Errorf("failed to prepare request for migration %s: %w",
+					name, err)
 		}
 
 		resp, err := applyMigration(ctx, name, index, bulker, body)
 		if err != nil {
+			log.Err(err).
+				Bytes("http.request.body.content", body).
+				Msgf("migration %s failed: %w", err)
 			return updatedDocs, fmt.Errorf("failed to apply migration %q: %w",
 				name, err)
 		}
@@ -260,8 +265,6 @@ ctx._source.policy_output_permissions_hash="";
 
 	body, err := query.MarshalJSON()
 	if err != nil {
-		log.Debug().Str("painlessScript", painless).
-			Msgf("%s: failed painless script", migrationName)
 		return migrationName, FleetAgents, nil, fmt.Errorf("could not marshal ES query: %w", err)
 	}