From f8364b18ce10af76cf37f6d135b086a418ce98c6 Mon Sep 17 00:00:00 2001
From: Philipp Schirmer <philipp.schirmer@bakdata.com>
Date: Fri, 21 Feb 2025 16:18:14 +0100
Subject: [PATCH 01/13] Allow flexible configuration of JMX rules

---
 charts/streams-app/README.md                    | 8 ++++----
 charts/streams-app/templates/jmx-configmap.yaml | 5 +----
 charts/streams-app/values.yaml                  | 2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/charts/streams-app/README.md b/charts/streams-app/README.md
index 0da4042f3..f4e869351 100644
--- a/charts/streams-app/README.md
+++ b/charts/streams-app/README.md
@@ -79,10 +79,10 @@ Alternatively, a YAML file that specifies the values for the parameters can be p
 
 ### JMX Configuration
 
-| Parameter         | Description                                       | Default  |
-| ----------------- | ------------------------------------------------- | -------- |
-| `jmx.port`        | The jmx port which JMX style metrics are exposed. | `5555`   |
-| `jmx.metricRules` | List of JMX metric rules.                         | `[".*"]` |
+| Parameter         | Description                                       | Default           |
+|-------------------|---------------------------------------------------|-------------------|
+| `jmx.port`        | The jmx port which JMX style metrics are exposed. | `5555`            |
+| `jmx.metricRules` | List of JMX metric rules.                         | `[pattern: ".*"]` |
 
 ### Prometheus JMX Exporter Configuration
 
diff --git a/charts/streams-app/templates/jmx-configmap.yaml b/charts/streams-app/templates/jmx-configmap.yaml
index 42339d73b..aea02f8f3 100644
--- a/charts/streams-app/templates/jmx-configmap.yaml
+++ b/charts/streams-app/templates/jmx-configmap.yaml
@@ -15,8 +15,5 @@ data:
     lowercaseOutputName: true
     lowercaseOutputLabelNames: true
     ssl: false
-    rules:
-      {{- range .Values.jmx.metricRules}}
-      - pattern: {{ . | quote }}
-      {{- end}}
+    rules: {{ .Values.jmx.metricRules }}
 {{- end }}
diff --git a/charts/streams-app/values.yaml b/charts/streams-app/values.yaml
index d84eaf5cd..2a8ee9750 100644
--- a/charts/streams-app/values.yaml
+++ b/charts/streams-app/values.yaml
@@ -94,7 +94,7 @@ readinessProbe: {}
 jmx:
   port: 5555
   metricRules:
-    - ".*"
+    - pattern: ".*"
 
 autoscaling:
   enabled: false

From ad8fa2ec57947c271e585cc5f8a2f43073d81058 Mon Sep 17 00:00:00 2001
From: Philipp Schirmer <philipp.schirmer@bakdata.com>
Date: Fri, 21 Feb 2025 17:11:52 +0100
Subject: [PATCH 02/13] Allow flexible configuration of JMX rules

---
 charts/streams-app/README.md                 | 16 ++++++++--------
 charts/streams-app/templates/deployment.yaml | 10 +++-------
 charts/streams-app/values.yaml               |  4 ++--
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/charts/streams-app/README.md b/charts/streams-app/README.md
index f4e869351..2cb59f8a1 100644
--- a/charts/streams-app/README.md
+++ b/charts/streams-app/README.md
@@ -86,14 +86,14 @@ Alternatively, a YAML file that specifies the values for the parameters can be p
 
 ### Prometheus JMX Exporter Configuration
 
