feat(k8s-values): enable Prometheus metrics

fix indent in template
YotpoLtd · Aug 4, 2020 · 5a0e2cc · 5a0e2cc
1 parent 36d1a42
commit 5a0e2cc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/helm/spark-yotpo/templates/sparkapplication.yaml b/helm/spark-yotpo/templates/sparkapplication.yaml
@@ -138,18 +138,18 @@ spec:
     {{ toYaml .Values.tolerations | indent 6 }}
     {{- end }}
     {{- if .Values.jmxExporterJar }}
-monitoring:
-  exposeDriverMetrics: true
-  exposeExecutorMetrics: true
-  prometheus:
-    port: {{ .Values.jmxPort | default 8090 }}
-    jmxExporterJar: {{ .Values.jmxExporterJar }}
-  {{- end }}
-  {{- if .Values.volumes }}
-volumes:
-  {{ toYaml .Values.volumes | indent 3 }}
-  {{- end }}
-  {{- if .Values.nodeSelector }}
-nodeSelector:
-  {{ toYaml .Values.nodeSelector | indent 4 }}
-  {{- end }}
+  monitoring:
+    exposeDriverMetrics: true
+    exposeExecutorMetrics: true
+    prometheus:
+      port: {{ .Values.jmxPort | default 8090 }}
+      jmxExporterJar: {{ .Values.jmxExporterJar }}
+    {{- end }}
+    {{- if .Values.volumes }}
+  volumes:
+    {{ toYaml .Values.volumes | indent 3 }}
+    {{- end }}
+    {{- if .Values.nodeSelector }}
+  nodeSelector:
+    {{ toYaml .Values.nodeSelector | indent 4 }}
+    {{- end }}
diff --git a/helm/spark-yotpo/values.yaml b/helm/spark-yotpo/values.yaml
@@ -19,6 +19,7 @@ executor:
   coreLimit: 1
   instances: 1
   memory: "512m"
+jmxExporterJar: "/prometheus/jmx_prometheus_javaagent-0.11.0.jar"
 sparkConf:
   spark.executor.logs.rolling.maxRetainedFiles: 0
   spark.executor.logs.rolling.maxSize: 104857600