Merge branch '2.0.x' of https://gitlab.exist.com/pemc/config into 2.0.x-updates

application-pemc-uat-default.yml

@@ -2,9 +2,9 @@ spring:
   redis:
     host: redis.marathon.l4lb.thisdcos.directory
   rabbitmq:
-    host: crss-sitrabbitmq.marathon.l4lb.thisdcos.directory
+    host: crss-uat-defaultrabbitmq.marathon.l4lb.thisdcos.directory
   datasource:
     driverClassName: org.postgresql.Driver
 
 crss:
-  api.gateway: http://crss-defaultcrss1application-main-ui.marathon.l4lb.thisdcos.directory:8080
+  api.gateway: http://crss-uat-defaultcrss1application-main-ui.marathon.l4lb.thisdcos.directory:8080

crss-admin/crss-admin-pemc-uat-default.yml

@@ -2,7 +2,7 @@ spring:
   redis:
     database: 5
   datasource:
-    url: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=admin
+    url: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=admin
     username: crss_admin
     password: crss_admin
   mail:

crss-audit/application-pemc-uat-default.yml

@@ -0,0 +1,46 @@
+spring:
+  crss-audit:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=audit
+      username: crss_audit
+      password: crss_audit
+      driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      connectionTimeout: 10000
+      test-on-borrow: true
+      validation-query: SELECT 1
+  jpa:
+    open-in-view: false
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.PostgreSQLDialect
+        ddl-auto: none
+        hbm2ddl:
+          auto: none
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
+    port: 6379
+    database: 4
+
+server:
+  port: 9094
+  undertow:
+    accesslog:
+      dir: target
+      enabled: true
+      pattern: combined
+    compression:
+      enabled: true
+      min-response-size: 1
+
+security:
+  oauth2:
+    client:
+      accessTokenUri: http://crss-uat-defaultcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
+      userAuthorizationUri: http://crss-uat-defaultcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
+    resource:
+      userInfoUri: http://crss-uat-defaultcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/user
+
+logging:
+  level:
+    com.pemc: debug

crss-audit/application-pemc-uat-sit.yml

@@ -0,0 +1,46 @@
+spring:
+  crss-audit:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=audit
+      username: crss_audit
+      password: crss_audit
+      driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      connectionTimeout: 10000
+      test-on-borrow: true
+      validation-query: SELECT 1
+  jpa:
+    open-in-view: false
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.PostgreSQLDialect
+        ddl-auto: none
+        hbm2ddl:
+          auto: none
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
+    port: 6379
+    database: 4
+
+server:
+  port: 9094
+  undertow:
+    accesslog:
+      dir: target
+      enabled: true
+      pattern: combined
+    compression:
+      enabled: true
+      min-response-size: 1
+
+security:
+  oauth2:
+    client:
+      accessTokenUri: http://crss-uat-sitcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
+      userAuthorizationUri: http://crss-uat-sitcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
+    resource:
+      userInfoUri: http://crss-uat-sitcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/user
+
+logging:
+  level:
+    com.pemc: debug

crss-dataflow-app/crss-dataflow-app-pemc-uat-default.yml

@@ -1,9 +1,10 @@
 spring:
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataflow
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
+      maxPoolSize: 5
   jpa:
     show-sql: true
     generate-ddl: true
@@ -13,13 +14,22 @@ spring:
           auto: none
 
   redis:
-    database: 5
+    database: 4
 
 server:
   port: 8082
 
+security:
+  oauth2:
+    client:
+      accessTokenUri: http://crss-uat-defaultcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
+      userAuthorizationUri: http://crss-uat-defaultcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
+    resource:
+      userInfoUri: http://crss-uat-defaultcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/user
+
+
 dataflow:
-  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
+  url: http://crss-uat-defaultspring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
 
 sftp:
   credentials:

crss-dataflow-app/crss-dataflow-app-pemc-uat-sit.yml

@@ -4,6 +4,7 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
+      maxPoolSize: 5
   jpa:
     show-sql: true
     generate-ddl: true

crss-datainterface-task-ingest/crss-datainterface-task-ingest-pemc-uat-sit.yml

@@ -9,16 +9,19 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
+      maxPoolSize: 2
   crss-nmms:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema?nmms
       username: crss_nmms
       password: crss_nmms
