Merge branch '2.2.x' into 2.3.x

application-pemc-dev.yml

@@ -6,8 +6,6 @@ spring:
   datasource:
     driverClassName: org.postgresql.Driver
 
-security.server.url: http://crssedge-server.marathon.l4lb.thisdcos.directory:8080/admin
-
 crss:
   api.gateway: http://edge-server.marathon.l4lb.thisdcos.directory:8080
   security.url: http://edge-server.marathon.l4lb.thisdcos.directory:8080/uaa

application-public.yml

@@ -0,0 +1,4 @@
+crss:
+  api.gateway: http://publicedge-server.marathon.l4lb.thisdcos.directory:8080
+  security.url: ${crss.api.gateway}/uaa
+  dispatch.interval: 5

crss-admin/crss-admin.yml

@@ -19,10 +19,15 @@ spring:
   mail:
     subject:
       prefix: "[CRSS 2.0 - Trial Operation]"
-    host: 192.168.10.96
-    port: 25
-    username: crss-mailer@wesm.ph
-    password: Cr551234
+    # Set to local mailserver for testing. Pleaase unset after.
+    #host: 192.168.10.96
+    #port: 25
+    #username: crss-mailer@wesm.ph
+    #password: Cr551234
+    host: mailserver.marathon.l4lb.thisdcos.directory
+    port: 3025
+    username: crss@local.dev.pemc.com
+    password: P@ssw0rd1434412
     properties:
         transport.protocol: smtp
         smtp:
@@ -32,9 +37,9 @@ spring:
 # TODO: UPDATE configs for prod
 crss:
   ldap:
-    protocol: LDAP
-    host: "192.168.95.106"
-    port: 389
+    protocol: LDAPS
+    host: "192.168.41.106"
+    port: 636
     root-dn: "dc=wesmsys,dc=local"
     user-search-base: MO,MP,SO
     admin-user: "wesmsys\\crss_user"
@@ -63,3 +68,7 @@ management:
   health:
     defaults:
       enabled: false
+
+logging:
+  level:
+    com.pemc.crss: DEBUG

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

@@ -4,7 +4,7 @@ spring:
     datasource:
       driverClassName: com.edb.Driver
       connectionTimeout: 150000
-      maximumPoolSize: 30
+      maximumPoolSize: 10
       test-on-borrow: true
       validation-query: SELECT 1
       jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=dataflow

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

@@ -26,4 +26,13 @@ spring:
 
   redis:
       host: localhost
-      port: 6379
+      port: 6379
+
+sftp:
+  credentials:
+    username: pemc
+    password: 123qwe
+    host: sftp.marathon.l4lb.thisdcos.directory
+    port: 22
+    workingDirectory: /upload/rbcq
+    privateKey:

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

@@ -1,11 +1,15 @@
 spring:
   crss-emdb:
-    # TODO update emdb datasource to oracle once prod credentials are available
     datasource:
-      driverClassName: com.edb.Driver
-      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss_external?currentSchema=emdb
-      username: crss_emdb
-      password: spaHg893
+      jdbcUrl: jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS_LIST=(LOAD_BALANCE=OFF)(FAILOVER=ON)
+           (ADDRESS=(PROTOCOL=TCP)(HOST=192.168.94.56)(PORT=1521))
+           (ADDRESS=(PROTOCOL=TCP)(HOST=192.168.94.57)(PORT=1521)))
+           (CONNECT_DATA=(SERVICE_NAME=ODAAB)(SERVER=DEDICATED)))
+      username: crss_tod
+      password: crss_tod
+      driverClassName: oracle.jdbc.OracleDriver
+      connectionTimeout: 150000
+      maximumPoolSize: 3
   crss-dataflow:
     datasource:
       jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=dataflow
@@ -36,14 +40,18 @@ spring:
       maximumPoolSize: 3
       test-on-borrow: true
       validation-query: SELECT 1
+
   jpa:
     show-sql: false
-    generate-ddl: true
+    generate-ddl: false
+    open-in-view: false
     properties:
       hibernate:
         dialect: org.hibernate.dialect.PostgreSQLDialect
         ddl-auto: none
