Exporter fix (#2099)

* Issue: #0000: updated the alertrules manifests * Issue: #0000: updated the vars * Issue: #0000: added the spark cluster var
project-sunbird · Dec 17, 2020 · 8cc3b55 · 8cc3b55
1 parent ae18860
commit 8cc3b55
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml b/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml
@@ -211,3 +211,7 @@ druid_raw_ingestion_lag_threshold: 200000
 druid_rollup_ingestion_lag_threshold: 200000
 rollup_druid_datasource: ""
 redis_process_names: ""
+
+vault_azure_spark_cluster_http_password: ""
+azure_spark_cluster_http_password: {{ vault_azure_spark_cluster_http_password }}
+
diff --git a/kubernetes/ansible/roles/sunbird-monitoring/templates/azure-ambari-prometheus-exporter.yaml b/kubernetes/ansible/roles/sunbird-monitoring/templates/azure-ambari-prometheus-exporter.yaml
@@ -5,9 +5,9 @@ env:
     # metrics_url - get metrics for all metrics for hdinsight cluster for each component
     metrics_url: "http://{{env}}-spark-cluster.azurehdinsight.net/api/v1/clusters/{{env}}-spark-cluster/host_components?fields=metrics/*"
     # alert_url - get alert count for the cluster (critical,ok etc)
-    alert_url: "http://{{env}}-spark-cluster.azurehdinsight.net/api/v1/clusters/{{env}}-spark-cluster/alerts?format=summary
+    alert_url: "http://{{env}}-spark-cluster.azurehdinsight.net/api/v1/clusters/{{env}}-spark-cluster/alerts?format=summary"
     # cluster_app_history_url - get the history of applications that run so far in cluster
-    app_history_url: "http://{{env}}-spark-cluster.azurehdinsight.net/api/v1/applications
+    app_history_url: "http://{{env}}-spark-cluster.azurehdinsight.net/api/v1/applications"
     # user name for azure hdcluster
     user: admin
     # password for azure hdcluster

diff --git a/kubernetes/helm_charts/monitoring/azure-ambari-prometheus-exporter/templates/alerRules.yaml b/kubernetes/helm_charts/monitoring/azure-ambari-prometheus-exporter/templates/alerRules.yaml
@@ -3,8 +3,9 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   labels:
-    {{- include "azure-ambari-prometheus-exporter.labels" . | nindent 4 }}
-    {{- toYaml .Values.serviceMonitor.labels | nindent 4 }}
+    role: alert-rules
+    app: {{ .Values.serviceMonitorLabels.release }}
+    release: {{ .Values.serviceMonitorLabels.release }}
   name: {{ include "azure-ambari-prometheus-exporter.fullname" . }}-alertrule
   namespace: {{ default .Values.namespace .Release.Namespace  }}
 spec: