Merge branch '2.1.x'

application-dev2.yml

@@ -2,7 +2,7 @@ spring:
   rabbitmq:
     host: rabbitmq.marathon.l4lb.thisdcos.directory
   redis:
-    host: redis.marathon.l4lb.thisdcos.directory
+    host: redis.marathon.mesos
   datasource:
     driverClassName: org.postgresql.Driver
 

crss-admin/crss-admin.yml

@@ -1,7 +1,6 @@
 spring:
   profiles.include: audit, client-sec
   redis:
-    host: redis.marathon.l4lb.thisdcos.directory
     database: 1
   http:
     multipart:

crss-audit/crss-audit-dev2.yml

@@ -5,6 +5,3 @@ spring:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=audit
       username: crss_audit
       password: crss_audit
-
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory

crss-audit/crss-audit.yml

@@ -18,9 +18,6 @@ spring:
         ddl-auto: none
         hbm2ddl:
           auto: none
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
 
 security:
   oauth2:

crss-dataflow-app/crss-dataflow-app-dev2.yml

@@ -16,9 +16,6 @@ spring:
         hbm2ddl:
           auto: none
 
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-
   # prevent batch job from running on app start
   batch:
     job:

crss-meterprocess-stream-mapper/crss-meterprocess-stream-mapper-dev2.yml

@@ -35,9 +35,6 @@ spring:
             auto: none
           temp:
             use_jdbc_metadata_defaults: false
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
 logging:
   level:
     com.pemc: debug

crss-meterprocess-task-stlready/crss-meterprocess-task-stlready.yml

@@ -40,10 +40,20 @@ spring:
         ddl-auto: none
         hbm2ddl:
           auto: none
+
   cloud:
     task:
       initialize:
         enable: false
+    deployer:
+      mesos:
+        chronos:
+          apiEndpoint: http://master.mesos/service/chronos/v1
+          memory: 8192
+          cpu: 2
+        dcos:
+          authorizationToken: eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1aWQiOiJkY29zX2hpc3Rvcnlfc2VydmljZSIsImV4cCI6NDY1NTE3ODM0OX0.erK7saZPxkEOP6k1S8CNvITHQ1SyEUj1cW5qx4GTQU-MPOwxMsFAcFYO0zAthXPYQSzaRxykTelkLMJTsSQVro9bGJcHua7SedIqCmq1TvAUBSJugyxsDxu07mmS-Yh7MwpmG3LAOItwCYzWhihMqdLKRA19iimAs8xS6V5uKo5U5Fq1lOAQ0ye4f4L9CgF8WWyIqILdpynLRIx_eViY5RWtqYznV8otg0jkJGsjHQQmPZa732NY0crJtDcN713wVqT4SZoG993-Zv4mH_RU0a7NbwtvFE1mCfmja1aMp_gtogdS3xdQvRcS1BzaoJs4_dGUvRoQdUeseuTbHkF6VQ
+
   batch:
     initializer:
       enabled: false
@@ -60,6 +70,6 @@ logging:
 batch:
   # resourceLocation: "file:target/libs/crss-meterprocess-task-stlready-1.0.0.BUILD-SNAPSHOT.jar"
   chunkSize: 100
-  maxWorkers: 10
+  maxWorkers: 20
   partitionSize:
-    stl: 10000
+    stl: 100000

crss-mq-computation/crss-mq-computation-dev2.yml

@@ -53,10 +53,6 @@ spring:
     initializer:
       enabled: false
 
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-
   cache:
     jcache:
       config: ehcache3.xml

crss-mq-computation/crss-mq-computation.yml

@@ -1,4 +1,7 @@
 spring:
+  profiles:
+    include: mesos
+
   crss-dataflow:
     datasource:
       jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=dataflow
@@ -46,6 +49,14 @@ spring:
     task:
       initialize:
         enable: false
