From d0ccc7f0445aac409bba111f7abb97f9e44b2d08 Mon Sep 17 00:00:00 2001 From: Thomas Schubart Date: Wed, 30 Nov 2022 11:02:16 +0000 Subject: [PATCH] [content-service] Log filesystem usage error --- .../pkg/initializer/download.go | 14 +++---- .../content-service/pkg/initializer/git.go | 14 +++---- .../pkg/initializer/initializer.go | 37 +++++++++++-------- .../pkg/initializer/prebuild.go | 12 +++--- .../pkg/initializer/snapshot.go | 14 +++---- components/supervisor/pkg/metrics/reporter.go | 2 +- components/ws-daemon/pkg/content/service.go | 4 +- .../testdata/render/aws-setup/output.golden | 9 +---- .../testdata/render/azure-setup/output.golden | 9 +---- .../render/customization/output.golden | 9 +---- .../render/external-registry/output.golden | 9 +---- .../testdata/render/gcp-setup/output.golden | 9 +---- .../testdata/render/http-proxy/output.golden | 9 +---- .../render/insecure-s3-setup/output.golden | 9 +---- .../testdata/render/kind-ide/output.golden | 9 +---- .../testdata/render/kind-meta/output.golden | 9 +---- .../cmd/testdata/render/minimal/output.golden | 9 +---- .../testdata/render/shortname/output.golden | 9 +---- .../statefulset-customization/output.golden | 9 +---- .../use-pod-security-policies/output.golden | 9 +---- .../render/vsxproxy-pvc/output.golden | 9 +---- .../workspace-requests-limits/output.golden | 9 +---- .../pkg/components/ide-metrics/configmap.go | 5 ++- 23 files changed, 84 insertions(+), 153 deletions(-) diff --git a/components/content-service/pkg/initializer/download.go b/components/content-service/pkg/initializer/download.go index f130f620807a2c..c27f91493e646e 100644 --- a/components/content-service/pkg/initializer/download.go +++ b/components/content-service/pkg/initializer/download.go @@ -49,9 +49,9 @@ func (ws *fileDownloadInitializer) Run(ctx context.Context, mappings []archive.I span, ctx := opentracing.StartSpanFromContext(ctx, "FileDownloadInitializer.Run") defer tracing.FinishSpan(span, &err) start := time.Now() - initialSize, diskErr := getDiskUsage() - if diskErr != nil { - log.WithError(err).Error("could not get disk usage") + initialSize, fsErr := getFsUsage() + if fsErr != nil { + log.WithError(fsErr).Error("could not get disk usage") } for _, info := range ws.FilesInfos { @@ -62,10 +62,10 @@ func (ws *fileDownloadInitializer) Run(ctx context.Context, mappings []archive.I } } - if diskErr == nil { - currentSize, diskErr := getDiskUsage() - if diskErr != nil { - log.WithError(err).Error("could not get disk usage") + if fsErr == nil { + currentSize, fsErr := getFsUsage() + if fsErr != nil { + log.WithError(fsErr).Error("could not get disk usage") } metrics = csapi.InitializerMetrics{csapi.InitializerMetric{ diff --git a/components/content-service/pkg/initializer/git.go b/components/content-service/pkg/initializer/git.go index 23033297243b57..0557e498c27300 100644 --- a/components/content-service/pkg/initializer/git.go +++ b/components/content-service/pkg/initializer/git.go @@ -64,9 +64,9 @@ func (ws *GitInitializer) Run(ctx context.Context, mappings []archive.IDMapping) span.SetTag("isGitWS", isGitWS) defer tracing.FinishSpan(span, &err) start := time.Now() - initialSize, diskErr := getDiskUsage() - if diskErr != nil { - log.WithError(err).Error("could not get disk usage") + initialSize, fsErr := getFsUsage() + if fsErr != nil { + log.WithError(fsErr).Error("could not get disk usage") } src = csapi.WorkspaceInitFromOther @@ -177,10 +177,10 @@ func (ws *GitInitializer) Run(ctx context.Context, mappings []archive.IDMapping) log.WithField("stage", "init").WithField("location", ws.Location).Debug("Git operations complete") - if diskErr == nil { - currentSize, diskErr := getDiskUsage() - if diskErr != nil { - log.WithError(err).Error("could not get disk usage") + if fsErr == nil { + currentSize, fsErr := getFsUsage() + if fsErr != nil { + log.WithError(fsErr).Error("could not get disk usage") } stats = csapi.InitializerMetrics{csapi.InitializerMetric{ diff --git a/components/content-service/pkg/initializer/initializer.go b/components/content-service/pkg/initializer/initializer.go index 6bfe342ab27e18..918a155a351940 100644 --- a/components/content-service/pkg/initializer/initializer.go +++ b/components/content-service/pkg/initializer/initializer.go @@ -67,9 +67,9 @@ func (e CompositeInitializer) Run(ctx context.Context, mappings []archive.IDMapp span, ctx := opentracing.StartSpanFromContext(ctx, "CompositeInitializer.Run") defer tracing.FinishSpan(span, &err) start := time.Now() - initialSize, diskErr := getDiskUsage() - if diskErr != nil { - log.WithError(err).Error("could not get disk usage") + initialSize, fsErr := getFsUsage() + if fsErr != nil { + log.WithError(fsErr).Error("could not get disk usage") } total := []csapi.InitializerMetric{} @@ -81,10 +81,10 @@ func (e CompositeInitializer) Run(ctx context.Context, mappings []archive.IDMapp total = append(total, stats...) } - if diskErr == nil { - currentSize, diskErr := getDiskUsage() - if diskErr != nil { - log.WithError(err).Error("could not get disk usage") + if fsErr == nil { + currentSize, fsErr := getFsUsage() + if fsErr != nil { + log.WithError(fsErr).Error("could not get disk usage") } total = append(total, csapi.InitializerMetric{ @@ -215,9 +215,9 @@ func (bi *fromBackupInitializer) Run(ctx context.Context, mappings []archive.IDM } start := time.Now() - initialSize, diskErr := getDiskUsage() - if diskErr != nil { - log.WithError(err).Error("could not get disk usage") + initialSize, fsErr := getFsUsage() + if fsErr != nil { + log.WithError(fsErr).Error("could not get disk usage") } hasBackup, err := bi.RemoteStorage.Download(ctx, bi.Location, storage.DefaultBackup, mappings) @@ -231,10 +231,10 @@ func (bi *fromBackupInitializer) Run(ctx context.Context, mappings []archive.IDM return src, nil, xerrors.Errorf("cannot restore backup: %w", err) } - if diskErr == nil { - currentSize, diskErr := getDiskUsage() - if diskErr != nil { - log.WithError(err).Error("could not get disk usage") + if fsErr == nil { + currentSize, fsErr := getFsUsage() + if fsErr != nil { + log.WithError(fsErr).Error("could not get disk usage") } stats = csapi.InitializerMetrics{csapi.InitializerMetric{ @@ -574,9 +574,14 @@ func PlaceWorkspaceReadyFile(ctx context.Context, wspath string, initsrc csapi.W return nil } -func getDiskUsage() (uint64, error) { +func getFsUsage() (uint64, error) { var stat syscall.Statfs_t - err := syscall.Statfs("/workspace", &stat) + + err := syscall.Statfs("/dst", &stat) + if os.IsNotExist(err) { + err = syscall.Statfs("/workspace", &stat) + } + if err != nil { return 0, err } diff --git a/components/content-service/pkg/initializer/prebuild.go b/components/content-service/pkg/initializer/prebuild.go index 87d4547938a3f9..228aa6486fac21 100644 --- a/components/content-service/pkg/initializer/prebuild.go +++ b/components/content-service/pkg/initializer/prebuild.go @@ -39,9 +39,9 @@ func (p *PrebuildInitializer) Run(ctx context.Context, mappings []archive.IDMapp span, ctx := opentracing.StartSpanFromContext(ctx, "PrebuildInitializer") defer tracing.FinishSpan(span, &err) startTime := time.Now() - initialSize, diskErr := getDiskUsage() - if diskErr != nil { - log.WithError(err).Error("could not get disk usage") + initialSize, fsErr := getFsUsage() + if fsErr != nil { + log.WithError(fsErr).Error("could not get disk usage") } var spandata []tracelog.Field @@ -109,10 +109,10 @@ func (p *PrebuildInitializer) Run(ctx context.Context, mappings []archive.IDMapp } log.Debug("Initialized workspace with prebuilt snapshot") - if diskErr == nil { - currentSize, err := getDiskUsage() + if fsErr == nil { + currentSize, fsErr := getFsUsage() if err != nil { - log.WithError(err).Error("could not get disk usage") + log.WithError(fsErr).Error("could not get disk usage") } stats = append(stats, csapi.InitializerMetric{ diff --git a/components/content-service/pkg/initializer/snapshot.go b/components/content-service/pkg/initializer/snapshot.go index 3027f40f5fb8fb..84ee1bd35cf47b 100644 --- a/components/content-service/pkg/initializer/snapshot.go +++ b/components/content-service/pkg/initializer/snapshot.go @@ -33,9 +33,9 @@ func (s *SnapshotInitializer) Run(ctx context.Context, mappings []archive.IDMapp span.SetTag("snapshot", s.Snapshot) defer tracing.FinishSpan(span, &err) start := time.Now() - initialSize, diskErr := getDiskUsage() - if diskErr != nil { - log.WithError(err).Error("could not get disk usage") + initialSize, fsErr := getFsUsage() + if fsErr != nil { + log.WithError(fsErr).Error("could not get disk usage") } src = csapi.WorkspaceInitFromBackup @@ -53,10 +53,10 @@ func (s *SnapshotInitializer) Run(ctx context.Context, mappings []archive.IDMapp return src, nil, xerrors.Errorf("did not find snapshot %s", s.Snapshot) } - if diskErr == nil { - currentSize, diskErr := getDiskUsage() - if diskErr == nil { - log.WithError(err).Error("could not get disk usage") + if fsErr == nil { + currentSize, fsErr := getFsUsage() + if fsErr == nil { + log.WithError(fsErr).Error("could not get disk usage") } stats = csapi.InitializerMetrics{csapi.InitializerMetric{ diff --git a/components/supervisor/pkg/metrics/reporter.go b/components/supervisor/pkg/metrics/reporter.go index 20c80c4fd02765..843f7a1fbff77b 100644 --- a/components/supervisor/pkg/metrics/reporter.go +++ b/components/supervisor/pkg/metrics/reporter.go @@ -40,7 +40,7 @@ func NewGrpcMetricsReporter(gitpodHost string) *GrpcMetricsReporter { "grpc_server_started_total": true, "grpc_server_handling_seconds": true, "supervisor_ide_ready_duration_total": true, - "initializer_bytes_second": true, + "supervisor_initializer_bytes_second": true, }, values: make(map[string]float64), addCounter: func(name string, labels map[string]string, value uint64) { diff --git a/components/ws-daemon/pkg/content/service.go b/components/ws-daemon/pkg/content/service.go index 11f309cfcb7613..2429d031a00570 100644 --- a/components/ws-daemon/pkg/content/service.go +++ b/components/ws-daemon/pkg/content/service.go @@ -44,7 +44,7 @@ import ( type metrics struct { BackupWaitingTimeHist prometheus.Histogram BackupWaitingTimeoutCounter prometheus.Counter - InitializerHistogram prometheus.HistogramVec + InitializerHistogram *prometheus.HistogramVec } // WorkspaceService implements the InitService and WorkspaceService @@ -130,7 +130,7 @@ func NewWorkspaceService(ctx context.Context, cfg Config, kubernetesNamespace st metrics: &metrics{ BackupWaitingTimeHist: waitingTimeHist, BackupWaitingTimeoutCounter: waitingTimeoutCounter, - InitializerHistogram: *initializerHistogram, + InitializerHistogram: initializerHistogram, }, // we permit five concurrent backups at any given time, hence the five in the channel backupWorkspaceLimiter: make(chan struct{}, 5), diff --git a/install/installer/cmd/testdata/render/aws-setup/output.golden b/install/installer/cmd/testdata/render/aws-setup/output.golden index aa225a802ddc71..5856e2b0b10b3c 100644 --- a/install/installer/cmd/testdata/render/aws-setup/output.golden +++ b/install/installer/cmd/testdata/render/aws-setup/output.golden @@ -4526,12 +4526,7 @@ data: { "name": "kind", "allowValues": [ - "fileDownload", - "git", - "composite", - "prebuild", - "snapshot", - "fromBackup" + "*" ], "defaultValue": "" } @@ -8748,7 +8743,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: ec425744dc9a6e158a25ec5e5749b4c4e5029d04fab8019ff5ea62d6132e08f6 + gitpod.io/checksum_config: cc52e275885690e10f10dac466a0ffd1e4a4551efa2ee5dcbb5c4c824d987f95 creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/azure-setup/output.golden b/install/installer/cmd/testdata/render/azure-setup/output.golden index 9e8a84efbc4104..1acdfac98fb00c 100644 --- a/install/installer/cmd/testdata/render/azure-setup/output.golden +++ b/install/installer/cmd/testdata/render/azure-setup/output.golden @@ -4443,12 +4443,7 @@ data: { "name": "kind", "allowValues": [ - "fileDownload", - "git", - "composite", - "prebuild", - "snapshot", - "fromBackup" + "*" ], "defaultValue": "" } @@ -8581,7 +8576,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: ec425744dc9a6e158a25ec5e5749b4c4e5029d04fab8019ff5ea62d6132e08f6 + gitpod.io/checksum_config: cc52e275885690e10f10dac466a0ffd1e4a4551efa2ee5dcbb5c4c824d987f95 creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/customization/output.golden b/install/installer/cmd/testdata/render/customization/output.golden index 0f43ee92d1bc89..ac257e4c508bfb 100644 --- a/install/installer/cmd/testdata/render/customization/output.golden +++ b/install/installer/cmd/testdata/render/customization/output.golden @@ -5313,12 +5313,7 @@ data: { "name": "kind", "allowValues": [ - "fileDownload", - "git", - "composite", - "prebuild", - "snapshot", - "fromBackup" + "*" ], "defaultValue": "" } @@ -10096,7 +10091,7 @@ spec: metadata: annotations: gitpod.io: hello - gitpod.io/checksum_config: 60da2ac8d3b80964aafb30e291f2b63ade9a798c4542659059783721d3a5b5b1 + gitpod.io/checksum_config: a87108c855371364faa6d0202ed2bef9c681928e38f7ff2cf90fe79f78caa73f hello: world creationTimestamp: null labels: diff --git a/install/installer/cmd/testdata/render/external-registry/output.golden b/install/installer/cmd/testdata/render/external-registry/output.golden index 89cc45f35f0dd4..026ccfef215fd4 100644 --- a/install/installer/cmd/testdata/render/external-registry/output.golden +++ b/install/installer/cmd/testdata/render/external-registry/output.golden @@ -4584,12 +4584,7 @@ data: { "name": "kind", "allowValues": [ - "fileDownload", - "git", - "composite", - "prebuild", - "snapshot", - "fromBackup" + "*" ], "defaultValue": "" } @@ -9022,7 +9017,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: ec425744dc9a6e158a25ec5e5749b4c4e5029d04fab8019ff5ea62d6132e08f6 + gitpod.io/checksum_config: cc52e275885690e10f10dac466a0ffd1e4a4551efa2ee5dcbb5c4c824d987f95 creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/gcp-setup/output.golden b/install/installer/cmd/testdata/render/gcp-setup/output.golden index 72ca5435a63d91..153caede50df40 100644 --- a/install/installer/cmd/testdata/render/gcp-setup/output.golden +++ b/install/installer/cmd/testdata/render/gcp-setup/output.golden @@ -4414,12 +4414,7 @@ data: { "name": "kind", "allowValues": [ - "fileDownload", - "git", - "composite", - "prebuild", - "snapshot", - "fromBackup" + "*" ], "defaultValue": "" } @@ -8625,7 +8620,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: ec425744dc9a6e158a25ec5e5749b4c4e5029d04fab8019ff5ea62d6132e08f6 + gitpod.io/checksum_config: cc52e275885690e10f10dac466a0ffd1e4a4551efa2ee5dcbb5c4c824d987f95 creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/http-proxy/output.golden b/install/installer/cmd/testdata/render/http-proxy/output.golden index dca0422253a125..5823e3cb34292f 100644 --- a/install/installer/cmd/testdata/render/http-proxy/output.golden +++ b/install/installer/cmd/testdata/render/http-proxy/output.golden @@ -4753,12 +4753,7 @@ data: { "name": "kind", "allowValues": [ - "fileDownload", - "git", - "composite", - "prebuild", - "snapshot", - "fromBackup" + "*" ], "defaultValue": "" } @@ -10107,7 +10102,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: ec425744dc9a6e158a25ec5e5749b4c4e5029d04fab8019ff5ea62d6132e08f6 + gitpod.io/checksum_config: cc52e275885690e10f10dac466a0ffd1e4a4551efa2ee5dcbb5c4c824d987f95 creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/insecure-s3-setup/output.golden b/install/installer/cmd/testdata/render/insecure-s3-setup/output.golden index 1d1a39537611a8..d9edd4d62538bf 100644 --- a/install/installer/cmd/testdata/render/insecure-s3-setup/output.golden +++ b/install/installer/cmd/testdata/render/insecure-s3-setup/output.golden @@ -4664,12 +4664,7 @@ data: { "name": "kind", "allowValues": [ - "fileDownload", - "git", - "composite", - "prebuild", - "snapshot", - "fromBackup" + "*" ], "defaultValue": "" } @@ -9184,7 +9179,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: ec425744dc9a6e158a25ec5e5749b4c4e5029d04fab8019ff5ea62d6132e08f6 + gitpod.io/checksum_config: cc52e275885690e10f10dac466a0ffd1e4a4551efa2ee5dcbb5c4c824d987f95 creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/kind-ide/output.golden b/install/installer/cmd/testdata/render/kind-ide/output.golden index 69fa5ad1c947bb..bb1a7d63e787a4 100644 --- a/install/installer/cmd/testdata/render/kind-ide/output.golden +++ b/install/installer/cmd/testdata/render/kind-ide/output.golden @@ -2274,12 +2274,7 @@ data: { "name": "kind", "allowValues": [ - "fileDownload", - "git", - "composite", - "prebuild", - "snapshot", - "fromBackup" + "*" ], "defaultValue": "" } @@ -3317,7 +3312,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: ec425744dc9a6e158a25ec5e5749b4c4e5029d04fab8019ff5ea62d6132e08f6 + gitpod.io/checksum_config: cc52e275885690e10f10dac466a0ffd1e4a4551efa2ee5dcbb5c4c824d987f95 creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/kind-meta/output.golden b/install/installer/cmd/testdata/render/kind-meta/output.golden index ab884934bd91fa..e2e727822ee4d1 100644 --- a/install/installer/cmd/testdata/render/kind-meta/output.golden +++ b/install/installer/cmd/testdata/render/kind-meta/output.golden @@ -3725,12 +3725,7 @@ data: { "name": "kind", "allowValues": [ - "fileDownload", - "git", - "composite", - "prebuild", - "snapshot", - "fromBackup" + "*" ], "defaultValue": "" } @@ -6647,7 +6642,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: ec425744dc9a6e158a25ec5e5749b4c4e5029d04fab8019ff5ea62d6132e08f6 + gitpod.io/checksum_config: cc52e275885690e10f10dac466a0ffd1e4a4551efa2ee5dcbb5c4c824d987f95 creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/minimal/output.golden b/install/installer/cmd/testdata/render/minimal/output.golden index 69e65a5a69a5c6..3b3b606b3195d2 100644 --- a/install/installer/cmd/testdata/render/minimal/output.golden +++ b/install/installer/cmd/testdata/render/minimal/output.golden @@ -4750,12 +4750,7 @@ data: { "name": "kind", "allowValues": [ - "fileDownload", - "git", - "composite", - "prebuild", - "snapshot", - "fromBackup" + "*" ], "defaultValue": "" } @@ -9302,7 +9297,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: ec425744dc9a6e158a25ec5e5749b4c4e5029d04fab8019ff5ea62d6132e08f6 + gitpod.io/checksum_config: cc52e275885690e10f10dac466a0ffd1e4a4551efa2ee5dcbb5c4c824d987f95 creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/shortname/output.golden b/install/installer/cmd/testdata/render/shortname/output.golden index 9edd1bc9a86802..f278512916cbbd 100644 --- a/install/installer/cmd/testdata/render/shortname/output.golden +++ b/install/installer/cmd/testdata/render/shortname/output.golden @@ -4750,12 +4750,7 @@ data: { "name": "kind", "allowValues": [ - "fileDownload", - "git", - "composite", - "prebuild", - "snapshot", - "fromBackup" + "*" ], "defaultValue": "" } @@ -9302,7 +9297,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: ec425744dc9a6e158a25ec5e5749b4c4e5029d04fab8019ff5ea62d6132e08f6 + gitpod.io/checksum_config: cc52e275885690e10f10dac466a0ffd1e4a4551efa2ee5dcbb5c4c824d987f95 creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/statefulset-customization/output.golden b/install/installer/cmd/testdata/render/statefulset-customization/output.golden index c47414a8a7c57f..529c935e1a20e7 100644 --- a/install/installer/cmd/testdata/render/statefulset-customization/output.golden +++ b/install/installer/cmd/testdata/render/statefulset-customization/output.golden @@ -4762,12 +4762,7 @@ data: { "name": "kind", "allowValues": [ - "fileDownload", - "git", - "composite", - "prebuild", - "snapshot", - "fromBackup" + "*" ], "defaultValue": "" } @@ -9314,7 +9309,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: ec425744dc9a6e158a25ec5e5749b4c4e5029d04fab8019ff5ea62d6132e08f6 + gitpod.io/checksum_config: cc52e275885690e10f10dac466a0ffd1e4a4551efa2ee5dcbb5c4c824d987f95 creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/use-pod-security-policies/output.golden b/install/installer/cmd/testdata/render/use-pod-security-policies/output.golden index 29536970b78d1f..b4d66a3e9cc2cb 100644 --- a/install/installer/cmd/testdata/render/use-pod-security-policies/output.golden +++ b/install/installer/cmd/testdata/render/use-pod-security-policies/output.golden @@ -5083,12 +5083,7 @@ data: { "name": "kind", "allowValues": [ - "fileDownload", - "git", - "composite", - "prebuild", - "snapshot", - "fromBackup" + "*" ], "defaultValue": "" } @@ -9746,7 +9741,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: ec425744dc9a6e158a25ec5e5749b4c4e5029d04fab8019ff5ea62d6132e08f6 + gitpod.io/checksum_config: cc52e275885690e10f10dac466a0ffd1e4a4551efa2ee5dcbb5c4c824d987f95 creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/vsxproxy-pvc/output.golden b/install/installer/cmd/testdata/render/vsxproxy-pvc/output.golden index f0c27c7e5f4711..be20cbec425fd6 100644 --- a/install/installer/cmd/testdata/render/vsxproxy-pvc/output.golden +++ b/install/installer/cmd/testdata/render/vsxproxy-pvc/output.golden @@ -4752,12 +4752,7 @@ data: { "name": "kind", "allowValues": [ - "fileDownload", - "git", - "composite", - "prebuild", - "snapshot", - "fromBackup" + "*" ], "defaultValue": "" } @@ -9292,7 +9287,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: ec425744dc9a6e158a25ec5e5749b4c4e5029d04fab8019ff5ea62d6132e08f6 + gitpod.io/checksum_config: cc52e275885690e10f10dac466a0ffd1e4a4551efa2ee5dcbb5c4c824d987f95 creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/workspace-requests-limits/output.golden b/install/installer/cmd/testdata/render/workspace-requests-limits/output.golden index 458b2785791afe..693455328eff23 100644 --- a/install/installer/cmd/testdata/render/workspace-requests-limits/output.golden +++ b/install/installer/cmd/testdata/render/workspace-requests-limits/output.golden @@ -4753,12 +4753,7 @@ data: { "name": "kind", "allowValues": [ - "fileDownload", - "git", - "composite", - "prebuild", - "snapshot", - "fromBackup" + "*" ], "defaultValue": "" } @@ -9305,7 +9300,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: ec425744dc9a6e158a25ec5e5749b4c4e5029d04fab8019ff5ea62d6132e08f6 + gitpod.io/checksum_config: cc52e275885690e10f10dac466a0ffd1e4a4551efa2ee5dcbb5c4c824d987f95 creationTimestamp: null labels: app: gitpod diff --git a/install/installer/pkg/components/ide-metrics/configmap.go b/install/installer/pkg/components/ide-metrics/configmap.go index e161ab10880e4e..71442f4afacaaf 100644 --- a/install/installer/pkg/components/ide-metrics/configmap.go +++ b/install/installer/pkg/components/ide-metrics/configmap.go @@ -10,6 +10,7 @@ import ( "github.com/gitpod-io/gitpod/ide-metrics-api/config" "github.com/gitpod-io/gitpod/installer/pkg/common" + "github.com/prometheus/client_golang/prometheus" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -249,11 +250,11 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) { { Name: "supervisor_initializer_bytes_second", Help: "initializer speed in bytes per second", - Buckets: []float64{1048576, 2097152, 4194304, 8388608, 16777216, 33554432, 67108864, 134217728, 268435456, 536870912, 1073741824, 2147483648}, + Buckets: prometheus.ExponentialBuckets(1024*1024, 2, 12), Labels: []config.LabelAllowList{ { Name: "kind", - AllowValues: []string{"fileDownload", "git", "composite", "prebuild", "snapshot", "fromBackup"}, + AllowValues: []string{"*"}, }, }, },