From 51e54e7ae1eca94bae1783049241676ca2fef4a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <soeren.henning@jku.at>
Date: Tue, 9 Apr 2024 18:04:06 +0200
Subject: [PATCH] Use better maintained JMX Exporter image
---
.../resources/uc1-beam-samza-deployment.yaml | 13 +++----------
.../resources/uc1-hazelcastjet-deployment.yaml | 13 +++----------
.../resources/uc1-kstreams-deployment.yaml | 13 +++----------
.../resources/uc2-beam-samza-deployment.yaml | 13 +++----------
.../resources/uc2-hazelcastjet-deployment.yaml | 13 +++----------
.../resources/uc2-kstreams-deployment.yaml | 13 +++----------
.../resources/uc3-beam-samza-deployment.yaml | 13 +++----------
.../resources/uc3-hazelcastjet-deployment.yaml | 13 +++----------
.../resources/uc3-kstreams-deployment.yaml | 13 +++----------
.../resources/uc4-beam-samza-deployment.yaml | 13 +++----------
.../resources/uc4-hazelcastjet-deployment.yaml | 13 +++----------
.../resources/uc4-kstreams-deployment.yaml | 13 +++----------
12 files changed, 36 insertions(+), 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
index 53c664879..9520cedc0 100644
--- 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/theodolite-benchmarks/definitions/uc1-hazelcastjet/resources/uc1-hazelcastjet-deployment.yaml b/theodolite-benchmarks/definitions/uc1-hazelcastjet/resources/uc1-hazelcastjet-deployment.yaml
index cd2b7b293..0d0a05b04 100644
--- a/theodolite-benchmarks/definitions/uc1-hazelcastjet/resources/uc1-hazelcastjet-deployment.yaml
+++ b/theodolite-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
index 37d9004bb..36f1ce5b4 100644
--- 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
index e8aff588e..627b77df0 100644
--- 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/theodolite-benchmarks/definitions/uc2-hazelcastjet/resources/uc2-hazelcastjet-deployment.yaml b/theodolite-benchmarks/definitions/uc2-hazelcastjet/resources/uc2-hazelcastjet-deployment.yaml
index 3d265bcd8..58ce292bc 100644
--- a/theodolite-benchmarks/definitions/uc2-hazelcastjet/resources/uc2-hazelcastjet-deployment.yaml
+++ b/theodolite-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
index ccd7a5a6e..e492b8dd8 100644
--- 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
index cb26a449b..7347fb4eb 100644
--- 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/theodolite-benchmarks/definitions/uc3-hazelcastjet/resources/uc3-hazelcastjet-deployment.yaml b/theodolite-benchmarks/definitions/uc3-hazelcastjet/resources/uc3-hazelcastjet-deployment.yaml
index 3e66eea00..d25a4008a 100644
--- a/theodolite-benchmarks/definitions/uc3-hazelcastjet/resources/uc3-hazelcastjet-deployment.yaml
+++ b/theodolite-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
index 6da2e5dee..17ecd50cb 100644
--- 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
index f2a00fa85..6233664aa 100644
--- 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/theodolite-benchmarks/definitions/uc4-hazelcastjet/resources/uc4-hazelcastjet-deployment.yaml b/theodolite-benchmarks/definitions/uc4-hazelcastjet/resources/uc4-hazelcastjet-deployment.yaml
index 1cf62cba1..990c8a741 100644
--- a/theodolite-benchmarks/definitions/uc4-hazelcastjet/resources/uc4-hazelcastjet-deployment.yaml
+++ b/theodolite-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
index 848d1d3a1..89c4a0a7f 100644
--- 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:
--
GitLab