Merge pull request #86 from steadybit/develop

release
steadybit · Dec 13, 2024 · f1fcc5d · f1fcc5d
2 parents 9c378bd + 60d55a1
commit f1fcc5d
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 10 deletions.
diff --git a/bestseller-fashion/src/main/resources/application.yml b/bestseller-fashion/src/main/resources/application.yml
@@ -4,10 +4,11 @@ server:
 spring:
   application:
     name: fashion-bestseller
-  datasource:
-    platform: hsqldb
   jmx:
     enabled: true
+  sql:
+    init:
+      platform: hsqldb
 
 management:
   metrics:
@@ -17,6 +18,9 @@ management:
           autotime:
             percentiles: 0.95
   endpoints:
+    jmx:
+      exposure:
+        include: beans,mappings
     web:
       exposure:
         include: metrics,prometheus,health

diff --git a/bestseller-toys/src/main/resources/application.yml b/bestseller-toys/src/main/resources/application.yml
@@ -4,10 +4,11 @@ server:
 spring:
   application:
     name: toys-bestseller
-  datasource:
-    platform: hsqldb
   jmx:
     enabled: true
+  sql:
+    init:
+      platform: hsqldb
 
 management:
   metrics:
@@ -17,6 +18,9 @@ management:
           autotime:
             percentiles: 0.95
   endpoints:
+    jmx:
+      exposure:
+        include: beans,mappings
     web:
       exposure:
         include: metrics,prometheus,health

diff --git a/checkout/src/main/resources/application.yml b/checkout/src/main/resources/application.yml
@@ -4,15 +4,16 @@ server:
 spring:
   application:
     name: checkout
-  datasource:
-    platform: hsqldb
   jmx:
     enabled: true
   activemq:
     broker-url: "tcp://localhost:61616"
   jpa:
     properties:
       "hibernate.jdbc.log.warnings": "false"
+  sql:
+    init:
+      platform: hsqldb
 
 management:
   metrics:
@@ -22,6 +23,9 @@ management:
           autotime:
             percentiles: 0.95
   endpoints:
+    jmx:
+      exposure:
+        include: beans,mappings
     web:
       exposure:
         include: metrics,prometheus,health

diff --git a/gateway/pom.xml b/gateway/pom.xml
@@ -72,6 +72,10 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-gateway</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-bootstrap</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>

diff --git a/gateway/src/main/resources/application.yml b/gateway/src/main/resources/application.yml
@@ -2,8 +2,6 @@ server:
   port: 8080
 
 spring:
-  application:
-    name: gateway
   jmx:
     enabled: true
 
@@ -18,6 +16,9 @@ management:
           autotime:
             percentiles: 0.95
   endpoints:
+    jmx:
+      exposure:
+        include: beans,mappings
     web:
       exposure:
         include: metrics,prometheus,health,mappings

diff --git a/gateway/src/main/resources/bootstrap.yml b/gateway/src/main/resources/bootstrap.yml
@@ -0,0 +1,4 @@
+
+spring:
+  application:
+    name: gateway
diff --git a/hot-deals/src/main/resources/application.yml b/hot-deals/src/main/resources/application.yml
@@ -4,10 +4,11 @@ server:
 spring:
   application:
     name: hot-deals
-  datasource:
-    platform: hsqldb
   jmx:
     enabled: true
+  sql:
+    init:
+      platform: hsqldb
 
 management:
   metrics:
@@ -17,6 +18,9 @@ management:
           autotime:
             percentiles: 0.95
   endpoints:
+    jmx:
+      exposure:
+        include: beans,mappings
     web:
       exposure:
         include: metrics,prometheus,health

diff --git a/inventory-service-mock/src/main/resources/application.yml b/inventory-service-mock/src/main/resources/application.yml
@@ -15,6 +15,9 @@ management:
           autotime:
             percentiles: 0.75
   endpoints:
+    jmx:
+      exposure:
+        include: beans,mappings
     web:
       exposure:
         include: metrics,prometheus,health

diff --git a/order/src/main/resources/application.yml b/order/src/main/resources/application.yml
@@ -14,6 +14,9 @@ management:
           autotime:
             percentiles: 0.95
   endpoints:
+    jmx:
+      exposure:
+        include: beans,mappings
     web:
       exposure:
         include: metrics,prometheus,health