Skip to content

Commit

Permalink
Improve current feature
Browse files Browse the repository at this point in the history
  • Loading branch information
fjammes committed Jan 10, 2025
1 parent a2b94c1 commit 185821e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 11 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ RUN mkdir $HOME && chown ${spark_uid} $HOME
# Add the Prometheus JMX exporter Java agent jar for exposing metrics sent to the JmxSink to Prometheus.
# 3. Update the version of the JMX exporter agent if needed to v1.0.1 (latest)
ENV JMX_EXPORTER_AGENT_VERSION 0.11.0
ADD https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/${JMX_EXPORTER_AGENT_VERSION}/jmx_prometheus_javaagent-${JMX_EXPORTER_AGENT_VERSION}.jar /prometheus/
RUN chmod 644 /prometheus/jmx_prometheus_javaagent-${JMX_EXPORTER_AGENT_VERSION}.jar
ADD https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/${JMX_EXPORTER_AGENT_VERSION}/jmx_prometheus_javaagent-${JMX_EXPORTER_AGENT_VERSION}.jar /opt/spark/jars
RUN chmod 644 /opt/spark/jars/jmx_prometheus_javaagent-${JMX_EXPORTER_AGENT_VERSION}.jar

USER ${spark_uid}

Expand Down
4 changes: 0 additions & 4 deletions chart/templates/spark-fink-raw2science.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,3 @@ spec:
instances: {{ tpl .Values.raw2science.instances . }}
labels:
version: 3.4.1
# TODO use helm template here
deps:
jars:
- https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.11.0/jmx_prometheus_javaagent-0.11.0.jar
6 changes: 1 addition & 5 deletions chart/templates/spark-fink-stream2raw.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,11 @@ spec:
memory: "512m"
labels:
version: 3.4.1
# TODO use helm template here
deps:
jars:
- https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.11.0/jmx_prometheus_javaagent-0.11.0.jar
monitoring:
exposeDriverMetrics: true
exposeExecutorMetrics: true
prometheus:
# Downloaded in workdir from Dockerfile
jmxExporterJar: "/home/fink/jmx_prometheus_javaagent-0.11.0.jar"
jmxExporterJar: "/opt/spark/jars/jmx_prometheus_javaagent-0.11.0.jar"
port: 8090

0 comments on commit 185821e

Please sign in to comment.