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.

Sign up for GitHub

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

Jump to bottom

Jsonnet: remove cortex_ prefix from settings #1552

Merged
merged 1 commit into from
Mar 28, 2022
Merged

Jsonnet: remove cortex_ prefix from settings #1552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,7 +847,7 @@ _Changes since `grafana/cortex-jsonnet` `1.9.0`._
},
}
```
* [FEATURE] Added multi-zone ingesters and store-gateways support. #1352
* [FEATURE] Added multi-zone ingesters and store-gateways support. #1352 #1552
* [ENHANCEMENT] Add overrides config to compactor. This allows setting retention configs per user. [#386](https://github.com/grafana/cortex-jsonnet/pull/386)
* [ENHANCEMENT] Added 256MB memory ballast to querier. [#369](https://github.com/grafana/cortex-jsonnet/pull/369)
* [ENHANCEMENT] Update `etcd-operator` to latest version (see https://github.com/grafana/jsonnet-libs/pull/480). [#263](https://github.com/grafana/cortex-jsonnet/pull/263)
Expand Down
8 changes: 4 additions & 4 deletions operations/mimir-tests/test-gossip-multi-zone.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ mimir {
alertmanager_client_type: 'gcs',
alertmanager_gcs_bucket_name: 'alerts-bucket',

cortex_multi_zone_ingester_enabled: true,
cortex_multi_zone_ingester_replicas: 3,
multi_zone_ingester_enabled: true,
multi_zone_ingester_replicas: 3,

cortex_multi_zone_store_gateway_enabled: true,
cortex_multi_zone_store_gateway_replicas: 3,
multi_zone_store_gateway_enabled: true,
multi_zone_store_gateway_replicas: 3,
},
}
12 changes: 6 additions & 6 deletions operations/mimir-tests/test-multi-zone-with-ongoing-migration.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ mimir {
alertmanager_client_type: 'gcs',
alertmanager_gcs_bucket_name: 'alerts-bucket',

cortex_multi_zone_ingester_enabled: true,
cortex_multi_zone_ingester_migration_enabled: true,
cortex_multi_zone_ingester_replicas: 3,
multi_zone_ingester_enabled: true,
multi_zone_ingester_migration_enabled: true,
multi_zone_ingester_replicas: 3,

cortex_multi_zone_store_gateway_enabled: true,
cortex_multi_zone_store_gateway_migration_enabled: true,
cortex_multi_zone_store_gateway_replicas: 3,
multi_zone_store_gateway_enabled: true,
multi_zone_store_gateway_migration_enabled: true,
multi_zone_store_gateway_replicas: 3,
},
}
8 changes: 4 additions & 4 deletions operations/mimir-tests/test-multi-zone.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ mimir {
alertmanager_client_type: 'gcs',
alertmanager_gcs_bucket_name: 'alerts-bucket',

cortex_multi_zone_ingester_enabled: true,
cortex_multi_zone_ingester_replicas: 3,
multi_zone_ingester_enabled: true,
multi_zone_ingester_replicas: 3,

cortex_multi_zone_store_gateway_enabled: true,
cortex_multi_zone_store_gateway_replicas: 3,
multi_zone_store_gateway_enabled: true,
multi_zone_store_gateway_replicas: 3,
},
}
1 change: 0 additions & 1 deletion operations/mimir/config.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
compactor_cleanup_interval: '15m',

// Enable use of bucket index by querier, ruler and store-gateway.
// Bucket index is generated by compactor from Cortex 1.7, there is no flag required to enable this on compactor.
bucket_index_enabled: true,

store_gateway_replication_factor: 3,
Expand Down
16 changes: 8 additions & 8 deletions operations/mimir/memberlist.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,32 +70,32 @@
distributor_deployment+: if !$._config.memberlist_ring_enabled then {} else
gossipLabel,

ingester_statefulset: if $._config.cortex_multi_zone_ingester_enabled && !$._config.cortex_multi_zone_ingester_migration_enabled then null else
ingester_statefulset: if $._config.multi_zone_ingester_enabled && !$._config.multi_zone_ingester_migration_enabled then null else
(super.ingester_statefulset + if !$._config.memberlist_ring_enabled then {} else gossipLabel),

ingester_zone_a_statefulset: if !$._config.cortex_multi_zone_ingester_enabled then null else
ingester_zone_a_statefulset: if !$._config.multi_zone_ingester_enabled then null else
(super.ingester_zone_a_statefulset + if !$._config.memberlist_ring_enabled then {} else gossipLabel),

ingester_zone_b_statefulset: if !$._config.cortex_multi_zone_ingester_enabled then null else
ingester_zone_b_statefulset: if !$._config.multi_zone_ingester_enabled then null else
(super.ingester_zone_b_statefulset + if !$._config.memberlist_ring_enabled then {} else gossipLabel),

ingester_zone_c_statefulset: if !$._config.cortex_multi_zone_ingester_enabled then null else
ingester_zone_c_statefulset: if !$._config.multi_zone_ingester_enabled then null else
(super.ingester_zone_c_statefulset + if !$._config.memberlist_ring_enabled then {} else gossipLabel),

querier_deployment+: if !$._config.memberlist_ring_enabled then {} else gossipLabel,

ruler_deployment+: if !$._config.memberlist_ring_enabled || !$._config.ruler_enabled then {} else gossipLabel,

store_gateway_statefulset: if $._config.cortex_multi_zone_store_gateway_enabled && !$._config.cortex_multi_zone_store_gateway_migration_enabled then null else
store_gateway_statefulset: if $._config.multi_zone_store_gateway_enabled && !$._config.multi_zone_store_gateway_migration_enabled then null else
(super.store_gateway_statefulset + if !$._config.memberlist_ring_enabled then {} else gossipLabel),

store_gateway_zone_a_statefulset: if !$._config.cortex_multi_zone_store_gateway_enabled then null else
store_gateway_zone_a_statefulset: if !$._config.multi_zone_store_gateway_enabled then null else
(super.store_gateway_zone_a_statefulset + if !$._config.memberlist_ring_enabled then {} else gossipLabel),

store_gateway_zone_b_statefulset: if !$._config.cortex_multi_zone_store_gateway_enabled then null else
store_gateway_zone_b_statefulset: if !$._config.multi_zone_store_gateway_enabled then null else
(super.store_gateway_zone_b_statefulset + if !$._config.memberlist_ring_enabled then {} else gossipLabel),

store_gateway_zone_c_statefulset: if !$._config.cortex_multi_zone_store_gateway_enabled then null else
store_gateway_zone_c_statefulset: if !$._config.multi_zone_store_gateway_enabled then null else
(super.store_gateway_zone_c_statefulset + if !$._config.memberlist_ring_enabled then {} else gossipLabel),

// Headless service (= no assigned IP, DNS returns all targets instead) pointing to gossip network members.
Expand Down
Loading