[cleanup] added config for exist-dev staging

.gitignore

@@ -1,4 +1,4 @@
 .idea/
 *.iml
 *.DS_Store
-.gradle
+.gradle

application-azure.yml

@@ -1,24 +0,0 @@
-spring:
-  jpa:
-    show-sql: false
-    properties:
-      hibernate.use_sql_comments: true
-      hibernate.format_sql: true
-  datasource:
-    driverClassName: org.postgresql.Driver
-crss:
-  api.gateway: http://crssedge-server.marathon.l4lb.thisdcos.directory:8080
-  security.url: http://crssedge-server.marathon.l4lb.thisdcos.directory:8080/uaa
-  dispatch.interval: 5
-
-logging:
-  pattern:
-    level: 'username:%X{username:-system} %5p'
-  level:
-    com.pemc.crss: DEBUG
-    com.netflix: DEBUG
-    org.springframework.cloud: DEBUG
-
-cfg:
-  general:
-    interval: 5

application-dev2.yml

@@ -1,31 +0,0 @@
-spring:
-  rabbitmq:
-    host: rabbitmq.marathon.l4lb.thisdcos.directory
-  redis:
-    host: redis.marathon.mesos
-  datasource:
-    driverClassName: org.postgresql.Driver
-  #jpa:
-    #properties:
-      #hibernate.jdbc.use_get_generated_keys: true
-      #hibernate.temp.use_jdbc_metadata_defaults: false
-  cloud:
-    deployer:
-      mesos:
-        dcos:
-          authorizationToken: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE4NTAyNzg0ODUuMzA5NTUyMiwidWlkIjoiamVqb21hci5kaW1heXVnYUBnbWFpbC5jb20ifQ.5QIykNbBuejzQAM9Bt3doUy8kNfqykQWR9yLdsiBElE
-
-security.server.url: http://crssedge-server.marathon.l4lb.thisdcos.directory:8080/admin
-
-logging:
-  level:
-    com.pemc.crss: DEBUG
-    
-crss:
-  api.gateway: http://crssedge-server.marathon.l4lb.thisdcos.directory:8080
-  security.url: http://crssedge-server.marathon.l4lb.thisdcos.directory:8080/uaa
-  dcos.token: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE4NTAyNzg0ODUuMzA5NTUyMiwidWlkIjoiamVqb21hci5kaW1heXVnYUBnbWFpbC5jb20ifQ.5QIykNbBuejzQAM9Bt3doUy8kNfqykQWR9yLdsiBElE
-
-cfg:
-  general:
-    calcValidation: false

application-exist-dev.yml

@@ -0,0 +1,20 @@
+spring:
+  rabbitmq:
+    host: rabbitmq.marathon.l4lb.thisdcos.directory
+  redis:
+    host: redis.marathon.mesos
+  datasource:
+    driverClassName: org.postgresql.Driver
+
+crss:
+  api.gateway: http://edge-server.marathon.l4lb.thisdcos.directory:8080
+  security.url: http://edge-server.marathon.l4lb.thisdcos.directory:8080/uaa
+
+logging:
+  level:
+    com.pemc.crss: DEBUG
+
+cfg:
+  general:
+    interval: 5
+    calcValidation: false

crss-admin/crss-admin-azure.yml

@@ -1,29 +0,0 @@
-spring:
-  profiles:
-    include: ldap
-  redis:
-    database: 2
-  datasource:
-    url: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=admin
-    username: crss_admin
-    password: crss_admin
-    hikari:
-      maximumPoolSize: 20
-  mail:
-    host: mailserver.marathon.l4lb.thisdcos.directory
-    port: 3025
-    username: crss@local.dev.pemc.com
-    password: P@ssw0rd1434412
-    properties:
-      mail:
-        transport.protocol: smtp
-        smtp:
-          auth: true
-          starttls.enable: true
-logging:
-  pattern:
-    level: 'username:%X{username:-system} %5p'
-  level:
-    com.pemc.crss: DEBUG
-    com.netflix: WARN
-    org.springframework.cloud: DEBUG

crss-admin/crss-admin-dcos.yml

@@ -1,20 +0,0 @@
-spring:
-  profiles:
-    include: ldap
-  datasource:
-    url: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_admin
-    username: crss_admin
-    password: crss_admin
-  mail:
-    host: mailserver.marathon.l4lb.thisdcos.directory
-    port: 3025
-    username: crss@local.dev.pemc.com
-    password: P@ssw0rd1434412
-    properties:
-      mail:
-        transport.protocol: smtp
-        smtp:
-          auth: true
-          starttls.enable: true
-  redis:
-    host: redis.marathon.mesos

crss-admin/crss-admin-dev2.yml → crss-admin/crss-admin-exist-dev.yml

@@ -1,12 +1,8 @@
 spring:
   datasource:
-    url: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=admin
+    url: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=admin
     username: crss_admin
-    password: crss_admin
-    hikari:
-      connectionTimeout: 20000
-      idleTimeout: 180000 # 3 min
-      maxLifetime: 600000 # 10 min
+    password: YReYA7fI
   mail:
     host: mailserver.marathon.l4lb.thisdcos.directory
     port: 3025
@@ -21,14 +17,14 @@ spring:
 crss:
   ldap:
     protocol: LDAPS
-    host: "192.168.241.174"
+    host: "192.168.1.105"
     port: 636
-    root-dn: "dc=wesmsys,dc=local"
+    root-dn: "dc=wesmlocal,dc=dev"
     user-search-base: MO,MP,SO
-    admin-user: "wesmsys\\Administrator"
-    admin-password: "ex1stw1nd0wsaD"
+    admin-user: "wesmdev\\crss_user"
+    admin-password: "Pemc@123"
     username-field: "userPrincipalName"
-    domain: "wesmsys.local"
+    domain: "wesmlocal.dev"
     embedded: false
     passwordOpEnabled: true
     passwordExpiryField: "msDS-UserPasswordExpiryTimeComputed"

crss-audit/crss-audit-azure.yml

@@ -1,10 +0,0 @@
-spring:
-  crss-audit:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=audit
-      username: crss_audit
-      password: crss_audit
-
-  redis:
-    host: redis.marathon.mesos

crss-audit/crss-audit-dev2.yml

@@ -1,7 +0,0 @@
-spring:
-  crss-audit:
-    datasource:
-      driverClassName: ${spring.datasource.driverClassName}
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=audit
-      username: crss_audit
-      password: crss_audit

crss-audit/crss-audit-exist-dev.yml

@@ -0,0 +1,7 @@
+spring:
+  crss-audit:
+    datasource:
+      driverClassName: ${spring.datasource.driverClassName}
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=audit
+      username: crss_audit
+      password: S0CuFyj6

crss-data/crss-data-azure.yml

@@ -1,28 +0,0 @@
-spring:
-  datasource:
-    driverClassName: org.postgresql.Driver
-    # TODO: Should be replaced with psql after UAT
-    url: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=dataextraction
-#    url: jdbc:oracle:thin:@10.64.0.4:1521:ORCL
-    username: crss_dataextraction
-    password: crss_dataextraction
-crss:
-  metadata:
-    datasource:
-      driverClassName: org.postgresql.Driver
-      url: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=dataextraction
-      username: crss_dataextraction
-      password: crss_dataextraction
-  datawarehouse:
-    datasource:
-      driverClassName: org.postgresql.Driver
-      platform: postgresql
-      url: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=datawarehouse
-      username: crss_datawarehouse
-      password: crss_datawarehouse
-  registration:
-     datasource:
-       driverClassName: org.postgresql.Driver
-       url: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=registration
-       username: crss_registration
-       password: crss_registration

crss-data/crss-data-dev2.yml

@@ -1,48 +0,0 @@
-spring:
-  datasource:
-    driverClassName: org.postgresql.Driver
-    url: jdbc:postgresql://192.168.241.177:5432/crss?currentSchema=dataextraction
-    jdbcUrl: jdbc:postgresql://192.168.241.177:5432/crss?currentSchema=dataextraction
-    username: crss_dataextraction
-    password: crss_dataextraction
-    test-on-borrow: true
-    remove-abandoned: true
-    validation-query: SELECT 1
-    hikari:
-      connectionTimeout: 10000
-      maximumPoolSize: 2
-      idleTimeout: 180000 # 3 min
-      maxLifetime: 600000 # 10 min
-crss:
-  metadata:
-    datasource:
-      driverClassName: org.postgresql.Driver
-      url: jdbc:postgresql://192.168.241.177:5432/crss?currentSchema=dataextraction
-      jdbcUrl: jdbc:postgresql://192.168.241.177:5432/crss?currentSchema=dataextraction
-      username: crss_dataextraction
-      password: crss_dataextraction
-  datawarehouse:
-    datasource:
-      platform: postgresql
-      url: jdbc:postgresql://192.168.241.177:5432/crss_external?currentSchema=datawarehouse
-      jdbcUrl: jdbc:postgresql://192.168.241.177:5432/crss_external?currentSchema=datawarehouse
-      username: crss_datawarehouse
-      password: crss_datawarehouse
-      driverClassName: org.postgresql.Driver
-      hikari:
-        connectionTimeout: 10000
-        maximumPoolSize: 5
-        minimumIdle: 2
-  registration:
-     datasource:
-       driverClassName: org.postgresql.Driver
-       url: jdbc:postgresql://192.168.241.177:5432/crss?currentSchema=registration
-       jdbcUrl: jdbc:postgresql://192.168.241.177:5432/crss?currentSchema=registration
-       username: crss_registration
-       password: crss_registration
-       hikari:
-         connectionTimeout: 10000
-         maximumPoolSize: 5
-         minimumIdle: 2
-         idleTimeout: 180000 # 3 min
-         maxLifetime: 600000 # 10 min

