From be08425e7818ae9512f54c832f9a16502242ac2f Mon Sep 17 00:00:00 2001
From: Chris Bono <chris.bono@gmail.com>
Date: Mon, 5 Aug 2024 14:01:45 -0500
Subject: [PATCH] Update Prometheus metrics prop names (Boot 3.x)

---
 src/carvel/test/servers.test.ts                 | 4 ++--
 src/deploy/carvel/configure-prometheus-proxy.sh | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/carvel/test/servers.test.ts b/src/carvel/test/servers.test.ts
index 4907df896f..839d682da4 100644
--- a/src/carvel/test/servers.test.ts
+++ b/src/carvel/test/servers.test.ts
@@ -485,14 +485,14 @@ describe('servers', () => {
 
     const dataflowDoc = parseYamlDocument(dataflowApplicationYaml);
     const dataflowJson = dataflowDoc.toJSON();
-    const enabled1 = lodash.get(dataflowJson, 'management.metrics.export.prometheus.enabled') as boolean;
+    const enabled1 = lodash.get(dataflowJson, 'management.prometheus.metrics.export.enabled') as boolean;
     expect(enabled1).toBeTrue();
     const url = lodash.get(dataflowJson, 'spring.cloud.dataflow.metrics.dashboard.url') as string;
     expect(url).toBeFalsy();
 
     const skipperDoc = parseYamlDocument(skipperApplicationYaml);
     const skipperJson = skipperDoc.toJSON();
-    const enabled2 = lodash.get(skipperJson, 'management.metrics.export.prometheus.enabled') as boolean;
+    const enabled2 = lodash.get(skipperJson, 'management.prometheus.metrics.export.enabled') as boolean;
     expect(enabled2).toBeTrue();
   });
 
diff --git a/src/deploy/carvel/configure-prometheus-proxy.sh b/src/deploy/carvel/configure-prometheus-proxy.sh
index 15a865b6d3..f31594dd98 100755
--- a/src/deploy/carvel/configure-prometheus-proxy.sh
+++ b/src/deploy/carvel/configure-prometheus-proxy.sh
@@ -2,10 +2,10 @@
 function set_properties() {
     PREFIX=$1
     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
-    yq "${PREFIX}.management.metrics.export.prometheus.step=\"$STEP\"" -i ./scdf-values.yml
+    yq "${PREFIX}.management.prometheus.metrics.export.pushgateway.base-url=\"http://$HOST:$PORT\"" -i ./scdf-values.yml
+    yq "${PREFIX}.management.prometheus.metrics.export.pushgateway.enabled=true" -i ./scdf-values.yml
+    yq "${PREFIX}.management.prometheus.metrics.export.pushgateway.shutdown-operation=\"PUSH\"" -i ./scdf-values.yml
+    yq "${PREFIX}.management.prometheus.metrics.export.step=\"$STEP\"" -i ./scdf-values.yml
 }
 if [ "$2" = "" ]; then
     echo "Usage is: <host> <port> [step]"