Skip to content

Fix output from gitops to use "fleets" instead of "teams", "queries" instead of "reports"#40610

Merged
sgress454 merged 4 commits intomainfrom
sgress454/update-gitops-logs
Feb 26, 2026
Merged

Fix output from gitops to use "fleets" instead of "teams", "queries" instead of "reports"#40610
sgress454 merged 4 commits intomainfrom
sgress454/update-gitops-logs

Conversation

@sgress454
Copy link
Copy Markdown
Contributor

@sgress454 sgress454 commented Feb 26, 2026

Related issue: Resolves #40621

Details

This PR updates the output from fleetctl gitops and fleetctl apply to use the correct terminology:

  • "fleet" instead of "team"
  • "report" instead of "query" (where appropriate)
  • "for unassigned hosts" in place of "No Team" where possible, and "for fleet Unassigned" otherwise.

All changes other than tests are in client.go and are text-only; no functional code is changed (and no code relies on the strings besides tests).

Checklist for submitter

If some of the following don't apply, delete the relevant line.

  • Changes file added for user-visible changes in changes/, orbit/changes/ or ee/fleetd-chrome/changes.
    See Changes files for more information.
    n/a

Testing

  • Added/updated automated tests
  • QA'd all new/changed functionality manually

I did a fleetctl generate-gitops and a fleetctl gitops run and saw the updated logs:

[+] would've applied EULA
[+] would've applied certificate authorities
[+] would've applied fleet config
[+] would've applied MDM profiles
[+] would've applied enroll secrets
[+] would've applied 1 report
[+] would've applied 1 software package for fleet 'Unassigned'
[+] would've applied 0 app store apps for fleet 'Unassigned'
[+] would've applied webhook settings for unassigned hosts
[+] would've applied 1 policy
[!] gitops dry run succeeded

but I did not go through and try and replicate every log or error message. I think the best we can do on this one is eyeball the code changes for mistakes.

@codecov
Copy link
Copy Markdown

codecov Bot commented Feb 26, 2026

Codecov Report

❌ Patch coverage is 51.61290% with 30 lines in your changes missing coverage. Please review.
✅ Project coverage is 66.28%. Comparing base (baf7f82) to head (9dcaa19).
⚠️ Report is 21 commits behind head on main.

Files with missing lines Patch % Lines
server/service/client.go 51.61% 30 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##             main   #40610   +/-   ##
=======================================
  Coverage   66.28%   66.28%           
=======================================
  Files        2466     2466           
  Lines      197552   197552           
  Branches     8726     8726           
=======================================
+ Hits       130946   130955    +9     
+ Misses      54757    54752    -5     
+ Partials    11849    11845    -4     
Flag Coverage Δ
backend 68.17% <51.61%> (+<0.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 title WIP: fix output from gitops to use "fleets" instead of "teams", "queries" instead of "reports" Fix output from gitops to use "fleets" instead of "teams", "queries" instead of "reports" Feb 26, 2026
@sgress454 sgress454 marked this pull request as ready for review February 26, 2026 19:13
@sgress454 sgress454 requested a review from a team as a code owner February 26, 2026 19:13
@sgress454 sgress454 merged commit 4305ca1 into main Feb 26, 2026
51 checks passed
@sgress454 sgress454 deleted the sgress454/update-gitops-logs branch February 26, 2026 20:38
sgress454 added a commit that referenced this pull request Feb 26, 2026
…instead of "reports" (#40610)

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

# Details

This PR updates the output from `fleetctl gitops` and `fleetctl apply`
to use the correct terminology:
* "fleet" instead of "team"
* "report" instead of "query" (where appropriate)
* "for unassigned hosts" in place of "No Team" where possible, and "for
fleet Unassigned" otherwise.

All changes other than tests are in `client.go` and are text-only; no
functional code is changed (and no code relies on the strings besides
tests).

# Checklist for submitter

If some of the following don't apply, delete the relevant line.

- [ ] Changes file added for user-visible changes in `changes/`,
`orbit/changes/` or `ee/fleetd-chrome/changes`.
See [Changes
files](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/guides/committing-changes.md#changes-files)
for more information.
n/a

## Testing

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

I did a `fleetctl generate-gitops` and a `fleetctl gitops` run and saw
the updated logs:
```
[+] would've applied EULA
[+] would've applied certificate authorities
[+] would've applied fleet config
[+] would've applied MDM profiles
[+] would've applied enroll secrets
[+] would've applied 1 report
[+] would've applied 1 software package for fleet 'Unassigned'
[+] would've applied 0 app store apps for fleet 'Unassigned'
[+] would've applied webhook settings for unassigned hosts
[+] would've applied 1 policy
[!] gitops dry run succeeded
```

but I did not go through and try and replicate every log or error
message. I think the best we can do on this one is eyeball the code
changes for mistakes.
sgress454 added a commit that referenced this pull request Feb 26, 2026
@georgekarrv georgekarrv mentioned this pull request Mar 3, 2026
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.

Update log message from GitOps to refer to fleets, reports and "unassigned hosts"

2 participants