Skip to content

Backport #7858 and #7864 to release-1.22 for rc.2 #7863

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
CharlieTLe merged 2 commits into from
Sep 25, 2026
Merged

Backport #7858 and #7864 to release-1.22 for rc.2 #7863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
271555b
Ingester: fix cortex_ingester_ingestion_delay_seconds losing most obs…
SungJin1212 Sep 22, 2026
76ef7bf
Pull minio from docker.io/cortexproject instead of quay.io
CharlieTLe Sep 25, 2026
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
2 changes: 1 addition & 1 deletion .github/workflows/test-build-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ jobs:
done
}

retry docker pull quay.io/minio/minio:RELEASE.2024-05-28T17-19-04Z
retry docker pull docker.io/cortexproject/minio:RELEASE.2024-07-04T14-25-45Z
retry docker pull consul:1.8.4
retry docker pull quay.io/coreos/etcd:v3.5.29
if [ "$TEST_TAGS" = "integration_backward_compatibility" ]; then
Expand Down
2 changes: 1 addition & 1 deletion development/tsdb-blocks-storage-s3-gossip/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
- 8500:8500

minio:
image: quay.io/minio/minio
image: docker.io/cortexproject/minio:RELEASE.2024-07-04T14-25-45Z
command: [ "server", "/data" ]
environment:
- MINIO_ACCESS_KEY=cortex
Expand Down
2 changes: 1 addition & 1 deletion development/tsdb-blocks-storage-s3-single-binary/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
- 8500:8500

minio:
image: quay.io/minio/minio
image: docker.io/cortexproject/minio:RELEASE.2024-07-04T14-25-45Z
command: [ "server", "/data" ]
environment:
- MINIO_ACCESS_KEY=cortex
Expand Down
2 changes: 1 addition & 1 deletion development/tsdb-blocks-storage-s3/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
- 8500:8500

minio:
image: quay.io/minio/minio
image: docker.io/cortexproject/minio:RELEASE.2024-07-04T14-25-45Z
command: [ "server", "/data" ]
environment:
- MINIO_ACCESS_KEY=cortex
Expand Down
2 changes: 1 addition & 1 deletion integration/e2e/images/images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ package images
var (
Memcached = "memcached:1.6.1"
Redis = "docker.io/redis:7.0.4-alpine"
Minio = "quay.io/minio/minio:RELEASE.2024-05-28T17-19-04Z"
Minio = "docker.io/cortexproject/minio:RELEASE.2024-07-04T14-25-45Z" // Unmodified copy of MinIO's official image; MinIO withdrew its public images.
Consul = "consul:1.8.4"
ETCD = "quay.io/coreos/etcd:v3.5.29"
Prometheus = "quay.io/prometheus/prometheus:v3.9.1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/ingester/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ func newIngesterMetrics(r prometheus.Registerer,
Help: "Delay in seconds between sample ingestion time and sample timestamp.",
NativeHistogramBucketFactor: 1.1,
NativeHistogramMaxBucketNumber: 100,
NativeHistogramMinResetDuration: 1,
NativeHistogramMinResetDuration: 1 * time.Hour,
Buckets: []float64{1, 5, 10, 30, 60, 120, 300, 600}, // 1s, 5s, 10s, 30s, 1m, 2m, 5m, 10m
}, []string{"user"}),
oooLabelsTotal: promauto.With(r).NewCounterVec(prometheus.CounterOpts{
Expand Down