crss-data/crss-data-exist-dev.yml

@@ -0,0 +1,36 @@
+spring:
+  datasource:
+    driverClassName: org.postgresql.Driver
+    url: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=dataextraction
+    username: crss_dataextraction
+    password: xgZx2FqM
+crss:
+  metadata:
+    datasource:
+      driverClassName: org.postgresql.Driver
+      url: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=dataextraction
+      username: crss_dataextraction
+      password: xgZx2FqM
+  datawarehouse:
+    datasource:
+      platform: postgresql
+      url: jdbc:postgresql://172.16.0.20:5432/crss_external?currentSchema=datawarehouse
+      username: crss_datawarehouse
+      password: 8BE7ShE3
+      driverClassName: org.postgresql.Driver
+      hikari:
+        connectionTimeout: 10000
+        maximumPoolSize: 5
+        minimumIdle: 2
+  registration:
+     datasource:
+       driverClassName: org.postgresql.Driver
+       url: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=registration
+       username: crss_registration
+       password: 51UF3JA9
+       hikari:
+         connectionTimeout: 10000
+         maximumPoolSize: 5
+         minimumIdle: 2
+         idleTimeout: 180000 # 3 min
+         maxLifetime: 600000 # 10 min

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

@@ -1,41 +0,0 @@
-spring:
-  crss-dataflow:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=dataflow
-      username: crss_dataflow
-      password: crss_dataflow
-  jpa:
-    show-sql: false
-    generate-ddl: true
-    properties:
-      hibernate:
-        hbm2ddl:
-          auto: none
-
-  redis:
-    host: redis.marathon.mesos
-
-  # prevent batch job from running on app start
-  batch:
-    job:
-      enabled: false
-    # set to false if spring batch tables are already created
-    initializer:
-      enabled: true
-
-server:
-  port: 8082
-
-logging:
-  level:
-    org.hibernate.type: debug
-
-
-dataflow:
-  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
-
-sftp:
-  credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload

crss-dataflow-app/crss-dataflow-app-dev2.yml → crss-dataflow-app/crss-dataflow-app-exist-dev.yml

@@ -1,15 +1,15 @@
 spring:
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=dataflow
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=dataflow
       username: crss_dataflow
-      password: crss_dataflow
+      password: lgcCpwy0
       driverClassName: org.postgresql.Driver
-      connectionTimeout: 30000
+      connectionTimeout: 10000
       test-on-borrow: true
       validation-query: SELECT 1
   jpa:
-    show-sql: false
+    show-sql: true
     generate-ddl: true
     properties:
       hibernate:
@@ -23,15 +23,24 @@ spring:
     initializer:
       enabled: false
 
+logging:
+  level:
+    com.pemc.crss: DEBUG
+    org.hibernate.type: trace
+    org.hibernate.stat: debug
+
 server:
   port: 8082
 
 dataflow:
   url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
 
+sftp:
+  credentials:
+    host: sftp.marathon.l4lb.thisdcos.directory
+    workingDirectory: /upload
+
 scheduler:
-  parallel-stl-monthly-job: 2
-  launch-timeout-seconds: 1800
   job-execution-timeout-minutes:
     default: 180
     runStlReady: 480
@@ -41,8 +50,3 @@ scheduler:
     genMqReport: 480
     genMtr: 480
 
-sftp:
-  credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload
-

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

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

crss-datainterface-app/crss-datainterface-app-azure.yml → crss-datainterface-app/crss-datainterface-app-exist-dev.yml

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

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

@@ -1,51 +0,0 @@
-spring:
-  crss-emdb:
-    datasource:
-      driverClassName: oracle.jdbc.OracleDriver
-      jdbcUrl: jdbc:oracle:thin:@52.187.11.108:1521:ORCL
-      username: stl
-      password: 123qwe
-  crss-dataflow:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=dataflow
-      username: crss_dataflow
-      password: crss_dataflow
-  crss-nmms:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=nmms
-      username: crss_nmms
-      password: crss_nmms
-  crss-registration:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=registration
-      username: crss_registration
-      password: crss_registration
-  crss-scheduler:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://localhost:5433/crss_sched
-      username: crss_sched
-      password: crss_sched
-  jpa:
-    show-sql: true
-    properties:
-      hibernate:
-        #generate_statistics: true
-        hbm2ddl:
-          auto: none
-
-  redis:
-    host: redis.marathon.mesos
-
-batch:
-  #resourceLocation: "file:target/libs/crss-datainterface-task-ingest-1.0.0.BUILD-SNAPSHOT.jar"
-
-sftp:
-  credentials:
-    username: pemc
-    password: 123qwe
-    host: pemc-storage.southeastasia.cloudapp.azure.com
-    port: 22

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

@@ -1,45 +0,0 @@
-spring:
-  crss-emdb:
-    datasource:
-      driverClassName: org.postgresql.Driver
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_external?currentSchema=emdb
-      username: postgres
-      password: postgres
-      maximumPoolSize: 10
-  crss-dataflow:
-    datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=dataflow
-      username: crss_dataflow
-      password: crss_dataflow
-      driverClassName: org.postgresql.Driver
-  crss-nmms:
-    datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=nmms
-      username: crss_nmms
-      password: crss_nmms
-      driverClassName: org.postgresql.Driver
-  crss-registration:
-    datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=registration
-      username: crss_registration
-      password: crss_registration
-      driverClassName: org.postgresql.Driver
-  crss-settlements:
-    datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=settlement
-      username: crss_settlement
-      password: crss_settlement
-      driverClassName: org.postgresql.Driver
-  crss-scheduler:
-    datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=scheduler
-      username: crss_sched
-      password: crss_sched
-      driverClassName: org.postgresql.Driver
-
-sftp:
-  credentials:
-    username: pemc
-    password: 123qwe
-    host: 192.168.233.3
-    port: 2222

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

@@ -0,0 +1,44 @@
+spring:
+  crss-emdb:
+    datasource:
+      driverClassName: org.postgresql.Driver
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss_external?currentSchema=emdb
+      username: postgres
+      password: postgres
+  crss-dataflow:
+    datasource:
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=dataflow
+      username: crss_dataflow
+      password: lgcCpwy0
+      driverClassName: org.postgresql.Driver
+  crss-nmms:
+    datasource:
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=nmms
+      username: crss_nmms
+      password: lbgg1i2Y
+      driverClassName: org.postgresql.Driver
+  crss-registration:
+    datasource:
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=registration
+      username: crss_registration
+      password: 51UF3JA9
+      driverClassName: org.postgresql.Driver
+  crss-stl:
+    datasource:
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=settlement
+      username: crss_settlement
+      password: i17SMOPm
+      driverClassName: org.postgresql.Driver
+  crss-scheduler:
+    datasource:
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=scheduler
+      username: crss_uat_user
+      password: f2aB2NkF
+      driverClassName: org.postgresql.Driver
+
+sftp:
+  credentials:
+    username: pemc
+    password: 123qwe
+    host: sftp.marathon.l4lb.thisdcos.directory
+    port: 22

crss-edge/crss-edge-dev2.yml

