Use better maintained JMX Exporter image

cau-se · Apr 9, 2024 · 51e54e7 · 51e54e7
1 parent 508b2f6
commit 51e54e7
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 120 deletions.
diff --git a/theodolite-benchmarks/definitions/uc1-beam-samza/resources/uc1-beam-samza-deployment.yaml b/theodolite-benchmarks/definitions/uc1-beam-samza/resources/uc1-beam-samza-deployment.yaml
@@ -38,17 +38,10 @@ spec:
               memory: 4Gi
               cpu: 1000m
         - name: prometheus-jmx-exporter
-          image: "solsson/kafka-prometheus-jmx-exporter@sha256:6f82e2b0464f50da8104acd7363fb9b995001ddff77d248379f8788e78946143"
-          command:
-            - java
-            - -XX:+UnlockExperimentalVMOptions
-            - -XX:+UseCGroupMemoryLimitForHeap
-            - -XX:MaxRAMFraction=1
-            - -XshowSettings:vm
-            - -jar
-            - jmx_prometheus_httpserver.jar
+          image: "bitnami/jmx-exporter:0.20.0"
+          args:
             - "5556"
-            - /etc/jmx-aggregation/jmx-prometheus.yml
+            - "/etc/jmx-aggregation/jmx-prometheus.yml"
           ports:
             - containerPort: 5556
           volumeMounts:

diff --git a/...dolite-benchmarks/definitions/uc1-hazelcastjet/resources/uc1-hazelcastjet-deployment.yaml b/...dolite-benchmarks/definitions/uc1-hazelcastjet/resources/uc1-hazelcastjet-deployment.yaml
@@ -36,17 +36,10 @@ spec:
               memory: 4Gi
               cpu: 1000m
         - name: prometheus-jmx-exporter
-          image: "solsson/kafka-prometheus-jmx-exporter@sha256:6f82e2b0464f50da8104acd7363fb9b995001ddff77d248379f8788e78946143"
-          command:
-            - java
-            - -XX:+UnlockExperimentalVMOptions
-            - -XX:+UseCGroupMemoryLimitForHeap
-            - -XX:MaxRAMFraction=1
-            - -XshowSettings:vm
-            - -jar
-            - jmx_prometheus_httpserver.jar
+          image: "bitnami/jmx-exporter:0.20.0"
+          args:
             - "5556"
-            - /etc/jmx-aggregation/jmx-prometheus.yml
+            - "/etc/jmx-aggregation/jmx-prometheus.yml"
           ports:
             - containerPort: 5556
           volumeMounts:

diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-kstreams-deployment.yaml b/theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-kstreams-deployment.yaml
@@ -31,17 +31,10 @@ spec:
               memory: 4Gi
               cpu: 1000m
         - name: prometheus-jmx-exporter
-          image: "solsson/kafka-prometheus-jmx-exporter@sha256:6f82e2b0464f50da8104acd7363fb9b995001ddff77d248379f8788e78946143"
-          command:
-            - java
-            - -XX:+UnlockExperimentalVMOptions
-            - -XX:+UseCGroupMemoryLimitForHeap
-            - -XX:MaxRAMFraction=1
-            - -XshowSettings:vm
-            - -jar
-            - jmx_prometheus_httpserver.jar
+          image: "bitnami/jmx-exporter:0.20.0"
+          args:
             - "5556"
-            - /etc/jmx-aggregation/jmx-kafka-prometheus.yml
+            - "/etc/jmx-aggregation/jmx-kafka-prometheus.yml"
           ports:
             - containerPort: 5556
           volumeMounts:

diff --git a/theodolite-benchmarks/definitions/uc2-beam-samza/resources/uc2-beam-samza-deployment.yaml b/theodolite-benchmarks/definitions/uc2-beam-samza/resources/uc2-beam-samza-deployment.yaml
@@ -38,17 +38,10 @@ spec:
               memory: 4Gi
               cpu: 1000m
         - name: prometheus-jmx-exporter
-          image: "solsson/kafka-prometheus-jmx-exporter@sha256:6f82e2b0464f50da8104acd7363fb9b995001ddff77d248379f8788e78946143"
-          command:
-            - java
-            - -XX:+UnlockExperimentalVMOptions
-            - -XX:+UseCGroupMemoryLimitForHeap
-            - -XX:MaxRAMFraction=1
-            - -XshowSettings:vm
-            - -jar
-            - jmx_prometheus_httpserver.jar
+          image: "bitnami/jmx-exporter:0.20.0"
+          args:
             - "5556"
