Jsonnet: rename autoscaling_distributor_[min|max]_replicas to autosca…

…ling_distributor_[min|max]_replicas_per_zone Signed-off-by: Marco Pracucci <[email protected]>
grafana · Nov 25, 2024 · 24834ee · 24834ee
1 parent 289a1ab
commit 24834ee
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -104,6 +104,7 @@
 * [CHANGE] Remove support to set Redis as a cache backend from jsonnet. #9677
 * [CHANGE] Rollout-operator now defaults to storing scaling operation metadata in a Kubernetes ConfigMap. This avoids recursively invoking the admission webhook in some Kubernetes environments. #9699
 * [CHANGE] Update rollout-operator version to 0.20.0. #9995
+* [CHANGE] The configuration options `autoscaling_distributor_min_replicas` and `autoscaling_distributor_max_replicas` has been renamed to `autoscaling_distributor_min_replicas_per_zone` and `autoscaling_distributor_max_replicas_per_zone` respectively. #10019
 * [FEATURE] Add support to deploy distributors in multi availability zones. #9548
 * [FEATURE] Add configuration settings to set the number of Memcached replicas for each type of cache (`memcached_frontend_replicas`, `memcached_index_queries_replicas`, `memcached_chunks_replicas`, `memcached_metadata_replicas`). #9679
 * [ENHANCEMENT] Add `ingest_storage_ingester_autoscaling_triggers` option to specify multiple triggers in ScaledObject created for ingest-store ingester autoscaling. #9422

diff --git a/operations/mimir-tests/test-autoscaling.jsonnet b/operations/mimir-tests/test-autoscaling.jsonnet
@@ -29,8 +29,8 @@ mimir {
     autoscaling_ruler_querier_max_replicas: 30,
 
     autoscaling_distributor_enabled: true,
-    autoscaling_distributor_min_replicas: 3,
-    autoscaling_distributor_max_replicas: 30,
+    autoscaling_distributor_min_replicas_per_zone: 3,
+    autoscaling_distributor_max_replicas_per_zone: 30,
 
     autoscaling_query_frontend_enabled: true,
     autoscaling_query_frontend_min_replicas: 3,

diff --git a/operations/mimir-tests/test-multi-zone-distributor.jsonnet b/operations/mimir-tests/test-multi-zone-distributor.jsonnet
@@ -6,7 +6,7 @@
     multi_zone_availability_zones: availabilityZones,
 
     autoscaling_distributor_enabled: true,
-    autoscaling_distributor_min_replicas: 3,
-    autoscaling_distributor_max_replicas: 30,
+    autoscaling_distributor_min_replicas_per_zone: 3,
+    autoscaling_distributor_max_replicas_per_zone: 30,
   },
 }
diff --git a/operations/mimir/autoscaling.libsonnet b/operations/mimir/autoscaling.libsonnet
@@ -18,8 +18,8 @@
     autoscaling_ruler_querier_workers_target_utilization: 0.75,  // Target to utilize 75% ruler-querier workers on peak traffic, so we have 25% room for higher peaks.
 
     autoscaling_distributor_enabled: false,
-    autoscaling_distributor_min_replicas: error 'you must set autoscaling_distributor_min_replicas in the _config',
-    autoscaling_distributor_max_replicas: error 'you must set autoscaling_distributor_max_replicas in the _config',
+    autoscaling_distributor_min_replicas_per_zone: error 'you must set autoscaling_distributor_min_replicas_per_zone in the _config',
+    autoscaling_distributor_max_replicas_per_zone: error 'you must set autoscaling_distributor_max_replicas_per_zone in the _config',
     autoscaling_distributor_cpu_target_utilization: 1,
     autoscaling_distributor_memory_target_utilization: 1,
 
@@ -551,8 +551,8 @@
       container_name='distributor',
       cpu_requests=$.distributor_container.resources.requests.cpu,
       memory_requests=$.distributor_container.resources.requests.memory,
-      min_replicas=$._config.autoscaling_distributor_min_replicas,
-      max_replicas=$._config.autoscaling_distributor_max_replicas,
+      min_replicas=$._config.autoscaling_distributor_min_replicas_per_zone,
+      max_replicas=$._config.autoscaling_distributor_max_replicas_per_zone,
       cpu_target_utilization=$._config.autoscaling_distributor_cpu_target_utilization,
       memory_target_utilization=$._config.autoscaling_distributor_memory_target_utilization,
       with_cortex_prefix=true,