Merge branch '2.1.x'

crss-datainterface-app/crss-datainterface-app-dev2.yml

@@ -1,10 +1,10 @@
 spring:
   crss-nmms:
     datasource:
+      driverClassName: "${spring.datasource.driverClassName}"
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=nmms
       username: crss_nmms
       password: crss_nmms
-      driverClassName: org.postgresql.Driver
 
 dataflow:
   url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393

crss-datainterface-task-ingest/crss-datainterface-task-ingest-dev2.yml

@@ -30,3 +30,9 @@ spring:
       password: crss_settlement
       driverClassName: org.postgresql.Driver
 
+sftp:
+  credentials:
+    username: pemc
+    password: 123qwe
+    host: 192.168.233.3
+    port: 2222

crss-meterprocess-stream-daily-sink/crss-meterprocess-stream-daily-sink.yml

@@ -31,7 +31,7 @@ spring:
       validation-query: SELECT 1
 
   jpa:
-    show-sql: false
+    show-sql: true
     hibernate:
       ddl-auto: none
     properties:

crss-mq-computation/crss-mq-computation-pemc-uat-sit.yml

@@ -31,6 +31,14 @@ spring:
   redis:
     database: 4
 
+  jpa:
+    show-sql: true
+
+logging:
+  level:
+    com.pemc.crss: DEBUG
+    org.springframework.cloud: DEBUG
+
 batch:
   maxWorkers: 20
   partitionSize:

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

@@ -68,8 +68,8 @@ batch:
   chunkSize: 100
   maxWorkers: 15
   partitionSize:
-    gap: 2000
-    mq: 1500
+    gap: 10
+    mq: 100000
     ssla: 1500
     report: 1
 

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

@@ -45,6 +45,11 @@ spring:
       test-on-borrow: true
       validation-query: SELECT 1
 
+  cloud:
+    deployer:
+      local:
+        deleteFilesOnExit: false
+
   jpa:
     show-sql: false
     generate-ddl: true

crss-settlement-task-file-gen-addtlcomp/crss-settlement-task-file-gen-addtlcomp-dev.yml

@@ -28,7 +28,7 @@ sftp:
     privateKey:
 
 batch:
-  resourceLocation: "file:target/libs/crss-settlement-task-file-gen-addtlcomp-2.0.0.RC6.jar"
+  resourceLocation: "file:target/libs/crss-settlement-task-file-gen-addtlcomp-2.1.0.BUILD-SNAPSHOT.jar"
   chunkSize: 100
   maxWorkers: 20
   partitionSize:

crss-settlement-task-file-gen-addtlcomp/crss-settlement-task-file-gen-addtlcomp-dev2.yml

@@ -18,11 +18,12 @@ spring:
       username: crss_meterprocess
       password: crss_meterprocess
       driverClassName: org.postgresql.Driver
+
   profiles:
-        include: mesos
+    include: mesos
   cloud:
     deployer:
       mesos:
         chronos:
           memory: 2048
-          cpu: 0.5
+          cpu: 0.5

crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation-dev.yml

@@ -42,11 +42,11 @@ spring:
         deleteFilesOnExit: false
 
 batch:
-  resourceLocation: "file:target/libs/crss-settlement-task-invoice-generation-2.0.0.RC6.jar"
+  resourceLocation: "file:target/libs/crss-settlement-task-invoice-generation-2.1.0.BUILD-SNAPSHOT.jar"
   chunkSize: 100
   maxWorkers: 2
   partitionSize:
-    amsSp: 5
+    amsSp: 1500
     amsInv: 10
     amsMf: 10
     energyStl: 10

crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation-dev2.yml

@@ -18,11 +18,13 @@ spring:
       username: crss_meterprocess
       password: crss_meterprocess
       driverClassName: org.postgresql.Driver
+
   profiles:
-          include: mesos
+    include: mesos
   cloud:
     deployer:
       mesos:
         chronos:
           memory: 2048
-          cpu: 0.5
+          cpu: 0.5
+