Skip to content

feat: expose user seat limits as Prometheus metrics #10169

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 24 commits into from
Oct 13, 2023
Merged

feat: expose user seat limits as Prometheus metrics #10169

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
3fa3258
WIP
mtojek Oct 10, 2023
4048965
WIP
mtojek Oct 10, 2023
fef0939
doTick
mtojek Oct 10, 2023
d1e1bab
Remove fetchEntitlements
mtojek Oct 10, 2023
395d64b
Fix: nolint
mtojek Oct 10, 2023
157cbe1
Unit test
mtojek Oct 10, 2023
3e7cb97
imports
mtojek Oct 10, 2023
4abcd00
Fix: lint
mtojek Oct 10, 2023
9ee99d5
entitled
mtojek Oct 10, 2023
77bd93d
Merge branch 'main' into 9983-license-prometheus
mtojek Oct 10, 2023
b16f1c0
fix: sigsegv
mtojek Oct 10, 2023
366f33a
WIP
mtojek Oct 12, 2023
88cf939
Merge branch 'main' into 9983-license-prometheus-2
mtojek Oct 12, 2023
f1f24be
WIP
mtojek Oct 12, 2023
46d190c
WIP
mtojek Oct 12, 2023
630a115
fix: db
mtojek Oct 12, 2023
cadbaa8
fix
mtojek Oct 12, 2023
d221c46
cleanup
mtojek Oct 12, 2023
073dce9
fix
mtojek Oct 12, 2023
0c6d00e
Collector adjustments
mtojek Oct 12, 2023
b8a969d
Fix tests
mtojek Oct 12, 2023
c4c434e
Given-When-Then
mtojek Oct 12, 2023
433fb7a
Merge branch 'main' into 9983-license-prometheus
mtojek Oct 13, 2023
8845fb3
Use const metrics
mtojek Oct 13, 2023
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
cleanup
  • Loading branch information
@mtojek
mtojek committed Oct 12, 2023
commit d221c464cfdf3f7b6cd9fc756743f6137364182d
1 change: 0 additions & 1 deletion coderd/coderd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,6 @@ func New(options *Options) *API {
if err != nil {
panic(xerrors.Errorf("get deployment ID: %w", err))
}

api := &API{
ctx: ctx,
cancel: cancel,
Expand Down
5 changes: 1 addition & 4 deletions enterprise/coderd/coderd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,6 @@ func New(ctx context.Context, options *Options) (_ *API, err error) {
}
options.Database = cryptDB

licenseMetricsCollector := new(license.MetricsCollector)

api := &API{
ctx: ctx,
cancel: cancelFunc,
Expand All @@ -102,7 +100,7 @@ func New(ctx context.Context, options *Options) (_ *API, err error) {
psk: options.ProvisionerDaemonPSK,
authorizer: options.Authorizer,
},
licenseMetricsCollector: licenseMetricsCollector,
licenseMetricsCollector: new(license.MetricsCollector),
}
defer func() {
if err != nil {
Expand Down Expand Up @@ -368,7 +366,6 @@ func New(ctx context.Context, options *Options) (_ *API, err error) {
if err != nil {
return nil, xerrors.Errorf("initialize proxy health: %w", err)
}

go api.ProxyHealth.Run(ctx)
// Force the initial loading of the cache. Do this in a go routine in case
// the calls to the workspace proxies hang and this takes some time.
Expand Down