Global config clean up - defaulting to marathon url

application-dev.yml

@@ -8,4 +8,8 @@ spring:
       javax.persistence.schema-generation.create-source: metadata
       javax.persistence.schema-generation.scripts.action: drop-and-create
       javax.persistence.schema-generation.scripts.create-target: target/create.sql
-      javax.persistence.schema-generation.scripts.drop-target: target/drop.sql
+      javax.persistence.schema-generation.scripts.drop-target: target/drop.sql
+  redis:
+    host: localhost
+  rabbitmq:
+    host: localhost

application-pemc-staging.yml

@@ -1,6 +0,0 @@
-spring:
-  profiles.include: docker
-  rabbitmq:
-    host: 192.168.39.117
-logging.level:
-  com.pemc.crss: INFO

application-pemc-uat.yml

@@ -1,4 +1 @@
-spring:
-  rabbitmq:
-    host: rabbitmq.marathon.l4lb.thisdcos.directory
 security.server.url: http://crssapplication-main-ui.marathon.l4lb.thisdcos.directory:8080/admin

application-ss-combined.yml

@@ -1,11 +1 @@
-spring:
-  rabbitmq:
-    host: rabbitmq.marathon.l4lb.thisdcos.directory
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-security.server.url: http://crssapplication-main-ui.marathon.l4lb.thisdcos.directory:8080/admin
-graylog:
-  host: 192.168.233.7
-  port: 15375
-#  port: 12201
-#  protocol: tcp # ideally this is udp, but since we have a problem in dc/os env we shift to slow tcp
+security.server.url: http://crssapplication-main-ui.marathon.l4lb.thisdcos.directory:8080/admin

application-staging.yml

@@ -1,8 +1,8 @@
 spring:
-  profiles.include: docker
   rabbitmq:
     host: rabbitmq
   redis:
     host: redis
 graylog:
-  host: 192.168.241.62
+  host: 192.168.241.62
+security.server.url: http://app:8080/admin

application-uat.yml

@@ -1,8 +0,0 @@
-spring:
-  profiles.include: docker
-  rabbitmq:
-    host: pemc-oracle.ss.exist.com
-logging.level:
-  com.pemc.crss: INFO
-graylog:
-  host: 192.168.235.6

application.yml

@@ -16,6 +16,10 @@ spring:
     maxPoolSize: 20
     test-on-borrow: true
     validation-query: SELECT 1
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
+  rabbitmq:
+    host: rabbitmq.marathon.l4lb.thisdcos.directory
 
 security:
   oauth2:
@@ -31,11 +35,6 @@ security:
       filter-order: 3
       userInfoUri: ${security.server.url:http://localhost:8082}/user
 
-eureka:
-  client:
-    serviceUrl:
-      defaultZone: http://localhost:8761/eureka/
-
 server:
   undertow:
     accesslog:
@@ -55,10 +54,4 @@ logging:
     org.springframework.cloud: WARN
 
 graylog:
-  host: logginggraylog.marathon.l4lb.thisdcos.directory
-
-# TODO: remove this 2 profiles below if done migrating to new environment
----
-spring:
-  profiles: docker
-security.server.url: http://app:8080/admin
+  host: logginggraylog.marathon.l4lb.thisdcos.directory