grafana
diff --git a/‎CHANGELOG.md
+1 b/‎CHANGELOG.md
+1
diff --git a/‎pkg/frontend/querymiddleware/error_caching.go
+4-4 b/‎pkg/frontend/querymiddleware/error_caching.go
+4-4
@@ -12,6 +12,7 @@
 * [CHANGE] Overrides-exporter: Don't export per-tenant overrides that are set to their default values. #11173
 * [CHANGE] gRPC/HTTP clients: Rename metric `cortex_client_request_invalid_cluster_validation_labels_total` to `cortex_client_invalid_cluster_validation_label_requests_total`. #11237
 * [FEATURE] Distributor: Experimental support for Prometheus Remote-Write 2.0 protocol. Limitations: Created timestamp is ignored, per series metadata is merged on metric family level automatically, ingestion might fail if client sends ProtoBuf fields out of order. The label `version` is added to the metric `cortex_distributor_requests_in_total` with a value of either `1.0` or `2.0` depending on the detected Remote-Write protocol. #11100 #11101 #11192 #11143
+* [FEATURE] Query-frontend: expand `query-frontend.cache-errors` and `query-frontend.results-cache-ttl-for-errors` configuration options to cache non-transient response failures for instant queries. #11120
 * [ENHANCEMENT] Ingester: Add support for exporting native histogram cost attribution metrics (`cortex_ingester_attributed_active_native_histogram_series` and `cortex_ingester_attributed_active_native_histogram_buckets`) with labels specified by customers to a custom Prometheus registry. #10892
 * [ENHANCEMENT] Store-gateway: Download sparse headers uploaded by compactors. Compactors have to be configured with `-compactor.upload-sparse-index-headers=true` option. #10879 #11072.
 * [ENHANCEMENT] Compactor: Upload block index file and multiple segment files concurrently. Concurrency scales linearly with block size up to `-compactor.max-per-block-upload-concurrency`. #10947
 
@@ -161,7 +161,6 @@ func (e *errorCachingHandler) loadErrorFromCache(ctx context.Context, key, hashe
 	}
 
 	return apierror.New(apierror.Type(cachedError.ErrorType), cachedError.ErrorMessage)
-
 }
 
 func (e *errorCachingHandler) storeErrorToCache(key, hashedKey string, ttl time.Duration, apiErr *apierror.APIError, spanLog *spanlogger.SpanLogger) {
@@ -187,11 +186,12 @@ func (e *errorCachingHandler) storeErrorToCache(key, hashedKey string, ttl time.
 }
 
 func (e *errorCachingHandler) isCacheable(apiErr *apierror.APIError) (bool, string) {
-	if apiErr.Type != apierror.TypeBadData && apiErr.Type != apierror.TypeExec && apiErr.Type != apierror.TypeTooLargeEntry {
+	switch apiErr.Type {
+	case apierror.TypeBadData, apierror.TypeExec, apierror.TypeTooLargeEntry:
+		return true, ""
+	default:
 		return false, reasonNotCacheableError
 	}
-
-	return true, ""
 }
 
 func addWithExemplar(ctx context.Context, counter prometheus.Counter, val float64) {
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,6 @@ func (e *errorCachingHandler) loadErrorFromCache(ctx context.Context, key, hashe`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`return apierror.New(apierror.Type(cachedError.ErrorType), cachedError.ErrorMessage)`
`164`		`-`
`165`	`164`	`}`
`166`	`165`
`167`	`166`	`func (e errorCachingHandler) storeErrorToCache(key, hashedKey string, ttl time.Duration, apiErr apierror.APIError, spanLog *spanlogger.SpanLogger) {`
`@@ -187,11 +186,12 @@ func (e *errorCachingHandler) storeErrorToCache(key, hashedKey string, ttl time.`
`187`	`186`	`}`
`188`	`187`
`189`	`188`	`func (e errorCachingHandler) isCacheable(apiErr apierror.APIError) (bool, string) {`
`190`		`- if apiErr.Type != apierror.TypeBadData && apiErr.Type != apierror.TypeExec && apiErr.Type != apierror.TypeTooLargeEntry {`
	`189`	`+ switch apiErr.Type {`
	`190`	`+ case apierror.TypeBadData, apierror.TypeExec, apierror.TypeTooLargeEntry:`
	`191`	`+ return true, ""`
	`192`	`+ default:`
`191`	`193`	`return false, reasonNotCacheableError`
`192`	`194`	`}`
`193`		`-`
`194`		`- return true, ""`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`func addWithExemplar(ctx context.Context, counter prometheus.Counter, val float64) {`