feat: add filtering options to provisioners list #19378
Merged
+707
−94
Conversation
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
|
@rafrdz Going to take a look no! For the chromatic tests we typically self check those to make sure we didn't accidentally introduce some glaring UI bug. So you can go through those yourself when you have a chance, but feel free to ping me if you're having issues on that front |
brettkolodny
requested changes
Aug 20, 2025
There was a problem hiding this comment.
Just a few small changes on the TS side. The backend changes look good to me but @Emyrk may want to take another look as well
...s/OrganizationSettingsPage/OrganizationProvisionersPage/OrganizationProvisionersPageView.tsx
Outdated
Show resolved
Hide resolved
...pages/OrganizationSettingsPage/OrganizationProvisionersPage/OrganizationProvisionersPage.tsx
Outdated
Show resolved
Hide resolved
...pages/OrganizationSettingsPage/OrganizationProvisionersPage/OrganizationProvisionersPage.tsx
Outdated
Show resolved
Hide resolved
...pages/OrganizationSettingsPage/OrganizationProvisionersPage/OrganizationProvisionersPage.tsx
Outdated
Show resolved
Hide resolved
...pages/OrganizationSettingsPage/OrganizationProvisionersPage/OrganizationProvisionersPage.tsx
Outdated
Show resolved
Hide resolved
Emyrk
approved these changes
Aug 20, 2025
Comment on lines
+114
to
+144
| AND ( | ||
| sqlc.narg('max_age_ms')::bigint IS NULL | ||
| OR pd.last_seen_at IS NULL | ||
| OR pd.last_seen_at >= (NOW() - (sqlc.narg('max_age_ms')::bigint || ' ms')::interval) | ||
| ) | ||
| AND ( | ||
| -- Always include online daemons | ||
| (pd.last_seen_at IS NOT NULL AND pd.last_seen_at >= (NOW() - (@stale_interval_ms::bigint || ' ms')::interval)) | ||
| -- Include offline daemons if offline param is true or 'offline' status is requested | ||
| OR ( | ||
| (pd.last_seen_at IS NULL OR pd.last_seen_at < (NOW() - (@stale_interval_ms::bigint || ' ms')::interval)) | ||
| AND ( | ||
| COALESCE(sqlc.narg('offline')::bool, false) = true | ||
| OR 'offline'::provisioner_daemon_status = ANY(@statuses::provisioner_daemon_status[]) | ||
| ) | ||
| ) | ||
| ) | ||
| AND ( | ||
| -- Filter daemons by any statuses if provided | ||
| COALESCE(array_length(@statuses::provisioner_daemon_status[], 1), 0) = 0 | ||
| OR (current_job.id IS NOT NULL AND 'busy'::provisioner_daemon_status = ANY(@statuses::provisioner_daemon_status[])) | ||
| OR (current_job.id IS NULL AND 'idle'::provisioner_daemon_status = ANY(@statuses::provisioner_daemon_status[])) | ||
| OR ( | ||
| 'offline'::provisioner_daemon_status = ANY(@statuses::provisioner_daemon_status[]) | ||
| AND (pd.last_seen_at IS NULL OR pd.last_seen_at < (NOW() - (@stale_interval_ms::bigint || ' ms')::interval)) | ||
| ) | ||
| OR ( | ||
| COALESCE(sqlc.narg('offline')::bool, false) = true | ||
| AND (pd.last_seen_at IS NULL OR pd.last_seen_at < (NOW() - (@stale_interval_ms::bigint || ' ms')::interval)) | ||
| ) | ||
| ) |
There was a problem hiding this comment.
We usually do CASE ... WHEN, but this works
Comment on lines
+1
to
+16
| // Package sdk2db provides common conversion routines from codersdk types to database types | ||
| package sdk2db | ||
|
|
||
| import ( | ||
| "github.com/coder/coder/v2/coderd/database" | ||
| "github.com/coder/coder/v2/coderd/database/db2sdk" | ||
| "github.com/coder/coder/v2/codersdk" | ||
| ) | ||
|
|
||
| func ProvisionerDaemonStatus(status codersdk.ProvisionerDaemonStatus) database.ProvisionerDaemonStatus { | ||
| return database.ProvisionerDaemonStatus(status) | ||
| } | ||
|
|
||
| func ProvisionerDaemonStatuses(params []codersdk.ProvisionerDaemonStatus) []database.ProvisionerDaemonStatus { | ||
| return db2sdk.List(params, ProvisionerDaemonStatus) | ||
| } |
There was a problem hiding this comment.
👍
I bet we can move some things here later
brettkolodny
approved these changes
Aug 21, 2025
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Summary
In this pull request we're adding support for additional filtering options to the
provisioners listCLI command and the/provisionerdaemonsAPI endpoint.Resolves: #18783
Changes
Added CLI Options
--show-offline: When this option is provided, all provisioner daemons will be returned. This means that when--show-offlineis not provided onlyidleandbusyprovisioner daemons will be returned.--status=<list_of_statuses>: When this option is provided with a comma-separated list of valid statuses (idle,busy, oroffline) only provisioner daemons that have these statuses will be returned.--max-age=<duration>: When this option is provided with a valid duration value (e.g.,24h,30s) only provisioner daemons with alast_seen_attimestamp within the provided max age will be returned.Query Params
?offline=true: Include offline provisioner daemons in the results. Offline provisioner daemons will be excluded if?offline=falseor if offline is not provided.?status=<list_of_statuses>: Include provisioner daemons with the specified statuses.?max_age=<duration>: Include provisioner daemons with alast_seen_attimestamp within the max age duration.Frontend
--show-offlinehas to be provided to see them), a checkbox was added to the provisioners list page to allow for offline provisioners to be displayedCurrent provisioners page (without checkbox)
Provisioners page with checkbox (unchecked)
Provisioner page with checkbox (checked) and URL updated with query parameters
Show Offline vs Offline Status
To list offline provisioner daemons, users can either:
--show-offlineoptionOR
offlinein the list of values provided to the--statusoption