-| Parameter                        | Description                                                                                                    | Default                                                            |
-| -------------------------------- | -------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------ |
-| `prometheus.jmx.enabled`         | Whether or not to install Prometheus JMX Exporter as a sidecar container and expose JMX metrics to Prometheus. | `true`                                                             |
-| `prometheus.jmx.image`           | Docker Image for Prometheus JMX Exporter container.                                                            | `solsson/kafka-prometheus-jmx-exporter@sha256`                     |
-| `prometheus.jmx.imageTag`        | Docker Image Tag for Prometheus JMX Exporter container.                                                        | `6f82e2b0464f50da8104acd7363fb9b995001ddff77d248379f8788e78946143` |
-| `prometheus.jmx.imagePullPolicy` | Docker Image Pull Policy for Prometheus JMX Exporter container.                                                | `IfNotPresent`                                                     |
-| `prometheus.jmx.port`            | JMX Exporter Port which exposes metrics in Prometheus format for scraping.                                     | `5556`                                                             |
-| `prometheus.jmx.resources`       | JMX Exporter resources configuration.                                                                          | see [values.yaml](values.yaml) for details                         |
+| Parameter                        | Description                                                                                                    | Default                                    |
+|----------------------------------|----------------------------------------------------------------------------------------------------------------|--------------------------------------------|
+| `prometheus.jmx.enabled`         | Whether or not to install Prometheus JMX Exporter as a sidecar container and expose JMX metrics to Prometheus. | `true`                                     |
+| `prometheus.jmx.image`           | Docker Image for Prometheus JMX Exporter container.                                                            | `bitnami/jmx-exporter`                     |
+| `prometheus.jmx.imageTag`        | Docker Image Tag for Prometheus JMX Exporter container.                                                        | `latest`                                   |
+| `prometheus.jmx.imagePullPolicy` | Docker Image Pull Policy for Prometheus JMX Exporter container.                                                | `IfNotPresent`                             |
+| `prometheus.jmx.port`            | JMX Exporter Port which exposes metrics in Prometheus format for scraping.                                     | `5556`                                     |
+| `prometheus.jmx.resources`       | JMX Exporter resources configuration.                                                                          | see [values.yaml](values.yaml) for details |
 
 ### Auto-Scaling
 
diff --git a/charts/streams-app/templates/deployment.yaml b/charts/streams-app/templates/deployment.yaml
index 45d102100..8acddc97b 100644
--- a/charts/streams-app/templates/deployment.yaml
+++ b/charts/streams-app/templates/deployment.yaml
@@ -230,15 +230,11 @@ spec:
         - name: prometheus-jmx-exporter
           image: "{{ .Values.prometheus.jmx.image }}:{{ .Values.prometheus.jmx.imageTag }}"
           command:
-            - java
-            - -XX:+UnlockExperimentalVMOptions
-            - -XX:+UseCGroupMemoryLimitForHeap
-            - -XX:MaxRAMFraction=1
-            - -XshowSettings:vm
-            - -jar
-            - jmx_prometheus_httpserver.jar
             - {{ .Values.prometheus.jmx.port | quote }}
             - /etc/jmx-streams-app/jmx-kafka-streams-app-prometheus.yml
+          env:
+            - name: JAVA_TOOL_OPTIONS
+              value: "-XX:MaxRAMPercentage=90.0 -XshowSettings:vm"
           ports:
             - containerPort: {{ .Values.prometheus.jmx.port }}
           resources:
diff --git a/charts/streams-app/values.yaml b/charts/streams-app/values.yaml
index 2a8ee9750..ab465ea02 100644
--- a/charts/streams-app/values.yaml
+++ b/charts/streams-app/values.yaml
@@ -151,8 +151,8 @@ prometheus:
   ## ref: https://github.com/prometheus/jmx_exporter
   jmx:
     enabled: true
-    image: solsson/kafka-prometheus-jmx-exporter@sha256
-    imageTag: 6f82e2b0464f50da8104acd7363fb9b995001ddff77d248379f8788e78946143
+    image: bitnami/jmx-exporter
+    imageTag: latest
     port: 5556
 
     ## Resources configuration for the JMX exporter container.

From a051d250eaeb7406b9ac9b5515e2f5c39c15a735 Mon Sep 17 00:00:00 2001
From: Philipp Schirmer <philipp.schirmer@bakdata.com>
Date: Fri, 21 Feb 2025 17:39:29 +0100
Subject: [PATCH 03/13] Allow flexible configuration of JMX rules

