fix: pass ansible var for JF (#3061)

kubernetes/helm_charts/monitoring/processing-kafka-exporter/templates/alertRules.yaml

@@ -41,11 +41,21 @@ spec:
         severity: critical
         module: dp
 
-    - alert: kafka_broker_unavailable
+    - alert: kafka_broker_unavailable_processing_cluster
       annotations:
-        summary: {{`"Kafka brokers unavailable"`}}
-        message: "There are only {{`{{humanize $value}}`}} kafka brokers available; Expected count: {{len .Values.kafkaExporter.kafka.servers}}"
-      expr: kafka_brokers < {{ len .Values.kafkaExporter.kafka.servers }}
+        summary: {{`"Kafka brokers unavailable processing cluster"`}}
+        message: "There are only {{`{{humanize $value}}`}} kafka brokers available; Expected count: {{ len .Values.kafkaExporter.kafka.servers }}"
+      expr: kafka_brokers{job="processing-kafka-exporter"} < {{ len .Values.kafkaExporter.kafka.servers }}
+      for: 5m
+      labels:
+        severity: critical
+        module: dp
+        
+    - alert: kafka_broker_unavailable_ingestion_cluster
+      annotations:
+        summary: {{`"Kafka brokers unavailable ingestion cluster "`}}
+        message: "There are only {{`{{humanize $value}}`}} kafka brokers available; Expected count: {{ len .Values.ingestion_cluster_kafka_server_count }}"
+      expr: kafka_brokers{job="ingestion-kafka-exporter"} < {{ len .Values.ingestion_cluster_kafka_server_count }}
       for: 5m
       labels:
         severity: critical

kubernetes/helm_charts/monitoring/processing-kafka-exporter/values.yaml

@@ -3,6 +3,7 @@
 # Declare variables to be passed into your templates.
 
 replicaCount: 1
+ingestion_cluster_kafka_server_count: ["{{ ingestion_cluster_kafka | join('","') }}"]
 
 image:
   repository: danielqsj/kafka-exporter

pipelines/esmapping/Jenkinsfile

@@ -26,7 +26,7 @@ node() {
                 currentWs = sh(returnStdout: true, script: 'pwd').trim()
                 ansiblePlaybook = "${currentWs}/ansible/es-mapping.yml"
                 if (params.indices_name == "all")
-                   ansibleExtraArgs = "--extra-vars \"indices_name=${params.indices_name} ansible_tag=run_all_index_and_mapping\" --vault-password-file /var/lib/jenkins/secrets/vault-pass"
+                   ansibleExtraArgs = "--extra-vars \"indices_name=${params.indices_name} ansible_tag=run_all_index_and_mapping es_files=${params.es_files}\" --vault-password-file /var/lib/jenkins/secrets/vault-pass"
                 else
                    ansibleExtraArgs = "--extra-vars \"indices_name=${params.indices_name} ansible_tag=run_single_index_and_mapping es_files=${params.es_files}\" --vault-password-file /var/lib/jenkins/secrets/vault-pass"
                 values.put('currentWs', currentWs)