Skip to content
Closed
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@
* [ENHANCEMENT] Add extra, **experimental**, KEDA ScaledObject trigger to prevent from down-scaling during OOM kills, if memory trigger is disabled and `$._config.autoscaling_oom_protection_enabled` is true. #13509
* [ENHANCEMENT] Multi-zone: Make config validation exclusions configurable via `multi_zone_config_validation_excluded_args` and `multi_zone_config_validation_excluded_env_vars`, and add validation for multi-zone distributor deployments. #13728
* [BUGFIX] Ingester: Fix `$._config.ingest_storage_ingester_autoscaling_max_owned_series_threshold` default value, to compute it based on the configured `$._config.ingester_instance_limits.max_series`. #13448
* [ENHANCEMENT] Rollout-operator: Extend zone aware pod distribution budget partition regex to include optional `-partition` in pod name. eg `ingester-zone-a-partition-10` is now supported. #13817

### Documentation

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3264,8 +3264,8 @@ metadata:
namespace: default
spec:
maxUnavailable: 1
podNamePartitionRegex: '[a-z\-]+-zone-[a-z]-([0-9]+)'
podNameRegexGroup: 1
podNamePartitionRegex: '[a-z\-]+-zone-[a-z]-(partition\-)?([0-9]+)'
podNameRegexGroup: 2
selector:
matchLabels:
rollout-group: ingester
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3213,8 +3213,8 @@ metadata:
namespace: default
spec:
maxUnavailable: 1
podNamePartitionRegex: '[a-z\-]+-zone-[a-z]-([0-9]+)'
podNameRegexGroup: 1
podNamePartitionRegex: '[a-z\-]+-zone-[a-z]-(partition\-)?([0-9]+)'
podNameRegexGroup: 2
selector:
matchLabels:
rollout-group: ingester
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3195,8 +3195,8 @@ metadata:
namespace: default
spec:
maxUnavailable: 1
podNamePartitionRegex: '[a-z\-]+-zone-[a-z]-([0-9]+)'
podNameRegexGroup: 1
podNamePartitionRegex: '[a-z\-]+-zone-[a-z]-(partition\-)?([0-9]+)'
podNameRegexGroup: 2
selector:
matchLabels:
rollout-group: ingester
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3097,8 +3097,8 @@ metadata:
namespace: default
spec:
maxUnavailable: 1
podNamePartitionRegex: '[a-z\-]+-zone-[a-z]-([0-9]+)'
podNameRegexGroup: 1
podNamePartitionRegex: '[a-z\-]+-zone-[a-z]-(partition\-)?([0-9]+)'
podNameRegexGroup: 2
selector:
matchLabels:
rollout-group: ingester
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3101,8 +3101,8 @@ metadata:
namespace: default
spec:
maxUnavailable: 1
podNamePartitionRegex: '[a-z\-]+-zone-[a-z]-([0-9]+)'
podNameRegexGroup: 1
podNamePartitionRegex: '[a-z\-]+-zone-[a-z]-(partition\-)?([0-9]+)'
podNameRegexGroup: 2
selector:
matchLabels:
rollout-group: ingester
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3151,8 +3151,8 @@ metadata:
namespace: default
spec:
maxUnavailable: 1
podNamePartitionRegex: '[a-z\-]+-zone-[a-z]-([0-9]+)'
podNameRegexGroup: 1
podNamePartitionRegex: '[a-z\-]+-zone-[a-z]-(partition\-)?([0-9]+)'
podNameRegexGroup: 2
selector:
matchLabels:
rollout-group: ingester
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3151,8 +3151,8 @@ metadata:
namespace: default
spec:
maxUnavailable: 1
podNamePartitionRegex: '[a-z\-]+-zone-[a-z]-([0-9]+)'
podNameRegexGroup: 1
podNamePartitionRegex: '[a-z\-]+-zone-[a-z]-(partition\-)?([0-9]+)'
podNameRegexGroup: 2
selector:
matchLabels:
rollout-group: ingester
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2979,8 +2979,8 @@ metadata:
namespace: default
spec:
maxUnavailable: 1
podNamePartitionRegex: '[a-z\-]+-zone-[a-z]-([0-9]+)'
podNameRegexGroup: 1
podNamePartitionRegex: '[a-z\-]+-zone-[a-z]-(partition\-)?([0-9]+)'
podNameRegexGroup: 2
selector:
matchLabels:
rollout-group: ingester
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3264,8 +3264,8 @@ metadata:
namespace: default
spec:
maxUnavailable: 1
podNamePartitionRegex: '[a-z\-]+-zone-[a-z]-([0-9]+)'
podNameRegexGroup: 1
podNamePartitionRegex: '[a-z\-]+-zone-[a-z]-(partition\-)?([0-9]+)'
podNameRegexGroup: 2
selector:
matchLabels:
rollout-group: ingester
Expand Down
4 changes: 2 additions & 2 deletions operations/mimir/multi-zone-ingester.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
multi_zone_ingester_zpdb_max_unavailable: if $._config.ingest_storage_enabled then 1 else std.toString($._config.multi_zone_ingester_max_unavailable),

// the regex to extract the ingester partition identifier from a pod name
multi_zone_ingester_zpdb_partition_regex: if $._config.ingest_storage_enabled then '[a-z\\-]+-zone-[a-z]-([0-9]+)' else '',
multi_zone_ingester_zpdb_partition_regex: if $._config.ingest_storage_enabled then '[a-z\\-]+-zone-[a-z]-(partition\\-)?([0-9]+)' else '',

// the regex subexpression group number - only required if the above regular expression has more then 1 grouping
multi_zone_ingester_zpdb_partition_group: 1,
multi_zone_ingester_zpdb_partition_group: 2,

// Controls whether the multi (virtual) zone ingester should also be deployed multi-AZ.
multi_zone_ingester_multi_az_enabled: false,
Expand Down