From a362397b6abe332944d48acc9b6361e8b3d2643f Mon Sep 17 00:00:00 2001
From: Chris Bono <cbono@vmware.com>
Date: Mon, 12 Aug 2024 17:47:55 -0500
Subject: [PATCH] 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.
---
 src/carvel/config/dataflow.lib.yml                 | 6 +++---
 src/carvel/config/skipper.lib.yml                  | 6 +++---
 src/kubernetes/server/server-config.yaml           | 7 +++----
 src/templates/kubernetes/server/server-config.yaml | 7 +++----
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/carvel/config/dataflow.lib.yml b/src/carvel/config/dataflow.lib.yml
index 034a7e723d..f65f1268ce 100644
--- 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
index 15533d6e7f..3800fbc012 100644
--- 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
index 2f31f2243c..0a9a4ecb44 100644
--- 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
index c197e5faef..f40e213710 100644
--- 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"
-