diff --git a/spring-cloud-dataflow-build/spring-cloud-dataflow-build-dependencies/pom.xml b/spring-cloud-dataflow-build/spring-cloud-dataflow-build-dependencies/pom.xml
index 8ce15ded5c..c871cfb30b 100644
--- a/spring-cloud-dataflow-build/spring-cloud-dataflow-build-dependencies/pom.xml
+++ b/spring-cloud-dataflow-build/spring-cloud-dataflow-build-dependencies/pom.xml
@@ -32,7 +32,7 @@
1.26.2
9.39.3
- 2.0.0-M2
+ 2.0.0-M4
2.3.0
3.5.4
5.12.4
diff --git a/spring-cloud-dataflow-composed-task-runner/pom.xml b/spring-cloud-dataflow-composed-task-runner/pom.xml
index 255b8579cc..d24255f523 100644
--- a/spring-cloud-dataflow-composed-task-runner/pom.xml
+++ b/spring-cloud-dataflow-composed-task-runner/pom.xml
@@ -102,7 +102,7 @@
io.micrometer
- micrometer-registry-prometheus-simpleclient
+ micrometer-registry-prometheus
io.micrometer.prometheus
diff --git a/spring-cloud-dataflow-server-core/pom.xml b/spring-cloud-dataflow-server-core/pom.xml
index 4946ee0268..6f2a45dd84 100644
--- a/spring-cloud-dataflow-server-core/pom.xml
+++ b/spring-cloud-dataflow-server-core/pom.xml
@@ -28,7 +28,7 @@
io.micrometer
- micrometer-registry-prometheus-simpleclient
+ micrometer-registry-prometheus
io.micrometer.prometheus
diff --git a/spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-sink-dependencies/pom.xml b/spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-sink-dependencies/pom.xml
index 3631061700..c32490c448 100644
--- a/spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-sink-dependencies/pom.xml
+++ b/spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-sink-dependencies/pom.xml
@@ -79,7 +79,7 @@
io.micrometer
- micrometer-registry-prometheus-simpleclient
+ micrometer-registry-prometheus
org.springframework.cloud
diff --git a/spring-cloud-skipper/spring-cloud-skipper-server-core/pom.xml b/spring-cloud-skipper/spring-cloud-skipper-server-core/pom.xml
index 19f79558c9..0330ea4106 100644
--- a/spring-cloud-skipper/spring-cloud-skipper-server-core/pom.xml
+++ b/spring-cloud-skipper/spring-cloud-skipper-server-core/pom.xml
@@ -40,7 +40,7 @@
io.micrometer
- micrometer-registry-prometheus-simpleclient
+ micrometer-registry-prometheus
io.micrometer.prometheus
diff --git a/src/carvel/config/values/values.yml b/src/carvel/config/values/values.yml
index e5cfcb8487..81fbf4b169 100644
--- a/src/carvel/config/values/values.yml
+++ b/src/carvel/config/values/values.yml
@@ -112,5 +112,5 @@ scdf:
enabled: false
image:
repository: micrometermetrics/prometheus-rsocket-proxy
- tag: 2.0.0-M2
+ tag: 2.0.0-M4
digest: ""
diff --git a/src/carvel/docs/configuration-options.adoc b/src/carvel/docs/configuration-options.adoc
index 4b84059e6f..682baedfb5 100644
--- a/src/carvel/docs/configuration-options.adoc
+++ b/src/carvel/docs/configuration-options.adoc
@@ -597,7 +597,7 @@ No
Type:::
String
Default Value:::
-2.0.0-M2
+2.0.0-M4
[[configuration-options-scdf.feature.monitoring.prometheusRsocketProxy.image.digest]]`scdf.feature.monitoring.prometheusRsocketProxy.image.digest`::
Description:::
diff --git a/src/deploy/carvel/load-images.sh b/src/deploy/carvel/load-images.sh
index 30cbfdd723..8b2ea37a34 100755
--- a/src/deploy/carvel/load-images.sh
+++ b/src/deploy/carvel/load-images.sh
@@ -67,7 +67,7 @@ else
sh "$K8S/load-image.sh" "springcloud/spring-cloud-dataflow-server" "$DATAFLOW_VERSION" true
fi
if [ "$PROMETHEUS" = "true" ]; then
- sh "$K8S/load-image.sh" "micrometermetrics/prometheus-rsocket-proxy" "2.0.0-M2" false
+ sh "$K8S/load-image.sh" "micrometermetrics/prometheus-rsocket-proxy" "2.0.0-M4" false
fi
if [ "$REGISTRY" = "" ]; then
REGISTRY=springcloud
diff --git a/src/deploy/images/pull-prometheus-rsocket-proxy.sh b/src/deploy/images/pull-prometheus-rsocket-proxy.sh
index 65dac2970a..05f2a46af5 100755
--- a/src/deploy/images/pull-prometheus-rsocket-proxy.sh
+++ b/src/deploy/images/pull-prometheus-rsocket-proxy.sh
@@ -1,2 +1,2 @@
#!/bin/bash
-docker pull "micrometermetrics/prometheus-rsocket-proxy:2.0.0-M2"
+docker pull "micrometermetrics/prometheus-rsocket-proxy:2.0.0-M4"
diff --git a/src/deploy/k8s/deploy-scdf.sh b/src/deploy/k8s/deploy-scdf.sh
index c587aee20f..3dfbf64da3 100755
--- a/src/deploy/k8s/deploy-scdf.sh
+++ b/src/deploy/k8s/deploy-scdf.sh
@@ -171,7 +171,7 @@ if [ "$PROMETHEUS" = "true" ] || [ "$METRICS" = "prometheus" ]; then
if [ "$K8S_DRIVER" != "tmc" ] && [ "$K8S_DRIVER" != "gke" ]; then
sh "$SCDIR/load-image.sh" "springcloud/spring-cloud-dataflow-grafana-prometheus:$DATAFLOW_VERSION" false
sh "$SCDIR/load-image.sh" "prom/prometheus:v2.37.8"
- sh "$SCDIR/load-image.sh" "micrometermetrics/prometheus-rsocket-proxy:2.0.0-M2"
+ sh "$SCDIR/load-image.sh" "micrometermetrics/prometheus-rsocket-proxy:2.0.0-M4"
fi
set +e
kubectl create --namespace "$NS" serviceaccount prometheus-rsocket-proxy
diff --git a/src/docker-compose/docker-compose-prometheus.yml b/src/docker-compose/docker-compose-prometheus.yml
index 67f7ff4430..13b9019f3a 100644
--- a/src/docker-compose/docker-compose-prometheus.yml
+++ b/src/docker-compose/docker-compose-prometheus.yml
@@ -20,7 +20,7 @@ services:
#- SPRING_APPLICATION_JSON={"spring.jpa.properties.hibernate.generate_statistics":true}
prometheus-rsocket-proxy:
- image: micrometermetrics/prometheus-rsocket-proxy:2.0.0-M2
+ image: micrometermetrics/prometheus-rsocket-proxy:2.0.0-M4
container_name: prometheus-rsocket-proxy
expose:
- '9096'
diff --git a/src/kubernetes/prometheus-proxy/prometheus-proxy-deployment.yaml b/src/kubernetes/prometheus-proxy/prometheus-proxy-deployment.yaml
index 5420441724..3d12b5624a 100644
--- a/src/kubernetes/prometheus-proxy/prometheus-proxy-deployment.yaml
+++ b/src/kubernetes/prometheus-proxy/prometheus-proxy-deployment.yaml
@@ -17,7 +17,7 @@ spec:
serviceAccountName: prometheus-rsocket-proxy
containers:
- name: prometheus-rsocket-proxy
- image: micrometermetrics/prometheus-rsocket-proxy:2.0.0-M2
+ image: micrometermetrics/prometheus-rsocket-proxy:2.0.0-M4
imagePullPolicy: IfNotPresent
ports:
- name: scrape
diff --git a/src/templates/docker-compose/docker-compose-prometheus.yml b/src/templates/docker-compose/docker-compose-prometheus.yml
index ad09cce384..9a4d707d77 100644
--- a/src/templates/docker-compose/docker-compose-prometheus.yml
+++ b/src/templates/docker-compose/docker-compose-prometheus.yml
@@ -22,7 +22,7 @@ services:
#- SPRING_APPLICATION_JSON={"spring.jpa.properties.hibernate.generate_statistics":true}
prometheus-rsocket-proxy:
- image: micrometermetrics/prometheus-rsocket-proxy:2.0.0-M2
+ image: micrometermetrics/prometheus-rsocket-proxy:2.0.0-M4
container_name: prometheus-rsocket-proxy
expose:
- '9096'
diff --git a/src/templates/kubernetes/prometheus-proxy/prometheus-proxy-deployment.yaml b/src/templates/kubernetes/prometheus-proxy/prometheus-proxy-deployment.yaml
index 5bdfe0bb8d..f77d7f0dc1 100644
--- a/src/templates/kubernetes/prometheus-proxy/prometheus-proxy-deployment.yaml
+++ b/src/templates/kubernetes/prometheus-proxy/prometheus-proxy-deployment.yaml
@@ -17,7 +17,7 @@ spec:
serviceAccountName: prometheus-rsocket-proxy
containers:
- name: prometheus-rsocket-proxy
- image: micrometermetrics/prometheus-rsocket-proxy:2.0.0-M2
+ image: micrometermetrics/prometheus-rsocket-proxy:2.0.0-M4
imagePullPolicy: IfNotPresent
ports:
- name: scrape