diff --git a/.github/workflows/test-build-deploy.yml b/.github/workflows/test-build-deploy.yml index a0a97e3a16..be6479a1d2 100644 --- a/.github/workflows/test-build-deploy.yml +++ b/.github/workflows/test-build-deploy.yml @@ -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 diff --git a/development/tsdb-blocks-storage-s3-gossip/docker-compose.yml b/development/tsdb-blocks-storage-s3-gossip/docker-compose.yml index 0bfbc0f6c1..ac87160f36 100644 --- a/development/tsdb-blocks-storage-s3-gossip/docker-compose.yml +++ b/development/tsdb-blocks-storage-s3-gossip/docker-compose.yml @@ -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 diff --git a/development/tsdb-blocks-storage-s3-single-binary/docker-compose.yml b/development/tsdb-blocks-storage-s3-single-binary/docker-compose.yml index ea247084cf..84d890dde6 100644 --- a/development/tsdb-blocks-storage-s3-single-binary/docker-compose.yml +++ b/development/tsdb-blocks-storage-s3-single-binary/docker-compose.yml @@ -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 diff --git a/development/tsdb-blocks-storage-s3/docker-compose.yml b/development/tsdb-blocks-storage-s3/docker-compose.yml index 54d819d745..bc966244cc 100644 --- a/development/tsdb-blocks-storage-s3/docker-compose.yml +++ b/development/tsdb-blocks-storage-s3/docker-compose.yml @@ -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 diff --git a/integration/e2e/images/images.go b/integration/e2e/images/images.go index c2714676b1..450beef9ee 100644 --- a/integration/e2e/images/images.go +++ b/integration/e2e/images/images.go @@ -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" diff --git a/pkg/ingester/metrics.go b/pkg/ingester/metrics.go index 3ad21faad6..e5e038f68c 100644 --- a/pkg/ingester/metrics.go +++ b/pkg/ingester/metrics.go @@ -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{