Update to prometheus-rsocket-proxy 2.0.0-M1 (#5888)

spring-cloud · Aug 12, 2024 · b61c3c9 · b61c3c9
1 parent e1c8485
commit b61c3c9
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 12 deletions.
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
@@ -29,7 +29,7 @@
 		<nimbus-jose-jwt.version>9.39.3</nimbus-jose-jwt.version>
 		<snappy-java.version>1.1.10.5</snappy-java.version>
 		<commons-compress.version>1.26.2</commons-compress.version>
-		<prometheus-rsocket.version>1.6.0-SNAPSHOT</prometheus-rsocket.version>
+		<prometheus-rsocket.version>2.0.0-M1</prometheus-rsocket.version>
 		<java-cfenv.version>2.3.0</java-cfenv.version>
 		<spring-cloud-services-starter-config-client.version>3.5.4</spring-cloud-services-starter-config-client.version>
 		<kubernetes-fabric8-client.version>5.12.4</kubernetes-fabric8-client.version>

diff --git a/spring-cloud-dataflow-docs/src/main/asciidoc/spring-boot-3x.adoc b/spring-cloud-dataflow-docs/src/main/asciidoc/spring-boot-3x.adoc
@@ -20,8 +20,6 @@ The naming of the metrics registry-specific properties differ as follows:
 * `2.x`: `management.metrics.export.prometheus.enabled=true`
 * `3.x`: `management.prometheus.metrics.export.enabled=true`
 
-NOTE: One exception to this rule is the Prometheus RSocket Proxy which still runs on Spring Boot `2.x` and therefore expects the properties in the `management.metrics.export.prometheus.rsocket.*` format.
-
 Be sure that you use the `2.x` format when configuring `2.x` based stream apps and the `3.x` format when configuring `3.x` based stream apps.
 
 ===== Dataflow Metrics Property Replication

diff --git a/src/carvel/config/values/values.yml b/src/carvel/config/values/values.yml
@@ -108,5 +108,5 @@ scdf:
         enabled: false
         image:
           repository: micrometermetrics/prometheus-rsocket-proxy
-          tag: 1.6.0-SNAPSHOT
+          tag: 2.0.0-M1
           digest: ""
diff --git a/src/deploy/carvel/configure-prometheus-proxy.sh b/src/deploy/carvel/configure-prometheus-proxy.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 function set_properties() {
     PREFIX=$1
-    yq "${PREFIX}.management.metrics.export.prometheus.rsocket.host=\"$HOST\"" -i ./scdf-values.yml
+    yq "${PREFIX}.micrometer.prometheus.rsocket.host=\"$HOST\"" -i ./scdf-values.yml
     yq "${PREFIX}.management.metrics.export.prometheus.pushgateway.base-url=\"http://$HOST:$PORT\"" -i ./scdf-values.yml
     yq "${PREFIX}.management.metrics.export.prometheus.pushgateway.enabled=true" -i ./scdf-values.yml
     yq "${PREFIX}.management.metrics.export.prometheus.pushgateway.shutdown-operation=\"PUSH\"" -i ./scdf-values.yml

diff --git 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" "1.6.0-SNAPSHOT" false
+    sh "$K8S/load-image.sh" "micrometermetrics/prometheus-rsocket-proxy" "2.0.0-M1" 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
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker pull "micrometermetrics/prometheus-rsocket-proxy:1.6.0-SNAPSHOT"
+docker pull "micrometermetrics/prometheus-rsocket-proxy:2.0.0-M1"
diff --git 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:1.6.0-SNAPSHOT"
+        sh "$SCDIR/load-image.sh" "micrometermetrics/prometheus-rsocket-proxy:2.0.0-M1"
     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
@@ -22,7 +22,7 @@ services:
       #- SPRING_APPLICATION_JSON={"spring.jpa.properties.hibernate.generate_statistics":true}
 
   prometheus-rsocket-proxy:
-    image: micrometermetrics/prometheus-rsocket-proxy:1.6.0-SNAPSHOT
+    image: micrometermetrics/prometheus-rsocket-proxy:2.0.0-M1
     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
@@ -17,7 +17,7 @@ spec:
       serviceAccountName: prometheus-rsocket-proxy
       containers:
         - name: prometheus-rsocket-proxy
-          image: micrometermetrics/prometheus-rsocket-proxy:1.6.0-SNAPSHOT
+          image: micrometermetrics/prometheus-rsocket-proxy:2.0.0-M1
           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
@@ -22,7 +22,7 @@ services:
       #- SPRING_APPLICATION_JSON={"spring.jpa.properties.hibernate.generate_statistics":true}
 
   prometheus-rsocket-proxy:
-    image: micrometermetrics/prometheus-rsocket-proxy:1.6.0-SNAPSHOT
+    image: micrometermetrics/prometheus-rsocket-proxy:2.0.0-M1
     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
@@ -17,7 +17,7 @@ spec:
       serviceAccountName: prometheus-rsocket-proxy
       containers:
         - name: prometheus-rsocket-proxy
-          image: micrometermetrics/prometheus-rsocket-proxy:1.6.0-SNAPSHOT
+          image: micrometermetrics/prometheus-rsocket-proxy:2.0.0-M1
           imagePullPolicy: IfNotPresent
           ports:
             - name: scrape