@@ -1,37 +0,0 @@
-spring:
-admin-service:
-  ribbon:
-    listOfServers: crssadmin-service.marathon.l4lb.thisdcos.directory:8080
-registration-service:
-  ribbon:
-    listOfServers: crssregistration-service.marathon.l4lb.thisdcos.directory:8080
-metering-service:
-  ribbon:
-    listOfServers: crssmetering-service.marathon.l4lb.thisdcos.directory:8080
-scheduler-service:
-  ribbon:
-    listOfServers: crssscheduler-service.marathon.l4lb.thisdcos.directory:8080
-data-extraction-service:
-  ribbon:
-    listOfServers: crssdata-extraction-service.marathon.l4lb.thisdcos.directory:8080
-crss-meterprocess-app:
-  ribbon:
-    listOfServers: crssmeterprocess-app.marathon.l4lb.thisdcos.directory:8081
-crss-settlement-app:
-  ribbon:
-    listOfServers: crsssettlement-app.marathon.l4lb.thisdcos.directory:8082
-crss-dataflow-app:
-  ribbon:
-    listOfServers: crssdataflow-app.marathon.l4lb.thisdcos.directory:8082
-crss-datainterface-app:
-  ribbon:
-    listOfServers: crssdatainterface-app.marathon.l4lb.thisdcos.directory:8084
-crss-audit:
-  ribbon:
-    listOfServers: crssaudit.marathon.l4lb.thisdcos.directory:9094
-crss-uaa:
-  ribbon:
-    listOfServers: crssuaa-server.marathon.l4lb.thisdcos.directory:9999
-crss-worklist-app:
-  ribbon:
-    listOfServers: crssworklist-app.marathon.l4lb.thisdcos.directory:8085

crss-edge/crss-edge-publicazure.yml

@@ -1,10 +0,0 @@
-spring:
-admin-service:
-  ribbon:
-    listOfServers: crssadmin-service.marathon.l4lb.thisdcos.directory:8080
-registration-service:
-  ribbon:
-    listOfServers: crssregistration-service.marathon.l4lb.thisdcos.directory:8080
-crss-uaa:
-  ribbon:
-    listOfServers: crssuaa-server-public.marathon.l4lb.thisdcos.directory:9999

crss-metering/crss-metering-azure.yml

@@ -1,6 +0,0 @@
-spring:
-  profiles.include: pg-query
-  datasource:
-    url: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=metering
-    username: crss_metering
-    password: crss_metering

crss-metering/crss-metering-dev2.yml → crss-metering/crss-metering-exist-dev.yml

@@ -1,9 +1,9 @@
 spring:
   profiles.include: pg-query
   datasource:
-    url: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=metering
+    url: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=metering
     username: crss_metering
-    password: crss_metering
+    password: Fh7UcXpW
     hikari:
       connectionTimeout: 10000
       maximumPoolSize: 20

crss-meterprocess-app/crss-meterprocess-app-azure.yml

@@ -1,33 +0,0 @@
-spring:
-  crss-main:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-  crss-registration:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=registration
-      username: crss_registration
-      password: crss_registration
-  crss-nmms:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=nmms
-      username: crss_nmms
-      password: crss_nmms
-
-  jpa:
-    generate-ddl: false
-
-server:
-  port: 8081
-
-dataflow:
-  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
-
-sftp:
-  credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload

crss-meterprocess-app/crss-meterprocess-app-dev2.yml → crss-meterprocess-app/crss-meterprocess-app-exist-dev.yml

@@ -2,27 +2,25 @@ spring:
   crss-main:
     datasource:
       driverClassName: ${spring.datasource.driverClassName}
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
-      password: crss_meterprocess
-      maximumPoolSize: 10
+      password: D9JpfUtT
   crss-registration:
     datasource:
       driverClassName: ${spring.datasource.driverClassName}
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=registration
       username: crss_registration
-      password: crss_registration
-      maximumPoolSize: 10
+      password: 51UF3JA9
   crss-nmms:
     datasource:
       driverClassName: ${spring.datasource.driverClassName}
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=nmms
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=nmms
       username: crss_nmms
-      password: crss_nmms
-      maximumPoolSize: 10
+      password: lbgg1i2Y
 
   jpa:
-    show-sql: false
+    show-sql: true
+    generate-ddl: false
 
 server:
   port: 8081

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

@@ -1,19 +0,0 @@
-spring:
-  crss-main:
-    datasource:
-      driverClassName: org.postgresql.Driver
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-  crss-metering:
-    datasource:
-      driverClassName: org.postgresql.Driver
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=metering
-      username: crss_metering
-      password: crss_metering
-  crss-registration:
-    datasource:
-      driverClassName: org.postgresql.Driver
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=registration
-      username: crss_registration
-      password: crss_registration

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

@@ -1,19 +0,0 @@
-spring:
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-  crss-metering:
-    datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=metering
-      username: crss_metering
-      password: crss_metering
-      driverClassName: org.postgresql.Driver
-  crss-registration:
-    datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=registration
-      username: crss_registration
-      password: crss_registration
-      driverClassName: org.postgresql.Driver

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

@@ -0,0 +1,19 @@
+spring:
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: D9JpfUtT
+      driverClassName: org.postgresql.Driver
+  crss-metering:
+    datasource:
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=metering
+      username: crss_metering
+      password: Fh7UcXpW
+      driverClassName: org.postgresql.Driver
+  crss-registration:
+    datasource:
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=registration
+      username: crss_registration
+      password: 51UF3JA9
+      driverClassName: org.postgresql.Driver

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

@@ -1,23 +0,0 @@
-spring:
-  crss-registration:
-    dataSource:
-      driverClassName: org.postgresql.Driver
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=registration
-      username: crss_registration
-      password: crss_registration
-  crss-main:
-    datasource:
-      driverClassName: org.postgresql.Driver
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-
-  jpa:
-    properties:
-      hibernate:
-        hbm2ddl:
-          auto: none
-
-  redis:
-    host: redis.marathon.mesos
-

crss-meterprocess-stream-mapper/crss-meterprocess-stream-mapper-dev2.yml → crss-meterprocess-stream-mapper/crss-meterprocess-stream-mapper-exist-dev.yml

@@ -6,25 +6,25 @@ spring:
           content-type: application/json
   crss-registration:
     dataSource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=registration
       username: crss_registration
-      password: crss_registration
+      password: 51UF3JA9
       driverClassName: org.postgresql.Driver
       maxPoolSize: 5
       test-on-borrow: true
       validation-query: SELECT 1
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
-      password: crss_meterprocess
+      password: D9JpfUtT
       driverClassName: org.postgresql.Driver
       maxPoolSize: 5
       test-on-borrow: true
       validation-query: SELECT 1
 
   jpa:
-      show-sql: true
+      show-sql: false
       hibernate:
         ddl-auto: none
       properties:
@@ -38,5 +38,3 @@ spring:
 logging:
   level:
     com.pemc: debug
-    org.hibernate: INFO
-    org.hibernate.type: trace

crss-meterprocess-stream-processor-daily-validate/crss-meterprocess-stream-processor-daily-validate-azure.yml

@@ -1,31 +0,0 @@
-spring:
-  crss-main:
-    datasource:
-      driverClassName: org.postgresql.Driver
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-  crss-metering:
-    datasource:
-      driverClassName: org.postgresql.Driver
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=metering
-      username: crss_metering
-      password: crss_metering
-  crss-registration:
-    datasource:
-      driverClassName: org.postgresql.Driver
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=registration
-      username: crss_registration
-      password: crss_registration
-
-  jpa:
-    hibernate:
-      ddl-auto: none
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
-        hbm2ddl:
-          auto: none
-        temp:
-          use_jdbc_metadata_defaults: false

crss-meterprocess-stream-processor-daily-validate/crss-meterprocess-stream-processor-daily-validate-dev2.yml → crss-meterprocess-stream-processor-daily-validate/crss-meterprocess-stream-processor-daily-validate-exist-dev.yml

@@ -1,27 +1,27 @@
 spring:
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
-      password: crss_meterprocess
+      password: D9JpfUtT
       driverClassName: org.postgresql.Driver
       maxPoolSize: 5
       test-on-borrow: true
       validation-query: SELECT 1
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=metering
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=metering
       username: crss_metering
-      password: crss_metering
+      password: Fh7UcXpW
       driverClassName: org.postgresql.Driver
       maxPoolSize: 5
       test-on-borrow: true
       validation-query: SELECT 1
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=registration
       username: crss_registration
-      password: crss_registration
+      password: 51UF3JA9
       driverClassName: org.postgresql.Driver
       maxPoolSize: 5
       test-on-borrow: true

crss-meterprocess-stream-source-daily-raw/crss-meterprocess-stream-source-daily-raw-azure.yml

@@ -1,41 +0,0 @@
-#daily extract
-spring:
-  profiles: dailyExtract
-  datasource:
-    driverClassName: org.postgresql.Driver
-    password: crss_metering
-    username: crss_metering
-    url: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=metering
-
-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);"
-
----
-
-#Monthly extract
-spring:
-  profiles: monthlyExtract
-  datasource:
-    driverClassName: org.postgresql.Driver
-    password: crss_metering
-    username: crss_metering
-    url: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=metering
-
-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);"
-
----
-
-# default
-spring:
-  datasource:
-    driverClassName: org.postgresql.Driver
-    password: crss_metering
-    username: crss_metering
-    url: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=metering
-
-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-stream-source-daily-raw/crss-meterprocess-stream-source-daily-raw-dev2.yml → crss-meterprocess-stream-source-daily-raw/crss-meterprocess-stream-source-daily-raw-exist-dev.yml