-            - /etc/jmx-aggregation/jmx-prometheus.yml
+            - "/etc/jmx-aggregation/jmx-prometheus.yml"
           ports:
             - containerPort: 5556
           volumeMounts:

diff --git a/...dolite-benchmarks/definitions/uc2-hazelcastjet/resources/uc2-hazelcastjet-deployment.yaml b/...dolite-benchmarks/definitions/uc2-hazelcastjet/resources/uc2-hazelcastjet-deployment.yaml
@@ -38,17 +38,10 @@ spec:
               memory: 4Gi
               cpu: 1000m
         - name: prometheus-jmx-exporter
-          image: "solsson/kafka-prometheus-jmx-exporter@sha256:6f82e2b0464f50da8104acd7363fb9b995001ddff77d248379f8788e78946143"
-          command:
-            - java
-            - -XX:+UnlockExperimentalVMOptions
-            - -XX:+UseCGroupMemoryLimitForHeap
-            - -XX:MaxRAMFraction=1
-            - -XshowSettings:vm
-            - -jar
-            - jmx_prometheus_httpserver.jar
+          image: "bitnami/jmx-exporter:0.20.0"
+          args:
             - "5556"
-            - /etc/jmx-aggregation/jmx-prometheus.yml
+            - "/etc/jmx-aggregation/jmx-prometheus.yml"
           ports:
             - containerPort: 5556
           volumeMounts:

diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-kstreams-deployment.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-kstreams-deployment.yaml
@@ -31,17 +31,10 @@ spec:
               memory: 4Gi
               cpu: 1000m
         - name: prometheus-jmx-exporter
-          image: "solsson/kafka-prometheus-jmx-exporter@sha256:6f82e2b0464f50da8104acd7363fb9b995001ddff77d248379f8788e78946143"
-          command:
-            - java
-            - -XX:+UnlockExperimentalVMOptions
-            - -XX:+UseCGroupMemoryLimitForHeap
-            - -XX:MaxRAMFraction=1
-            - -XshowSettings:vm
-            - -jar
-            - jmx_prometheus_httpserver.jar
+          image: "bitnami/jmx-exporter:0.20.0"
+          args:
             - "5556"
-            - /etc/jmx-aggregation/jmx-kafka-prometheus.yml
+            - "/etc/jmx-aggregation/jmx-kafka-prometheus.yml"
           ports:
             - containerPort: 5556
           volumeMounts:

diff --git a/theodolite-benchmarks/definitions/uc3-beam-samza/resources/uc3-beam-samza-deployment.yaml b/theodolite-benchmarks/definitions/uc3-beam-samza/resources/uc3-beam-samza-deployment.yaml
@@ -38,17 +38,10 @@ spec:
               memory: 4Gi
               cpu: 1000m
         - name: prometheus-jmx-exporter
-          image: "solsson/kafka-prometheus-jmx-exporter@sha256:6f82e2b0464f50da8104acd7363fb9b995001ddff77d248379f8788e78946143"
-          command:
-            - java
-            - -XX:+UnlockExperimentalVMOptions
-            - -XX:+UseCGroupMemoryLimitForHeap
-            - -XX:MaxRAMFraction=1
-            - -XshowSettings:vm
-            - -jar
-            - jmx_prometheus_httpserver.jar
+          image: "bitnami/jmx-exporter:0.20.0"
+          args:
             - "5556"
-            - /etc/jmx-aggregation/jmx-prometheus.yml
+            - "/etc/jmx-aggregation/jmx-prometheus.yml"
           ports:
             - containerPort: 5556
           volumeMounts:

diff --git a/...dolite-benchmarks/definitions/uc3-hazelcastjet/resources/uc3-hazelcastjet-deployment.yaml b/...dolite-benchmarks/definitions/uc3-hazelcastjet/resources/uc3-hazelcastjet-deployment.yaml
@@ -38,17 +38,10 @@ spec:
               memory: 4Gi
               cpu: 1000m
         - name: prometheus-jmx-exporter
-          image: "solsson/kafka-prometheus-jmx-exporter@sha256:6f82e2b0464f50da8104acd7363fb9b995001ddff77d248379f8788e78946143"
-          command:
-            - java
-            - -XX:+UnlockExperimentalVMOptions
-            - -XX:+UseCGroupMemoryLimitForHeap
-            - -XX:MaxRAMFraction=1
-            - -XshowSettings:vm
-            - -jar
-            - jmx_prometheus_httpserver.jar
+          image: "bitnami/jmx-exporter:0.20.0"
+          args:
             - "5556"
