Skip to content
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.

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

Jsonnet: remove cortex_ prefix from ruler-querier HPA scaling metric #8188

Merged
merged 1 commit into from
May 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
* [ENHANCEMENT] Shuffle-sharding: add `$._config.shuffle_sharding.ingest_storage_partitions_enabled` and `$._config.shuffle_sharding.ingester_partitions_shard_size` options, that allow configuring partitions shard size in ingest-storage mode. #7804
* [ENHANCEMENT] Rollout-operator: upgrade to v0.14.0.
* [ENHANCEMENT] Add `_config.autoscaling_querier_predictive_scaling_enabled` to scale querier based on inflight queries 7 days ago. #7775
* [ENHANCEMENT] Add support to autoscale ruler-querier replicas based on in-flight queries too (in addition to CPU and memory based scaling). #8060
* [ENHANCEMENT] Add support to autoscale ruler-querier replicas based on in-flight queries too (in addition to CPU and memory based scaling). #8060 #8188
* [BUGFIX] Guard against missing samples in KEDA queries. #7691

### Mimirtool
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2384,11 +2384,11 @@ spec:
type: prometheus
- metadata:
ignoreNullValues: "false"
metricName: cortex_ruler_querier_queries_hpa_default
metricName: ruler_querier_queries_hpa_default
query: sum(max_over_time(cortex_query_scheduler_inflight_requests{container="ruler-query-scheduler",namespace="default",quantile="0.5"}[1m]))
serverAddress: http://prometheus.default:9090/prometheus
threshold: "7"
name: cortex_ruler_querier_queries_hpa_default
name: ruler_querier_queries_hpa_default
type: prometheus
---
apiVersion: keda.sh/v1alpha1
Expand Down
4 changes: 2 additions & 2 deletions operations/mimir-tests/test-autoscaling-generated.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2384,11 +2384,11 @@ spec:
type: prometheus
- metadata:
ignoreNullValues: "false"
metricName: cortex_ruler_querier_queries_hpa_default
metricName: ruler_querier_queries_hpa_default
query: sum(max_over_time(cortex_query_scheduler_inflight_requests{container="ruler-query-scheduler",namespace="default",quantile="0.5"}[1m]))
serverAddress: http://prometheus.default:9090/prometheus
threshold: "6"
name: cortex_ruler_querier_queries_hpa_default
name: ruler_querier_queries_hpa_default
type: prometheus
---
apiVersion: keda.sh/v1alpha1
Expand Down
2 changes: 1 addition & 1 deletion operations/mimir/autoscaling.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@
local name = 'ruler-querier-queries',
local querier_max_concurrent = $.ruler_querier_args['querier.max-concurrent'],

metric_name: 'cortex_%s_hpa_%s' % [std.strReplace(name, '-', '_'), $._config.namespace],
metric_name: '%s_hpa_%s' % [std.strReplace(name, '-', '_'), $._config.namespace],

// Each ruler-query-scheduler tracks *at regular intervals* the number of inflight requests
// (both enqueued and processing queries) as a summary. With the following query we target
Expand Down
Loading