diff --git a/components/ws-manager/pkg/manager/metrics.go b/components/ws-manager/pkg/manager/metrics.go index 3dbc4d6c42c9d3..4b10e8d300b904 100644 --- a/components/ws-manager/pkg/manager/metrics.go +++ b/components/ws-manager/pkg/manager/metrics.go @@ -117,25 +117,25 @@ func newMetrics(m *Manager) *metrics { Subsystem: metricsWorkspaceSubsystem, Name: "workspace_backups_total", Help: "total number of workspace backups", - }, []string{"type", "class"}), + }, []string{"type", "pvc", "class"}), totalBackupFailureCounterVec: prometheus.NewCounterVec(prometheus.CounterOpts{ Namespace: metricsNamespace, Subsystem: metricsWorkspaceSubsystem, Name: "workspace_backups_failure_total", Help: "total number of workspace backup failures", - }, []string{"type", "class"}), + }, []string{"type", "pvc", "class"}), totalRestoreCounterVec: prometheus.NewCounterVec(prometheus.CounterOpts{ Namespace: metricsNamespace, Subsystem: metricsWorkspaceSubsystem, Name: "workspace_restores_total", Help: "total number of workspace restores", - }, []string{"type", "class"}), + }, []string{"type", "pvc", "class"}), totalRestoreFailureCounterVec: prometheus.NewCounterVec(prometheus.CounterOpts{ Namespace: metricsNamespace, Subsystem: metricsWorkspaceSubsystem, Name: "workspace_restores_failure_total", Help: "total number of workspace restore failures", - }, []string{"type", "class"}), + }, []string{"type", "pvc", "class"}), totalUnintentionalWorkspaceStopCounterVec: prometheus.NewCounterVec(prometheus.CounterOpts{ Namespace: metricsNamespace, Subsystem: metricsWorkspaceSubsystem, diff --git a/components/ws-manager/pkg/manager/monitor.go b/components/ws-manager/pkg/manager/monitor.go index 0809faf8888a04..07a6707ddfc8bc 100644 --- a/components/ws-manager/pkg/manager/monitor.go +++ b/components/ws-manager/pkg/manager/monitor.go @@ -11,6 +11,7 @@ import ( "fmt" "net/url" "os" + "strconv" "strings" "sync" "time" @@ -903,9 +904,9 @@ func (m *Monitor) initializeWorkspaceContent(ctx context.Context, pod *corev1.Po _, isBackup := initializer.Spec.(*csapi.WorkspaceInitializer_Backup) if isBackup { - m.manager.metrics.totalRestoreCounterVec.WithLabelValues(wsType, wsClass).Inc() + m.manager.metrics.totalRestoreCounterVec.WithLabelValues(wsType, strconv.FormatBool(pvcFeatureEnabled), wsClass).Inc() if err != nil { - m.manager.metrics.totalRestoreFailureCounterVec.WithLabelValues(wsType, wsClass).Inc() + m.manager.metrics.totalRestoreFailureCounterVec.WithLabelValues(wsType, strconv.FormatBool(pvcFeatureEnabled), wsClass).Inc() } } @@ -1304,11 +1305,11 @@ func (m *Monitor) finalizeWorkspaceContent(ctx context.Context, wso *workspaceOb } if doBackup || doSnapshot { - m.manager.metrics.totalBackupCounterVec.WithLabelValues(wsType, wso.Pod.Labels[workspaceClassLabel]).Inc() + m.manager.metrics.totalBackupCounterVec.WithLabelValues(wsType, strconv.FormatBool(pvcFeatureEnabled), wso.Pod.Labels[workspaceClassLabel]).Inc() } if backupError != nil { - m.manager.metrics.totalBackupFailureCounterVec.WithLabelValues(wsType, wso.Pod.Labels[workspaceClassLabel]).Inc() + m.manager.metrics.totalBackupFailureCounterVec.WithLabelValues(wsType, strconv.FormatBool(pvcFeatureEnabled), wso.Pod.Labels[workspaceClassLabel]).Inc() if dataloss { disposalStatus.BackupFailure = backupError.Error()