---
 charts/streams-app/templates/deployment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/streams-app/templates/deployment.yaml b/charts/streams-app/templates/deployment.yaml
index 8acddc97b..527db8490 100644
--- a/charts/streams-app/templates/deployment.yaml
+++ b/charts/streams-app/templates/deployment.yaml
@@ -229,7 +229,7 @@ spec:
       {{- if .Values.prometheus.jmx.enabled }}
         - name: prometheus-jmx-exporter
           image: "{{ .Values.prometheus.jmx.image }}:{{ .Values.prometheus.jmx.imageTag }}"
-          command:
+          args:
             - {{ .Values.prometheus.jmx.port | quote }}
             - /etc/jmx-streams-app/jmx-kafka-streams-app-prometheus.yml
           env:

From 0f274dd3f46c011545f3a3f46adfde5363fdec67 Mon Sep 17 00:00:00 2001
From: Philipp Schirmer <philipp.schirmer@bakdata.com>
Date: Fri, 21 Feb 2025 17:48:43 +0100
Subject: [PATCH 04/13] Allow flexible configuration of JMX rules

---
 charts/streams-app/templates/deployment.yaml    | 2 +-
 charts/streams-app/templates/jmx-configmap.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/streams-app/templates/deployment.yaml b/charts/streams-app/templates/deployment.yaml
index 527db8490..d5030b03e 100644
--- a/charts/streams-app/templates/deployment.yaml
+++ b/charts/streams-app/templates/deployment.yaml
@@ -234,7 +234,7 @@ spec:
             - /etc/jmx-streams-app/jmx-kafka-streams-app-prometheus.yml
           env:
             - name: JAVA_TOOL_OPTIONS
-              value: "-XX:MaxRAMPercentage=90.0 -XshowSettings:vm"
+              value: "-XX:MaxRAMPercentage=90.0"
           ports:
             - containerPort: {{ .Values.prometheus.jmx.port }}
           resources:
diff --git a/charts/streams-app/templates/jmx-configmap.yaml b/charts/streams-app/templates/jmx-configmap.yaml
index aea02f8f3..fbffb87c8 100644
--- a/charts/streams-app/templates/jmx-configmap.yaml
+++ b/charts/streams-app/templates/jmx-configmap.yaml
@@ -15,5 +15,5 @@ data:
     lowercaseOutputName: true
     lowercaseOutputLabelNames: true
     ssl: false
-    rules: {{ .Values.jmx.metricRules }}
+    rules: {{ .Values.jmx.metricRules | quote }}
 {{- end }}

From cf66401b89e10543b4744ce5ec9ffac30305961f Mon Sep 17 00:00:00 2001
From: Philipp Schirmer <philipp.schirmer@bakdata.com>
Date: Fri, 21 Feb 2025 19:04:18 +0100
Subject: [PATCH 05/13] Allow flexible configuration of JMX rules

---
 charts/streams-app/templates/jmx-configmap.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/streams-app/templates/jmx-configmap.yaml b/charts/streams-app/templates/jmx-configmap.yaml
index fbffb87c8..4884489b5 100644
--- a/charts/streams-app/templates/jmx-configmap.yaml
+++ b/charts/streams-app/templates/jmx-configmap.yaml
@@ -15,5 +15,5 @@ data:
     lowercaseOutputName: true
     lowercaseOutputLabelNames: true
     ssl: false
-    rules: {{ .Values.jmx.metricRules | quote }}
+    rules: {{ toYaml .Values.jmx.metricRules | nindent 6 }}
 {{- end }}

From 226ecad156c2e14a0406a5a906adaf3d22467681 Mon Sep 17 00:00:00 2001
From: Philipp Schirmer <philipp.schirmer@bakdata.com>
Date: Fri, 21 Feb 2025 19:25:20 +0100
Subject: [PATCH 06/13] Allow flexible configuration of JMX rules