+      maxPoolSize: 2
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=registration
       username: crss_registration
       password: crss_registration
+      maxPoolSize: 2
   jpa:
     show-sql: true
     properties:

crss-metering/crss-metering-pemc-uat-sit.yml

@@ -6,4 +6,4 @@ spring:
     password: crss_metering
     hikari:
       connectionTimeout: 10000
-      maximumPoolSize: 20
+      maximumPoolSize: 5

crss-meterprocess-app/crss-meterprocess-app-pemc-uat-default.yml

@@ -1,17 +1,19 @@
 spring:
+  redis:
+    database: 4
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=registration
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=registration
       username: crss_registration
       password: crss_registration
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=nmms
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=nmms
       username: crss_nmms
       password: crss_nmms
 
@@ -22,10 +24,19 @@ spring:
 server:
   port: 8081
 
+
+security:
+  oauth2:
+    client:
+      accessTokenUri: http://crss-uat-defaultcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
+      userAuthorizationUri: http://crss-uat-defaultcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
+    resource:
+      userInfoUri: http://crss-uat-defaultcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/user
+
 dataflow:
-  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
+  url: http://crss-uat-defaultspring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
 
 sftp:
   credentials:
     host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload
+    workingDirectory: /upload/mq

crss-meterprocess-app/crss-meterprocess-app-pemc-uat-sit.yml

@@ -37,4 +37,4 @@ dataflow:
 sftp:
   credentials:
     host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload
+    workingDirectory: /upload/mq

crss-meterprocess-app/crss-meterprocess-app-pemc-uat.yml

@@ -35,4 +35,4 @@ dataflow:
 sftp:
   credentials:
     host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload
+    workingDirectory: /upload/mq

crss-meterprocess-stream-daily-sink/crss-meterprocess-stream-daily-sink-pemc-uat-sit.yml

@@ -3,14 +3,17 @@ spring:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
       username: crss_meterprocess
-      password: crss_meterproces
+      password: crss_meterprocess
+      maxPoolSize: 2
   crss-metering:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
       username: crss_metering
       password: crss_metering
+      maxPoolSize: 2
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=registration
       username: crss_registration
-      password: crss_registration
+      password: crss_registration
+      maxPoolSize: 2

crss-meterprocess-stream-mapper/crss-meterprocess-stream-mapper-pemc-uat-sit.yml

@@ -4,11 +4,13 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=registration
       username: crss_registration
       password: crss_registration
+      maxPoolSize: 2
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
+      maxPoolSize: 2
 
   jpa:
     properties:

crss-meterprocess-stream-processor-daily-validate/crss-meterprocess-stream-processor-daily-validate-pemc-uat-sit.yml

@@ -4,13 +4,16 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
+      maxPoolSize: 2
   crss-metering:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
       username: crss_metering
       password: crss_metering
+      maxPoolSize: 2
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=registration
       username: crss_registration
-      password: crss_registration
+      password: crss_registration
+      maxPoolSize: 2

crss-meterprocess-stream-source-daily-raw/crss-meterprocess-stream-source-daily-raw-pemc-uat-sit.yml

@@ -5,7 +5,7 @@ spring:
     password: crss_metering
     username: crss_metering
     url: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
-
+    maxPoolSize: 2
 jdbc:
   query: "select * from metering.txn_meter_data_daily where consumed <> TRUE or consumed is null limit 10000;"
   update: "update metering.txn_meter_data_daily set consumed = TRUE where meter_data_id in (:meter_data_id);"
@@ -19,6 +19,7 @@ spring:
     password: crss_metering
     username: crss_metering
     url: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
+    maxPoolSize: 2
 jdbc:
   query: "select * from metering.txn_meter_data_monthly where consumed <> TRUE or consumed is null limit 10000;"
   update: "update metering.txn_meter_data_monthly set consumed = TRUE where meter_data_id in (:meter_data_id);"
@@ -31,7 +32,7 @@ spring:
     password: crss_metering
     username: crss_metering
     url: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
-
+    maxPoolSize: 2
 jdbc:
   query: "select * from metering.txn_meter_data_monthly where consumed <> TRUE or consumed is null limit 10000;"
   update: "update metering.txn_meter_data_monthly set consumed = TRUE where meter_data_id in (:meter_data_id);"

crss-meterprocess-task-stlready/crss-meterprocess-task-stlready-pemc-uat-sit.yml

@@ -4,16 +4,19 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
+      maxPoolSize: 2
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
+      maxPoolSize: 2
   crss-nmms:
       datasource:
         jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=nmms
         username: crss_nmms
         password: crss_nmms
+        maxPoolSize: 2
   jpa:
     show-sql: false
     generate-ddl: true
@@ -33,5 +36,5 @@ spring:
       enabled: false
 
   redis:
-    database: 5
+    database: 4
 

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

@@ -39,7 +39,7 @@ batch:
   partitionSize:
     mq: 10000
     ssla: 5000
-    report: 1000
+    report: 1
 
 sftp:
   credentials:

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

@@ -40,7 +40,7 @@ batch:
   partitionSize:
     mq: 10000
     ssla: 5000
-    report: 1000
+    report: 1
 
 sftp:
   credentials:

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

@@ -25,7 +25,7 @@ spring:
       mesos:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 1024
+          memory: 2048
     task:
       initialize:
         enable: false
@@ -41,9 +41,9 @@ batch:
   partitionSize:
     mq: 10000
     ssla: 5000
-    report: 1000
+    report: 1
 
 sftp:
   credentials:
     host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload
+    workingDirectory: /upload/mq

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

@@ -1,19 +1,22 @@
 spring:
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema?dataflow
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
+      maxPoolSize: 2
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
+      maxPoolSize: 2
   crss-registration:
     dataSource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=registration
       username: crss_registration
       password: crss_registration
+      maxPoolSize: 2
   jpa:
     # show-sql: true
     generate-ddl: true
@@ -24,7 +27,7 @@ spring:
       mesos:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 1024
+          memory: 2048
     task:
       initialize:
         enable: false
@@ -40,9 +43,9 @@ batch:
   partitionSize:
     mq: 10000
     ssla: 5000
-    report: 1000
+    report: 1
 
 sftp:
   credentials:
     host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload
+    workingDirectory: /upload/mq

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

@@ -24,7 +24,7 @@ spring:
       mesos:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 1024
+          memory: 2048
     task:
       initialize:
         enable: false
@@ -40,9 +40,9 @@ batch:
   partitionSize:
     mq: 10000
     ssla: 5000
-    report: 1000
+    report: 1
 
 sftp:
   credentials:
     host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload
+    workingDirectory: /upload/mq

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

@@ -40,7 +40,8 @@ batch:
   partitionSize:
     mq: 10000
     ssla: 5000
-    report: 1000
+    report: 1
+
 sftp:
   credentials:
     host: sftp.marathon.l4lb.thisdcos.directory

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

@@ -66,7 +66,7 @@ batch:
     gap: 5000
     mq: 1500
     ssla: 1500
-    report: 1500
+    report: 1
 
 mqreport:
   directory: /tmp/

crss-mtr/crss-mtr-pemc-uat-default.yml

@@ -24,7 +24,7 @@ spring:
       mesos:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 1024
+          memory: 4096
     task:
       initialize:
         enable: false
@@ -35,6 +35,10 @@ spring:
   redis:
     database: 5
 
+batch:
+  partitionSize:
+    mtr: 1
+
 sftp:
   credentials:
     host: sftp.marathon.l4lb.thisdcos.directory

crss-mtr/crss-mtr-pemc-uat-sit.yml

@@ -4,16 +4,19 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
+      maxPoolSize: 2
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
+      maxPoolSize: 2
   crss-registration:
     dataSource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=registration
       username: crss_registration
       password: crss_registration
+      maxPoolSize: 2
   jpa:
     show-sql: true
     generate-ddl: true
@@ -24,17 +27,14 @@ spring:
       mesos:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 1024
-    task:
-      initialize:
-        enable: false
-  batch:
-    initializer:
-      enabled: false
+          memory: 4096
 
   redis:
-    database: 5
+    database: 4
 
+batch:
+  partitionSize:
+    mtr: 1
 
 sftp:
   credentials:

crss-mtr/crss-mtr-pemc-uat.yml

@@ -24,7 +24,7 @@ spring:
       mesos:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 1024
+          memory: 4096
     task:
       initialize:
         enable: false
@@ -35,6 +35,9 @@ spring:
   redis:
     host: redis.marathon.l4lb.thisdcos.directory
 
+batch:
+  partitionSize:
+    mtr: 1
 
 sftp:
   credentials:

crss-settlement-app/crss-settlement-app-pemc-uat-default.yml

@@ -1,15 +1,17 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=settlement
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=settlement
       username: crss_settlement
       password: crss_settlement
+  redis:
+    database: 4
 
 server:
   port: 8082
 
 dataflow:
-  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
+  url: http://crss-uat-defaultspring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
 
 sftp:
   credentials:

crss-settlement-task-calculation-addtlcomp/application-pemc-uat-default.yml

@@ -0,0 +1,76 @@
+spring:
+  crss-stl:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=settlement
+      username: crss_settlement
+      password: crss_settlement
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  # for removal after ITER 7 stl testing
+  crss-meterprocess:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: crss_meterprocess
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: crss_meterprocess
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  crss-metering:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=metering
+      username: crss_metering
+      password: crss_metering
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  crss-nmms:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=nmms
+      username: crss_nmms
+      password: crss_nmms
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  crss-dataflow:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=dataflow
+      username: crss_dataflow
+      password: crss_dataflow
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+
+  jpa:
+    show-sql: false
+    generate-ddl: true
+    properties:
+      hibernate:
+        generate_statistics: false
+        dialect: org.hibernate.dialect.PostgreSQL81Dialect
+        ddl-auto: validate
+        hbm2ddl:
+          import_files:
+
+  batch:
+    job:
+      enabled: true
+
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
+    port: 6379
+
+logging:
+  level:
+    com.pemc: DEBUG
+    com.netflix: DEBUG
+    org.springframework.cloud: DEBUG
+    org.hibernate.stat: debug

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

@@ -4,32 +4,47 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_settlement
       username: crss_settlement
       password: crss_settlement
+      maxPoolSize: 2
   # for removal after ITER 7 stl testing
   crss-meterprocess:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/stl_crss_meterprocess
       username: crss_settlement
       password: crss_settlement
+      maxPoolSize: 2
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/stl_crss_meterprocess
       username: crss_settlement
       password: crss_settlement
+      maxPoolSize: 2
   crss-metering:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/stl_crss_metering
       username: crss_settlement
       password: crss_settlement
+      maxPoolSize: 2
   crss-nmms:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/stl_crss_nmms
       username: crss_settlement
       password: crss_settlement
+      maxPoolSize: 2
   crss-dataflow:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_dataflow
       username: crss_dataflow
       password: crss_dataflow
+      maxPoolSize: 2
+
+  jpa:
+    properties:
+      hibernate:
+        generate_statistics: false
+
+  batch:
+    job:
+      enabled: true
 
   redis:
     host: redis.marathon.l4lb.thisdcos.directory

crss-settlement-task-calculation/crss-settlement-task-calculation-pemc-uat-default.yml

@@ -1,35 +1,43 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=settlement
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=settlement
       username: crss_settlement
       password: crss_settlement
+      maxPoolSize: 2
   # for removal after ITER 7 stl testing
   crss-meterprocess:
     datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
+      maxPoolSize: 2
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
+      maxPoolSize: 2
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=metering
       username: crss_metering
-      password: crss_metering
+      password: crss_meterin
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=nmms
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=nmms
       username: crss_nmms
       password: crss_nmms
+      maxPoolSize: 2
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataflow
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
+      maxPoolSize: 2
 
   redis:
-    database: 5
+    database: 4

crss-settlement-task-calculation/crss-settlement-task-calculation-pemc-uat-sit.yml

@@ -4,32 +4,38 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=settlement
       username: crss_settlement
       password: crss_settlement
+      maxPoolSize: 2
   # for removal after ITER 7 stl testing
   crss-meterprocess:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
+      maxPoolSize: 2
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
+      maxPoolSize: 2
   crss-metering:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
       username: crss_metering
       password: crss_metering
+      maxPoolSize: 2
   crss-nmms:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=nmms
       username: crss_nmms
       password: crss_nmms
+      maxPoolSize: 2
   crss-dataflow:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
+      maxPoolSize: 2
 
   redis:
     database: 4

crss-settlement-task-file-gen-addtlcomp/application-pemc-uat-default.yml

@@ -0,0 +1,73 @@
+spring:
+  crss-stl:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=settlement
+      username: crss_settlement
+      password: crss_settlement
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  crss-dataflow:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=dataflow
+      username: crss_dataflow
+      password: crss_dataflow
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  # for removal after ITER 7 stl testing
+  crss-meterprocess:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: crss_meterprocess
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: crss_meterprocess
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+
+  jpa:
+    show-sql: false
+    generate-ddl: true
+    properties:
+      hibernate:
+        generate_statistics: true
+        dialect: org.hibernate.dialect.PostgreSQL81Dialect
+        ddl-auto: validate
+        hbm2ddl:
+          import_files:
+
+  batch:
+    job:
+      enabled: true
+
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
+    port: 6379
+
+logging:
+  level:
+    com.pemc: DEBUG
+    com.netflix: DEBUG
+    org.springframework.cloud: DEBUG
+    org.hibernate.stat: debug
+
+report:
+  directory:
+    base: report/
+
+sftp:
+  credentials:
+    username: pemc
+    password: 123qwe
+    host: sftp.marathon.l4lb.thisdcos.directory
+    port: 22
+    workingDirectory: /upload/stl
+    privateKey:

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

@@ -4,13 +4,13 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_settlement
       username: crss_settlement
       password: crss_settlement
-      maxPoolSize: 20
+      maxPoolSize: 2
   crss-dataflow:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_dataflow
       username: crss_dataflow
       password: crss_dataflow
-      maxPoolSize: 20
+      maxPoolSize: 2
   # for removal after ITER 7 stl testing
   crss-meterprocess:
     datasource:
@@ -18,14 +18,14 @@ spring:
       username: crss_settlement
       password: crss_settlement
       connectionTimeout: 10000
-      maxPoolSize: 20
+      maxPoolSize: 2
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/stl_crss_meterprocess
       username: crss_settlement
       password: crss_settlement
       connectionTimeout: 10000
-      maxPoolSize: 20
+      maxPoolSize: 2
 
   redis:
     host: redis.marathon.l4lb.thisdcos.directory

crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation-pemc-uat-default.yml

@@ -1,34 +1,49 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=settlement
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=settlement
       username: crss_settlement
       password: crss_settlement
-      maxPoolSize: 20
+      maxPoolSize: 2
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataflow
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
-      maxPoolSize: 20
+      maxPoolSize: 2
   # for removal after ITER 7 stl testing
   crss-meterprocess:
     datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
       connectionTimeout: 10000
-      maxPoolSize: 20
+      maxPoolSize: 2
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
       connectionTimeout: 10000
-      maxPoolSize: 20
+      maxPoolSize: 2
+
+  jpa:
+    show-sql: false
+    generate-ddl: true
+    properties:
+      hibernate:
+        generate_statistics: true
+        dialect: org.hibernate.dialect.PostgreSQL81Dialect
+        ddl-auto: validate
+        hbm2ddl:
+          import_files:
+
+  batch:
+    job:
+      enabled: true
 
   redis:
-    database: 5
+    database: 4
 
 sftp:
   credentials:

crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation-pemc-uat-sit.yml

@@ -4,13 +4,13 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=settlement
       username: crss_settlement
       password: crss_settlement
-      maxPoolSize: 20
+      maxPoolSize: 2
   crss-dataflow:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
-      maxPoolSize: 20
+      maxPoolSize: 2
   # for removal after ITER 7 stl testing
   crss-meterprocess:
     datasource:
@@ -18,14 +18,14 @@ spring:
       username: crss_meterprocess
       password: crss_meterprocess
       connectionTimeout: 10000
-      maxPoolSize: 20
+      maxPoolSize: 2
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
       connectionTimeout: 10000
-      maxPoolSize: 20
+      maxPoolSize: 2
 
   redis:
     database: 4

crss-settlement-task-validation/application-pemc-uat-default.yml

@@ -0,0 +1,85 @@
+spring:
+  crss-stl:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=settlement
+      username: crss_settlement
+      password: crss_settlement
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  crss-registration:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=registration
+      username: crss_registration
+      password: crss_registration
+      driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
+  # for removal after ITER 7 stl testing
+  crss-meterprocess:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: crss_meterprocess
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: crss_meterprocess
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  crss-metering:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=metering
+      username: crss_metering
+      password: crss_metering
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  crss-nmms:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=nmms
+      username: crss_nmms
+      password: crss_nmms
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  crss-dataflow:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=dataflow
+      username: crss_dataflow
+      password: crss_dataflow
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+
+  jpa:
+    show-sql: false
+    generate-ddl: true
+    properties:
+      hibernate:
+        generate_statistics: true
+        dialect: org.hibernate.dialect.PostgreSQL81Dialect
+        ddl-auto: validate
+        hbm2ddl:
+          import_files:
+
+  batch:
+    job:
+      enabled: true
+
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
+    port: 6379
+
+logging:
+  level:
+    com.pemc: DEBUG
+    com.netflix: DEBUG
+    org.springframework.cloud: DEBUG
+    org.hibernate.stat: debug

crss-settlement-task-validation/application-pemc-uat.yml

@@ -0,0 +1,85 @@
+spring:
+  crss-stl:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_settlement
+      username: crss_settlement
+      password: crss_settlement
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  crss-registration:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_reg
+      username: crss_settlement
+      password: crss_settlement
+      driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
+  # for removal after ITER 7 stl testing
+  crss-meterprocess:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/stl_crss_meterprocess
+      username: crss_settlement
+      password: crss_settlement
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/stl_crss_meterprocess
+      username: crss_settlement
+      password: crss_settlement
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  crss-metering:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/stl_crss_metering
+      username: crss_settlement
+      password: crss_settlement
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  crss-nmms:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/stl_crss_nmms
+      username: crss_settlement
+      password: crss_settlement
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  crss-dataflow:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_dataflow
+      username: crss_dataflow
+      password: crss_dataflow
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+
+  jpa:
+    show-sql: false
+    generate-ddl: true
+    properties:
+      hibernate:
+        generate_statistics: true
+        dialect: org.hibernate.dialect.PostgreSQL81Dialect
+        ddl-auto: validate
+        hbm2ddl:
+          import_files:
+
+  batch:
+    job:
+      enabled: true
+
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
+    port: 6379
+
+logging:
+  level:
+    com.pemc: DEBUG
+    com.netflix: DEBUG
+    org.springframework.cloud: DEBUG
+    org.hibernate.stat: debug

ui-bsmd/ui-bsmd-pemc-uat-default.yml

@@ -7,13 +7,19 @@ zuul:
 
 crss-meterprocess-app:
   ribbon:
-    listOfServers: crss-uat-default-crss2crss-meterprocess-app.marathon.l4lb.thisdcos.directory:8081
+    listOfServers: crss-uat-defaultcrss2meterprocess-app.marathon.l4lb.thisdcos.directory:8081
 crss-settlement-app:
   ribbon:
-    listOfServers: crss-uat-default-crss2crss-settlement-app.marathon.l4lb.thisdcos.directory:8082
+    listOfServers: crss-uat-defaultcrss2settlement-app.marathon.l4lb.thisdcos.directory:8082
 crss-dataflow-app:
   ribbon:
-    listOfServers: crss-uat-default-crss2crss-dataflow-app.marathon.l4lb.thisdcos.directory:8082
+    listOfServers: crss-uat-defaultcrss2dataflow-app.marathon.l4lb.thisdcos.directory:8082
 crss-admin:
   ribbon:
-    listOfServers: crss-uat-default-crss1admin-service.marathon.l4lb.thisdcos.directory:808
+    listOfServers: crss-uat-defaultcrss1admin-service.marathon.l4lb.thisdcos.directory:8080
+crss-reg:
+  ribbon:
+    listOfServers: crss-uat-defaultcrss1registration-service.marathon.l4lb.thisdcos.directory:8080
+crss-audit:
+  ribbon:
+    listOfServers: crss-uat-defaultcrss2audit.marathon.l4lb.thisdcos.directory:9094