Prefix ruler-querier HPA metrics with cortex_

Signed-off-by: Marco Pracucci <[email protected]>
grafana · May 27, 2024 · 7f02510 · 7f02510
1 parent 1c87174
commit 7f02510
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/operations/mimir-tests/test-autoscaling-custom-target-utilization-generated.yaml b/operations/mimir-tests/test-autoscaling-custom-target-utilization-generated.yaml
@@ -2327,7 +2327,7 @@ spec:
   triggers:
   - metadata:
       ignoreNullValues: "false"
-      metricName: ruler_querier_cpu_hpa_default
+      metricName: cortex_ruler_querier_cpu_hpa_default
       query: |
         max_over_time(
           sum(
@@ -2346,11 +2346,11 @@ spec:
         )
       serverAddress: http://prometheus.default:9090/prometheus
       threshold: "178"
-    name: ruler_querier_cpu_hpa_default
+    name: cortex_ruler_querier_cpu_hpa_default
     type: prometheus
   - metadata:
       ignoreNullValues: "false"
-      metricName: ruler_querier_memory_hpa_default
+      metricName: cortex_ruler_querier_memory_hpa_default
       query: |
         max_over_time(
           sum(
@@ -2380,7 +2380,7 @@ spec:
         )
       serverAddress: http://prometheus.default:9090/prometheus
       threshold: "955630223"
-    name: ruler_querier_memory_hpa_default
+    name: cortex_ruler_querier_memory_hpa_default
     type: prometheus
   - metadata:
       ignoreNullValues: "false"

diff --git a/operations/mimir-tests/test-autoscaling-generated.yaml b/operations/mimir-tests/test-autoscaling-generated.yaml
@@ -2327,7 +2327,7 @@ spec:
   triggers:
   - metadata:
       ignoreNullValues: "false"
-      metricName: ruler_querier_cpu_hpa_default
+      metricName: cortex_ruler_querier_cpu_hpa_default
       query: |
         max_over_time(
           sum(
@@ -2346,11 +2346,11 @@ spec:
         )
       serverAddress: http://prometheus.default:9090/prometheus
       threshold: "200"
-    name: ruler_querier_cpu_hpa_default
+    name: cortex_ruler_querier_cpu_hpa_default
     type: prometheus
   - metadata:
       ignoreNullValues: "false"
-      metricName: ruler_querier_memory_hpa_default
+      metricName: cortex_ruler_querier_memory_hpa_default
       query: |
         max_over_time(
           sum(
@@ -2380,7 +2380,7 @@ spec:
         )
       serverAddress: http://prometheus.default:9090/prometheus
       threshold: "1073741824"
-    name: ruler_querier_memory_hpa_default
+    name: cortex_ruler_querier_memory_hpa_default
     type: prometheus
   - metadata:
       ignoreNullValues: "false"

diff --git a/operations/mimir/autoscaling.libsonnet b/operations/mimir/autoscaling.libsonnet
@@ -473,6 +473,7 @@
       max_replicas=$._config.autoscaling_ruler_querier_max_replicas,
       cpu_target_utilization=$._config.autoscaling_ruler_querier_cpu_target_utilization,
       memory_target_utilization=$._config.autoscaling_ruler_querier_memory_target_utilization,
+      with_cortex_prefix=true,
       extra_triggers=if $._config.autoscaling_ruler_querier_workers_target_utilization <= 0 then [] else [
         {
           local name = 'ruler-querier-queries',