---
 charts/streams-app/templates/deployment.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/charts/streams-app/templates/deployment.yaml b/charts/streams-app/templates/deployment.yaml
index d5030b03e..1f7cb691a 100644
--- a/charts/streams-app/templates/deployment.yaml
+++ b/charts/streams-app/templates/deployment.yaml
@@ -44,6 +44,7 @@ spec:
       {{- end }}
       {{- if .Values.prometheus.jmx.enabled }}
         prometheus.io/scrape: "true"
+        prometheus.io/path: "/metrics"
         prometheus.io/port: {{ .Values.prometheus.jmx.port | quote }}
       {{- end }}
       {{- range $key, $value := .Values.podAnnotations }}

From 9a00d7da47d0707eaba0f2a0f28fdd2c6c7ce440 Mon Sep 17 00:00:00 2001
From: Philipp Schirmer <philipp.schirmer@bakdata.com>
Date: Fri, 21 Feb 2025 19:39:44 +0100
Subject: [PATCH 07/13] Allow flexible configuration of JMX rules

---
 charts/streams-app/templates/jmx-configmap.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/streams-app/templates/jmx-configmap.yaml b/charts/streams-app/templates/jmx-configmap.yaml
index 4884489b5..fa184be8d 100644
--- a/charts/streams-app/templates/jmx-configmap.yaml
+++ b/charts/streams-app/templates/jmx-configmap.yaml
@@ -15,5 +15,5 @@ data:
     lowercaseOutputName: true
     lowercaseOutputLabelNames: true
     ssl: false
-    rules: {{ toYaml .Values.jmx.metricRules | nindent 6 }}
+    rules: {{ toYaml .Values.jmx.metricRules | nindent 4 }}
 {{- end }}

From 60dc7b3ec3e2896536520573eb47b53e211c196c Mon Sep 17 00:00:00 2001
From: Philipp Schirmer <philipp.schirmer@bakdata.com>
Date: Mon, 24 Feb 2025 07:38:24 +0100
Subject: [PATCH 08/13] Update

---
 charts/producer-app/templates/deployment.yaml |  1 +
 charts/producer-app/templates/job.yaml        |  1 +
 charts/producer-app/templates/pod.yaml        |  1 +
 charts/streams-app/README.md                  | 15 +++++++++++++--
 charts/streams-app/templates/deployment.yaml  |  9 +++------
 charts/streams-app/values.yaml                |  4 ++--
 monitoring/pod_monitor.yaml                   | 14 ++++++++++++++
 7 files changed, 35 insertions(+), 10 deletions(-)
 create mode 100644 monitoring/pod_monitor.yaml

diff --git a/charts/producer-app/templates/deployment.yaml b/charts/producer-app/templates/deployment.yaml
index dceae867c..345b9dc67 100644
--- a/charts/producer-app/templates/deployment.yaml
+++ b/charts/producer-app/templates/deployment.yaml
@@ -12,6 +12,7 @@ metadata:
   labels:
     app: {{ template "producer-app.name" . }}
     chart: {{ template "producer-app.chart" . }}
+    streams-bootstrap/kind: {{ .Chart.Name }}
     release: {{ .Release.Name }}
     {{- range $key, $value := .Values.labels }}
     {{ $key }}: {{ $value }}
diff --git a/charts/producer-app/templates/job.yaml b/charts/producer-app/templates/job.yaml
index bbd729aa1..7d56d8308 100644
--- a/charts/producer-app/templates/job.yaml
+++ b/charts/producer-app/templates/job.yaml
@@ -17,6 +17,7 @@ metadata:
   labels:
     app: {{ template "producer-app.name" . }}
     chart: {{ template "producer-app.chart" . }}
+    streams-bootstrap/kind: {{ .Chart.Name }}
     release: {{ .Release.Name }}
     {{- range $key, $value := .Values.labels }}
     {{ $key }}: {{ $value }}
