Move shareable config to global yml

application.yml

@@ -12,21 +12,51 @@ security:
     resource:
       userInfoUri: ${security.server.url:http://localhost:8082}/user
 
+eureka:
+  client:
+    serviceUrl:
+      defaultZone: http://localhost:8761/eureka/
+
+server:
+  undertow:
+    accesslog:
+      dir: target
+      enabled: true
+      pattern: combined
+  compression:
+    enabled: true
+    min-response-size: 1
 logging:
   pattern:
     level: 'username:%X{username:-system} %5p'
+  level:
+    com.pemc.crss: DEBUG
+    com.netflix: WARN
+    org.springframework.cloud: WARN
 
 ---
 spring:
   profiles: docker
 security.server.url: http://app:8080
-
+eureka:
+  client:
+    serviceUrl:
+      defaultZone: http://discovery:8080/eureka/
 ---
 spring:
   profiles: staging
   profiles.include: docker
+  rabbitmq:
+    host: 192.168.241.62
+# TODO graylog
+graylog:
+  host: pemc.integration.exist.com
 
 ---
 spring:
   profiles: uat
-  profiles.include: docker
+  profiles.include: docker
+  rabbitmq:
+    host: pemc-oracle.ss.exist.com
+graylog:
+  host: pemc.integration.exist.com

crss-metering/application-dev.yml

@@ -15,16 +15,4 @@ spring:
         dialect: org.hibernate.dialect.PostgreSQL94Dialect
 
 server:
-  port: 8084
-
-eureka:
-  client:
-    serviceUrl:
-      defaultZone: http://localhost:8761/eureka/
-
-logging:
-  level:
-    com.pemc: DEBUG
-    com.netflix: WARN
-    org.springframework.cloud: WARN
-    org.hibernate.SQL: DEBUG
+  port: 8084

crss-metering/application-staging.yml

@@ -12,10 +12,4 @@ spring:
     database: POSTGRESQL
     properties:
       hibernate:
-        dialect: org.hibernate.dialect.PostgreSQL94Dialect
-  rabbitmq:
-    host: 192.168.241.62
-
-# currently staging and uat shared in one graylog which is not good
-#graylog:
-#  host: pemc.integration.exist.com
+        dialect: org.hibernate.dialect.PostgreSQL94Dialect

crss-metering/application-uat.yml

@@ -12,9 +12,4 @@ spring:
     database: POSTGRESQL
     properties:
       hibernate:
-        dialect: org.hibernate.dialect.PostgreSQL94Dialect
-  rabbitmq:
-    host: pemc-oracle.ss.exist.com
-
-graylog:
-  host: pemc.integration.exist.com
+        dialect: org.hibernate.dialect.PostgreSQL94Dialect

crss-metering/application.yml

@@ -4,26 +4,4 @@ spring:
     maxFileSize: 5MB
     maxRequestSize: 5MB
     fileSizeThreshold: 5MB
-    resolveLazily: false
-
-eureka:
-  client:
-    serviceUrl:
-      defaultZone: http://localhost:8761/eureka/
-#    healthcheck:
-      #      enabled: true
-#    lease:
-#      duration: 5
-#  instance:
-#    leaseRenewalIntervalInSeconds: 1
-#    leaseExpirationDurationInSeconds: 2
-
-server:
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-  compression:
-    enabled: true
-    min-response-size: 1
+    resolveLazily: false