-        generate_statistics: false
+        hbm2ddl:
+          auto: none
+
   cloud:
     task:
       initialize:
@@ -51,13 +59,11 @@ spring:
   batch:
     initializer:
       enabled: false
-  redis:
-    host: localhost
-    port: 6379
 
 logging:
   level:
-    com.pemc: debug
+    com.pemc.crss: DEBUG
+
 
 batch:
   # resourceLocation: "file:target/libs/crss-datainterface-task-ingest-1.0.0.BUILD-SNAPSHOT.jar"
@@ -73,18 +79,21 @@ mqreport:
 
 sftp:
   credentials:
-    username: pemc
-    password: 123qwe
-    host: sftp.marathon.l4lb.thisdcos.directory
+    #username: pemc
+    #password: 123qwe
+    username: crss_sftp_rbcq
+    password: Pemc1234
+    #host: sftp.marathon.l4lb.thisdcos.directory
+    host: 192.168.94.82
     port: 22
-    workingDirectory: /upload/rbcq
+    workingDirectory: /rbcq
     privateKey:
 
 database:
   emdb:
-    rtu-db: "TEMP_SNAPSHOT_DATA"
-    energy-price-sched-db: "TEMP_MOAR_MVIEW"
-    reserve-price-sched-db: "TEMP_RESERVED_MOAR_MVIEW"
+    rtu-db: "SNAPSHOT_MVIEW"
+    energy-price-sched-db: "ENERGY_MVIEW"
+    reserve-price-sched-db: "RESERVE_MVIEW"
   nmms:
     rtu-db: "TXN_RTU"
     energy-price-sched-db: "TXN_ENERGY_PRICE_SCHED"

crss-edge/crss-edge-public.yml

