Skip to content

Commit b53fedf

Browse files
authored
chore(spark): remove jmx exporter (#1157)
* chore(spark): remove jmx exporter * update changelog
1 parent ecebd07 commit b53fedf

File tree

4 files changed

+2
-146
lines changed

4 files changed

+2
-146
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ All notable changes to this project will be documented in this file.
123123
- nifi: Remove `2.2.0` ([#1114]).
124124
- kafka: Remove `3.7.1` and `3.8.0` ([#1117]).
125125
- spark-connect-client: Remove `3.5.5` ([#1142]).
126+
- spark-k8s: Remove the JMX exporter jar ([#1157]).
126127

127128
[nifi-iceberg-bundle]: https://github.com/stackabletech/nifi-iceberg-bundle
128129
[#1025]: https://github.com/stackabletech/docker-images/pull/1025
@@ -184,6 +185,7 @@ All notable changes to this project will be documented in this file.
184185
[#1151]: https://github.com/stackabletech/docker-images/pull/1151
185186
[#1152]: https://github.com/stackabletech/docker-images/pull/1152
186187
[#1156]: https://github.com/stackabletech/docker-images/pull/1156
188+
[#1157]: https://github.com/stackabletech/docker-images/pull/1157
187189
[#1163]: https://github.com/stackabletech/docker-images/pull/1163
188190
[#1165]: https://github.com/stackabletech/docker-images/pull/1165
189191

spark-k8s/Dockerfile

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ ARG AZURE_KEYVAULT_CORE
131131
ARG JACKSON_DATAFORMAT_XML
132132
ARG STAX2_API
133133
ARG WOODSTOX_CORE
134-
ARG JMX_EXPORTER
135134
ARG TARGETARCH
136135
ARG TINI
137136
ARG STACKABLE_USER_UID
@@ -206,8 +205,6 @@ RUN cp /stackable/spark-${PRODUCT}/connector/connect/server/target/spark-connect
206205
&& cp /stackable/spark-${PRODUCT}/connector/connect/common/target/spark-connect-common_*-${PRODUCT}.jar . \
207206
&& cp /stackable/spark-${PRODUCT}/connector/connect/client/jvm/target/spark-connect-client-jvm_2.12-${PRODUCT}.jar .
208207

209-
COPY spark-k8s/stackable/jmx /stackable/jmx
210-
211208
WORKDIR /stackable/spark-${PRODUCT}/dist/extra-jars
212209

213210
RUN <<EOF
@@ -224,14 +221,8 @@ curl --fail "https://repo.stackable.tech/repository/packages/tini/tini-${TINI}-$
224221
-o /usr/bin/tini
225222
chmod +x /usr/bin/tini
226223

227-
# JMX Exporter
228-
curl --fail "https://repo.stackable.tech/repository/packages/jmx-exporter/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar" \
229-
-o "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar"
230-
ln -s "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar" /stackable/jmx/jmx_prometheus_javaagent.jar
231-
232224
chmod -R g=u /stackable/spark-${PRODUCT}/dist
233225
chmod -R g=u /stackable/spark-${PRODUCT}/assembly/target/bom.json
234-
chmod -R g=u /stackable/jmx
235226
EOF
236227

237228
# TODO: java-base installs the Adoptium dnf repo and the Termurin jre which is not needed here.
@@ -241,7 +232,6 @@ FROM stackable/image/java-base AS final
241232
ARG PRODUCT
242233
ARG PYTHON
243234
ARG RELEASE
244-
ARG JMX_EXPORTER
245235
ARG HBASE_CONNECTOR
246236
ARG STACKABLE_USER_UID
247237

@@ -267,7 +257,6 @@ COPY --chown=${STACKABLE_USER_UID}:0 --from=spark-builder /stackable/spark-${PRO
267257
COPY --chown=${STACKABLE_USER_UID}:0 --from=spark-source-builder /stackable/spark-${PRODUCT}-src.tar.gz /stackable
268258
COPY --chown=${STACKABLE_USER_UID}:0 --from=hbase-connectors-builder /stackable/hbase-connector-${HBASE_CONNECTOR}-src.tar.gz /stackable
269259
COPY --chown=${STACKABLE_USER_UID}:0 --from=spark-builder /stackable/spark-${PRODUCT}/assembly/target/bom.json /stackable/spark/spark-${PRODUCT}.cdx.json
270-
COPY --chown=${STACKABLE_USER_UID}:0 --from=spark-builder /stackable/jmx /stackable/jmx
271260
COPY --from=spark-builder /usr/bin/tini /usr/bin/tini
272261

273262
COPY --chown=${STACKABLE_USER_UID}:0 spark-k8s/stackable/run-spark.sh /stackable/run-spark.sh
@@ -301,7 +290,6 @@ chown -h ${STACKABLE_USER_UID}:0 /stackable/spark/examples/jars/spark-examples.j
301290

302291
# fix permissions
303292
chmod g=u /stackable/spark
304-
chmod g=u /stackable/jmx
305293
chmod g=u /stackable/run-spark.sh
306294
EOF
307295

spark-k8s/stackable/jmx/config.yaml

Lines changed: 0 additions & 132 deletions
This file was deleted.

spark-k8s/versions.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
"stax2_api": "4.2.1", # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.15.2
1414
"woodstox_core": "6.5.1", # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.15.2
1515
"vector": "0.47.0",
16-
"jmx_exporter": "1.3.0",
1716
"tini": "0.19.0",
1817
"hbase_connector": "1.0.1",
1918
},
@@ -31,7 +30,6 @@
3130
"stax2_api": "4.2.1", # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.15.2
3231
"woodstox_core": "6.5.1", # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.15.2
3332
"vector": "0.47.0",
34-
"jmx_exporter": "1.3.0",
3533
"tini": "0.19.0",
3634
"hbase_connector": "1.0.1",
3735
},

0 commit comments

Comments
 (0)