Skip to content

chore: cherry-pick remaining PRs into 2.22 #17851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
May 15, 2025
+4,494 −1,137
Merged

chore: cherry-pick remaining PRs into 2.22 #17851

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
deb8a42
feat: add `is_prebuild_claim` to distinguish post-claim provisioning …
dannykopping May 12, 2025
ca314ba
chore: add prebuild docs (#17580)
dannykopping May 9, 2025
93ce739
feat: reinitialize agents when a prebuilt workspace is claimed (#17475)
SasSwart May 14, 2025
3027bcf
feat: track resource replacements when claiming a prebuilt workspace …
dannykopping May 14, 2025
fd0a84d
fix: add missing clause for tracking replacements (#17849)
dannykopping May 15, 2025
cef7313
fix: exclude deleted templates from metrics collection (#17839)
evgeniy-scherbina May 15, 2025
7118b57
chore: make lint; make fmt
dannykopping May 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
chore: make lint; make fmt 
Signed-off-by: Danny Kopping <dannykopping@gmail.com>
  • Loading branch information
@dannykopping
dannykopping committed May 15, 2025
commit 7118b578617a1b77c7d6ed7cb273117a0becdd58
10 changes: 5 additions & 5 deletions cli/agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,12 +358,12 @@ func (r *RootCmd) workspaceAgent() *serpent.Command {
SSHMaxTimeout: sshMaxTimeout,
Subsystems: subsystems,

PrometheusRegistry: prometheusRegistry,
BlockFileTransfer: blockFileTransfer,
Execer: execer,
PrometheusRegistry: prometheusRegistry,
BlockFileTransfer: blockFileTransfer,
Execer: execer,

ExperimentalDevcontainersEnabled: experimentalDevcontainersEnabled,
})
ExperimentalDevcontainersEnabled: experimentalDevcontainersEnabled,
})

promHandler := agent.PrometheusMetricsHandler(prometheusRegistry, logger)
prometheusSrvClose := ServeHandler(ctx, logger, promHandler, prometheusAddress, "prometheus")
Expand Down
Loading