Jsonnet: remove cortex_ prefix from settings (#1552)

Signed-off-by: Marco Pracucci <marco@pracucci.com>

CHANGELOG.md

@@ -837,7 +837,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)

operations/mimir-tests/test-gossip-multi-zone.jsonnet

@@ -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,
   },
 }

operations/mimir-tests/test-multi-zone-with-ongoing-migration.jsonnet

@@ -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,
   },
 }

operations/mimir-tests/test-multi-zone.jsonnet

@@ -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,
   },
 }

operations/mimir/config.libsonnet

@@ -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,

operations/mimir/memberlist.libsonnet

@@ -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.