diff --git a/charts/producer-app/templates/pod.yaml b/charts/producer-app/templates/pod.yaml
index 5a2f6c394..e490e9edc 100644
--- a/charts/producer-app/templates/pod.yaml
+++ b/charts/producer-app/templates/pod.yaml
@@ -12,6 +12,7 @@ metadata:
 {{- end }}
   labels:
     app: {{ template "producer-app.name" . }}
+    streams-bootstrap/kind: {{ .Chart.Name }}
     release: {{ .Release.Name }}
     {{- range $key, $value := .Values.podLabels }}
     {{ $key }}: {{ $value }}
diff --git a/charts/streams-app/README.md b/charts/streams-app/README.md
index 2cb59f8a1..b5c4eb646 100644
--- a/charts/streams-app/README.md
+++ b/charts/streams-app/README.md
@@ -88,13 +88,24 @@ Alternatively, a YAML file that specifies the values for the parameters can be p
 
 | Parameter                        | Description                                                                                                    | Default                                    |
 |----------------------------------|----------------------------------------------------------------------------------------------------------------|--------------------------------------------|
-| `prometheus.jmx.enabled`         | Whether or not to install Prometheus JMX Exporter as a sidecar container and expose JMX metrics to Prometheus. | `true`                                     |
+| `prometheus.jmx.enabled`         | Whether or not to install Prometheus JMX Exporter as a sidecar container and expose JMX metrics to Prometheus. | `false`                                    |
 | `prometheus.jmx.image`           | Docker Image for Prometheus JMX Exporter container.                                                            | `bitnami/jmx-exporter`                     |
-| `prometheus.jmx.imageTag`        | Docker Image Tag for Prometheus JMX Exporter container.                                                        | `latest`                                   |
+| `prometheus.jmx.imageTag`        | Docker Image Tag for Prometheus JMX Exporter container.                                                        | `1.1.0`                                    |
 | `prometheus.jmx.imagePullPolicy` | Docker Image Pull Policy for Prometheus JMX Exporter container.                                                | `IfNotPresent`                             |
 | `prometheus.jmx.port`            | JMX Exporter Port which exposes metrics in Prometheus format for scraping.                                     | `5556`                                     |
 | `prometheus.jmx.resources`       | JMX Exporter resources configuration.                                                                          | see [values.yaml](values.yaml) for details |
 