@@ -2,9 +2,9 @@
 spring:
   profiles: dailyExtract
   datasource:
-    url: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=metering
+    url: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=metering
     username: crss_metering
-    password: crss_metering
+    password: Fh7UcXpW
     driver-class-name: org.postgresql.Driver
     maxPoolSize: 5
     test-on-borrow: true
@@ -32,9 +32,9 @@ logging:
 spring:
   profiles: monthlyExtract
   datasource:
-    url: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=metering
+    url: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=metering
     username: crss_metering
-    password: crss_metering
+    password: Fh7UcXpW
     driver-class-name: org.postgresql.Driver
     maxPoolSize: 5
     test-on-borrow: true
@@ -61,9 +61,9 @@ logging:
 # default
 spring:
   datasource:
-    url: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=metering
+    url: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=metering
     username: crss_metering
-    password: crss_metering
+    password: Fh7UcXpW
     driver-class-name: org.postgresql.Driver
     maxPoolSize: 5
     test-on-borrow: true

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

@@ -1,43 +0,0 @@
-spring:
-  crss-dataflow:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=dataflow
-      username: crss_dataflow
-      password: crss_dataflow
-  crss-main:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-  crss-nmms:
-      datasource:
-        driverClassName: "${spring.datasource.driverClassName}"
-        jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=nmms
-        username: crss_nmms
-        password: crss_nmms
-  crss-registration:
-    dataSource:
-      driverClassName: org.postgresql.Driver
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=registration
-      username: crss_registration
-      password: crss_registration
-  jpa:
-    generate-ddl: true
-  profiles:
-    include: mesos
-  cloud:
-    deployer:
-      mesos:
-        chronos:
-          apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 4096
-          cpu: 0.5
-
-  redis:
-    host: redis.marathon.mesos
-
-batch:
-  partitionSize:
-    stl: 5000

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

@@ -1,63 +0,0 @@
-spring:
-  crss-dataflow:
-    datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=dataflow
-      url: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=dataflow
-      username: crss_dataflow
-      password: crss_dataflow
-      driverClassName: org.postgresql.Driver
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=meterprocess
-      url: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-  crss-nmms:
-      datasource:
-        jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=nmms
-        url: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=nmms
-        username: crss_nmms
-        password: crss_nmms
-        driverClassName: org.postgresql.Driver
-  crss-registration:
-      dataSource:
-        jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=registration
-        url: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=registration
-        username: crss_registration
-        password: crss_registration
-        driverClassName: org.postgresql.Driver
-        maxPoolSize: 5
-        test-on-borrow: true
-        validation-query: SELECT 1
-
-  profiles:
-    include: mesos
-
-  cloud:
-    deployer:
-      mesos:
-        chronos:
-          apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 1536
-          cpu: 0.2
-          # apply monthly constraints here
-          constraints: rack,LIKE,rack-(daily|monthly)
-
-batch:
-  partitionSize:
-    stl: 5000
-
----
-spring:
-  profiles: dailyMq
-  cloud.deployer.mesos.chronos.constraints: rack,EQUAL,rack-daily
----
-
----
-spring:
-  profiles: finalizeDaily
-  cloud.deployer.mesos.chronos.constraints: rack,EQUAL,rack-daily
----
-
-

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

@@ -0,0 +1,61 @@
+spring:
+  crss-dataflow:
+    datasource:
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=dataflow
+      url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=dataflow
+      username: crss_dataflow
+      password: lgcCpwy0
+      driverClassName: org.postgresql.Driver
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=meterprocess
+      url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: D9JpfUtT
+      driverClassName: org.postgresql.Driver
+  crss-nmms:
+      datasource:
+        jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=nmms
+        url: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=nmms
+        username: crss_nmms
+        password: lbgg1i2Y
+        driverClassName: org.postgresql.Driver
+  crss-registration:
+      dataSource:
+        jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=registration
+        url: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=registration
+        username: crss_registration
+        password: 51UF3JA9
+        driverClassName: org.postgresql.Driver
+        maxPoolSize: 5
+        test-on-borrow: true
+        validation-query: SELECT 1
+
+  profiles:
+    include: mesos
+
+  cloud:
+    deployer:
+      mesos:
+        chronos:
+          apiEndpoint: http://master.mesos/service/chronos/v1
+          memory: 4096
+          cpu: 2
+          # apply monthly constraints here
+          constraints:
+
+batch:
+  partitionSize:
+    stl: 20000
+
+---
+spring:
+  profiles: dailyMq
+  cloud.deployer.mesos.chronos.constraints:
+---
+
+---
+spring:
+  profiles: finalizeDaily
+  cloud.deployer.mesos.chronos.constraints:
+---

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

@@ -1,54 +0,0 @@
-spring:
-  crss-dataflow:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=dataflow
-      username: crss_dataflow
-      password: crss_dataflow
-  crss-main:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-  crss-registration:
-    dataSource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=registration
-      username: crss_registration
-      password: crss_registration
-  jpa:
-    show-sql: true
-    generate-ddl: true
-    properties:
-      hibernate:
-        jdbc:
-          batch_size: 100
-  profiles:
-    include: mesos
-  cloud:
-    deployer:
-      mesos:
-        chronos:
-          apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 5120
-          cpu: 0.5
-
-  redis:
-    host: redis.marathon.mesos
-
-batch:
-  # resourceLocation: ${resourceLocation} - property expansion defaulted in app's application.yml
-  partitionSize:
-    gap: 5000
-    mq: 5000
-    ssla: 5000
-    report: 1
-
-sftp:
-  credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload
-    port: 22
-    username: pemc
-    password: 123qwe

crss-mq-computation/crss-mq-computation-dev2.yml → crss-mq-computation/crss-mq-computation-exist-dev.yml

@@ -1,36 +1,36 @@
 spring:
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=dataflow
-      url: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=dataflow
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=dataflow
+      url: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=dataflow
       username: crss_dataflow
-      password: crss_dataflow
+      password: lgcCpwy0
       driverClassName: org.postgresql.Driver
       maxPoolSize: 5
       test-on-borrow: true
       validation-query: SELECT 1
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=meterprocess
-      url: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=meterprocess
+      url: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
-      password: crss_meterprocess
+      password: D9JpfUtT
       driverClassName: org.postgresql.Driver
       maxPoolSize: 5
       test-on-borrow: true
       validation-query: SELECT 1
   crss-registration:
     dataSource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=registration
-      url: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=registration
+      url: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=registration
       username: crss_registration
-      password: crss_registration
+      password: 51UF3JA9
       driverClassName: org.postgresql.Driver
       maxPoolSize: 5
       test-on-borrow: true
       validation-query: SELECT 1
   jpa:
-    show-sql: true
+    # show-sql: true
     generate-ddl: true
     open-in-view: false
     properties:
@@ -48,10 +48,10 @@ spring:
       mesos:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 4096
+          memory: 2560
           cpu: 0.5
           # apply monthly constraints here
-          constraints: rack,LIKE,rack-(daily|monthly)
+          constraints:
     task:
       initialize:
         enable: false
@@ -65,8 +65,7 @@ spring:
 
 logging:
   level:
-    com.pemc.crss : debug
-    # org.hibernate.type: trace
+    com.pemc: debug
     # org.hibernate.stat: debug
 
 batch:
@@ -75,11 +74,12 @@ batch:
   maxWorkers: 10
   partitionSize:
     gap: 5000
-    mq: 5000
+    mq: 90000
     ssla: 5000
     report: 1
-    mqMonthly: 576
-    mqDaily: 32
+    mqMonthly: 24
+    mqDaily: 96
+    report-max-count: 28828
 
 mqreport:
   directory: /tmp/
@@ -90,18 +90,18 @@ sftp:
     password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
     port: 22
-    workingDirectory: /upload
+    workingDirectory: /upload/mq
     privateKey:
 
 
 ---
 spring:
   profiles: dailyMq
-  cloud.deployer.mesos.chronos.constraints: rack,LIKE,rack-(daily|monthly)
+  cloud.deployer.mesos.chronos.constraints:
 ---
 
 ---
 spring:
   profiles: dailyMqReport
-  cloud.deployer.mesos.chronos.constraints: rack,LIKE,rack-(daily|monthly)
+  cloud.deployer.mesos.chronos.constraints:
 ---

crss-mtr/crss-mtr-azure.yml