@@ -0,0 +1,65 @@
+zuul:
+  host.socket-timeout-millis: 60000
+  ignoredServices: '*'
+  sensitiveHeaders: ''
+  ignoredHeaders: Access-Control-Allow-Credentials, Access-Control-Allow-Origin
+  routes:
+    admin:
+      path: /admin/**
+      serviceId: admin-service
+    reg:
+      path: /reg/**
+      serviceId: registration-service
+    uaa:
+      path: /uaa/**
+      stripPrefix: false
+      serviceId: crss-uaa
+admin-service:
+  ribbon:
+    listOfServers: http://publiccrssadmin-service.marathon.l4lb.thisdcos.directory:8080
+registration-service:
+  ribbon:
+    listOfServers: http://publiccrssregistration-service.marathon.l4lb.thisdcos.directory:8080
+crss-uaa:
+  ribbon:
+    listOfServers: http://publiccrsscrss-uaa.marathon.l4lb.thisdcos.directory:9999
+
+hystrix:
+  command:
+    default:
+      execution:
+        isolation:
+          thread:
+            timeoutInMilliseconds: 300000
+#zuul.host.socket-timeout-millis: 30000
+
+ribbon:
+  ConnectTimeout: 300000
+  ReadTimeout: 600000
+  maxAutoRetries: 1
+  MaxAutoRetriesNextServer: 2
+
+# NOTE: since the server is undertow who serve the static pages, the uploads config must be set here also
+#       if size was modified please update also the registration's application.yml
+spring:
+  profiles:
+    include: client-sec
+  http:
+    multipart:
+      enabled: true
+      maxFileSize: "25Mb"
+      maxRequestSize: "25Mb"
+      fileSizeThreshold: "5Mb"
+      resolveLazily: false
+  resources:
+    chain:
+      gzipped: true
+server:
+  compression:
+    enabled: true
+    min-response-size: 1
+  undertow:
+    direct-buffers: true # Instruct JVM to use native I/O operations on the buffers
+    buffer-size: 16384 # Socket buffer size. Default is 16kb
+    io-threads: 16 # The number of I/O threads created for non-blocking tasks. (#CPU * 2)
+    worker-threads: 128 # CPU * 16

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

@@ -32,11 +32,12 @@ spring:
       mesos:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 2048
+          memory: 4096
           cpu: 0.5
 
   redis:
     host: redis.marathon.l4lb.thisdcos.directory
 
 batch:
-  # resourceLocation: ${resourceLocation} - property expansion defaulted in app's application.yml
+  partitionSize:
+    stl: 5000

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

@@ -35,6 +35,9 @@ spring:
       mesos:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 1024
-
+          memory: 4096
+          cpu: 2
 
+batch:
+  partitionSize:
+    stl: 20000

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

@@ -20,6 +20,10 @@ spring:
   jpa:
     show-sql: true
     generate-ddl: true
+    properties:
+      hibernate:
+        jdbc:
+          batch_size: 100
   profiles:
     include: mesos
   cloud:

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

@@ -68,7 +68,10 @@ spring:
 
 logging:
   level:
-    com.pemc.crss: debug
+    com.pemc.crss: DEBUG
+    # org.hibernate.stat: debug
+    #org.hibernate: INFO
+    #org.hibernate.type: trace
 
 batch:
   vacuum: false
@@ -76,7 +79,7 @@ batch:
   maxWorkers: 20
   partitionSize:
     gap: 100000
-    mq: 120000
+    mq: 90000
     ssla: 5000
     report: 1
 
@@ -89,6 +92,6 @@ sftp:
     password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
     port: 22
-    workingDirectory: /upload
+    workingDirectory: /upload/mq
     privateKey:
 

crss-mtr/crss-mtr-pemc-dev.yml

@@ -45,7 +45,7 @@ spring:
       mesos:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 3072
+          memory: 4096
           cpu: 2
     task:
       initialize:
@@ -63,7 +63,8 @@ batch:
   chunkSize: 1
   maxWorkers: 10
   partitionSize:
-    mtr: 1000
+    mtr: 1
+    mtrSein: 20
 
 mtr:
   directory: /tmp/

crss-mtr/crss-mtr.yml

@@ -62,7 +62,7 @@ spring:
 
 logging:
   level:
-    com.pemc.crss: debug
+    com.pemc: debug
     org.hibernate.stat: debug
     org.springframework.cloud: debug
 

crss-settlement-app/crss-settlement-app.yml

@@ -2,7 +2,7 @@ spring:
   profiles.include: client-sec
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=settlement
+      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=settlement&ApplicationName=stlApp
       username: crss_settlement
       password: i17SMOPm
       driverClassName: com.edb.Driver
@@ -14,7 +14,7 @@ spring:
     datasource:
         jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=worklist
         username: crss_worklist
-        password: lbgg1i2Y
+        password: c3XL8Lcb
         driverClassName: com.edb.Driver
         connectionTimeout: 150000
         maximumPoolSize: 3

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

@@ -1,7 +1,7 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=settlement
+      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=settlement&ApplicationName=calcAddtlComp
       username: crss_settlement
       password: i17SMOPm
       driverClassName: com.edb.Driver
@@ -11,7 +11,7 @@ spring:
       validation-query: SELECT 1
   crss-main:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=meterprocess&ApplicationName=calcAddtlComp
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: com.edb.Driver
@@ -21,7 +21,7 @@ spring:
       validation-query: SELECT 1
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=metering
+      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=metering&ApplicationName=calcAddtlComp
       username: crss_metering
       password: Fh7UcXpW
       driverClassName: com.edb.Driver
@@ -31,7 +31,7 @@ spring:
       validation-query: SELECT 1
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=nmms
+      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=nmms&ApplicationName=calcAddtlComp
       username: crss_nmms
       password: lbgg1i2Y
       driverClassName: com.edb.Driver
@@ -41,7 +41,7 @@ spring:
       validation-query: SELECT 1
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=dataflow
+      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=dataflow&ApplicationName=calcAddtlComp
       username: crss_dataflow
       password: lgcCpwy0
       driverClassName: com.edb.Driver
@@ -69,8 +69,8 @@ spring:
       mesos:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 8192
-          cpu: 1
+          memory: 6144
+          cpu: 1.5
         dcos:
           authorizationToken: eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1aWQiOiJkY29zX2hpc3Rvcnlfc2VydmljZSIsImV4cCI6NDY1NTE3ODM0OX0.erK7saZPxkEOP6k1S8CNvITHQ1SyEUj1cW5qx4GTQU-MPOwxMsFAcFYO0zAthXPYQSzaRxykTelkLMJTsSQVro9bGJcHua7SedIqCmq1TvAUBSJugyxsDxu07mmS-Yh7MwpmG3LAOItwCYzWhihMqdLKRA19iimAs8xS6V5uKo5U5Fq1lOAQ0ye4f4L9CgF8WWyIqILdpynLRIx_eViY5RWtqYznV8otg0jkJGsjHQQmPZa732NY0crJtDcN713wVqT4SZoG993-Zv4mH_RU0a7NbwtvFE1mCfmja1aMp_gtogdS3xdQvRcS1BzaoJs4_dGUvRoQdUeseuTbHkF6VQ
 
@@ -82,11 +82,11 @@ spring:
 
 batch:
   chunkSize: 100
-  maxWorkers: 10
+  maxWorkers: 22
   partitionSize:
-    ac: 3000
-    acAlloc: 300
-    vatAc: 3000
+    ac: 10000
+    acAlloc: 600
+    vatAc: 10000
     vatAcAlloc: 1500
     acGmr: 1500
 

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

@@ -1,7 +1,7 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=settlement
+      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=settlement&ApplicationName=stlCalc
       username: crss_settlement
       password: i17SMOPm
       driverClassName: com.edb.Driver
@@ -11,7 +11,7 @@ spring:
       validation-query: SELECT 1
   crss-main:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=meterprocess&ApplicationName=stlCalc
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: com.edb.Driver
@@ -21,7 +21,7 @@ spring:
       validation-query: SELECT 1
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=metering
+      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=metering&ApplicationName=stlCalc
       username: crss_metering
       password: Fh7UcXpW
       driverClassName: com.edb.Driver
@@ -31,7 +31,7 @@ spring:
       validation-query: SELECT 1
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=nmms
+      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=nmms&ApplicationName=stlCalc
       username: crss_nmms
       password: lbgg1i2Y
       driverClassName: com.edb.Driver
@@ -41,7 +41,7 @@ spring:
       validation-query: SELECT 1
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=dataflow
+      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=dataflow&ApplicationName=stlCalc
       username: crss_dataflow
       password: lgcCpwy0
       driverClassName: com.edb.Driver
@@ -71,8 +71,8 @@ spring:
       mesos:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 4096
-          cpu: 1
+          memory: 8192
+          cpu: 2
         dcos:
           authorizationToken: eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1aWQiOiJkY29zX2hpc3Rvcnlfc2VydmljZSIsImV4cCI6NDY1NTE3ODM0OX0.erK7saZPxkEOP6k1S8CNvITHQ1SyEUj1cW5qx4GTQU-MPOwxMsFAcFYO0zAthXPYQSzaRxykTelkLMJTsSQVro9bGJcHua7SedIqCmq1TvAUBSJugyxsDxu07mmS-Yh7MwpmG3LAOItwCYzWhihMqdLKRA19iimAs8xS6V5uKo5U5Fq1lOAQ0ye4f4L9CgF8WWyIqILdpynLRIx_eViY5RWtqYznV8otg0jkJGsjHQQmPZa732NY0crJtDcN713wVqT4SZoG993-Zv4mH_RU0a7NbwtvFE1mCfmja1aMp_gtogdS3xdQvRcS1BzaoJs4_dGUvRoQdUeseuTbHkF6VQ
 
@@ -88,24 +88,24 @@ spring:
 
 batch:
   chunkSize: 1000
-  maxWorkers: 27
+  maxWorkers: 24
   partitionSize:
-    disAggBcqBuyer: 500
-    calcEta: 500
-    procNss: 1500
-    nss: 500
-    nssTot: 450000
-    disAggBcqSeller: 1000
-    disAggBcq: 500
+    disAggBcqBuyer: 500 #max DI: 8928
+    calcEta: 500 #max DI: 8928
+    procNss: 1500 #max DI: 8928
+    nss: 300 #max DI: 8928
+    nssTot: 400000
+    disAggBcqSeller: 1000 #max DI: 8928
+    disAggBcq: 500 #max DI: 8928
     retBcq: 44000
-    retDat: 450
-    rta: 900
+    retDat: 500 #max DI: 8928
+    rta: 150
     rprta: 2000
     rcra: 900
     sFactor: 500
     runway: 400
-    spotSeller: 10
-    spotBuyer: 10
+    spotSeller: 150
+    spotBuyer: 75
     gmr: 1500
     energyMf: 1500
     reserveMf: 1500

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

@@ -1,7 +1,7 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=settlement
+      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=settlement&ApplicationName=fileGenAddtlComp
       username: crss_settlement
       password: i17SMOPm
       driverClassName: com.edb.Driver
@@ -11,7 +11,7 @@ spring:
       validation-query: SELECT 1
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=dataflow
+      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=dataflow&ApplicationName=fileGenAddtlComp
       username: crss_dataflow
       password: lgcCpwy0
       driverClassName: com.edb.Driver
@@ -21,7 +21,7 @@ spring:
       validation-query: SELECT 1
   crss-main:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=meterprocess&ApplicationName=fileGenAddtlComp
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: com.edb.Driver
@@ -58,8 +58,8 @@ spring:
       mesos:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 4096
-          cpu: 1
+          memory: 12288
+          cpu: 3
         dcos:
           authorizationToken: eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1aWQiOiJkY29zX2hpc3Rvcnlfc2VydmljZSIsImV4cCI6NDY1NTE3ODM0OX0.erK7saZPxkEOP6k1S8CNvITHQ1SyEUj1cW5qx4GTQU-MPOwxMsFAcFYO0zAthXPYQSzaRxykTelkLMJTsSQVro9bGJcHua7SedIqCmq1TvAUBSJugyxsDxu07mmS-Yh7MwpmG3LAOItwCYzWhihMqdLKRA19iimAs8xS6V5uKo5U5Fq1lOAQ0ye4f4L9CgF8WWyIqILdpynLRIx_eViY5RWtqYznV8otg0jkJGsjHQQmPZa732NY0crJtDcN713wVqT4SZoG993-Zv4mH_RU0a7NbwtvFE1mCfmja1aMp_gtogdS3xdQvRcS1BzaoJs4_dGUvRoQdUeseuTbHkF6VQ
 
@@ -92,7 +92,7 @@ sftp:
 
 
 batch:
-  chunkSize: 100
-  maxWorkers: 2
+  chunkSize: 500
+  maxWorkers: 20
   partitionSize:
-    acDataPartitionSize: 500
+    acDataPartitionSize: 800000

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

@@ -57,7 +57,7 @@ batch:
     amsSp: 1500
     amsInv: 10
     energyStl: 10
-    lr: 10
+    lr: 31
 
 sftp:
   credentials:

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

@@ -1,32 +1,32 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=settlement
+      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=settlement&ApplicationName=invoiceGen
       username: crss_settlement
       password: i17SMOPm
       driverClassName: com.edb.Driver
-      connectionTimeout: 150000
-      maximumPoolSize: 3
+      connectionTimeout: 300000
+      maximumPoolSize: 5
       test-on-borrow: true
       validation-query: SELECT 1
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=dataflow
+      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=dataflow&ApplicationName=invoiceGen
       username: crss_dataflow
       password: lgcCpwy0
       driverClassName: com.edb.Driver
-      connectionTimeout: 150000
-      maximumPoolSize: 3
+      connectionTimeout: 300000
+      maximumPoolSize: 5
       test-on-borrow: true
       validation-query: SELECT 1
   crss-main:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=meterprocess&ApplicationName=invoiceGen
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: com.edb.Driver
-      connectionTimeout: 150000
-      maximumPoolSize: 3
+      connectionTimeout: 300000
+      maximumPoolSize: 5
       test-on-borrow: true
       validation-query: SELECT 1
   crss-registration:
@@ -60,8 +60,8 @@ spring:
       mesos:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 12288
-          cpu: 3
+          memory: 20480
+          cpu: 5
         dcos:
           authorizationToken: eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1aWQiOiJkY29zX2hpc3Rvcnlfc2VydmljZSIsImV4cCI6NDY1NTE3ODM0OX0.erK7saZPxkEOP6k1S8CNvITHQ1SyEUj1cW5qx4GTQU-MPOwxMsFAcFYO0zAthXPYQSzaRxykTelkLMJTsSQVro9bGJcHua7SedIqCmq1TvAUBSJugyxsDxu07mmS-Yh7MwpmG3LAOItwCYzWhihMqdLKRA19iimAs8xS6V5uKo5U5Fq1lOAQ0ye4f4L9CgF8WWyIqILdpynLRIx_eViY5RWtqYznV8otg0jkJGsjHQQmPZa732NY0crJtDcN713wVqT4SZoG993-Zv4mH_RU0a7NbwtvFE1mCfmja1aMp_gtogdS3xdQvRcS1BzaoJs4_dGUvRoQdUeseuTbHkF6VQ
 
@@ -72,14 +72,17 @@ spring:
       enabled: true
 
 batch:
-  chunkSize: 100
-  maxWorkers: 20
+  chunkSize: 1000
+  maxWorkers: 27
   partitionSize:
-    amsSp: 1500
-    amsInv: 1500
-    energyStl: 5
-    lr: 3
-    energyStlB: 150000
+    amsSp: 3000
+    amsInv: 3000
+    amsRmf: 3000
+    energyStl: 50 #remove if not used anymore?
+    # LR part: partitions per billing id = Math.ceil(30/lr)
+    # lr values greater than 16 will always result to 2 partitions per billing id with different DI range
+    lr: 16
+    energyStlB: 2100000 #10 partitions
 
 
 logging:

crss-settlement-task-validation/crss-settlement-task-validation.yml

@@ -1,7 +1,7 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=settlement
+      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=settlement&ApplicationName=stlValidation
       username: crss_settlement
       password: i17SMOPm
       driverClassName: com.edb.Driver
@@ -11,7 +11,7 @@ spring:
       validation-query: SELECT 1
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=registration&ApplicationName=stlValidation
       username: crss_registration
       password: 51UF3JA9
       driverClassName: com.edb.Driver
@@ -21,7 +21,7 @@ spring:
       validation-query: SELECT 1
   crss-main:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=meterprocess&ApplicationName=stlValidation
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: com.edb.Driver
@@ -31,7 +31,7 @@ spring:
       validation-query: SELECT 1
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=metering
+      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=metering&ApplicationName=stlValidation
       username: crss_metering
       password: Fh7UcXpW
       driverClassName: com.edb.Driver
@@ -41,7 +41,7 @@ spring:
       validation-query: SELECT 1
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=nmms
+      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=nmms&ApplicationName=stlValidation
       username: crss_nmms
       password: lbgg1i2Y
       driverClassName: com.edb.Driver
@@ -51,7 +51,7 @@ spring:
       validation-query: SELECT 1
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=dataflow
+      jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=dataflow&ApplicationName=stlValidation
       username: crss_dataflow
       password: lgcCpwy0
       driverClassName: com.edb.Driver

crss-uaa/crss-uaa-public.yml

@@ -0,0 +1,12 @@
+crss:
+  security:
+    oauth2:
+      default-redirect-uri: https://crss.wesm.ph
+      auto-approve: true
+      authorized-grant-types: authorization_code,refresh_token,password
+      access-token-validity-second: 3600
+      registered-redirect-uris: https://crss.wesm.ph,http://crss.wesm.ph
+      client:
+        client-id: crss
+        client-secret: crsssecret
+        scope: openid

crss-worklist-app/crss-worklist-app.yml

@@ -12,7 +12,7 @@ spring:
     datasource:
       jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=settlement
       username: crss_settlement
-      password: lbgg1i2Y
+      password: i17SMOPm
       driverClassName: com.edb.Driver
       connectionTimeout: 150000
       maximumPoolSize: 5