Merge branch 'master' into merge-release-1.17.1-to-master

Author: yeya24

.github/workflows/test-build-deploy.yml

@@ -11,7 +11,7 @@ jobs:
   lint:
     runs-on: ubuntu-20.04
     container:
-      image: quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-b37062f16
+      image: quay.io/cortexproject/build-image:node_version_upgrade-60582e680
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
@@ -40,7 +40,7 @@ jobs:
   test:
     runs-on: ubuntu-20.04
     container:
-      image: quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-b37062f16
+      image: quay.io/cortexproject/build-image:node_version_upgrade-60582e680
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
@@ -83,7 +83,7 @@ jobs:
   build:
     runs-on: ubuntu-20.04
     container:
-      image: quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-b37062f16
+      image: quay.io/cortexproject/build-image:node_version_upgrade-60582e680
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
@@ -180,6 +180,7 @@ jobs:
             docker pull quay.io/cortexproject/cortex:v1.15.3
             docker pull quay.io/cortexproject/cortex:v1.16.0
             docker pull quay.io/cortexproject/cortex:v1.16.1
+            docker pull quay.io/cortexproject/cortex:v1.17.0
           fi
           docker pull memcached:1.6.1
           docker pull redis:7.0.4-alpine
@@ -215,14 +216,14 @@ jobs:
         run: |
           touch build-image/.uptodate
           MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations
-          make BUILD_IMAGE=quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-b37062f16 TTY='' configs-integration-test
+          make BUILD_IMAGE=quay.io/cortexproject/build-image:node_version_upgrade-60582e680 TTY='' configs-integration-test
 
   deploy_website:
     needs: [build, test]
     if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex'
     runs-on: ubuntu-20.04
     container:
-      image: quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-b37062f16
+      image: quay.io/cortexproject/build-image:node_version_upgrade-60582e680
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
@@ -264,7 +265,7 @@ jobs:
     if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex'
     runs-on: ubuntu-20.04
     container:
-      image: quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-b37062f16
+      image: quay.io/cortexproject/build-image:node_version_upgrade-60582e680
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2

ADOPTERS.md

@@ -4,7 +4,6 @@ This is the list of organisations that are using Cortex in **production environm
 
 * [Adobe](https://www.adobe.com)
 * [Amazon Web Services (AWS)](https://aws.amazon.com/prometheus)
-* [Apple](https://www.apple.com)
 * [Aspen Mesh](https://aspenmesh.io/)
 * [Buoyant](https://buoyant.io/)
 * [DigitalOcean](https://www.digitalocean.com/)

CHANGELOG.md

@@ -1,6 +1,21 @@
 # Changelog
 
 ## master / unreleased
+* [ENHANCEMENT] Query Frontend/Querier: Added store gateway postings touched count and touched size in Querier stats and log in Query Frontend. #5892
+* [ENHANCEMENT] Query Frontend/Querier: Returns `warnings` on prometheus query responses. #5916
+* [ENHANCEMENT] Ingester: Allowing to configure `-blocks-storage.tsdb.head-compaction-interval` flag up to 30 min and add a jitter on the first head compaction. #5919 #5928
+* [ENHANCEMENT] Distributor: Added `max_inflight_push_requests` config to ingester client to protect distributor from OOMKilled. #5917
+* [ENHANCEMENT] Distributor/Querier: Clean stale per-ingester metrics after ingester restarts. #5930
+* [ENHANCEMENT] Distributor/Ring: Allow disabling detailed ring metrics by ring member. #5931
+* [ENHANCEMENT] KV: Etcd Added etcd.ping-without-stream-allowed parameter to disable/enable  PermitWithoutStream #5933
+* [ENHANCEMENT] Ingester: Add a new `max_series_per_label_set` limit. This limit functions similarly to `max_series_per_metric`, but allowing users to define the maximum number of series per LabelSet. #5950
+* [ENHANCEMENT] Store Gateway: Log gRPC requests together with headers configured in `http_request_headers_to_log`. #5958
+* [ENHANCEMENT] Ingester: Added `upload_compacted_blocks_enabled` config to ingester to parameterize uploading compacted blocks.
+* [CHANGE] Upgrade Dockerfile Node version from 14x to 18x. #5906
+* [CHANGE] Query Frontend/Ruler: Omit empty data field in API response. #5953 #5954
+* [BUGFIX] Configsdb: Fix endline issue in db password. #5920
+* [BUGFIX] Ingester: Fix `user` and `type` labels for the `cortex_ingester_tsdb_head_samples_appended_total` TSDB metric. #5952
+
 
 ## 1.17.1 2024-05-20
 

Makefile

@@ -122,7 +122,7 @@ build-image/$(UPTODATE): build-image/*
 SUDO := $(shell docker info >/dev/null 2>&1 || echo "sudo -E")
 BUILD_IN_CONTAINER := true
 BUILD_IMAGE ?= $(IMAGE_PREFIX)build-image
-LATEST_BUILD_IMAGE_TAG ?= upgrade-go-to-1.21.9-b37062f16
+LATEST_BUILD_IMAGE_TAG ?= node_version_upgrade-60582e680
 
 # TTY is parameterized to allow Google Cloud Builder to run builds,
 # as it currently disallows TTY devices. This value needs to be overridden