mirror of
https://github.com/coder/coder.git
synced 2026-09-24 15:04:27 +08:00
feat: add filtering options to provisioners list (#19378)
## Summary In this pull request we're adding support for additional filtering options to the `provisioners list` CLI command and the `/provisionerdaemons` API endpoint. Resolves: https://github.com/coder/coder/issues/18783 ### Changes #### Added CLI Options - `--show-offline`: When this option is provided, all provisioner daemons will be returned. This means that when `--show-offline` is not provided only `idle` and `busy` provisioner daemons will be returned. - `--status=<list_of_statuses>`: When this option is provided with a comma-separated list of valid statuses (`idle`, `busy`, or `offline`) 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 a `last_seen_at` timestamp 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=false` or if offline is not provided. - `?status=<list_of_statuses>`: Include provisioner daemons with the specified statuses. - `?max_age=<duration>`: Include provisioner daemons with a `last_seen_at` timestamp within the max age duration. #### Frontend - Since offline provisioners will not be returned by default anymore (`--show-offline` has to be provided to see them), a checkbox was added to the provisioners list page to allow for offline provisioners to be displayed - A revamp of the provisioners page will be done in: https://github.com/coder/coder/issues/17156, this checkbox change was just added to maintain currently functionality with the backend updates Current provisioners page (without checkbox) <img width="1329" height="574" alt="Screenshot 2025-08-20 at 10 51 00 AM" src="https://github.com/user-attachments/assets/77b73650-0b62-44f0-a77f-acbe5710809f" /> Provisioners page with checkbox (unchecked) <img width="1314" height="626" alt="Screenshot 2025-08-20 at 10 48 40 AM" src="https://github.com/user-attachments/assets/7ba164ad-6d3f-417b-bd39-338c0161b145" /> Provisioner page with checkbox (checked) and URL updated with query parameters <img width="1306" height="597" alt="Screenshot 2025-08-20 at 10 50 14 AM" src="https://github.com/user-attachments/assets/e78d0986-bbf8-491b-9d56-b682973237a0" /> ### Show Offline vs Offline Status To list offline provisioner daemons, users can either: 1. Include the `--show-offline` option OR 2. Include `offline` in the list of values provided to the `--status` option
This commit is contained in:
@@ -397,6 +397,7 @@ func TestGetProvisionerDaemonsWithStatusByOrganization(t *testing.T) {
|
||||
daemons, err := db.GetProvisionerDaemonsWithStatusByOrganization(context.Background(), database.GetProvisionerDaemonsWithStatusByOrganizationParams{
|
||||
OrganizationID: org.ID,
|
||||
IDs: []uuid.UUID{matchingDaemon0.ID, matchingDaemon1.ID},
|
||||
Offline: sql.NullBool{Bool: true, Valid: true},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
require.Len(t, daemons, 2)
|
||||
@@ -430,6 +431,7 @@ func TestGetProvisionerDaemonsWithStatusByOrganization(t *testing.T) {
|
||||
daemons, err := db.GetProvisionerDaemonsWithStatusByOrganization(context.Background(), database.GetProvisionerDaemonsWithStatusByOrganizationParams{
|
||||
OrganizationID: org.ID,
|
||||
Tags: database.StringMap{"foo": "bar"},
|
||||
Offline: sql.NullBool{Bool: true, Valid: true},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
require.Len(t, daemons, 1)
|
||||
@@ -463,6 +465,7 @@ func TestGetProvisionerDaemonsWithStatusByOrganization(t *testing.T) {
|
||||
daemons, err := db.GetProvisionerDaemonsWithStatusByOrganization(context.Background(), database.GetProvisionerDaemonsWithStatusByOrganizationParams{
|
||||
OrganizationID: org.ID,
|
||||
StaleIntervalMS: 45 * time.Minute.Milliseconds(),
|
||||
Offline: sql.NullBool{Bool: true, Valid: true},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
require.Len(t, daemons, 2)
|
||||
@@ -475,6 +478,230 @@ func TestGetProvisionerDaemonsWithStatusByOrganization(t *testing.T) {
|
||||
require.Equal(t, database.ProvisionerDaemonStatusOffline, daemons[0].Status)
|
||||
require.Equal(t, database.ProvisionerDaemonStatusIdle, daemons[1].Status)
|
||||
})
|
||||
|
||||
t.Run("ExcludeOffline", func(t *testing.T) {
|
||||
t.Parallel()
|
||||
db, _ := dbtestutil.NewDB(t)
|
||||
org := dbgen.Organization(t, db, database.Organization{})
|
||||
|
||||
dbgen.ProvisionerDaemon(t, db, database.ProvisionerDaemon{
|
||||
Name: "offline-daemon",
|
||||
OrganizationID: org.ID,
|
||||
CreatedAt: dbtime.Now().Add(-time.Hour),
|
||||
LastSeenAt: sql.NullTime{
|
||||
Valid: true,
|
||||
Time: dbtime.Now().Add(-time.Hour),
|
||||
},
|
||||
})
|
||||
fooDaemon := dbgen.ProvisionerDaemon(t, db, database.ProvisionerDaemon{
|
||||
Name: "foo-daemon",
|
||||
OrganizationID: org.ID,
|
||||
CreatedAt: dbtime.Now().Add(-(30 * time.Minute)),
|
||||
LastSeenAt: sql.NullTime{
|
||||
Valid: true,
|
||||
Time: dbtime.Now().Add(-(30 * time.Minute)),
|
||||
},
|
||||
})
|
||||
|
||||
daemons, err := db.GetProvisionerDaemonsWithStatusByOrganization(context.Background(), database.GetProvisionerDaemonsWithStatusByOrganizationParams{
|
||||
OrganizationID: org.ID,
|
||||
StaleIntervalMS: 45 * time.Minute.Milliseconds(),
|
||||
})
|
||||
require.NoError(t, err)
|
||||
require.Len(t, daemons, 1)
|
||||
|
||||
require.Equal(t, fooDaemon.ID, daemons[0].ProvisionerDaemon.ID)
|
||||
require.Equal(t, database.ProvisionerDaemonStatusIdle, daemons[0].Status)
|
||||
})
|
||||
|
||||
t.Run("IncludeOffline", func(t *testing.T) {
|
||||
t.Parallel()
|
||||
db, _ := dbtestutil.NewDB(t)
|
||||
org := dbgen.Organization(t, db, database.Organization{})
|
||||
|
||||
dbgen.ProvisionerDaemon(t, db, database.ProvisionerDaemon{
|
||||
Name: "offline-daemon",
|
||||
OrganizationID: org.ID,
|
||||
CreatedAt: dbtime.Now().Add(-time.Hour),
|
||||
LastSeenAt: sql.NullTime{
|
||||
Valid: true,
|
||||
Time: dbtime.Now().Add(-time.Hour),
|
||||
},
|
||||
})
|
||||
dbgen.ProvisionerDaemon(t, db, database.ProvisionerDaemon{
|
||||
Name: "foo-daemon",
|
||||
OrganizationID: org.ID,
|
||||
Tags: database.StringMap{
|
||||
"foo": "bar",
|
||||
},
|
||||
})
|
||||
dbgen.ProvisionerDaemon(t, db, database.ProvisionerDaemon{
|
||||
Name: "bar-daemon",
|
||||
OrganizationID: org.ID,
|
||||
CreatedAt: dbtime.Now().Add(-(30 * time.Minute)),
|
||||
LastSeenAt: sql.NullTime{
|
||||
Valid: true,
|
||||
Time: dbtime.Now().Add(-(30 * time.Minute)),
|
||||
},
|
||||
})
|
||||
|
||||
daemons, err := db.GetProvisionerDaemonsWithStatusByOrganization(context.Background(), database.GetProvisionerDaemonsWithStatusByOrganizationParams{
|
||||
OrganizationID: org.ID,
|
||||
StaleIntervalMS: 45 * time.Minute.Milliseconds(),
|
||||
Offline: sql.NullBool{Bool: true, Valid: true},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
require.Len(t, daemons, 3)
|
||||
|
||||
statusCounts := make(map[database.ProvisionerDaemonStatus]int)
|
||||
for _, daemon := range daemons {
|
||||
statusCounts[daemon.Status]++
|
||||
}
|
||||
|
||||
require.Equal(t, 2, statusCounts[database.ProvisionerDaemonStatusIdle])
|
||||
require.Equal(t, 1, statusCounts[database.ProvisionerDaemonStatusOffline])
|
||||
})
|
||||
|
||||
t.Run("MatchesStatuses", func(t *testing.T) {
|
||||
t.Parallel()
|
||||
db, _ := dbtestutil.NewDB(t)
|
||||
org := dbgen.Organization(t, db, database.Organization{})
|
||||
|
||||
dbgen.ProvisionerDaemon(t, db, database.ProvisionerDaemon{
|
||||
Name: "offline-daemon",
|
||||
OrganizationID: org.ID,
|
||||
CreatedAt: dbtime.Now().Add(-time.Hour),
|
||||
LastSeenAt: sql.NullTime{
|
||||
Valid: true,
|
||||
Time: dbtime.Now().Add(-time.Hour),
|
||||
},
|
||||
})
|
||||
|
||||
dbgen.ProvisionerDaemon(t, db, database.ProvisionerDaemon{
|
||||
Name: "foo-daemon",
|
||||
OrganizationID: org.ID,
|
||||
CreatedAt: dbtime.Now().Add(-(30 * time.Minute)),
|
||||
LastSeenAt: sql.NullTime{
|
||||
Valid: true,
|
||||
Time: dbtime.Now().Add(-(30 * time.Minute)),
|
||||
},
|
||||
})
|
||||
|
||||
type testCase struct {
|
||||
name string
|
||||
statuses []database.ProvisionerDaemonStatus
|
||||
expectedNum int
|
||||
}
|
||||
|
||||
tests := []testCase{
|
||||
{
|
||||
name: "Get idle and offline",
|
||||
statuses: []database.ProvisionerDaemonStatus{
|
||||
database.ProvisionerDaemonStatusOffline,
|
||||
database.ProvisionerDaemonStatusIdle,
|
||||
},
|
||||
expectedNum: 2,
|
||||
},
|
||||
{
|
||||
name: "Get offline",
|
||||
statuses: []database.ProvisionerDaemonStatus{
|
||||
database.ProvisionerDaemonStatusOffline,
|
||||
},
|
||||
expectedNum: 1,
|
||||
},
|
||||
// Offline daemons should not be included without Offline param
|
||||
{
|
||||
name: "Get idle - empty statuses",
|
||||
statuses: []database.ProvisionerDaemonStatus{},
|
||||
expectedNum: 1,
|
||||
},
|
||||
{
|
||||
name: "Get idle - nil statuses",
|
||||
statuses: nil,
|
||||
expectedNum: 1,
|
||||
},
|
||||
}
|
||||
|
||||
for _, tc := range tests {
|
||||
//nolint:tparallel,paralleltest
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
daemons, err := db.GetProvisionerDaemonsWithStatusByOrganization(context.Background(), database.GetProvisionerDaemonsWithStatusByOrganizationParams{
|
||||
OrganizationID: org.ID,
|
||||
StaleIntervalMS: 45 * time.Minute.Milliseconds(),
|
||||
Statuses: tc.statuses,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
require.Len(t, daemons, tc.expectedNum)
|
||||
})
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("FilterByMaxAge", func(t *testing.T) {
|
||||
t.Parallel()
|
||||
db, _ := dbtestutil.NewDB(t)
|
||||
org := dbgen.Organization(t, db, database.Organization{})
|
||||
|
||||
dbgen.ProvisionerDaemon(t, db, database.ProvisionerDaemon{
|
||||
Name: "foo-daemon",
|
||||
OrganizationID: org.ID,
|
||||
CreatedAt: dbtime.Now().Add(-(45 * time.Minute)),
|
||||
LastSeenAt: sql.NullTime{
|
||||
Valid: true,
|
||||
Time: dbtime.Now().Add(-(45 * time.Minute)),
|
||||
},
|
||||
})
|
||||
|
||||
dbgen.ProvisionerDaemon(t, db, database.ProvisionerDaemon{
|
||||
Name: "bar-daemon",
|
||||
OrganizationID: org.ID,
|
||||
CreatedAt: dbtime.Now().Add(-(25 * time.Minute)),
|
||||
LastSeenAt: sql.NullTime{
|
||||
Valid: true,
|
||||
Time: dbtime.Now().Add(-(25 * time.Minute)),
|
||||
},
|
||||
})
|
||||
|
||||
type testCase struct {
|
||||
name string
|
||||
maxAge sql.NullInt64
|
||||
expectedNum int
|
||||
}
|
||||
|
||||
tests := []testCase{
|
||||
{
|
||||
name: "Max age 1 hour",
|
||||
maxAge: sql.NullInt64{Int64: time.Hour.Milliseconds(), Valid: true},
|
||||
expectedNum: 2,
|
||||
},
|
||||
{
|
||||
name: "Max age 30 minutes",
|
||||
maxAge: sql.NullInt64{Int64: (30 * time.Minute).Milliseconds(), Valid: true},
|
||||
expectedNum: 1,
|
||||
},
|
||||
{
|
||||
name: "Max age 15 minutes",
|
||||
maxAge: sql.NullInt64{Int64: (15 * time.Minute).Milliseconds(), Valid: true},
|
||||
expectedNum: 0,
|
||||
},
|
||||
{
|
||||
name: "No max age",
|
||||
maxAge: sql.NullInt64{Valid: false},
|
||||
expectedNum: 2,
|
||||
},
|
||||
}
|
||||
for _, tc := range tests {
|
||||
//nolint:tparallel,paralleltest
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
daemons, err := db.GetProvisionerDaemonsWithStatusByOrganization(context.Background(), database.GetProvisionerDaemonsWithStatusByOrganizationParams{
|
||||
OrganizationID: org.ID,
|
||||
StaleIntervalMS: 60 * time.Minute.Milliseconds(),
|
||||
MaxAgeMs: tc.maxAge,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
require.Len(t, daemons, tc.expectedNum)
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
func TestGetWorkspaceAgentUsageStats(t *testing.T) {
|
||||
|
||||
Reference in New Issue
Block a user