Skip to content

feat: add provisionerd prometheus metrics #4909

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 5 commits into from
Nov 5, 2022
Merged

feat: add provisionerd prometheus metrics #4909

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c44dcf6
feat: add provisionerd prometheus metrics
coadler Nov 4, 2022
ee10a50
Merge branch 'main' into colin/pd-metrics
coadler Nov 4, 2022
4212ccf
fixup! Merge branch 'main' into colin/pd-metrics
coadler Nov 4, 2022
b938110
revert prometheusmetrics.go
coadler Nov 4, 2022
a520a17
fixup! revert prometheusmetrics.go
coadler Nov 4, 2022
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
Next Next commit
Merge branch 'main' into colin/pd-metrics
  • Loading branch information
@coadler
coadler committed Nov 4, 2022
commit ee10a502f09f3bb6eee6cb568b80ac24d5be9351
8 changes: 4 additions & 4 deletions coderd/coderd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ type Options struct {
GoogleTokenValidator *idtoken.Validator
GithubOAuth2Config *GithubOAuth2Config
OIDCConfig *OIDCConfig
PrometheusRegisterer prometheus.Registerer
PrometheusRegistry *prometheus.Registry
SecureAuthCookie bool
SSHKeygenAlgorithm gitsshkey.Algorithm
Telemetry telemetry.Reporter
Expand Down Expand Up @@ -132,8 +132,8 @@ func New(options *Options) *API {
if options.Authorizer == nil {
options.Authorizer = rbac.NewAuthorizer()
}
if options.PrometheusRegisterer == nil {
options.PrometheusRegisterer = prometheus.NewRegistry()
if options.PrometheusRegistry == nil {
options.PrometheusRegistry = prometheus.NewRegistry()
}
if options.TailnetCoordinator == nil {
options.TailnetCoordinator = tailnet.NewCoordinator()
Expand Down Expand Up @@ -204,7 +204,7 @@ func New(options *Options) *API {
httpmw.Recover(api.Logger),
httpmw.ExtractRealIP(api.RealIPConfig),
httpmw.Logger(api.Logger),
httpmw.Prometheus(options.PrometheusRegisterer),
httpmw.Prometheus(options.PrometheusRegistry),
// handleSubdomainApplications checks if the first subdomain is a valid
// app URL. If it is, it will serve that application.
api.handleSubdomainApplications(
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.