Update Prometheus metrics prop names (Boot 3.x)

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

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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]"