selfhosted
/
coder
mirror of https://github.com/coder/coder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: replace owner_email with workspace_owner, change action to workspace_transition (#6337)

This commit is contained in:
Cian Johnston 2023-02-24 04:38:58 +00:00 committed by GitHub
parent 16363fd1ff
commit 473ab208af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
provisionerd/provisionerd.go
View File

@ -162,7 +162,7 @@ func NewMetrics(reg prometheus.Registerer) Metrics {
Subsystem: "", // Explicitly empty to make this a top-level metric.
Name: "workspace_builds_total",
Help: "The number of workspaces started, updated, or deleted.",
}, []string{"owner_email", "workspace_name", "template_name", "template_version", "action", "status"}),
}, []string{"workspace_owner", "workspace_name", "template_name", "template_version", "workspace_transition", "status"}),
},
}
}
@ -353,8 +353,8 @@ func (p *Server) acquireJob(ctx context.Context) {
if build := job.GetWorkspaceBuild(); build != nil {
fields = append(fields,
slog.F("action", build.Metadata.WorkspaceTransition.String()),
slog.F("owner_email", build.Metadata.WorkspaceOwnerEmail),
slog.F("workspace_transition", build.Metadata.WorkspaceTransition.String()),
slog.F("workspace_owner", build.Metadata.WorkspaceOwner),
slog.F("template_name", build.Metadata.TemplateName),
slog.F("template_version", build.Metadata.TemplateVersion),
slog.F("workspace_build_id", build.WorkspaceBuildId),

6
provisionerd/runner/runner.go
View File

@ -118,13 +118,13 @@ func New(
logger := opts.Logger.With(slog.F("job_id", job.JobId))
if build := job.GetWorkspaceBuild(); build != nil {
logger = logger.With(
slog.F("action", build.Metadata.WorkspaceTransition.String()),
slog.F("owner_email", build.Metadata.WorkspaceOwnerEmail),
slog.F("template_name", build.Metadata.TemplateName),
slog.F("template_version", build.Metadata.TemplateVersion),
slog.F("workspace_build_id", build.WorkspaceBuildId),
slog.F("workspace_id", build.Metadata.WorkspaceId),
slog.F("workspace_name", build.Metadata.WorkspaceName),
slog.F("workspace_owner", build.Metadata.WorkspaceOwner),
slog.F("workspace_transition", build.Metadata.WorkspaceTransition.String()),
)
}
@ -178,7 +178,7 @@ func (r *Runner) Run() {
concurrentGauge.Dec()
if build := r.job.GetWorkspaceBuild(); build != nil {
r.metrics.WorkspaceBuilds.WithLabelValues(
build.Metadata.WorkspaceOwnerEmail,
build.Metadata.WorkspaceOwner,
build.Metadata.WorkspaceName,
build.Metadata.TemplateName,
build.Metadata.TemplateVersion,