-            - /etc/jmx-aggregation/jmx-prometheus.yml
+            - "/etc/jmx-aggregation/jmx-prometheus.yml"
           ports:
             - containerPort: 5556
           volumeMounts:

diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-kstreams-deployment.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-kstreams-deployment.yaml
@@ -31,17 +31,10 @@ spec:
               memory: 4Gi
               cpu: 1000m
         - name: prometheus-jmx-exporter
-          image: "solsson/kafka-prometheus-jmx-exporter@sha256:6f82e2b0464f50da8104acd7363fb9b995001ddff77d248379f8788e78946143"
-          command:
-            - java
-            - -XX:+UnlockExperimentalVMOptions
-            - -XX:+UseCGroupMemoryLimitForHeap
-            - -XX:MaxRAMFraction=1
-            - -XshowSettings:vm
-            - -jar
-            - jmx_prometheus_httpserver.jar
+          image: "bitnami/jmx-exporter:0.20.0"
+          args:
             - "5556"
-            - /etc/jmx-aggregation/jmx-kafka-prometheus.yml
+            - "/etc/jmx-aggregation/jmx-kafka-prometheus.yml"
           ports:
             - containerPort: 5556
           volumeMounts:

diff --git a/theodolite-benchmarks/definitions/uc4-beam-samza/resources/uc4-beam-samza-deployment.yaml b/theodolite-benchmarks/definitions/uc4-beam-samza/resources/uc4-beam-samza-deployment.yaml
@@ -38,17 +38,10 @@ spec:
               memory: 4Gi
               cpu: 1000m
         - name: prometheus-jmx-exporter
-          image: "solsson/kafka-prometheus-jmx-exporter@sha256:6f82e2b0464f50da8104acd7363fb9b995001ddff77d248379f8788e78946143"
-          command:
-            - java
-            - -XX:+UnlockExperimentalVMOptions
-            - -XX:+UseCGroupMemoryLimitForHeap
-            - -XX:MaxRAMFraction=1
-            - -XshowSettings:vm
-            - -jar
-            - jmx_prometheus_httpserver.jar
+          image: "bitnami/jmx-exporter:0.20.0"
+          args:
             - "5556"
-            - /etc/jmx-aggregation/jmx-prometheus.yml
+            - "/etc/jmx-aggregation/jmx-prometheus.yml"
           ports:
             - containerPort: 5556
           volumeMounts:

diff --git a/...dolite-benchmarks/definitions/uc4-hazelcastjet/resources/uc4-hazelcastjet-deployment.yaml b/...dolite-benchmarks/definitions/uc4-hazelcastjet/resources/uc4-hazelcastjet-deployment.yaml
@@ -38,17 +38,10 @@ spec:
               memory: 4Gi
               cpu: 1000m
         - name: prometheus-jmx-exporter
-          image: "solsson/kafka-prometheus-jmx-exporter@sha256:6f82e2b0464f50da8104acd7363fb9b995001ddff77d248379f8788e78946143"
-          command:
-            - java
-            - -XX:+UnlockExperimentalVMOptions
-            - -XX:+UseCGroupMemoryLimitForHeap
-            - -XX:MaxRAMFraction=1
-            - -XshowSettings:vm
-            - -jar
-            - jmx_prometheus_httpserver.jar
+          image: "bitnami/jmx-exporter:0.20.0"
+          args:
             - "5556"
-            - /etc/jmx-aggregation/jmx-prometheus.yml
+            - "/etc/jmx-aggregation/jmx-prometheus.yml"
           ports:
             - containerPort: 5556
           volumeMounts:

diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-kstreams-deployment.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-kstreams-deployment.yaml
@@ -31,17 +31,10 @@ spec:
               memory: 4Gi
               cpu: 1000m
         - name: prometheus-jmx-exporter
-          image: "solsson/kafka-prometheus-jmx-exporter@sha256:6f82e2b0464f50da8104acd7363fb9b995001ddff77d248379f8788e78946143"
-          command:
-            - java
-            - -XX:+UnlockExperimentalVMOptions
-            - -XX:+UseCGroupMemoryLimitForHeap
-            - -XX:MaxRAMFraction=1
-            - -XshowSettings:vm
-            - -jar
-            - jmx_prometheus_httpserver.jar
+          image: "bitnami/jmx-exporter:0.20.0"
+          args:
             - "5556"
-            - /etc/jmx-aggregation/jmx-kafka-prometheus.yml
+            - "/etc/jmx-aggregation/jmx-kafka-prometheus.yml"
           ports:
             - containerPort: 5556
           volumeMounts: