[devops] aligned values for crss 2.1 configurations

crss-admin/crss-admin.yml

@@ -32,9 +32,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"
@@ -62,3 +62,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.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"
@@ -82,9 +88,9 @@ sftp:
 
 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-mq-computation/crss-mq-computation.yml

@@ -53,8 +53,8 @@ spring:
       mesos:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 8192
-          cpu: 2
+          memory: 16384
+          cpu: 4
         dcos:
           authorizationToken: eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1aWQiOiJkY29zX2hpc3Rvcnlfc2VydmljZSIsImV4cCI6NDY1NTE3ODM0OX0.erK7saZPxkEOP6k1S8CNvITHQ1SyEUj1cW5qx4GTQU-MPOwxMsFAcFYO0zAthXPYQSzaRxykTelkLMJTsSQVro9bGJcHua7SedIqCmq1TvAUBSJugyxsDxu07mmS-Yh7MwpmG3LAOItwCYzWhihMqdLKRA19iimAs8xS6V5uKo5U5Fq1lOAQ0ye4f4L9CgF8WWyIqILdpynLRIx_eViY5RWtqYznV8otg0jkJGsjHQQmPZa732NY0crJtDcN713wVqT4SZoG993-Zv4mH_RU0a7NbwtvFE1mCfmja1aMp_gtogdS3xdQvRcS1BzaoJs4_dGUvRoQdUeseuTbHkF6VQ
 
@@ -68,7 +68,10 @@ spring:
 
 logging:
   level:
-    com.pemc: 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.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,10 +14,10 @@ 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: 10000
-        maximumPoolSize: 5
+        connectionTimeout: 150000
+        maximumPoolSize: 3
   jpa:
     show-sql: false
     generate-ddl: false

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
@@ -88,24 +88,24 @@ spring:
 
 batch:
   chunkSize: 1000
-  maxWorkers: 27
+  maxWorkers: 18
   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: 500 #max DI: 8928
+    nssTot: 550000
+    disAggBcqSeller: 1000 #max DI: 8928
+    disAggBcq: 500 #max DI: 8928
     retBcq: 44000
-    retDat: 450
+    retDat: 500 #max DI: 8928
     rta: 900
     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
@@ -49,8 +49,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
 
@@ -83,7 +83,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.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=invoiceGen
       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=invoiceGen
       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=invoiceGen
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: com.edb.Driver
@@ -50,8 +50,8 @@ spring:
       mesos:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 12288
-          cpu: 3
+          memory: 24576
+          cpu: 6
         dcos:
           authorizationToken: eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1aWQiOiJkY29zX2hpc3Rvcnlfc2VydmljZSIsImV4cCI6NDY1NTE3ODM0OX0.erK7saZPxkEOP6k1S8CNvITHQ1SyEUj1cW5qx4GTQU-MPOwxMsFAcFYO0zAthXPYQSzaRxykTelkLMJTsSQVro9bGJcHua7SedIqCmq1TvAUBSJugyxsDxu07mmS-Yh7MwpmG3LAOItwCYzWhihMqdLKRA19iimAs8xS6V5uKo5U5Fq1lOAQ0ye4f4L9CgF8WWyIqILdpynLRIx_eViY5RWtqYznV8otg0jkJGsjHQQmPZa732NY0crJtDcN713wVqT4SZoG993-Zv4mH_RU0a7NbwtvFE1mCfmja1aMp_gtogdS3xdQvRcS1BzaoJs4_dGUvRoQdUeseuTbHkF6VQ
 
@@ -62,16 +62,17 @@ spring:
       enabled: true
 
 batch:
-  chunkSize: 100
+  chunkSize: 1000
   maxWorkers: 20
   partitionSize:
-    amsSp: 1500
-    amsInv: 1500
-    amsEmf: 1500
-    amsRmf: 1500
-    energyStl: 5
-    lr: 3
-    energyStlB: 150000
+    amsSp: 3000
+    amsInv: 3000
+    amsMf: 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: 1400000 #15 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-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