diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b8394caf..37ecd583b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -124,6 +124,7 @@ All notable changes to this project will be documented in this file. - kafka: Remove `3.7.1` and `3.8.0` ([#1117]). - spark-connect-client: Remove `3.5.5` ([#1142]). - spark-k8s: Remove the JMX exporter jar ([#1157]). +- zookeeper: Remove jmx exporter ([#1161]). [nifi-iceberg-bundle]: https://github.com/stackabletech/nifi-iceberg-bundle [#1025]: https://github.com/stackabletech/docker-images/pull/1025 @@ -188,6 +189,7 @@ All notable changes to this project will be documented in this file. [#1157]: https://github.com/stackabletech/docker-images/pull/1157 [#1163]: https://github.com/stackabletech/docker-images/pull/1163 [#1165]: https://github.com/stackabletech/docker-images/pull/1165 +[#1161]: https://github.com/stackabletech/docker-images/pull/1161 ## [25.3.0] - 2025-03-21 diff --git a/zookeeper/Dockerfile b/zookeeper/Dockerfile index de157812b..0394f8bc8 100644 --- a/zookeeper/Dockerfile +++ b/zookeeper/Dockerfile @@ -7,14 +7,11 @@ FROM stackable/image/java-devel AS builder ARG PRODUCT -ARG JMX_EXPORTER ARG STACKABLE_USER_UID # Copy patches into the builder COPY --chown=${STACKABLE_USER_UID}:0 zookeeper/stackable/patches/patchable.toml /stackable/src/zookeeper/stackable/patches/patchable.toml COPY --chown=${STACKABLE_USER_UID}:0 zookeeper/stackable/patches/${PRODUCT} /stackable/src/zookeeper/stackable/patches/${PRODUCT} -# Copy JMX config into the builder -COPY --chown=${STACKABLE_USER_UID}:0 zookeeper/stackable/jmx /stackable/jmx USER ${STACKABLE_USER_UID} WORKDIR /stackable @@ -38,12 +35,6 @@ mv zookeeper-assembly/target/bom.json /stackable/apache-zookeeper-${PRODUCT}-bin rm -rf /stackable/apache-zookeeper-${PRODUCT}-bin/docs rm /stackable/apache-zookeeper-${PRODUCT}-bin/README_packaging.md -# Download the JMX exporter jar from our own repo -curl "https://repo.stackable.tech/repository/packages/jmx-exporter/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar" \ - -o "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar" -chmod +x "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar" -ln -s "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar" /stackable/jmx/jmx_prometheus_javaagent.jar - # set correct groups chmod -R g=u /stackable EOF @@ -72,7 +63,6 @@ LABEL \ # Copy over the ZooKeeper binary folder COPY --chown=${STACKABLE_USER_UID}:0 --from=builder /stackable/apache-zookeeper-${PRODUCT}-bin /stackable/apache-zookeeper-${PRODUCT}-bin/ COPY --chown=${STACKABLE_USER_UID}:0 --from=builder /stackable/zookeeper-${PRODUCT}-src.tar.gz /stackable -COPY --chown=${STACKABLE_USER_UID}:0 --from=builder /stackable/jmx /stackable/jmx/ COPY zookeeper/licenses /licenses RUN <<>(\\w+)" - name: "zookeeper_$2" - type: GAUGE - - pattern: "org.apache.ZooKeeperService<>(\\w+)" - name: "zookeeper_$3" - type: GAUGE - labels: - replicaId: "$2" - - pattern: "org.apache.ZooKeeperService<>(Packets\\w+)" - name: "zookeeper_$4" - type: COUNTER - labels: - replicaId: "$2" - memberType: "$3" - - pattern: "org.apache.ZooKeeperService<>(\\w+)" - name: "zookeeper_$4" - type: GAUGE - labels: - replicaId: "$2" - memberType: "$3" - - pattern: "org.apache.ZooKeeperService<>(\\w+)" - name: "zookeeper_$4_$5" - type: GAUGE - labels: - replicaId: "$2" - memberType: "$3" - # standalone Zookeeper - - pattern: "org.apache.ZooKeeperService<>(\\w+)" - type: GAUGE - name: "zookeeper_$2" - - pattern: "org.apache.ZooKeeperService<>(\\w+)" - type: GAUGE - name: "zookeeper_$2" diff --git a/zookeeper/versions.py b/zookeeper/versions.py index d63bfac5a..6a3070601 100644 --- a/zookeeper/versions.py +++ b/zookeeper/versions.py @@ -7,6 +7,5 @@ # zookeeper: Execution spotbugs of goal com.github.spotbugs:spotbugs-maven-plugin:4.0.0:spotbugs failed: Java # returned: 1 -> [Help 1] "java-devel": "11", - "jmx_exporter": "1.3.0", }, ]