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 690905ed5b..28102de2ce 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 @@ -29,7 +29,7 @@ 9.39.3 1.1.10.5 1.26.2 - 1.6.0-SNAPSHOT + 2.0.0-M1 2.3.0 3.5.4 5.12.4 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 index 62a797cee2..a0445897be 100644 --- 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 index 97752c8970..f44538cdd1 100644 --- 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 index ecda6b236f..15a865b6d3 100755 --- 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 index 78a4990a4e..73a0e6e600 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" "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 index 6abc6df781..1b6dcf4500 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: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 index 32f7905765..15538edcc7 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: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 index 6814b6e80c..59592daf4a 100644 --- 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 index 6a1ab72d19..0d9426bd71 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: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 index 55332b3fac..4ad09ff3d4 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: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 index d996782253..99be636fd0 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:1.6.0-SNAPSHOT + image: micrometermetrics/prometheus-rsocket-proxy:2.0.0-M1 imagePullPolicy: IfNotPresent ports: - name: scrape