Cherry pick to 4.74 - Fix incorrect host name in batch script results (#33311) - #33646
Merged
sgress454 merged 1 commit intoSep 30, 2025
Merged
Conversation
<!-- 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
temporarily deployed
to
Docker Hub
September 30, 2025 17:07 — with
GitHub Actions
Inactive
Codecov Report✅ All modified and coverable lines are covered by tests. 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
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
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
approved these changes
Sep 30, 2025
iansltx
left a comment
Contributor
There was a problem hiding this comment.
Good to go. Did a fuller review than normal for a cherry-pick so I could understand what was going on here.
Contributor
|
Test failures are flakey (mysql) or unrelated (vuln). |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Cherry pick of 7f0be5a (#33311)
Related issue: Resolves #33191
Related issue: Resolves #33182
Details
See #33311