Skip to content

Cherry pick to 4.74 - Fix incorrect host name in batch script results (#33311) - #33646

Merged
sgress454 merged 1 commit into
rc-minor-fleet-v4.74.0from
sgress454/33311-cherry-pick-to-rc-1.74
Sep 30, 2025
Merged

Cherry pick to 4.74 - Fix incorrect host name in batch script results (#33311)#33646
sgress454 merged 1 commit into
rc-minor-fleet-v4.74.0from
sgress454/33311-cherry-pick-to-rc-1.74

Conversation

@sgress454

@sgress454 sgress454 commented Sep 30, 2025

Copy link
Copy Markdown
Contributor

Cherry pick of 7f0be5a (#33311)

Related issue: Resolves #33191
Related issue: Resolves #33182

Details

See #33311

<!-- Add the related story/sub-task/bug number, like Resolves #123, or
remove if NA -->
**Related issue:** Resolves #33191
**Related issue:** Resolves #33182

# Details

This PR updates the field used to display the host name in the batch
script details tables from `hostname` to the calculated display name,
matching what [the main hosts tables (via the List Hosts endpoint)
uses](https://github.com/fleetdm/fleet/blob/134c74a94b0025e700627c1fb0699f69788aea88/server/fleet/hosts.go#L849-L851).

# Checklist for submitter

## Testing

- [X] Added/updated automated tests
- [X] QA'd all new/changed functionality manually

Before:
<img width="1118" height="377" alt="image"
src="https://github.com/user-attachments/assets/c56f6fbd-c661-4241-ba50-f0f18e6aeb88"
/>

After:
<img width="1118" height="343" alt="image"
src="https://github.com/user-attachments/assets/1b217021-904a-497d-91d2-e377850f62ac"
/>

For unreleased bug fixes in a release candidate, one of:

- [X] Confirmed that the fix is not expected to adversely impact load
test results

(cherry picked from commit 7f0be5a)
@sgress454
sgress454 requested a review from a team as a code owner September 30, 2025 17:07
@sgress454 sgress454 changed the title Fix incorrect host name in batch script results (#33311) Cherry pick to 4.74 - Fix incorrect host name in batch script results (#33311) Sep 30, 2025
@codecov

codecov Bot commented Sep 30, 2025

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 63.05%. Comparing base (bd0dd18) to head (fe7c150).
⚠️ Report is 6 commits behind head on rc-minor-fleet-v4.74.0.

Additional details and impacted files
@@                    Coverage Diff                     @@
##           rc-minor-fleet-v4.74.0   #33646      +/-   ##
==========================================================
+ Coverage                   58.04%   63.05%   +5.01%     
==========================================================
  Files                        1335     1334       -1     
  Lines                      180831   180983     +152     
==========================================================
+ Hits                       104955   114124    +9169     
+ Misses                      66606    56868    -9738     
- Partials                     9270     9991     +721     
Flag Coverage Δ
backend 63.05% <100.00%> (+5.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@sgress454
sgress454 changed the base branch from update-changelog-rc-4.74.0 to rc-minor-fleet-v4.74.0 September 30, 2025 17:42

@iansltx iansltx left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good to go. Did a fuller review than normal for a cherry-pick so I could understand what was going on here.

@iansltx

iansltx commented Sep 30, 2025

Copy link
Copy Markdown
Contributor

Test failures are flakey (mysql) or unrelated (vuln).

@sgress454
sgress454 merged commit 54e1d6e into rc-minor-fleet-v4.74.0 Sep 30, 2025
52 of 60 checks passed
@sgress454
sgress454 deleted the sgress454/33311-cherry-pick-to-rc-1.74 branch September 30, 2025 18:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants