Update metric prop names in yaml files (#5895)

The previous commits for updating metric names to the Boot 3.x format missed some entries in yaml files. This commit updates the yaml files.
spring-cloud · Aug 12, 2024 · a362397 · a362397
1 parent 967c15e
commit a362397
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/src/carvel/config/dataflow.lib.yml b/src/carvel/config/dataflow.lib.yml
@@ -47,9 +47,9 @@ config: #@ data.values.scdf.server.config
 #@overlay/match-child-defaults missing_ok=True
 config:
   management:
-    metrics:
-      export:
-        prometheus:
+    prometheus:
+      metrics:
+        export:
           enabled: true
           rsocket:
             enabled: true

diff --git a/src/carvel/config/skipper.lib.yml b/src/carvel/config/skipper.lib.yml
@@ -45,9 +45,9 @@ config: #@ data.values.scdf.skipper.config
 #@overlay/match-child-defaults missing_ok=True
 config:
   management:
-    metrics:
-      export:
-        prometheus:
+    prometheus:
+      metrics:
+        export:
           enabled: true
           rsocket:
             enabled: true

diff --git a/src/kubernetes/server/server-config.yaml b/src/kubernetes/server/server-config.yaml
@@ -7,9 +7,9 @@ metadata:
 data:
   application.yaml: |-
     management:
-      metrics:
-        export:
-          prometheus:
+      prometheus:
+        metrics:
+          export:
             enabled: true
             rsocket:
               enabled: true
@@ -36,4 +36,3 @@ data:
         driverClassName: org.mariadb.jdbc.Driver
         testOnBorrow: true
         validationQuery: "SELECT 1"
-        
diff --git a/src/templates/kubernetes/server/server-config.yaml b/src/templates/kubernetes/server/server-config.yaml
@@ -7,9 +7,9 @@ metadata:
 data:
   application.yaml: |-
     management:
-      metrics:
-        export:
-          prometheus:
+      prometheus:
+        metrics:
+          export:
             enabled: true
             rsocket:
               enabled: true
@@ -34,4 +34,3 @@ data:
         driverClassName: org.mariadb.jdbc.Driver
         testOnBorrow: true
         validationQuery: "SELECT 1"
-