@@ -1,50 +0,0 @@
-spring:
-  profiles:
-    include: mesos
-  crss-dataflow:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=dataflow
-      username: crss_dataflow
-      password: crss_dataflow
-  crss-main:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-  crss-registration:
-    dataSource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=registration
-      username: crss_registration
-      password: crss_registration
-  jpa:
-    show-sql: true
-    generate-ddl: true
-
-  cloud:
-    deployer:
-      mesos:
-        chronos:
-          apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 4096
-          cpu: 0.5
-
-  redis:
-    host: redis.marathon.mesos
-
-mtr:
-  directory: /tmp/
-
-batch:
-  partitionSize:
-    mtrSein: 50
-
-sftp:
-  credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: upload
-    port: 22
-    username: pemc
-    password: 123qwe

crss-mtr/crss-mtr-dev2.yml → crss-mtr/crss-mtr-exist-dev.yml

@@ -1,30 +1,30 @@
 spring:
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=dataflow
-      url: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=dataflow
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=dataflow
+      url: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=dataflow
       username: crss_dataflow
-      password: crss_dataflow
+      password: lgcCpwy0
       driverClassName: org.postgresql.Driver
       maxPoolSize: 5
       test-on-borrow: true
       validation-query: SELECT 1
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=meterprocess
-      url: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=meterprocess
+      url: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
-      password: crss_meterprocess
+      password: D9JpfUtT
       driverClassName: org.postgresql.Driver
       maxPoolSize: 5
       test-on-borrow: true
       validation-query: SELECT 1
   crss-registration:
     dataSource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=registration
-      url: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=registration
+      url: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=registration
       username: crss_registration
-      password: crss_registration
+      password: 51UF3JA9
       driverClassName: org.postgresql.Driver
       maxPoolSize: 5
       test-on-borrow: true
@@ -48,10 +48,10 @@ spring:
       mesos:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 3072
-          cpu: 0.5
+          memory: 4096
+          cpu: 2
           # apply monthly constraints here
-          constraints: rack,LIKE,rack-(daily|monthly)
+          constraints:
     task:
       initialize:
         enable: false
@@ -68,7 +68,8 @@ batch:
   chunkSize: 1
   maxWorkers: 10
   partitionSize:
-      mtrSein: 10
+    mtr: 1
+    mtrSein: 20
 
 mtr:
   directory: /tmp/
@@ -86,5 +87,5 @@ sftp:
 ---
 spring:
   profiles: dailyMtr
-  cloud.deployer.mesos.chronos.constraints: rack,EQUAL,rack-daily
+  cloud.deployer.mesos.chronos.constraints:
 ---

crss-reg/crss-reg-azure.yml

@@ -1,37 +0,0 @@
-spring:
-  datasource:
-    driverClassName: org.postgresql.Driver
-    url: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=registration
-    username: crss_registration
-    password: crss_registration
-  crss-stl:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=settlement
-      username: crss_settlement
-      password: crss_settlement
-  crss-dataflow:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=dataflow
-      username: crss_dataflow
-      password: crss_dataflow
-  xdf-control:
-    datasource:
-      driverClassName: org.postgresql.Driver
-      url: jdbc:postgresql://10.64.0.4:5432/crss_external?currentSchema=xdfcontrol
-      username: crss_xdfcontrol
-      password: crss_xdfcontrol
-
-crss:
-  docmgt:
-    root-dir: /home/pemc/upload/docmgt
-  xdf:
-    client-type: sftp # OPTIONS:[local, ftp, sftp]
-    root-folder: /home/pemc/upload/crss_xdf
-    auto-create-dir: true
-    file-encoding: UTF-8
-    file-exists-mode: fail  # OPTIONS:[append, append_no_flush, fail, ignore, replace]
-    remote:
-      host: pemc-storage.southeastasia.cloudapp.azure.com
-      port: 22
-      username: pemc
-      password: 123qwe

crss-reg/crss-reg-dev2.yml

@@ -1,50 +0,0 @@
-spring:
-  datasource:
-    driverClassName: org.postgresql.Driver
-    url: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=registration
-    username: crss_registration
-    password: crss_registration
-  crss-stl:
-    datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=settlement
-      username: crss_settlement
-      password: crss_settlement
-  crss-dataflow:
-    datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=dataflow
-      username: crss_dataflow
-      password: crss_dataflow
-  crss-admin:
-    datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=admin
-      username: crss_admin
-      password: crss_admin
-  crss-meterprocess:
-    datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-  xdf-control:
-    datasource:
-      driverClassName: org.postgresql.Driver
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_external?currentSchema=xdfcontrol
-      url: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_external?currentSchema=xdfcontrol
-      username: crss_xdfcontrol
-      password: crss_xdfcontrol
-
-crss:
-  docmgt:
-    root-dir: /crss/docmgt
-  xdf:
-    client-type: sftp  # OPTIONS:[local, ftp, sftp]
-    root-folder: /upload/xdf
-    auto-create-dir: true
-    file-encoding: UTF-8
-    file-exists-mode: fail  # OPTIONS:[append, append_no_flush, fail, ignore, replace]
-    remote:
-      host: sftp.marathon.l4lb.thisdcos.directory
-      port: 22
-      username: pemc
-      password: 123qwe
-  aeprreport:
-    validate: true

crss-reg/crss-reg-exist-dev.yml

@@ -0,0 +1,47 @@
+spring:
+  datasource:
+    driverClassName: org.postgresql.Driver
+    url: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=registration
+    username: crss_registration
+    password: 51UF3JA9
+  crss-stl:
+    datasource:
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=settlement
+      username: crss_settlement
+      password: i17SMOPm
+  crss-dataflow:
+    datasource:
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=dataflow
+      username: crss_dataflow
+      password: lgcCpwy0
+  crss-meterprocess:
+    datasource:
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: D9JpfUtT
+  crss-admin:
+    datasource:
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=admin
+      username: crss_admin
+      password: YReYA7fI
+  xdf-control:
+    datasource:
+      driverClassName: org.postgresql.Driver
+      url: jdbc:postgresql://172.16.0.20:5432/crss_external?currentSchema=xdfcontrol
+      username: crss_xdfcontrol
+      password: crss_xdfcontrol
+
+crss:
+  docmgt:
+    root-dir: /crss/docmgt
+  xdf:
+    client-type: sftp  # OPTIONS:[local, ftp, sftp]
+    root-folder: /upload/xdf
+    auto-create-dir: true
+    file-encoding: UTF-8
+    file-exists-mode: fail  # OPTIONS:[append, append_no_flush, fail, ignore, replace]
+    remote:
+      host: sftp.marathon.l4lb.thisdcos.directory
+      port: 22
+      username: pemc
+      password: 123qwe

crss-sched/crss-sched-azure.yml

@@ -1,7 +0,0 @@
-spring:
-  profiles.include: metronome
-  datasource:
-    driverClassName: org.postgresql.Driver
-    url: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=scheduler
-    username: crss_scheduler
-    password: crss_scheduler

crss-sched/crss-sched-dev2.yml

@@ -1,6 +0,0 @@
-spring:
-  profiles.include: metronome
-  datasource:
-    url: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=scheduler
-    username: crss_scheduler
-    password: crss_scheduler

crss-sched/crss-sched-exist-dev.yml

@@ -0,0 +1,6 @@
+spring:
+  profiles.include: metronome
+  datasource:
+    url: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=scheduler
+    username: crss_scheduler
+    password: 5Q4AY59T

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

@@ -1,29 +0,0 @@
-spring:
-  crss-stl:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=settlement
-      username: crss_settlement
-      password: crss_settlement
-  crss-worklist:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=worklist
-      username: crss_worklist
-      password: crss_worklist
-
-server:
-  port: 8082
-
-dataflow:
-  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
-
-sftp:
-  credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload/stl
-
-validation:
-  calculate-gmr: false
-  calculate-emf: false
-  calculate-rmf: false

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

@@ -1,33 +0,0 @@
-spring:
-  crss-stl:
-    datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=settlement
-      username: crss_settlement
-      password: crss_settlement
-      driverClassName: org.postgresql.Driver
-  crss-worklist:
-    datasource:
-      driverClassName: org.postgresql.Driver
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=worklist
-      username: crss_worklist
-      password: crss_worklist
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maximumPoolSize: 2
-      test-on-borrow: true
-      validation-query: SELECT 1
-
-server:
-  port: 8082
-
-dataflow:
-  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
-
-sftp:
-  credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload/stl

crss-settlement-app/crss-settlement-app-exist-dev.yml

@@ -0,0 +1,30 @@
+spring:
+  crss-stl:
+    datasource:
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=settlement
+      username: crss_settlement
+      password: i17SMOPm
+      driverClassName: org.postgresql.Driver
+  crss-worklist:
+    datasource:
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=worklist
+      username: crss_worklist
+      password: c3XL8Lcb
+      driverClassName: org.postgresql.Driver
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: D9JpfUtT
+      driverClassName: org.postgresql.Driver
+      maximumPoolSize: 2
+      test-on-borrow: true
+      validation-query: SELECT 1
+  http:
+    multipart:
+      maxRequestSize: 100MB
+      maxFileSize: 10MB
+
+cfg:
+  ams:
+    invoice-date-restrict-days: 120

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

@@ -1,75 +0,0 @@
-spring:
-  crss-stl:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=settlement
-      username: crss_settlement
-      password: crss_settlement
-      maximumPoolSize: 2
-  crss-main:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-      maximumPoolSize: 2
-  crss-metering:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=metering
-      username: crss_metering
-      password: crss_metering
-      maximumPoolSize: 2
-  crss-nmms:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=nmms
-      username: crss_nmms
-      password: crss_nmms
-      maximumPoolSize: 2
-  crss-dataflow:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=dataflow
-      username: crss_dataflow
-      password: crss_dataflow
-      maximumPoolSize: 5
-
-  profiles:
-    include: mesos
-  cloud:
-    deployer:
-      mesos:
-        chronos:
-          memory: 2048
-          cpu: 0.5
-    task:
-      initialize:
-        enable: false
-  batch:
-    initializer:
-      enabled: false
-    job:
-      enabled: true
-
-  jpa:
-    show-sql: false
-    generate-ddl: false
-    properties:
-      hibernate:
-        generate_statistics: false
-        dialect: org.hibernate.dialect.PostgreSQL81Dialect
-        ddl-auto: none
-        hbm2ddl:
-          import_files:
-
-  redis:
-    host: redis.marathon.mesos
-    port: 6379
-
-logging:
-  level:
-    com.pemc.crss.settlement.task.calculation.addtlcomp: DEBUG
-    com.netflix: DEBUG
-    org.springframework.cloud: DEBUG
-    org.hibernate.stat: debug

crss-settlement-task-calculation-addtlcomp/crss-settlement-task-calculation-addtlcomp-dev2.yml → crss-settlement-task-calculation-addtlcomp/crss-settlement-task-calculation-addtlcomp-exist-dev.yml

@@ -1,49 +1,55 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=settlement
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=settlement
       username: crss_settlement
-      password: crss_settlement
+      password: i17SMOPm
       driverClassName: org.postgresql.Driver
       maximumPoolSize: 2
       test-on-borrow: true
       validation-query: SELECT 1
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
-      password: crss_meterprocess
+      password: D9JpfUtT
       driverClassName: org.postgresql.Driver
       maximumPoolSize: 2
       test-on-borrow: true
       validation-query: SELECT 1
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=metering
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=metering
       username: crss_metering
-      password: crss_metering
+      password: Fh7UcXpW
       driverClassName: org.postgresql.Driver
       maximumPoolSize: 2
       test-on-borrow: true
       validation-query: SELECT 1
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=nmms
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=nmms
       username: crss_nmms
-      password: crss_nmms
+      password: lbgg1i2Y
       driverClassName: org.postgresql.Driver
       maximumPoolSize: 2
       test-on-borrow: true
       validation-query: SELECT 1
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=dataflow
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=dataflow
       username: crss_dataflow
-      password: crss_dataflow
+      password: lgcCpwy0
       driverClassName: org.postgresql.Driver
       maximumPoolSize: 5
       test-on-borrow: true
       validation-query: SELECT 1
+  crss-registration:
+    datasource:
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=registration
+      username: crss_registration
+      password: 51UF3JA9
+      driverClassName: org.postgresql.Driver
   profiles:
       include: mesos
   cloud:
@@ -51,9 +57,9 @@ spring:
       mesos:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 2500
-          cpu: 1
-          constraints: rack,EQUAL,rack-daily
+          memory: 2048
+          cpu: 0.5
+          constraints:
     task:
       initialize:
         enable: false

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

@@ -1,99 +0,0 @@
-spring:
-  crss-stl:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=settlement
-      username: crss_settlement
-      password: crss_settlement
-      maximumPoolSize: 2
-  crss-main:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-      maximumPoolSize: 2
-  crss-metering:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=metering
-      username: crss_metering
-      password: crss_metering
-      maximumPoolSize: 2
-  crss-nmms:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=nmms
-      username: crss_nmms
-      password: crss_nmms
-      maximumPoolSize: 2
-  crss-dataflow:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=dataflow
-      username: crss_dataflow
-      password: crss_dataflow
-      maximumPoolSize: 5
-      connectionTimeout: 300000
-
-  profiles:
-    include: mesos
-  cloud:
-    deployer:
-      mesos:
-        chronos:
-          memory: 2048
-          cpu: 0.5
-
-    task:
-      initialize:
-        enable: false
-  batch:
-    initializer:
-      enabled: false
-    job:
-      enabled: true
-
-  jpa:
-    show-sql: false
-    generate-ddl: true
-    properties:
-      hibernate:
-        generate_statistics: false
-        dialect: org.hibernate.dialect.PostgreSQL81Dialect
-        ddl-auto: none
-        hbm2ddl:
-          auto: none
-
-  redis:
-    host: redis.marathon.mesos
-    port: 6379
-
-batch:
-  chunkSize: 100
-  maxWorkers: 10
-  partitionSize:
-    retDat: 900
-    retBcq: 20000
-    calcEta: 3000
-    procNss: 3000
-    nss: 1000
-    disAggBcq: 1000
-    disAggBcqBuyer: 1000
-    disAggBcqSeller: 1000
-    rta: 300
-    rprta: 1000
-    rcra: 200
-    sFactor: 150
-    runway: 150
-    spotSeller: 1500
-    spotBuyer: 1500
-    gmr: 1500
-
-
-logging:
-  level:
-    com.pemc.crss.settlement.task.calculation: DEBUG
-    com.netflix: DEBUG
-    org.springframework.cloud: DEBUG
-    org.hibernate.stat: debug

crss-settlement-task-calculation/crss-settlement-task-calculation-dev2.yml → crss-settlement-task-calculation/crss-settlement-task-calculation-exist-dev.yml

@@ -1,45 +1,45 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=settlement
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=settlement
       username: crss_settlement
-      password: crss_settlement
+      password: i17SMOPm
       driverClassName: org.postgresql.Driver
       maximumPoolSize: 5
       test-on-borrow: true
       validation-query: SELECT 1
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
-      password: crss_meterprocess
+      password: D9JpfUtT
       driverClassName: org.postgresql.Driver
       maximumPoolSize: 2
       test-on-borrow: true
       validation-query: SELECT 1
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=metering
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=metering
       username: crss_metering
-      password: crss_metering
+      password: Fh7UcXpW
       driverClassName: org.postgresql.Driver
       maximumPoolSize: 2
       test-on-borrow: true
       validation-query: SELECT 1
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=nmms
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=nmms
       username: crss_nmms
-      password: crss_nmms
+      password: lbgg1i2Y
       driverClassName: org.postgresql.Driver
       maximumPoolSize: 2
       test-on-borrow: true
       validation-query: SELECT 1
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=dataflow
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=dataflow
       username: crss_dataflow
-      password: crss_dataflow
+      password: lgcCpwy0
       driverClassName: org.postgresql.Driver
       maximumPoolSize: 5
       connectionTimeout: 300000
@@ -47,11 +47,9 @@ spring:
       validation-query: SELECT 1
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=registration
       username: crss_registration
-      password: crss_registration
-      maximumPoolSize: 1
-      connectionTimeout: 60000
+      password: 51UF3JA9
       driverClassName: org.postgresql.Driver
 
   profiles:
@@ -60,11 +58,11 @@ spring:
     deployer:
       mesos:
         chronos:
-          memory: 1536
-          cpu: 0.2
           apiEndpoint: http://master.mesos/service/chronos/v1
+          memory: 3072
+          cpu: 1
           # apply monthly constraints here
-          constraints: rack,LIKE,rack-(daily|monthly)
+          constraints:
 
     task:
       initialize:
@@ -86,27 +84,27 @@ spring:
         hbm2ddl:
           auto: none
 
-batch:
-  chunkSize: 100
-  maxWorkers: 10
-  partitionSize:
-    retDat: 900
-    retBcq: 20000
-    calcEta: 3000
-    spotLlcc: 3000
-    procNss: 3000
-    nss: 1000
-    disAggBcq: 1000
-    disAggBcqBuyer: 1000
-    disAggBcqSeller: 1000
-    rta: 300
-    rprta: 1000
-    rcra: 200
-    sFactor: 150
-    runway: 150
-    spotSeller: 1500
-    spotBuyer: 1500
-    gmr: 1500
+#batch:
+#  chunkSize: 100
+#  maxWorkers: 10
+#  partitionSize:
+#    retDat: 900
+#    retBcq: 20000
+#    spotLlcc: 3000
+#    calcEta: 3000
+#    procNss: 3000
+#    nss: 1000
+#    disAggBcq: 1000
+#    disAggBcqBuyer: 1000
+#    disAggBcqSeller: 1000
+#    rta: 300
+#    rprta: 1000
+#    rcra: 200
+#    sFactor: 150
+#    runway: 150
+#    spotSeller: 1500
+#    spotBuyer: 1500
+#    gmr: 1500
 
 
 logging:
