From 96fa23733ef24444f5903b9b9de819bede734694 Mon Sep 17 00:00:00 2001
From: xeniape <xenia.fischer@stackable.tech>
Date: Thu, 12 Jun 2025 14:31:08 +0200
Subject: [PATCH 1/2] chore(zookeeper): remove jmx exporter

---
 zookeeper/Dockerfile                | 11 ---------
 zookeeper/stackable/jmx/server.yaml | 36 -----------------------------
 zookeeper/versions.py               |  1 -
 3 files changed, 48 deletions(-)
 delete mode 100644 zookeeper/stackable/jmx/server.yaml

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 <<EOF
@@ -89,7 +79,6 @@ ln -s /stackable/apache-zookeeper-${PRODUCT}-bin/ /stackable/zookeeper
 chown -h ${STACKABLE_USER_UID}:0 /stackable/zookeeper
 
 # fix missing permissions
-chmod g=u /stackable/jmx
 chmod g=u /stackable/apache-zookeeper-${PRODUCT}-bin/
 EOF
 
diff --git a/zookeeper/stackable/jmx/server.yaml b/zookeeper/stackable/jmx/server.yaml
deleted file mode 100644
index 7b079bc5d..000000000
--- a/zookeeper/stackable/jmx/server.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-rules:
-  # replicated Zookeeper
-  - pattern: "org.apache.ZooKeeperService<name0=ReplicatedServer_id(\\d+)><>(\\w+)"
-    name: "zookeeper_$2"
-    type: GAUGE
-  - pattern: "org.apache.ZooKeeperService<name0=ReplicatedServer_id(\\d+), name1=replica.(\\d+)><>(\\w+)"
-    name: "zookeeper_$3"
-    type: GAUGE
-    labels:
-      replicaId: "$2"
-  - pattern: "org.apache.ZooKeeperService<name0=ReplicatedServer_id(\\d+), name1=replica.(\\d+), name2=(\\w+)><>(Packets\\w+)"
-    name: "zookeeper_$4"
-    type: COUNTER
-    labels:
-      replicaId: "$2"
-      memberType: "$3"
-  - pattern: "org.apache.ZooKeeperService<name0=ReplicatedServer_id(\\d+), name1=replica.(\\d+), name2=(\\w+)><>(\\w+)"
-    name: "zookeeper_$4"
-    type: GAUGE
-    labels:
-      replicaId: "$2"
-      memberType: "$3"
-  - pattern: "org.apache.ZooKeeperService<name0=ReplicatedServer_id(\\d+), name1=replica.(\\d+), name2=(\\w+), name3=(\\w+)><>(\\w+)"
-    name: "zookeeper_$4_$5"
-    type: GAUGE
-    labels:
-      replicaId: "$2"
-      memberType: "$3"
-  # standalone Zookeeper
-  - pattern: "org.apache.ZooKeeperService<name0=StandaloneServer_port(\\d+)><>(\\w+)"
-    type: GAUGE
-    name: "zookeeper_$2"
-  - pattern: "org.apache.ZooKeeperService<name0=StandaloneServer_port(\\d+), name1=InMemoryDataTree><>(\\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",
     },
 ]

From 083609bc582ef1a153b3e40a4fea77d70c149f3c Mon Sep 17 00:00:00 2001
From: xeniape <xenia.fischer@stackable.tech>
Date: Thu, 12 Jun 2025 14:35:13 +0200
Subject: [PATCH 2/2] add changelog entry

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 587d2d138..315fa6fa4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -121,6 +121,7 @@ All notable changes to this project will be documented in this file.
 - nifi: Remove `2.2.0` ([#1114]).
 - kafka: Remove `3.7.1` and `3.8.0` ([#1117]).
 - spark-connect-client: Remove `3.5.5` ([#1142]).
+- zookeeper: Remove jmx exporter ([#1161]).
 
 [nifi-iceberg-bundle]: https://github.com/stackabletech/nifi-iceberg-bundle
 [#1025]: https://github.com/stackabletech/docker-images/pull/1025
@@ -182,6 +183,7 @@ All notable changes to this project will be documented in this file.
 [#1151]: https://github.com/stackabletech/docker-images/pull/1151
 [#1152]: https://github.com/stackabletech/docker-images/pull/1152
 [#1156]: https://github.com/stackabletech/docker-images/pull/1156
+[#1161]: https://github.com/stackabletech/docker-images/pull/1161
 
 ## [25.3.0] - 2025-03-21