+    deployer:
+      mesos:
+        chronos:
+          apiEndpoint: http://master.mesos/service/chronos/v1
+          memory: 8192
+          cpu: 2
+        dcos:
+          authorizationToken: eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1aWQiOiJkY29zX2hpc3Rvcnlfc2VydmljZSIsImV4cCI6NDY1NTE3ODM0OX0.erK7saZPxkEOP6k1S8CNvITHQ1SyEUj1cW5qx4GTQU-MPOwxMsFAcFYO0zAthXPYQSzaRxykTelkLMJTsSQVro9bGJcHua7SedIqCmq1TvAUBSJugyxsDxu07mmS-Yh7MwpmG3LAOItwCYzWhihMqdLKRA19iimAs8xS6V5uKo5U5Fq1lOAQ0ye4f4L9CgF8WWyIqILdpynLRIx_eViY5RWtqYznV8otg0jkJGsjHQQmPZa732NY0crJtDcN713wVqT4SZoG993-Zv4mH_RU0a7NbwtvFE1mCfmja1aMp_gtogdS3xdQvRcS1BzaoJs4_dGUvRoQdUeseuTbHkF6VQ
 
   batch:
     initializer:
@@ -55,10 +66,6 @@ spring:
     jcache:
       config: ehcache3.xml
 
-  redis:
-    host: localhost
-    port: 6379
-
 logging:
   level:
     com.pemc: debug
@@ -66,7 +73,7 @@ logging:
 
 batch:
   chunkSize: 100
-  maxWorkers: 15
+  maxWorkers: 20
   partitionSize:
     gap: 10000
     mq: 100000
@@ -84,3 +91,4 @@ sftp:
     port: 22
     workingDirectory: /upload
     privateKey:
+

crss-mtr/crss-mtr-dev2.yml

@@ -54,10 +54,6 @@ spring:
     initializer:
       enabled: false
 
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-
 logging:
   level:
     com.pemc: debug

crss-mtr/crss-mtr.yml

@@ -46,6 +46,15 @@ spring:
     task:
       initialize:
         enable: false
+    deployer:
+      mesos:
+        chronos:
+          apiEndpoint: http://master.mesos/service/chronos/v1
+          memory: 16384
+          cpu: 4
+        dcos:
+          authorizationToken: eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1aWQiOiJkY29zX2hpc3Rvcnlfc2VydmljZSIsImV4cCI6NDY1NTE3ODM0OX0.erK7saZPxkEOP6k1S8CNvITHQ1SyEUj1cW5qx4GTQU-MPOwxMsFAcFYO0zAthXPYQSzaRxykTelkLMJTsSQVro9bGJcHua7SedIqCmq1TvAUBSJugyxsDxu07mmS-Yh7MwpmG3LAOItwCYzWhihMqdLKRA19iimAs8xS6V5uKo5U5Fq1lOAQ0ye4f4L9CgF8WWyIqILdpynLRIx_eViY5RWtqYznV8otg0jkJGsjHQQmPZa732NY0crJtDcN713wVqT4SZoG993-Zv4mH_RU0a7NbwtvFE1mCfmja1aMp_gtogdS3xdQvRcS1BzaoJs4_dGUvRoQdUeseuTbHkF6VQ
+
 
   batch:
     initializer:
@@ -59,7 +68,7 @@ logging:
 batch:
   # resourceLocation: "file:target/libs/crss-meterprocess-task-mtr-1.0.0.BUILD-SNAPSHOT.jar"
   chunkSize: 1
-  maxWorkers: 10
+  maxWorkers: 20
   partitionSize:
     mtr: 1
     mtrSein: 20

crss-sched/crss-sched.yml

@@ -1,7 +1,7 @@
 spring:
+  profiles:
+    include: metronome,client-sec
   datasource:
-    jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=scheduler
+    url: jdbc:edb://10.176.11.131:5432/crss?currentSchema=scheduler
     username: crss_scheduler
-    password: 5Q4AY59T
-  profiles:
-    include: client-sec
+    password: 5Q4AY59T

crss-settlement-task-calculation-addtlcomp/crss-settlement-task-calculation-addtlcomp-dev2.yml

@@ -72,10 +72,6 @@ spring:
         hbm2ddl:
           import_files:
 
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-
 logging:
   level:
     com.pemc.crss.settlement.task.calculation.addtlcomp: DEBUG

crss-settlement-task-calculation/crss-settlement-task-calculation-dev2.yml

@@ -74,10 +74,6 @@ spring:
         hbm2ddl:
           auto: none
 
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-
 batch:
   chunkSize: 100
   maxWorkers: 10

crss-uaa/crss-uaa.yml

@@ -21,7 +21,7 @@ management:
 crss:
   security:
     oauth2:
-      default-redirect-uri: crss.prod.crss.wesmsys.local
+      default-redirect-uri: http://crss.prod.crss.wesmsys.local
       auto-approve: true
       authorized-grant-types: authorization_code,refresh_token,password
       access-token-validity-second: 3600