fix hashmod yaml (#650)

Signed-off-by: Thibault Mange <[email protected]>
rhobs · Nov 10, 2023 · c29b740 · c29b740
1 parent 79e0441
commit c29b740
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 23 deletions.
diff --git a/...services/app-sre-stage-01/rhobs/default/observatorium-metrics-store-default-template.yaml b/...services/app-sre-stage-01/rhobs/default/observatorium-metrics-store-default-template.yaml
@@ -441,9 +441,9 @@ objects:
       -o=jsonpath='{.status.replicas}')\n\n# Logging parameters\necho \"generating
       store hashmod config with ORDINAL_INDEX=${ORDINAL_INDEX} THANOS_STORE_REPLICAS=${STATEFULSET_NAME}
       HOSTNAME=${HOSTNAME} NAMESPACE=${NAMESPACE} THANOS_STORE_REPLICAS=${THANOS_STORE_REPLICAS}\"\n\ncat
-      <<EOF >/tmp/config/hashmod-config.yaml\n- action: hashmod\n    source_labels:
-      [\"__block_id\"]\n    target_label: shard\n    modulus: ${THANOS_STORE_REPLICAS}\n-
-      action: keep\n    source_labels: [\"shard\"]\n    regex: ${ORDINAL_INDEX}\nEOF\n"
+      <<EOF >/tmp/config/hashmod-config.yaml\n- action: hashmod\n  source_labels:\n
+      \   - __block_id\n  target_label: shard\n  modulus: ${THANOS_STORE_REPLICAS}\n-
+      action: keep\n  source_labels:\n    - shard\n  regex: ${ORDINAL_INDEX}\nEOF\n"
   kind: ConfigMap
   metadata:
     creationTimestamp: null

diff --git a/...urces/services/app-sre-stage-01/rhobs/rhel/observatorium-metrics-store-rhel-template.yaml b/...urces/services/app-sre-stage-01/rhobs/rhel/observatorium-metrics-store-rhel-template.yaml
@@ -441,9 +441,9 @@ objects:
       -o=jsonpath='{.status.replicas}')\n\n# Logging parameters\necho \"generating
       store hashmod config with ORDINAL_INDEX=${ORDINAL_INDEX} THANOS_STORE_REPLICAS=${STATEFULSET_NAME}
       HOSTNAME=${HOSTNAME} NAMESPACE=${NAMESPACE} THANOS_STORE_REPLICAS=${THANOS_STORE_REPLICAS}\"\n\ncat
-      <<EOF >/tmp/config/hashmod-config.yaml\n- action: hashmod\n    source_labels:
-      [\"__block_id\"]\n    target_label: shard\n    modulus: ${THANOS_STORE_REPLICAS}\n-
-      action: keep\n    source_labels: [\"shard\"]\n    regex: ${ORDINAL_INDEX}\nEOF\n"
+      <<EOF >/tmp/config/hashmod-config.yaml\n- action: hashmod\n  source_labels:\n
+      \   - __block_id\n  target_label: shard\n  modulus: ${THANOS_STORE_REPLICAS}\n-
+      action: keep\n  source_labels:\n    - shard\n  regex: ${ORDINAL_INDEX}\nEOF\n"
   kind: ConfigMap
   metadata:
     creationTimestamp: null

diff --git a/...ices/app-sre-stage-01/rhobs/telemeter/observatorium-metrics-store-telemeter-template.yaml b/...ices/app-sre-stage-01/rhobs/telemeter/observatorium-metrics-store-telemeter-template.yaml
@@ -441,9 +441,9 @@ objects:
       -o=jsonpath='{.status.replicas}')\n\n# Logging parameters\necho \"generating
       store hashmod config with ORDINAL_INDEX=${ORDINAL_INDEX} THANOS_STORE_REPLICAS=${STATEFULSET_NAME}
       HOSTNAME=${HOSTNAME} NAMESPACE=${NAMESPACE} THANOS_STORE_REPLICAS=${THANOS_STORE_REPLICAS}\"\n\ncat
-      <<EOF >/tmp/config/hashmod-config.yaml\n- action: hashmod\n    source_labels:
-      [\"__block_id\"]\n    target_label: shard\n    modulus: ${THANOS_STORE_REPLICAS}\n-
-      action: keep\n    source_labels: [\"shard\"]\n    regex: ${ORDINAL_INDEX}\nEOF\n"
+      <<EOF >/tmp/config/hashmod-config.yaml\n- action: hashmod\n  source_labels:\n
+      \   - __block_id\n  target_label: shard\n  modulus: ${THANOS_STORE_REPLICAS}\n-
+      action: keep\n  source_labels:\n    - shard\n  regex: ${ORDINAL_INDEX}\nEOF\n"
   kind: ConfigMap
   metadata:
     creationTimestamp: null

diff --git a/...ervices/telemeter-prod-01/rhobs/default/observatorium-metrics-store-default-template.yaml b/...ervices/telemeter-prod-01/rhobs/default/observatorium-metrics-store-default-template.yaml
@@ -441,9 +441,9 @@ objects:
       -o=jsonpath='{.status.replicas}')\n\n# Logging parameters\necho \"generating
       store hashmod config with ORDINAL_INDEX=${ORDINAL_INDEX} THANOS_STORE_REPLICAS=${STATEFULSET_NAME}
       HOSTNAME=${HOSTNAME} NAMESPACE=${NAMESPACE} THANOS_STORE_REPLICAS=${THANOS_STORE_REPLICAS}\"\n\ncat
-      <<EOF >/tmp/config/hashmod-config.yaml\n- action: hashmod\n    source_labels:
-      [\"__block_id\"]\n    target_label: shard\n    modulus: ${THANOS_STORE_REPLICAS}\n-
-      action: keep\n    source_labels: [\"shard\"]\n    regex: ${ORDINAL_INDEX}\nEOF\n"
+      <<EOF >/tmp/config/hashmod-config.yaml\n- action: hashmod\n  source_labels:\n
+      \   - __block_id\n  target_label: shard\n  modulus: ${THANOS_STORE_REPLICAS}\n-
+      action: keep\n  source_labels:\n    - shard\n  regex: ${ORDINAL_INDEX}\nEOF\n"
   kind: ConfigMap
   metadata:
     creationTimestamp: null

diff --git a/...rces/services/telemeter-prod-01/rhobs/rhel/observatorium-metrics-store-rhel-template.yaml b/...rces/services/telemeter-prod-01/rhobs/rhel/observatorium-metrics-store-rhel-template.yaml
@@ -441,9 +441,9 @@ objects:
       -o=jsonpath='{.status.replicas}')\n\n# Logging parameters\necho \"generating
       store hashmod config with ORDINAL_INDEX=${ORDINAL_INDEX} THANOS_STORE_REPLICAS=${STATEFULSET_NAME}
       HOSTNAME=${HOSTNAME} NAMESPACE=${NAMESPACE} THANOS_STORE_REPLICAS=${THANOS_STORE_REPLICAS}\"\n\ncat
-      <<EOF >/tmp/config/hashmod-config.yaml\n- action: hashmod\n    source_labels:
-      [\"__block_id\"]\n    target_label: shard\n    modulus: ${THANOS_STORE_REPLICAS}\n-
-      action: keep\n    source_labels: [\"shard\"]\n    regex: ${ORDINAL_INDEX}\nEOF\n"
+      <<EOF >/tmp/config/hashmod-config.yaml\n- action: hashmod\n  source_labels:\n
+      \   - __block_id\n  target_label: shard\n  modulus: ${THANOS_STORE_REPLICAS}\n-
+      action: keep\n  source_labels:\n    - shard\n  regex: ${ORDINAL_INDEX}\nEOF\n"
   kind: ConfigMap
   metadata:
     creationTimestamp: null

diff --git a/...ces/telemeter-prod-01/rhobs/telemeter/observatorium-metrics-store-telemeter-template.yaml b/...ces/telemeter-prod-01/rhobs/telemeter/observatorium-metrics-store-telemeter-template.yaml
@@ -441,9 +441,9 @@ objects:
       -o=jsonpath='{.status.replicas}')\n\n# Logging parameters\necho \"generating
       store hashmod config with ORDINAL_INDEX=${ORDINAL_INDEX} THANOS_STORE_REPLICAS=${STATEFULSET_NAME}
       HOSTNAME=${HOSTNAME} NAMESPACE=${NAMESPACE} THANOS_STORE_REPLICAS=${THANOS_STORE_REPLICAS}\"\n\ncat
-      <<EOF >/tmp/config/hashmod-config.yaml\n- action: hashmod\n    source_labels:
-      [\"__block_id\"]\n    target_label: shard\n    modulus: ${THANOS_STORE_REPLICAS}\n-
-      action: keep\n    source_labels: [\"shard\"]\n    regex: ${ORDINAL_INDEX}\nEOF\n"
+      <<EOF >/tmp/config/hashmod-config.yaml\n- action: hashmod\n  source_labels:\n
+      \   - __block_id\n  target_label: shard\n  modulus: ${THANOS_STORE_REPLICAS}\n-
+      action: keep\n  source_labels:\n    - shard\n  regex: ${ORDINAL_INDEX}\nEOF\n"
   kind: ConfigMap
   metadata:
     creationTimestamp: null

diff --git a/services_go/observatorium/assets/store-auto-shard-relabel-configMap.sh b/services_go/observatorium/assets/store-auto-shard-relabel-configMap.sh
@@ -12,10 +12,12 @@ echo "generating store hashmod config with ORDINAL_INDEX=${ORDINAL_INDEX} THANOS
 
 cat <<EOF >/tmp/config/hashmod-config.yaml
 - action: hashmod
-    source_labels: ["__block_id"]
-    target_label: shard
-    modulus: ${THANOS_STORE_REPLICAS}
+  source_labels:
+    - __block_id
+  target_label: shard
+  modulus: ${THANOS_STORE_REPLICAS}
 - action: keep
-    source_labels: ["shard"]
-    regex: ${ORDINAL_INDEX}
+  source_labels:
+    - shard
+  regex: ${ORDINAL_INDEX}
 EOF