@@ -119,33 +117,17 @@ logging:
 ---
 spring:
   profiles: genDEBRsvInputWorkspace
-  cloud.deployer.mesos.chronos.constraints: rack,EQUAL,rack-daily
+  cloud.deployer.mesos.chronos.constraints:
 ---
 
 ---
 spring:
   profiles: dailyStlAmtsCalculation
-  cloud.deployer.mesos.chronos.constraints: rack,EQUAL,rack-daily
+  cloud.deployer.mesos.chronos.constraints:
 ---
 
 ---
 spring:
   profiles: dailyLrCalculation
-  cloud:
-    deployer:
-      mesos:
-        chronos:
-          memory: 1536
-          cpu: 0.2
-          constraints: rack,EQUALS,rack-daily
-
----
-spring:
-  profiles: monthlyPrelimLrCalculation, monthlyFinalLrCalculation, monthlyAdjustedLrMtrAdjCalculation, monthlyAdjustedLrMtrFinCalculation
-  cloud:
-    deployer:
-      mesos:
-        chronos:
-          memory: 1536
-          cpu: 0.2
+  cloud.deployer.mesos.chronos.constraints:
 ---

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

@@ -1,45 +0,0 @@
-spring:
-  crss-stl:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=settlement
-      username: crss_settlement
-      password: crss_settlement
-      driverClassName: "${spring.datasource.driverClassName}"
-  crss-dataflow:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=dataflow
-      username: crss_dataflow
-      password: crss_dataflow
-      driverClassName: "${spring.datasource.driverClassName}"
-      maximumPoolSize: 5
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-      driverClassName: "${spring.datasource.driverClassName}"
-  crss-registration:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=registration
-      username: crss_registration
-      password: crss_registration
-  jpa:
-    show-sql: false
-    generate-ddl: false
-    properties:
-      hibernate:
-        generate_statistics: false
-        dialect: org.hibernate.dialect.PostgreSQL81Dialect
-        ddl-auto: none
-        hbm2ddl:
-          import_files:
-
-  profiles:
-    include: mesos
-  cloud:
-    deployer:
-      mesos:
-        chronos:
-          memory: 2048
-          cpu: 0.5

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

@@ -1,50 +0,0 @@
-spring:
-  crss-stl:
-    datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=settlement
-      username: crss_settlement
-      password: crss_settlement
-      driverClassName: org.postgresql.Driver
-  crss-dataflow:
-    datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=dataflow
-      username: crss_dataflow
-      password: crss_dataflow
-      maximumPoolSize: 5
-      driverClassName: org.postgresql.Driver
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-  crss-registration:
-    datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=registration
-      username: crss_registration
-      password: crss_registration
-      maximumPoolSize: 1
-      connectionTimeout: 60000
-      driverClassName: org.postgresql.Driver
-
-  jpa:
-    show-sql: false
-    generate-ddl: false
-    properties:
-      hibernate:
-        generate_statistics: false
-        dialect: org.hibernate.dialect.PostgreSQL81Dialect
-        ddl-auto: none
-        hbm2ddl:
-          import_files:
-
-  profiles:
-    include: mesos
-  cloud:
-    deployer:
-      mesos:
-        chronos:
-          apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 2500
-          cpu: 1
-          constraints: rack,EQUAL,rack-daily

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

@@ -0,0 +1,37 @@
+spring:
+  crss-stl:
+    datasource:
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=settlement
+      username: crss_settlement
+      password: i17SMOPm
+      driverClassName: org.postgresql.Driver
+  crss-dataflow:
+    datasource:
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=dataflow
+      username: crss_dataflow
+      password: lgcCpwy0
+      maximumPoolSize: 5
+      driverClassName: org.postgresql.Driver
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: D9JpfUtT
+      driverClassName: org.postgresql.Driver
+  crss-registration:
+    datasource:
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=registration
+      username: crss_registration
+      password: 51UF3JA9
+      driverClassName: org.postgresql.Driver
+
+  profiles:
+    include: mesos
+  cloud:
+    deployer:
+      mesos:
+        chronos:
+          apiEndpoint: http://master.mesos/service/chronos/v1
+          memory: 2048
+          cpu: 0.5
+          constraints:

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

@@ -1,39 +0,0 @@
-spring:
-  crss-stl:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=settlement
-      username: crss_settlement
-      password: crss_settlement
-  crss-dataflow:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=dataflow
-      username: crss_dataflow
-      password: crss_dataflow
-      maximumPoolSize: 5
-  crss-main:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-  crss-registration:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=registration
-      username: crss_registration
-      password: crss_registration
-
-  profiles:
-    include: mesos
-  cloud:
-    deployer:
-      mesos:
-        chronos:
-          memory: 2048
-          cpu: 0.5
-
-batch:
-  partitionSize:
-    lr: 31

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

@@ -1,43 +0,0 @@
-spring:
-  crss-stl:
-    datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=settlement
-      username: crss_settlement
-      password: crss_settlement
-      driverClassName: org.postgresql.Driver
-  crss-registration:
-    datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=registration
-      username: crss_registration
-      password: crss_registration
-      maximumPoolSize: 1
-      connectionTimeout: 60000
-      driverClassName: org.postgresql.Driver
-  crss-dataflow:
-    datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=dataflow
-      username: crss_dataflow
-      password: crss_dataflow
-      maximumPoolSize: 5
-      driverClassName: org.postgresql.Driver
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-
-  profiles:
-    include: mesos
-  cloud:
-    deployer:
-      mesos:
-        chronos:
-          apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 1536
-          cpu: 0.5
-          constraints: rack,LIKE,rack-(daily|monthly)
-
-batch:
-  partitionSize:
-    lr: 31

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

@@ -0,0 +1,46 @@
+spring:
+  crss-stl:
+    datasource:
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=settlement
+      username: crss_settlement
+      password: i17SMOPm
+      driverClassName: org.postgresql.Driver
+  crss-dataflow:
+    datasource:
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=dataflow
+      username: crss_dataflow
+      password: lgcCpwy0
+      maximumPoolSize: 5
+      driverClassName: org.postgresql.Driver
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: D9JpfUtT
+      driverClassName: org.postgresql.Driver
+  crss-registration:
+    datasource:
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=registration
+      username: crss_registration
+      password: 51UF3JA9
+      driverClassName: org.postgresql.Driver
+
+  profiles:
+    include: mesos
+  cloud:
+    deployer:
+      mesos:
+        chronos:
+          apiEndpoint: http://master.mesos/service/chronos/v1
+          memory: 3072
+          cpu: 0.5
+          constraints:
+batch:
+  partitionSize:
+    amsSp: 1500
+    amsInv: 1500
+    energyStl: 20
+    lr: 15
+    energyStlB: 150000
+    spotLlccStl: 16
+

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

@@ -1,75 +0,0 @@
-spring:
-  crss-stl:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=settlement
-      username: crss_settlement
-      password: crss_settlement
-  crss-registration:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=registration
-      username: crss_registration
-      password: crss_registration
-  crss-main:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-  crss-metering:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=metering
-      username: crss_metering
-      password: crss_metering
-  crss-nmms:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=nmms
-      username: crss_nmms
-      password: crss_nmms
-  crss-dataflow:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=dataflow
-      username: crss_dataflow
-      password: crss_dataflow
-      maximumPoolSize: 5
-  profiles:
-    include: mesos
-
-  cloud:
-    deployer:
-      mesos:
-        chronos:
-          memory: 2048
-          cpu: 0.5
-    task:
-      initialize:
-        enable: false
-  batch:
-    initializer:
-      enabled: false
-    job:
-      enabled: true
-
-  jpa:
-    show-sql: false
-    generate-ddl: false
-    properties:
-      hibernate:
-        generate_statistics: false
-        dialect: org.hibernate.dialect.PostgreSQL81Dialect
-        ddl-auto: validate
-        hbm2ddl:
-          import_files:
-          auto:
-
-
-logging:
-  level:
-    com.pemc.crss.settlement.task.validation: DEBUG
-    com.netflix: DEBUG
-    org.springframework.cloud: DEBUG
-    org.hibernate.stat: DEBUG

crss-settlement-task-validation/crss-settlement-task-validation-dev2.yml → crss-settlement-task-validation/crss-settlement-task-validation-exist-dev.yml

@@ -1,54 +1,55 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=settlement
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=settlement
       username: crss_settlement
-      password: crss_settlement
+      password: i17SMOPm
       driverClassName: org.postgresql.Driver
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=registration
       username: crss_registration