+Prometheus can scrape your metrics by deploying
+a [PodMonitor](https://github.com/bakdata/streams-bootstrap/blob/master/monitoring/pod_monitor.yaml) or adding pod
+annotations
+
+```yaml
+podAnnotations:
+  prometheus.io/scrape: "true"
+  prometheus.io/path: "/metrics"
+  prometheus.io/port: 5556 # needs to match prometheus.jmx.port
+```
+
 ### Auto-Scaling
 
 | Parameter                        | Description                                                                                                        | Default    |
diff --git a/charts/streams-app/templates/deployment.yaml b/charts/streams-app/templates/deployment.yaml
index 1f7cb691a..89df3200c 100644
--- a/charts/streams-app/templates/deployment.yaml
+++ b/charts/streams-app/templates/deployment.yaml
@@ -19,6 +19,7 @@ metadata:
   labels:
     app: {{ template "streams-app.name" . }}
     chart: {{ template "streams-app.chart" . }}
+    streams-bootstrap/kind: {{ .Chart.Name }}
     release: {{ .Release.Name }}
     {{- range $key, $value := .Values.labels }}
     {{ $key }}: {{ $value }}
@@ -37,22 +38,18 @@ spec:
       release: {{ .Release.Name }}
   template:
     metadata:
-    {{- if or .Values.prometheus.jmx.enabled .Values.podAnnotations .Values.files }}
+    {{- if or .Values.podAnnotations .Values.files }}
       annotations:
       {{- if .Values.files }}
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
       {{- end }}
-      {{- if .Values.prometheus.jmx.enabled }}
-        prometheus.io/scrape: "true"
-        prometheus.io/path: "/metrics"
-        prometheus.io/port: {{ .Values.prometheus.jmx.port | quote }}
-      {{- end }}
       {{- range $key, $value := .Values.podAnnotations }}
         {{ $key | quote }}: {{ $value | quote }}
       {{- end }}
     {{- end }}
       labels:
         app: {{ template "streams-app.name" . }}
+        streams-bootstrap/kind: {{ .Chart.Name }}
         release: {{ .Release.Name }}
         {{- range $key, $value := .Values.podLabels }}
         {{ $key }}: {{ $value }}
diff --git a/charts/streams-app/values.yaml b/charts/streams-app/values.yaml
index ab465ea02..0af04392f 100644
--- a/charts/streams-app/values.yaml
+++ b/charts/streams-app/values.yaml
@@ -150,9 +150,9 @@ prometheus:
   ## JMX Exporter Configuration
   ## ref: https://github.com/prometheus/jmx_exporter
   jmx:
-    enabled: true
+    enabled: false
     image: bitnami/jmx-exporter
-    imageTag: latest
+    imageTag: 1.1.0
     port: 5556
 
     ## Resources configuration for the JMX exporter container.
diff --git a/monitoring/pod_monitor.yaml b/monitoring/pod_monitor.yaml
new file mode 100644
index 000000000..acd3c88e6
--- /dev/null
+++ b/monitoring/pod_monitor.yaml
@@ -0,0 +1,14 @@
+apiVersion: monitoring.coreos.com/v1
+kind: PodMonitor
+metadata:
+  name: kafka-streams
+spec:
+  selector:
+    matchExpressions:
+      - key: "streams-bootstrap/kind"
+        operator: In
+        values:
+          - streams-app
+  podMetricsEndpoints:
+    - path: /metrics
+      targetPort: 5556

From a2e72d9e806a287495126fef1c3ccad7570c8057 Mon Sep 17 00:00:00 2001
From: Philipp Schirmer <philipp.schirmer@bakdata.com>
Date: Mon, 24 Feb 2025 11:38:54 +0100
Subject: [PATCH 09/13] Update

---
 charts/streams-app/README.md                    | 8 ++++----
 charts/streams-app/templates/deployment.yaml    | 4 ----
 charts/streams-app/templates/jmx-configmap.yaml | 2 +-
 charts/streams-app/values.yaml                  | 4 ++--
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/charts/streams-app/README.md b/charts/streams-app/README.md
index b5c4eb646..86bf75db9 100644
--- a/charts/streams-app/README.md
+++ b/charts/streams-app/README.md
@@ -79,10 +79,9 @@ Alternatively, a YAML file that specifies the values for the parameters can be p
 
 ### JMX Configuration
 
-| Parameter         | Description                                       | Default           |
-|-------------------|---------------------------------------------------|-------------------|
-| `jmx.port`        | The jmx port which JMX style metrics are exposed. | `5555`            |
-| `jmx.metricRules` | List of JMX metric rules.                         | `[pattern: ".*"]` |
+| Parameter  | Description                                       | Default |
+|------------|---------------------------------------------------|---------|
+| `jmx.port` | The jmx port which JMX style metrics are exposed. | `5555`  |
 
 ### Prometheus JMX Exporter Configuration
 
@@ -93,6 +92,7 @@ Alternatively, a YAML file that specifies the values for the parameters can be p
 | `prometheus.jmx.imageTag`        | Docker Image Tag for Prometheus JMX Exporter container.                                                        | `1.1.0`                                    |
 | `prometheus.jmx.imagePullPolicy` | Docker Image Pull Policy for Prometheus JMX Exporter container.                                                | `IfNotPresent`                             |
 | `prometheus.jmx.port`            | JMX Exporter Port which exposes metrics in Prometheus format for scraping.                                     | `5556`                                     |
+| `prometheus.jmx.metricRules`     | List of JMX metric rules.                                                                                      | `[pattern: ".*"]`                          |
 | `prometheus.jmx.resources`       | JMX Exporter resources configuration.                                                                          | see [values.yaml](values.yaml) for details |
 
 Prometheus can scrape your metrics by deploying
diff --git a/charts/streams-app/templates/deployment.yaml b/charts/streams-app/templates/deployment.yaml
index 89df3200c..1ef44f22f 100644
--- a/charts/streams-app/templates/deployment.yaml
+++ b/charts/streams-app/templates/deployment.yaml
@@ -103,10 +103,6 @@ spec:
                 fieldRef:
                   fieldPath: metadata.name
           {{- end }}
-          {{- if .Values.prometheus.jmx.enabled }}
-            - name: KAFKA_JMX_PORT
-              value: "{{ .Values.jmx.port }}"
-          {{- end }}
           {{- if not .Values.statefulSet }}
             - name: "{{ .Values.configurationEnvPrefix }}_VOLATILE_GROUP_INSTANCE_ID"
               value: "true"
diff --git a/charts/streams-app/templates/jmx-configmap.yaml b/charts/streams-app/templates/jmx-configmap.yaml
index fa184be8d..53dd2c79e 100644
--- a/charts/streams-app/templates/jmx-configmap.yaml
+++ b/charts/streams-app/templates/jmx-configmap.yaml
@@ -15,5 +15,5 @@ data:
     lowercaseOutputName: true
     lowercaseOutputLabelNames: true
     ssl: false
-    rules: {{ toYaml .Values.jmx.metricRules | nindent 4 }}
+    rules: {{ toYaml .Values.prometheus.jmx.metricRules | nindent 4 }}
 {{- end }}
diff --git a/charts/streams-app/values.yaml b/charts/streams-app/values.yaml
index 0af04392f..176dec237 100644
--- a/charts/streams-app/values.yaml
+++ b/charts/streams-app/values.yaml
@@ -93,8 +93,6 @@ readinessProbe: {}
 ## ref: https://kafka.apache.org/documentation/#connect_monitoring
 jmx:
   port: 5555
-  metricRules:
-    - pattern: ".*"
 
 autoscaling:
   enabled: false
@@ -154,6 +152,8 @@ prometheus:
     image: bitnami/jmx-exporter
     imageTag: 1.1.0
     port: 5556
+    metricRules:
+      - pattern: ".*"
 
     ## Resources configuration for the JMX exporter container.
     ## See the `resources` documentation above for details.

From b60c356ad27b9a05e7caa58f45528908c457e3ce Mon Sep 17 00:00:00 2001
From: Philipp Schirmer <philipp.schirmer@bakdata.com>
Date: Mon, 24 Feb 2025 13:14:57 +0100
Subject: [PATCH 10/13] Update

---
 charts/streams-app/templates/deployment.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/charts/streams-app/templates/deployment.yaml b/charts/streams-app/templates/deployment.yaml
index 1ef44f22f..63bc66142 100644
--- a/charts/streams-app/templates/deployment.yaml
+++ b/charts/streams-app/templates/deployment.yaml
@@ -231,6 +231,7 @@ spec:
               value: "-XX:MaxRAMPercentage=90.0"
           ports:
             - containerPort: {{ .Values.prometheus.jmx.port }}
+              name: prometheus
           resources:
 {{ toYaml .Values.prometheus.jmx.resources | indent 12 }}
           volumeMounts:

From 5f937bcf9c49f27f6bd93bd14920087be16047ce Mon Sep 17 00:00:00 2001
From: Philipp Schirmer <philipp.schirmer@bakdata.com>
Date: Mon, 24 Feb 2025 13:18:13 +0100
Subject: [PATCH 11/13] Update

---
 charts/streams-app/templates/deployment.yaml | 1 +
 charts/streams-app/values.yaml               | 1 +
 2 files changed, 2 insertions(+)

diff --git a/charts/streams-app/templates/deployment.yaml b/charts/streams-app/templates/deployment.yaml
index 63bc66142..f6320fc59 100644
--- a/charts/streams-app/templates/deployment.yaml
+++ b/charts/streams-app/templates/deployment.yaml
@@ -223,6 +223,7 @@ spec:
       {{- if .Values.prometheus.jmx.enabled }}
         - name: prometheus-jmx-exporter
           image: "{{ .Values.prometheus.jmx.image }}:{{ .Values.prometheus.jmx.imageTag }}"
+          imagePullPolicy: "{{ .Values.prometheus.jmx.imagePullPolicy }}"
           args:
             - {{ .Values.prometheus.jmx.port | quote }}
             - /etc/jmx-streams-app/jmx-kafka-streams-app-prometheus.yml
diff --git a/charts/streams-app/values.yaml b/charts/streams-app/values.yaml
index 176dec237..a1a21f4f5 100644
--- a/charts/streams-app/values.yaml
+++ b/charts/streams-app/values.yaml
@@ -151,6 +151,7 @@ prometheus:
     enabled: false
     image: bitnami/jmx-exporter
     imageTag: 1.1.0
+    imagePullPolicy: Always
     port: 5556
     metricRules:
       - pattern: ".*"

From 7a56c583354d61fcec028a9d22399dd63a4ae510 Mon Sep 17 00:00:00 2001
From: Philipp Schirmer <philipp.schirmer@bakdata.com>
Date: Mon, 24 Feb 2025 13:19:03 +0100
Subject: [PATCH 12/13] Update

---
 charts/streams-app/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/streams-app/README.md b/charts/streams-app/README.md
index 86bf75db9..526c7dbdc 100644
--- a/charts/streams-app/README.md
+++ b/charts/streams-app/README.md
@@ -90,7 +90,7 @@ Alternatively, a YAML file that specifies the values for the parameters can be p
 | `prometheus.jmx.enabled`         | Whether or not to install Prometheus JMX Exporter as a sidecar container and expose JMX metrics to Prometheus. | `false`                                    |
 | `prometheus.jmx.image`           | Docker Image for Prometheus JMX Exporter container.                                                            | `bitnami/jmx-exporter`                     |
 | `prometheus.jmx.imageTag`        | Docker Image Tag for Prometheus JMX Exporter container.                                                        | `1.1.0`                                    |
-| `prometheus.jmx.imagePullPolicy` | Docker Image Pull Policy for Prometheus JMX Exporter container.                                                | `IfNotPresent`                             |
+| `prometheus.jmx.imagePullPolicy` | Docker Image Pull Policy for Prometheus JMX Exporter container.                                                | `Always`                                   |
 | `prometheus.jmx.port`            | JMX Exporter Port which exposes metrics in Prometheus format for scraping.                                     | `5556`                                     |
 | `prometheus.jmx.metricRules`     | List of JMX metric rules.                                                                                      | `[pattern: ".*"]`                          |
 | `prometheus.jmx.resources`       | JMX Exporter resources configuration.                                                                          | see [values.yaml](values.yaml) for details |

From 51a378be7c82799e53dcb917b1e7683efc41b9a8 Mon Sep 17 00:00:00 2001
From: Philipp Schirmer <philipp.schirmer@bakdata.com>
Date: Mon, 24 Feb 2025 13:20:13 +0100
Subject: [PATCH 13/13] Update

---
 charts/streams-app/values.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/charts/streams-app/values.yaml b/charts/streams-app/values.yaml
index a1a21f4f5..1add0c52d 100644
--- a/charts/streams-app/values.yaml
+++ b/charts/streams-app/values.yaml
@@ -160,11 +160,11 @@ prometheus:
     ## See the `resources` documentation above for details.
     resources:
       requests:
-        cpu: 100m
-        memory: 500Mi
+        cpu: 10m
+        memory: 100Mi
       limits:
-        cpu: 300m
-        memory: 2G
+        cpu: 100m
+        memory: 100Mi
 
 # priorityClass
 # priorityClassName: ""