-      password: crss_registration
+      password: 51UF3JA9
       driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
-      password: crss_meterprocess
+      password: D9JpfUtT
       driverClassName: org.postgresql.Driver
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=metering
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=metering
       username: crss_metering
-      password: crss_metering
+      password: Fh7UcXpW
       driverClassName: org.postgresql.Driver
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=nmms
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=nmms
       username: crss_nmms
-      password: crss_nmms
+      password: lbgg1i2Y
       driverClassName: org.postgresql.Driver
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=dataflow
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=dataflow
       username: crss_dataflow
-      password: crss_dataflow
+      password: lgcCpwy0
       maximumPoolSize: 5
       driverClassName: org.postgresql.Driver
   profiles:
     include: mesos
-    
+
   cloud:
     deployer:
       mesos:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 2500
-          cpu: 1
+          memory: 2048
+          cpu: 0.5
           # apply monthly constraints here
-          constraints: rack,EQUAL,rack-monthly
-
+          constraints:
+        dcos:
+          authorizationToken: test-token
     task:
       initialize:
         enable: false
@@ -81,5 +82,6 @@ logging:
 ---
 spring:
   profiles: dailyStlValidation
-  cloud.deployer.mesos.chronos.constraints: rack,EQUAL,rack-daily
----
+  #test constraints only
+  cloud.deployer.mesos.chronos.constraints: rack,LIKE,rack-(daily|monthly)
+---

crss-uaa/crss-uaa-azure.yml

@@ -1,31 +0,0 @@
-spring:
-  redis:
-    database: 2
-  datasource:
-    url: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=admin
-    username: crss_admin
-    password: crss_admin
-
-crss:
-  security:
-    oauth2:
-      default-redirect-uri: http://crss.azure.crss.exist.com
-      registered-redirect-uris: http://crss.azure.crss.exist.com,http://crss.azure.crss.exist.com/bsmd
-  ldap:
-    protocol: LDAPS
-    host: "192.168.241.67"
-    port: 636
-    root-dn: "dc=wesmsys,dc=local"
-    user-search-base: MO,MP,SO
-    admin-user: "wesmsys\\crssadmin"
-    admin-password: "1qaz@WSX"
-    username-field: "userPrincipalName"
-    domain: "wesmsys.local"
-    embedded: false
-    passwordOpEnabled: true
-    passwordExpiryField: "msDS-UserPasswordExpiryTimeComputed"
-
-
-logging:
-  level:
-    com.pemc.crss: DEBUG

crss-uaa/crss-uaa-dev2.yml

@@ -1,32 +0,0 @@
-spring:
-  redis:
-    database: 2
-  datasource:
-    url: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=admin
-    username: crss_admin
-    password: crss_admin
-
-crss:
-  ldap:
-    protocol: LDAPS
-    host: "192.168.241.174"
-    port: 636
-    root-dn: "dc=wesmsys,dc=local"
-    user-search-base: MO,MP,SO
-    admin-user: "wesmsys\\Administrator"
-    admin-password: "ex1stw1nd0wsaD"
-    username-field: "userPrincipalName"
-    domain: "wesmsys.local"
-    embedded: false
-    passwordOpEnabled: true
-    passwordExpiryField: "msDS-UserPasswordExpiryTimeComputed"
-  security:
-    oauth2:
-      api-gateway: https://crss.dev2.crss.exist.com
-      default-redirect-uri: https://crss.dev2.crss.exist.com
-      registered-redirect-uris: https://crss.dev2.crss.exist.com,http://localhost:8087,http://localhost:8089
-
-
-logging:
-  level:
-    com.pemc.crss: DEBUG

crss-uaa/crss-uaa-exist-dev.yml

@@ -0,0 +1,32 @@
+spring:
+  redis:
+    database: 2
+  datasource:
+    url: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=admin
+    username: crss_admin
+    password: YReYA7fI
+
+crss:
+  ldap:
+    protocol: LDAPS
+    host: "192.168.1.105"
+    port: 636
+    root-dn: "dc=wesmlocal,dc=dev"
+    user-search-base: MO,MP,SO
+    admin-user: "wesmdev\\crss_user"
+    admin-password: "Pemc@123"
+    username-field: "userPrincipalName"
+    domain: "wesmlocal.dev"
+    embedded: false
+    passwordOpEnabled: true
+    passwordExpiryField: "msDS-UserPasswordExpiryTimeComputed"
+
+  security:
+    oauth2:
+      api-gateway: https://crss.dev.manila.exist.com
+      default-redirect-uri: https://crss.dev.manila.exist.com
+      registered-redirect-uris: https://crss.dev.manila.exist.com,http://localhost:8087,http://localhost:8089
+
+logging:
+  level:
+    com.pemc.crss: DEBUG

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

@@ -1,25 +0,0 @@
-spring:
-  crss-worklist:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=worklist
-      username: crss_worklist
-      password: crss_worklist
-      driverClassName: "${spring.datasource.driverClassName}"
-  crss-stl:
-    datasource:
-       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=settlement
-       username: crss_settlement
-       password: crss_settlement
-       driverClassName: "${spring.datasource.driverClassName}"
-  crss-main:
-    datasource:
-       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=meterprocess
-       username: crss_meterprocess
-       password: crss_meterprocess
-       driverClassName: "${spring.datasource.driverClassName}"
-  crss-registration:
-    dataSource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=registration
-      username: crss_registration
-      password: crss_registration

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

@@ -1,26 +0,0 @@
-spring:
-  crss-worklist:
-    datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=worklist
-      username: crss_worklist
-      password: crss_worklist
-      driverClassName: org.postgresql.Driver
-  crss-stl:
-    datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=settlement
-      username: crss_settlement
-      password: crss_settlement
-      driverClassName: org.postgresql.Driver
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-  crss-registration:
-    dataSource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=registration
-      url: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=registration
-      username: crss_registration
-      password: crss_registration
-      driverClassName: org.postgresql.Driver

crss-worklist-app/crss-worklist-app-exist-dev.yml

@@ -0,0 +1,25 @@
+spring:
+  crss-worklist:
+    datasource:
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=worklist
+      username: crss_worklist
+      password: c3XL8Lcb
+      driverClassName: org.postgresql.Driver
+  crss-stl:
+    datasource:
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=settlement
+      username: crss_settlement
+      password: i17SMOPm
+      driverClassName: org.postgresql.Driver
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: D9JpfUtT
+      driverClassName: org.postgresql.Driver
+  crss-registration:
+    dataSource:
+      jdbcUrl: jdbc:postgresql://172.16.0.20:5432/crss?currentSchema=registration
+      username: crss_registration
+      password: 51UF3JA9
+      driverClassName: org.postgresql.Driver

ui-bsmd/ui-bsmd-dev2.yml

@@ -1,27 +0,0 @@
-zuul:
-  sensitiveHeaders: 'Cookie,Set-Cookie'
-  routes:
-    admin:
-      path: /admin/**
-      serviceId: crss-admin
-    uaa:
-      url: http://crssuaa-server.marathon.l4lb.thisdcos.directory:9999
-
-crss-meterprocess-app:
-  ribbon:
-    listOfServers: crss2meterprocess-app.marathon.l4lb.thisdcos.directory:8081
-crss-settlement-app:
-  ribbon:
-    listOfServers: crss2settlement-app.marathon.l4lb.thisdcos.directory:8082
-crss-dataflow-app:
-  ribbon:
-    listOfServers: crss2dataflow-app.marathon.l4lb.thisdcos.directory:8082
-crss-admin:
-  ribbon:
-    listOfServers: crssadmin-service.marathon.l4lb.thisdcos.directory:8080
-crss-reg:
-  ribbon:
-    listOfServers: crssregistration-service.marathon.l4lb.thisdcos.directory:8080
-crss-audit:
-  ribbon:
-    listOfServers: crss2audit.marathon.l4lb.thisdcos.directory:9094

ui-bsmd/ui-bsmd-azure.yml → ui-bsmd/ui-bsmd-exist-dev.yml

@@ -13,9 +13,6 @@ crss-meterprocess-app:
 crss-settlement-app:
   ribbon:
     listOfServers: crsssettlement-app.marathon.l4lb.thisdcos.directory:8082
-crss-datainterface-app:
-  ribbon:
-    listOfServers: crssdatainterface-app.marathon.l4lb.thisdcos.directory:8084
 crss-dataflow-app:
   ribbon:
     listOfServers: crssdataflow-app.marathon.l4lb.thisdcos.directory:8082
@@ -28,6 +25,3 @@ crss-reg:
 crss-audit:
   ribbon:
     listOfServers: crssaudit.marathon.l4lb.thisdcos.directory:9094
-crss-worklist-app:
-  ribbon:
-    listOfServers: crssworklist-app.marathon.l4lb.thisdcos.directory:8085