Merge branch '2.0.x' into 2.1.x

  + fix conflicts (for verification with devs)

Conflicts:
	application-ss-combined.yml
	application.yml
	crss-admin/crss-admin-dcos.yml
	crss-admin/crss-admin-staging.yml
	crss-admin/crss-admin-top.yml
	crss-admin/crss-admin.yml
	crss-audit/crss-audit-dev2.yml
	crss-audit/crss-audit.yml
	crss-data/crss-data-ss-combined.yml
	crss-data/crss-data-top.yml
	crss-dataflow-app/application-pemc-uat.yml
	crss-dataflow-app/application.yml
	crss-dataflow-app/crss-dataflow-app-dev.yml
	crss-dataflow-app/crss-dataflow-app-dev2.yml
	crss-dataflow-app/crss-dataflow-app-devlocal.yml
	crss-dataflow-app/crss-dataflow-app-pemc-uat.yml
	crss-dataflow-app/crss-dataflow-app-top.yml
	crss-dataflow-app/crss-dataflow-app.yml
	crss-datainterface-task-ingest/crss-datainterface-task-ingest-dev.yml
	crss-datainterface-task-ingest/crss-datainterface-task-ingest-dev2.yml
	crss-datainterface-task-ingest/crss-datainterface-task-ingest-top.yml
	crss-metering/crss-metering-ss-combined.yml
	crss-metering/crss-metering-staging.yml
	crss-meterprocess-app/crss-meterprocess-app-dev.yml
	crss-meterprocess-app/crss-meterprocess-app-dev2.yml
	crss-meterprocess-app/crss-meterprocess-app-top.yml
	crss-meterprocess-app/crss-meterprocess-app.yml
	crss-meterprocess-stream-daily-sink/application.yml
	crss-meterprocess-stream-daily-sink/crss-meterprocess-stream-daily-sink-dev.yml
	crss-meterprocess-stream-daily-sink/crss-meterprocess-stream-daily-sink-dev2.yml
	crss-meterprocess-stream-daily-sink/crss-meterprocess-stream-daily-sink-devoracle.yml
	crss-meterprocess-stream-daily-sink/crss-meterprocess-stream-daily-sink-qaoracle.yml
	crss-meterprocess-stream-daily-sink/crss-meterprocess-stream-daily-sink-top.yml
	crss-meterprocess-stream-daily-sink/crss-meterprocess-stream-daily-sink.yml
	crss-meterprocess-stream-mapper/crss-meterprocess-stream-mapper-dev.yml
	crss-meterprocess-stream-mapper/crss-meterprocess-stream-mapper-dev2.yml
	crss-meterprocess-stream-mapper/crss-meterprocess-stream-mapper-devoracle.yml
	crss-meterprocess-stream-mapper/crss-meterprocess-stream-mapper-qaoracle.yml
	crss-meterprocess-stream-mapper/crss-meterprocess-stream-mapper-top.yml
	crss-meterprocess-stream-mapper/crss-meterprocess-stream-mapper.yml
	crss-meterprocess-stream-processor-daily-validate/application-dev.yml
	crss-meterprocess-stream-processor-daily-validate/application.yml
	crss-meterprocess-stream-processor-daily-validate/crss-meterprocess-stream-processor-daily-validate-dev.yml
	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-devoracle.yml
	crss-meterprocess-stream-processor-daily-validate/crss-meterprocess-stream-processor-daily-validate-qaoracle.yml
	crss-meterprocess-stream-processor-daily-validate/crss-meterprocess-stream-processor-daily-validate-top.yml
	crss-meterprocess-stream-processor-daily-validate/crss-meterprocess-stream-processor-daily-validate.yml
	crss-meterprocess-stream-source-daily-raw/application.yml
	crss-meterprocess-stream-source-daily-raw/crss-meterprocess-stream-source-daily-raw-dev.yml
	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-devoracle.yml
	crss-meterprocess-stream-source-daily-raw/crss-meterprocess-stream-source-daily-raw-qaoracle.yml
	crss-meterprocess-stream-source-daily-raw/crss-meterprocess-stream-source-daily-raw-top.yml
	crss-meterprocess-stream-source-daily-raw/crss-meterprocess-stream-source-daily-raw.yml
	crss-meterprocess-task-stlready/crss-meterprocess-task-stlready-dev.yml
	crss-meterprocess-task-stlready/crss-meterprocess-task-stlready-dev2.yml
	crss-meterprocess-task-stlready/crss-meterprocess-task-stlready-top.yml
	crss-meterprocess-task-stlready/crss-meterprocess-task-stlready.yml
	crss-mq-computation/crss-mq-computation-dev.yml
	crss-mq-computation/crss-mq-computation-dev2.yml
	crss-mq-computation/crss-mq-computation-devoracle.yml
	crss-mq-computation/crss-mq-computation-qaoracle.yml
	crss-mq-computation/crss-mq-computation-top.yml
	crss-mq-computation/crss-mq-computation.yml
	crss-mtr/crss-mtr-dev.yml
	crss-mtr/crss-mtr-dev2.yml
	crss-mtr/crss-mtr-devoracle.yml
	crss-mtr/crss-mtr-qaoracle.yml
	crss-mtr/crss-mtr.yml
	crss-reg/crss-reg-ss-combined.yml
	crss-reg/crss-reg-top.yml
	crss-reg/crss-reg.yml
	crss-sched/crss-sched-ss-combined.yml
	crss-settlement-app/crss-settlement-app-dev.yml
	crss-settlement-app/crss-settlement-app-dev2.yml
	crss-settlement-app/crss-settlement-app-pemc-uat-bcq.yml
	crss-settlement-app/crss-settlement-app-top.yml
	crss-settlement-app/crss-settlement-app.yml
	crss-settlement-task-calculation-addtlcomp/application-devlocal.yml
	crss-settlement-task-calculation-addtlcomp/crss-settlement-task-calculation-addtlcomp-dev.yml
	crss-settlement-task-calculation-addtlcomp/crss-settlement-task-calculation-addtlcomp-dev2.yml
	crss-settlement-task-calculation-addtlcomp/crss-settlement-task-calculation-addtlcomp-devlocal.yml
	crss-settlement-task-calculation-addtlcomp/crss-settlement-task-calculation-addtlcomp-top.yml
	crss-settlement-task-calculation-addtlcomp/crss-settlement-task-calculation-addtlcomp.yml
	crss-settlement-task-calculation/application-dev.yml
	crss-settlement-task-calculation/application-dev2.yml
	crss-settlement-task-calculation/application-devlocal.yml
	crss-settlement-task-calculation/application.yml
	crss-settlement-task-calculation/crss-settlement-task-calculation-dev.yml
	crss-settlement-task-calculation/crss-settlement-task-calculation-dev2.yml
	crss-settlement-task-calculation/crss-settlement-task-calculation-devlocal.yml
	crss-settlement-task-calculation/crss-settlement-task-calculation-top.yml
	crss-settlement-task-calculation/crss-settlement-task-calculation.yml
	crss-settlement-task-invoice-generation/application-devlocal.yml
	crss-settlement-task-invoice-generation/application.yml
	crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation-dev.yml
	crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation-dev2.yml
	crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation-devoracle.yml
	crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation-top.yml
	crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation.yml
	crss-settlement-task-validation/application-pemc-uat-sit.yml
	crss-settlement-task-validation/crss-settlement-task-validation-dev.yml
	crss-settlement-task-validation/crss-settlement-task-validation-dev2.yml
	crss-settlement-task-validation/crss-settlement-task-validation-devoracle.yml
	crss-settlement-task-validation/crss-settlement-task-validation-qa.yml
	crss-settlement-task-validation/crss-settlement-task-validation-top.yml
	crss-settlement-task-validation/crss-settlement-task-validation.yml
	crss-ui/crss-ui-pemc-uat.yml
	crss-ui/crss-ui.yml
	ui-bsmd/ui-bsmd-dev.yml
	ui-bsmd/ui-bsmd-dev2.yml
	ui-bsmd/ui-bsmd-pemc-uat.yml

application-pemc-top-sit.yml

@@ -0,0 +1,8 @@
+spring:
+  redis:
+    host: crss-top-sitredis.marathon.l4lb.thisdcos.directory
+  rabbitmq:
+    host: crss-top-sitrabbitmq.marathon.l4lb.thisdcos.directory
+
+crss:
+  api.gateway: http://crss-top-sitcrss1application-main-ui.marathon.l4lb.thisdcos.directory:8080

application-pemc-uat-default.yml

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

application-pemc-uat-sit.yml

@@ -0,0 +1,10 @@
+spring:
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
+  rabbitmq:
+    host: crss-uat-sitrabbitmq.marathon.l4lb.thisdcos.directory
+  datasource:
+    driverClassName: org.postgresql.Driver
+
+crss:
+  api.gateway: http://crss-uat-sitcrss1application-main-ui.marathon.l4lb.thisdcos.directory:8080

application-ss-combined.yml

@@ -0,0 +1,9 @@
+spring:
+  rabbitmq:
+    host: rabbitmq.marathon.l4lb.thisdcos.directory
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
+  datasource:
+    driverClassName: org.postgresql.Driver
+
+security.server.url: http://crssapplication-main-ui.marathon.l4lb.thisdcos.directory:8080/admin

application-top-sit.yml

@@ -0,0 +1,8 @@
+spring:
+  redis:
+    host: crss-top-sitredis.marathon.l4lb.thisdcos.directory
+  rabbitmq:
+    host: crss-top-sitrabbitmq.marathon.l4lb.thisdcos.directory
+
+crss:
+  api.gateway: http://crss-top-sitcrss1application-main-ui.marathon.l4lb.thisdcos.directory:8080

application.yml

@@ -24,7 +24,24 @@ spring:
   rabbitmq:
     host: rabbitmq.marathon.l4lb.thisdcos.directory
 
+security:
+  oauth2:
+    client:
+      accessTokenUri: ${crss.security.url}/oauth/access_token
+      userAuthorizationUri: ${crss.security.url}/oauth/authorize
+      clientId: crss
+      clientSecret: crsssecret
+      authorized-grant-types: authorization_code,refresh_token,password
+      scope: openid
+      access-token-validity-seconds: 3600
+    resource:
+      filter-order: 3
+      userInfoUri: ${crss.security.url}/user
 
+eureka:
+  client:
+    serviceUrl:
+      defaultZone: http://localhost:8761/eureka/
 
 server:
   undertow:

crss-admin/crss-admin-pemc-top-sit.yml

@@ -0,0 +1,32 @@
+spring:
+  datasource:
+    url: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=admin
+    username: crss_sit_admin
+    password: ZSluMmYE
+  mail:
+    host: mailserver.marathon.l4lb.thisdcos.directory
+    port: 3025
+    username: crss@top.crss.wesm.ph
+    password: P@ssw0rd1434412
+    properties:
+        transport.protocol: smtp
+        smtp:
+          auth: true
+          starttls.enable: true
+
+crss:
+  ldap:
+    protocol: LDAPS
+    host: "10.176.24.26"
+    port: 636
+    root-dn: "dc=wesmsys,dc=local"
+    user-search-base: ""
+    admin-user: "wesmsys\\crssadmin"
+    admin-password: "123qweASD"
+    username-field: "userPrincipalName"
+    domain: "wesmsys.local"
+    embedded: false
+    passwordOpEnabled: true
+  mail:
+    signature:
+      root-dir: /crss-uat-sit/esig

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

@@ -0,0 +1,31 @@
+spring:
+  redis:
+    database: 5
+  datasource:
+    url: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=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
+crss:
+  ldap:
+    protocol: LDAPS
+    host: "10.176.24.26"
+    port: 636
+    root-dn: "dc=wesmsys,dc=local"
+    user-search-base: ""
+    admin-user: "wesmsys\\crssadmin"
+    admin-password: "123qweASD"
+    username-field: "userPrincipalName"
+    domain: "wesmsys.local"
+    embedded: false
+    passwordOpEnabled: true

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

@@ -0,0 +1,34 @@
+spring:
+  redis:
+    database: 4
+  datasource:
+    url: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=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
+crss:
+  ldap:
+    protocol: LDAPS
+    host: "10.176.24.26"
+    port: 636
+    root-dn: "dc=wesmsys,dc=local"
+    user-search-base: MO,MP,SO
+    admin-user: "wesmsys\\crssadmin"
+    admin-password: "123qweASD"
+    username-field: "userPrincipalName"
+    domain: "wesmsys.local"
+    embedded: false
+    passwordOpEnabled: true
+  mail:
+    signature:
+      root-dir: /crss-uat-sit/esig

crss-admin/crss-admin-ss-combined.yml

@@ -1,6 +1,6 @@
 spring:
   datasource:
-    url: jdbc:postgresql://192.168.233.9:5432/crss_admin
+    url: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=admin
     username: crss_admin
     password: crss_admin
   mail:

crss-admin/crss-admin-staging.yml

@@ -17,4 +17,5 @@ spring:
           auth: true
           starttls.enable: true
   redis:
-    host: redis
+    host: redis
+    database: 1

crss-admin/crss-admin-top.yml

@@ -18,13 +18,13 @@ spring:
 crss:
   ldap:
     protocol: LDAPS
-    host: "10.176.24.26"
+    host: "10.176.12.106"
     port: 636
     root-dn: "dc=wesmsys,dc=local"
-    user-search-base: MO,MP,SO
-    admin-user: "wesmsys\\crssadmin"
-    admin-password: "123qweASD"
+    user-search-base: ""
+    admin-user: "wesmsys\\crss_user"
+    admin-password: "Cr$$1234"
     username-field: "userPrincipalName"
     domain: "wesmsys.local"
     embedded: false
-    passwordOpEnabled: true
+    passwordOpEnabled: true

crss-admin/crss-admin.yml

@@ -1,6 +1,8 @@
 spring:
   profiles.include: audit, client-sec
-
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
+    database: 1
   http:
     multipart:
       maxFileSize: "25Mb"

crss-audit/crss-audit-dev.yml

@@ -0,0 +1,15 @@
+spring:
+  crss-audit:
+    datasource:
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_audit
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
+
+security:
+  oauth2:
+    client:
+      accessTokenUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
+      userAuthorizationUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
+    resource:
+      userInfoUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/user

crss-audit/crss-audit-dev2.yml

@@ -1,11 +1,36 @@
 spring:
   crss-audit:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_audit
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=audit
       username: crss_audit
       password: crss_audit
+      driverClassName: org.postgresql.Driver
+      maxPoolSize: 2
+      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
+
+server:
+  port: 9094
+  undertow:
+    accesslog:
+      dir: target
+      enabled: true
+      pattern: combined
+    compression:
+      enabled: true
+      min-response-size: 1
 
 security:
   oauth2:
@@ -13,4 +38,8 @@ security:
       accessTokenUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
       userAuthorizationUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
     resource:
-      userInfoUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/user
+      userInfoUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/user
+
+logging:
+  level:
+    com.pemc: debug

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

@@ -0,0 +1,18 @@
+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
+  redis:
+      database: 5
+
+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

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

@@ -0,0 +1,19 @@
+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
+  redis:
+    database: 4
+
+
+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

crss-audit/crss-audit-qa.yml

@@ -0,0 +1,7 @@
+spring:
+  crss-audit:
+    datasource:
+      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_audit
+      username: admin
+      password: password
+      driverClassName: org.postgresql.Driver

crss-audit/crss-audit-top-sit.yml

@@ -0,0 +1,14 @@
+spring:
+  crss-audit:
+    datasource:
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=audit
+      username: crss_sit_audit
+      password: ZP476xLC
+
+security:
+  oauth2:
+    client:
+      accessTokenUri: http://crss-top-sitcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
+      userAuthorizationUri: http://crss-top-sitcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
+    resource:
+      userInfoUri: http://crss-top-sitcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/user

crss-audit/crss-audit-top.yml

@@ -0,0 +1,7 @@
+spring:
+  crss-audit:
+    datasource:
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=audit
+      username: crss_audit
+      password: S0CuFyj6
+

crss-audit/crss-audit.yml

@@ -1,11 +1,8 @@
 spring:
   crss-audit:
     datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_audit
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 20
+      driverClassName: com.edb.Driver
+      maxPoolSize: 2
       connectionTimeout: 10000
       test-on-borrow: true
       validation-query: SELECT 1
@@ -20,6 +17,15 @@ spring:
   redis:
     host: localhost
     port: 6379
+
+security:
+  oauth2:
+    client:
+      accessTokenUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
+      userAuthorizationUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
+    resource:
+      userInfoUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/user
+
 server:
   port: 9094
   undertow:

crss-data/crss-data-pemc-top-sit.yml

@@ -0,0 +1,23 @@
+spring:
+  datasource:
+    url: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=dataextraction
+    username: crss_sit_dataextraction
+    password: 7nca5DyN
+crss:
+  # TODO: renaming of datasource name must also update the binding in data-extraction service and kettle files
+  metadata:
+    datasource:
+      url: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=dataextraction
+      username: crss_sit_dataextraction
+      password: 7nca5DyN
+  datawarehouse:
+    datasource:
+      platform: postgresql
+      url: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=dataextraction
+      username: crss_sit_dataextraction
+      password: 7nca5DyN
+  registration:
+     datasource:
+       url: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=registration
+       username: crss_sit_registration
+       password: 6UZU8ilC

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

@@ -0,0 +1,23 @@
+spring:
+  datasource:
+    url: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataextraction
+    username: crss_dataextraction
+    password: crss_dataextraction
+crss:
+  metadata:
+    datasource:
+      url: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataextraction
+      username: crss_dataextraction
+      password: crss_dataextraction
+  datawarehouse:
+    datasource:
+      platform: oracle
+      url: jdbc:oracle:thin:@10.176.23.24:1521:ORCL
+      username: crss_dw
+      password: crss_dw
+      driverClassName: oracle.jdbc.OracleDriver
+  registration:
+     datasource:
+       url: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=registration
+       username: crss_registration
+       password: crss_registration

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

@@ -0,0 +1,23 @@
+spring:
+  datasource:
+    url: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataextraction
+    username: crss_dataextraction
+    password: crss_dataextraction
+crss:
+  metadata:
+    datasource:
+      url: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataextraction
+      username: crss_dataextraction
+      password: crss_dataextraction
+  datawarehouse:
+    datasource:
+      platform: oracle
+      url: jdbc:oracle:thin:@10.176.23.24:1521:ORCL
+      username: crss_dw
+      password: crss_dw
+      driverClassName: oracle.jdbc.OracleDriver
+  registration:
+     datasource:
+       url: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=registration
+       username: crss_registration
+       password: crss_registration

crss-data/crss-data-ss-combined.yml

@@ -1,14 +1,14 @@
 spring:
   datasource:
-    url: jdbc:postgresql://192.168.233.9:5432/crss_data
-    username: crss_data
-    password: crss_data
+    url: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=dataextraction
+    username: crss_dataextraction
+    password: crss_dataextraction
 crss:
   metadata:
     datasource:
-      url: jdbc:postgresql://192.168.233.9:5432/crss_data
-      username: crss_data
-      password: crss_data
+      url: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=dataextraction
+      username: crss_dataextraction
+      password: crss_dataextraction
   datawarehouse:
     datasource:
       platform: oracle
@@ -16,8 +16,18 @@ crss:
       username: crss_dw
       password: crss_dw
       driverClassName: oracle.jdbc.OracleDriver
+      hikari:
+        connectionTimeout: 10000
+        maximumPoolSize: 5
+        minimumIdle: 2
   registration:
      datasource:
-       url: jdbc:postgresql://192.168.233.9:5432/crss_reg
-       username: crss_reg
-       password: crss_reg
+       url: jdbc:postgresql://192.168.233.9: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-top.yml

@@ -13,9 +13,9 @@ crss:
   datawarehouse:
     datasource:
       platform: postgresql
-      url: jdbc:edb://10.176.11.23:5432/crss?currentSchema=dataextraction
-      username: crss_dw
-      password: etPyY3k8
+      url: jdbc:edb://10.176.11.23:5432/crss_sit_external?currentSchema=datawarehouse
+      username: crss_sit_datawarehouse
+      password: 8BE7ShE3
   registration:
      datasource:
        url: jdbc:edb://10.176.11.23:5432/crss?currentSchema=registration

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

@@ -1,20 +1,22 @@
 spring:
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_dataflow
-      username: admin
-      password: password
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_dataflow
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
   jpa:
     show-sql: true
 
   redis:
-    host: redis.marathon.l4lb.thisdcos.directory
+    host: localhost
+    port: 6379
 
 server:
-  port: 8082
+  port: 9092
 
 dataflow:
-  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
+  url: http://localhost:9393
 
 security:
   basic:

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

@@ -1,17 +1,47 @@
 spring:
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_dataflow
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
+      driverClassName: org.postgresql.Driver
+      maxPoolSize: 2
+      connectionTimeout: 10000
+      test-on-borrow: true
+      validation-query: SELECT 1
   jpa:
     show-sql: true
+    generate-ddl: false
+    properties:
+      hibernate:
+        generate_statistics: true
+        dialect: org.hibernate.dialect.PostgreSQLDialect
+        ddl-auto: none
+        hbm2ddl:
+          import_files:
+
+  # prevent batch job from running on app start
+  batch:
+    job:
+      enabled: false
 
   redis:
     host: redis.marathon.l4lb.thisdcos.directory
+    port: 6379
+
+#liquibase:
+#  change-log: classpath:/db/db.changelog-master.xml
 
 server:
   port: 8082
+  undertow:
+    accesslog:
+      dir: target
+      enabled: true
+      pattern: combined
+  compression:
+    enabled: true
+    min-response-size: 1
 
 security:
   oauth2:
@@ -21,5 +51,29 @@ security:
     resource:
       userInfoUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/user
 
+
+logging:
+  level:
+    com.pemc: DEBUG
+    com.netflix: DEBUG
+    org.springframework.cloud: DEBUG
+    org.apache.http: DEBUG
+    org.hibernate.type: trace
+    org.hibernate.stat: debug
+
 dataflow:
-  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
+  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
+
+sftp:
+  credentials:
+    username: pemc
+    password: 123qwe
+    host: pemc-storage.southeastasia.cloudapp.azure.com
+    port: 22
+    workingDirectory: /home/pemc/upload
+    privateKey:
+
+# temporary todi-config, to be moved to general config
+todi-config:
+  dispatch-interval: 5
+

crss-dataflow-app/crss-dataflow-app.yml → crss-dataflow-app/crss-dataflow-app-devlocal.yml

@@ -1,24 +1,22 @@
 spring:
-  profiles:
-    include: client-sec
   crss-dataflow:
     datasource:
       jdbcUrl: jdbc:postgresql://localhost:5432/crss_dataflow
       username: postgres
       password: postgres
       driverClassName: org.postgresql.Driver
-      connectionTimeout: 10000
       maxPoolSize: 20
+      connectionTimeout: 10000
       test-on-borrow: true
       validation-query: SELECT 1
   jpa:
     show-sql: false
-    generate-ddl: false
+    generate-ddl: true
     properties:
       hibernate:
-        generate_statistics: true
+        generate_statistics: false
         dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
+        ddl-auto: update
         hbm2ddl:
           import_files:
 
@@ -45,13 +43,25 @@ server:
     enabled: true
     min-response-size: 1
 
+security:
+  oauth2:
+    client:
+      accessTokenUri: http://localhost:8082/oauth/access_token
+      userAuthorizationUri: http://localhost:8082/oauth/authorize
+      clientId: crss
+      clientSecret: crsssecret
+      authorized-grant-types: authorization_code,refresh_token,password
+      scope: openid
+      access-token-validity-seconds: 3600
+    resource:
+      userInfoUri: http://localhost:8082/user
+
 logging:
   level:
     com.pemc: DEBUG
     com.netflix: DEBUG
     org.springframework.cloud: DEBUG
     org.apache.http: DEBUG
-    org.hibernate.stat: debug
 
 dataflow:
   url: http://localhost:9393
@@ -68,4 +78,7 @@ sftp:
 # temporary todi-config, to be moved to general config
 todi-config:
   dispatch-interval: 5
-  max-retry: 2
+  max-retry: 2
+
+crss:
+  api.gateway: http://localhost:8080

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

@@ -0,0 +1,25 @@
+spring:
+  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
+  redis:
+    database: 5
+
+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://crss-uat-defaultspring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
+
+sftp:
+  credentials:
+    host: sftp.marathon.l4lb.thisdcos.directory
+    workingDirectory: /upload

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

@@ -0,0 +1,25 @@
+spring:
+  crss-dataflow:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataflow
+      username: crss_dataflow
+      password: crss_dataflow
+      driverClassName: org.postgresql.Driver
+  redis:
+    database: 4
+
+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
+
+dataflow:
+  url: http://crss-uat-sitspring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
+
+sftp:
+  credentials:
+    host: sftp.marathon.l4lb.thisdcos.directory
+    workingDirectory: /upload

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

@@ -0,0 +1,12 @@
+spring:
+  crss-dataflow:
+    datasource:
+      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_dataflow
+      username: admin
+      password: password
+      driverClassName: org.postgresql.Driver
+
+sftp:
+  credentials:
+    host: sftp.marathon.l4lb.thisdcos.directory
+    workingDirectory: /upload

crss-dataflow-app/crss-dataflow-app-top-sit.yml

@@ -0,0 +1,22 @@
+spring:
+  crss-dataflow:
+    datasource:
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=dataflow
+      username: crss_sit_dataflow
+      password: uYgE8bqG
+
+security:
+  oauth2:
+    client:
+      accessTokenUri: http://crss-top-sitcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
+      userAuthorizationUri: http://crss-top-sitcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
+    resource:
+      userInfoUri: http://crss-top-sitcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/user
+
+dataflow:
+  url: http://crss-top-sitspring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
+
+sftp:
+  credentials:
+    host: sftp.marathon.l4lb.thisdcos.directory
+    workingDirectory: /upload

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

@@ -3,22 +3,9 @@ spring:
     datasource:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=dataflow
       username: crss_dataflow
-      password: crss_dataflow
-  jpa:
-    show-sql: true
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
+      password: lgcCpwy0
 
-server:
-  port: 8082
-
-security:
-  oauth2:
-    client:
-      accessTokenUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
-      userAuthorizationUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
-    resource:
-      userInfoUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/user
-
-dataflow:
-  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
+sftp:
+  credentials:
+    host: sftp.marathon.l4lb.thisdcos.directory
+    workingDirectory: /upload

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

@@ -1,27 +1,28 @@
 spring:
   crss-emdb:
     datasource:
-      maxPoolSize: 5
-      #test-on-borrow: true
-      #validation-query: SELECT 1
+      jdbcUrl: jdbc:oracle:thin:@oracle-12c1265.cloudapp.net:1521:ORCL
+      username: pemc
+      password: 123qwe
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_dataflow
-      username: admin
-      password: password
-      test-on-borrow: true
-      validation-query: SELECT 1
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_dataflow
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/todi_crss_nmms
-      username: admin
-      password: password
-      test-on-borrow: true
-      validation-query: SELECT 1
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_nmms
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/todi_crss_reg
-      username: admin
-      password: password
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_reg
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
+
   redis:
-    host: redis.marathon.l4lb.thisdcos.directory
+      host: localhost
+      port: 6379

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

@@ -1,41 +1,31 @@
 spring:
   crss-emdb:
     datasource:
-      maxPoolSize: 5
-      #test-on-borrow: true
-      #validation-query: SELECT 1
+      jdbcUrl: jdbc:oracle:thin:@oracle-12c1265.cloudapp.net:1521:ORCL
+      username: pemc
+      password: 123qwe
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_dataflow
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
-      test-on-borrow: true
-      validation-query: SELECT 1
+      driverClassName: org.postgresql.Driver
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_nmms
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=nmms
       username: crss_nmms
       password: crss_nmms
-      test-on-borrow: true
-      validation-query: SELECT 1
+      driverClassName: org.postgresql.Driver
   crss-registration:
-      datasource:
-        jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_reg
-        username: crss_reg
-        password: crss_reg
-        driverClassName: org.postgresql.Driver
-        maxPoolSize: 5
-        test-on-borrow: true
-        validation-query: SELECT 1
+    datasource:
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=registration
+      username: crss_registration
+      password: crss_registration
+      driverClassName: org.postgresql.Driver
   crss-settlements:
-      datasource:
-        jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_settlement
-        username: crss_settlement
-        password: crss_settlement
-        driverClassName: org.postgresql.Driver
-        maxPoolSize: 5
-        test-on-borrow: true
-        validation-query: SELECT 1
+    datasource:
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=settlement
+      username: crss_settlement
+      password: crss_settlement
+      driverClassName: org.postgresql.Driver
 
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory

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

@@ -0,0 +1,28 @@
+spring:
+  crss-emdb:
+    datasource:
+      jdbcUrl: jdbc:oracle:thin:@10.176.23.24:1521:ORCL
+      username: emdb
+      password: emdb
+  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
+  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
+  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
+
+  redis:
+    database: 5
+

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

@@ -0,0 +1,73 @@
+spring:
+  crss-emdb:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit_external?currentSchema=emdb
+      username: crss_sit_emdb
+      password: crss_sit_emdb
+      driverClassName: org.postgresql.Driver
+  crss-dataflow:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataflow
+      username: crss_dataflow
+      password: crss_dataflow
+      driverClassName: org.postgresql.Driver
+  crss-nmms:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=nmms
+      username: crss_nmms
+      password: crss_nmms
+      driverClassName: org.postgresql.Driver
+  crss-registration:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=registration
+      username: crss_registration
+      password: crss_registration
+      driverClassName: org.postgresql.Driver
+
+  redis:
+    database: 4
+
+logging:
+  level:
+    com.pemc: debug
+    org.hibernate.stat: debug
+
+batch:
+  resourceLocation: "file:target/libs/crss-datainterface-task-ingest-1.0.0.BUILD-SNAPSHOT.jar"
+  partitionSize:
+    mq: 1500
+    ssla: 1500
+    report: 1500
+    importPrices: 100
+  autoMinusDaysAgo: 2
+
+mqreport:
+  directory: /tmp/
+
+sftp:
+  credentials:
+    username: pemc
+    password: 123qwe
+    host: 10.176.24.25
+    port: 2222
+    workingDirectory: /upload/rbcq
+    privateKey:
+
+database:
+  emdb:
+    rtu-db: "SNAPSHOT_DATA"
+    energy-price-sched-db: "MOAR_MVIEW"
+    reserve-price-sched-db: "RESERVED_MOAR_MVIEW"
+  nmms:
+    rtu-db: "TXN_RTU"
+    energy-price-sched-db: "TXN_ENERGY_PRICE_SCHED"
+    reserve-price-sched-db: "TXN_RESERVE_PRICE_SCHED"
+    reserve-bcq-db: "TXN_RESERVE_BCQ"
+
+bcq:
+  fileNamePrefix: "reserve_bcq_"
+
+todi_config:
+  dispatch-interval: 5
+
+reserve-categories-white-list: "Regulation Down,Fast Contingency Raise,Fast Contingency Lower,Slow Contingency Raise,Slow Contingency Lower,Delayed Contingency Raise,Delayed Contingency Lower,Regulation Up"

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

@@ -0,0 +1,24 @@
+spring:
+  crss-emdb:
+    datasource:
+      jdbcUrl: jdbc:oracle:thin:@oracle-12c1265.cloudapp.net:1521:ORCL
+      username: pemc
+      password: 123qwe
+  crss-dataflow:
+    datasource:
+      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_dataflow
+      username: admin
+      password: password
+      driverClassName: org.postgresql.Driver
+  crss-nmms:
+    datasource:
+      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/todi_crss_nmms
+      username: admin
+      password: password
+      driverClassName: org.postgresql.Driver
+  crss-registration:
+    datasource:
+      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/todi_crss_reg
+      username: admin
+      password: password
+      driverClassName: org.postgresql.Driver

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

@@ -0,0 +1,21 @@
+spring:
+  crss-emdb:
+    datasource:
+      jdbcUrl: jdbc:oracle:thin:@10.176.23.24:1521:ORCL
+      username: emdb
+      password: emdb
+  crss-dataflow:
+    datasource:
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=dataflow
+      username: crss_sit_dataflow
+      password: uYgE8bqG
+  crss-nmms:
+    datasource:
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=nmms
+      username: crss_sit_nmms
+      password: tEglXBQd
+  crss-registration:
+    datasource:
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=registration
+      username: crss_sit_registration
+      password: 6UZU8ilC

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

@@ -1,39 +1,21 @@
 spring:
   crss-emdb:
     datasource:
-      maxPoolSize: 5
-      #test-on-borrow: true
-      #validation-query: SELECT 1
+      jdbcUrl: jdbc:oracle:thin:@10.176.23.24:1521:ORCL
+      username: emdb
+      password: emdb
   crss-dataflow:
     datasource:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=dataflow
-      username: crss_dataflow
-      password: crss_dataflow
-      test-on-borrow: true
-      validation-query: SELECT 1
+      username: dataflow
+      password: lgcCpwy0
   crss-nmms:
     datasource:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=nmms
-      username: crss_meterprocess
-      password: crss_meterprocess
-      test-on-borrow: true
-      validation-query: SELECT 1
+      username: crss_nmms
+      password: lbgg1i2Y
   crss-registration:
-      datasource:
-        jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=registration
-        username: crss_reg
-        password: B3XxYcAb
-        maxPoolSize: 5
-        test-on-borrow: true
-        validation-query: SELECT 1
-  crss-settlements:
-      datasource:
-        jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=settlement
-        username: crss_settlement
-        password: crss_settlement
-        maxPoolSize: 5
-        test-on-borrow: true
-        validation-query: SELECT 1
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-
+    datasource:
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=registration
+      username: crss_registration
+      password: 51UF3JA9

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

@@ -1,33 +1,26 @@
 spring:
   crss-emdb:
     datasource:
-      jdbcUrl: jdbc:oracle:thin:@13.76.188.39:1521:ORCL
-      username: pemc
-      password: 123qwe
       driverClassName: oracle.jdbc.OracleDriver
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_dataflow
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
+      driverClassName: com.edb.Driver
       connectionTimeout: 10000
-      maxPoolSize: 5
+      maxPoolSize: 2
+      test-on-borrow: true
+      validation-query: SELECT 1
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_nmms
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
+      driverClassName: com.edb.Driver
       connectionTimeout: 10000
-      maxPoolSize: 5
+      maxPoolSize: 2
+      test-on-borrow: true
+      validation-query: SELECT 1
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_reg
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
+      driverClassName: com.edb.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
       test-on-borrow: true
       validation-query: SELECT 1
   jpa:
@@ -37,7 +30,7 @@ spring:
       hibernate:
         dialect: org.hibernate.dialect.PostgreSQLDialect
         ddl-auto: none
-        generate_statistics: true
+        generate_statistics: false
   cloud:
     task:
       initialize:
@@ -52,7 +45,6 @@ spring:
 logging:
   level:
     com.pemc: debug
-    org.hibernate.stat: debug
 
 batch:
   # resourceLocation: "file:target/libs/crss-datainterface-task-ingest-1.0.0.BUILD-SNAPSHOT.jar"
@@ -70,9 +62,9 @@ sftp:
   credentials:
     username: pemc
     password: 123qwe
-    host: pemc-storage.southeastasia.cloudapp.azure.com
+    host: sftp.marathon.l4lb.thisdcos.directory
     port: 22
-    workingDirectory: /home/pemc/sow7
+    workingDirectory: /upload/rbcq
     privateKey:
 
 database:

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

@@ -0,0 +1,6 @@
+spring:
+  profiles.include: pg-query
+  datasource:
+    url: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=metering
+    username: crss_sit_metering
+    password: XmI6Yr1B

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

@@ -0,0 +1,9 @@
+spring:
+  profiles.include: pg-query
+  datasource:
+    url: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
+    username: crss_metering
+    password: crss_metering
+    hikari:
+      connectionTimeout: 10000
+      maximumPoolSize: 20

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

@@ -0,0 +1,9 @@
+spring:
+  profiles.include: pg-query
+  datasource:
+    url: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
+    username: crss_metering
+    password: crss_metering
+    hikari:
+      connectionTimeout: 10000
+      maximumPoolSize: 5

crss-metering/crss-metering-ss-combined.yml

@@ -1,6 +1,13 @@
 spring:
   profiles.include: pg-query
   datasource:
-    url: jdbc:postgresql://192.168.233.9:5432/crss_metering
+    url: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=metering
     username: crss_metering
-    password: crss_metering
+    password: crss_metering
+    hikari:
+      connectionTimeout: 10000
+      maximumPoolSize: 20
+
+logging:
+  level:
+    com.pemc.crss: DEBUG

crss-metering/crss-metering-staging.yml

@@ -4,6 +4,9 @@ spring:
     url: jdbc:edb://192.168.241.185:5433/crss?currentSchema=metering
     username: crss_metering
     password: CrssMetering
+    hikari:
+      connectionTimeout: 10000
+      maximumPoolSize: 20
 
 logging:
   level:

crss-meterprocess-app/crss-meterprocess-app-dev.yml

@@ -1,31 +1,41 @@
 spring:
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_meterprocess
-      username: admin
-      password: password
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_meterprocess
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_reg
-      username: admin
-      password: password
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_reg
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_nmms
-      username: admin
-      password: password
-
-  jpa:
-    generate-ddl: true
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_nmms
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
 
 server:
   port: 8081
 
 dataflow:
-  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
+  url: http://localhost:9393
 
 security:
-  ignored: /**
+  oauth2:
+    client:
+      accessTokenUri: http://localhost:8082/oauth/access_token
+      userAuthorizationUri: http://localhost:8082/oauth/authorize
+      clientId: crss
+      clientSecret: crsssecret
+      authorized-grant-types: authorization_code,refresh_token,password
+      scope: openid
+      access-token-validity-seconds: 3600
+    resource:
+      userInfoUri: http://localhost:8082/user
 
 management:
   security:
@@ -33,5 +43,9 @@ management:
 
 sftp:
   credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload
+    username: pemc
+    password: 123qwe
+    host: pemc-storage.southeastasia.cloudapp.azure.com
+    port: 22
+    workingDirectory: /home/pemc/upload
+    privateKey:

crss-meterprocess-app/crss-meterprocess-app-dev2.yml

@@ -1,25 +1,61 @@
 spring:
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_meterprocess
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
-      password: crss_meterprocess`
+      password: crss_meterprocess
+      driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_reg
-      username: crss_reg
-      password: crss_reg
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=registration
+      username: crss_registration
+      password: crss_registration
+      driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_nmms
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=nmms
       username: crss_nmms
       password: crss_nmms
+      driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
+
   jpa:
-    generate-ddl: true
+    show-sql: false
+    generate-ddl: false
+    properties:
+      hibernate:
+        generate_statistics: false
+        dialect: org.hibernate.dialect.PostgreSQLDialect
+        ddl-auto: none
+        hbm2ddl:
+          import_files:
+
+  # prevent batch job from running on app start
+  batch:
+    job:
+      enabled: false
+
+#liquibase:
+#  change-log: classpath:/db/db.changelog-master.xml
 
 server:
   port: 8081
-
+  undertow:
+    accesslog:
+      dir: target
+      enabled: true
+      pattern: combined
+  compression:
+    enabled: true
+    min-response-size: 1
 
 security:
   oauth2:
@@ -29,10 +65,24 @@ security:
     resource:
       userInfoUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/user
 
+logging:
+  level:
+    com.pemc: DEBUG
+    com.netflix: DEBUG
+    org.springframework.cloud: DEBUG
+    org.hibernate.stat: debug
+
 dataflow:
   url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
 
+job:
+  maxRun: 1
+
 sftp:
   credentials:
+    username: pemc
+    password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload
+    port: 22
+    workingDirectory: /upload
+    privateKey:

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

@@ -0,0 +1,35 @@
+spring:
+  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
+  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
+  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
+
+  redis:
+    database: 5
+
+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://crss-uat-defaultspring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
+
+

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

@@ -0,0 +1,35 @@
+spring:
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: crss_meterprocess
+      driverClassName: org.postgresql.Driver
+  crss-registration:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=registration
+      username: crss_registration
+      password: crss_registration
+      driverClassName: org.postgresql.Driver
+  crss-nmms:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=nmms
+      username: crss_nmms
+      password: crss_nmms
+      driverClassName: org.postgresql.Driver
+
+  redis:
+    database: 4
+
+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
+
+dataflow:
+  url: http://crss-uat-sitspring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
+
+

crss-meterprocess-app/crss-meterprocess-app-qa.yml

@@ -0,0 +1,19 @@
+spring:
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_meterprocess
+      username: admin
+      password: password
+      driverClassName: org.postgresql.Driver
+  crss-registration:
+    datasource:
+      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_reg
+      username: admin
+      password: password
+      driverClassName: org.postgresql.Driver
+  crss-nmms:
+    datasource:
+      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_nmms
+      username: admin
+      password: password
+      driverClassName: org.postgresql.Driver

crss-meterprocess-app/crss-meterprocess-app-top-sit.yml

@@ -0,0 +1,28 @@
+spring:
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=meterprocess
+      username: crss_sit_meterprocess
+      password: PmfXsUQp
+  crss-registration:
+    datasource:
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=registration
+      username: crss_sit_registration
+      password: 6UZU8ilC
+  crss-nmms:
+    datasource:
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=nmms
+      username: crss_sit_nmms
+      password: tEglXBQd
+
+security:
+  oauth2:
+    client:
+      accessTokenUri: http://crss-top-sitcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
+      userAuthorizationUri: http://crss-top-sitcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
+    resource:
+      userInfoUri: http://crss-top-sitcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/user
+
+dataflow:
+  url: http://crss-top-sitspring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
+

crss-meterprocess-app/crss-meterprocess-app-top.yml

@@ -3,36 +3,14 @@ spring:
     datasource:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
-      password: crss_meterprocess
+      password: D9JpfUtT
   crss-registration:
     datasource:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=registration
-      username: crss_reg
-      password: B3XxYcAb
+      username: crss_registration
+      password: 51UF3JA9
   crss-nmms:
     datasource:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=nmms
-      username: crss_meterprocess
-      password: crss_meterprocess
-
-  jpa:
-    generate-ddl: true
-
-server:
-  port: 8081
-
-security:
-  oauth2:
-    client:
-      accessTokenUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
-      userAuthorizationUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
-    resource:
-      userInfoUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/user
-
-dataflow:
-  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
-
-sftp:
-  credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload
+      username: crss_nmms
+      password: lbgg1i2Y

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

@@ -1,97 +0,0 @@
-spring:
-  profiles:
-    include: client-sec
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_meterprocess
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  crss-registration:
-    datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_reg
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  crss-nmms:
-    datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_nmms
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-
-  jpa:
-    show-sql: false
-    generate-ddl: false
-    properties:
-      hibernate:
-        generate_statistics: true
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        hbm2ddl:
-          import_files:
-
-  # prevent batch job from running on app start
-  batch:
-    job:
-      enabled: false
-
-#liquibase:
-#  change-log: classpath:/db/db.changelog-master.xml
-
-server:
-  port: 9091
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-  compression:
-    enabled: true
-    min-response-size: 1
-
-eureka:
-  instance:
-    prefer-ip-address: true
-  client:
-    serviceUrl:
-      defaultZone: http://localhost:8761/eureka/
-#          healthcheck:
-#            enabled: true
-#    lease:
-#      duration: 5
-#  instance:
-#    leaseRenewalIntervalInSeconds: 1
-#    leaseExpirationDurationInSeconds: 2
-
-logging:
-  level:
-    com.pemc: DEBUG
-    com.netflix: DEBUG
-    org.springframework.cloud: DEBUG
-    org.apache.http: DEBUG
-    org.hibernate.stat: debug
-
-dataflow:
-  url: http://localhost:9393
-
-job:
-  maxRun: 1
-
-sftp:
-  credentials:
-    username: pemc
-    password: 123qwe
-    host: pemc-storage.southeastasia.cloudapp.azure.com
-    port: 22
-    workingDirectory: /home/pemc/upload
-    privateKey:

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

@@ -1,16 +0,0 @@
-spring:
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_meterprocess
-      username: admin
-      password: password
-  crss-metering:
-    datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_metering
-      username: admin
-      password: password
-  crss-registration:
-    datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_reg
-      username: admin
-      password: password

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

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

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

@@ -1,26 +0,0 @@
-spring:
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-      username: crss_meterprocess_main
-      password: crss
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-  crss-metering:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-      username: crss_meterprocess_metering
-      password: crss
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-  crss-registration:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-      username: crss_meterprocess_reg
-      password: crss
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-  jpa:
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.Oracle10gDialect

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

@@ -0,0 +1,22 @@
+spring:
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: crss_meterprocess
+      driverClassName: org.postgresql.Driver
+  crss-metering:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
+      username: crss_metering
+      password: crss_metering
+      driverClassName: org.postgresql.Driver
+  crss-registration:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=registration
+      username: crss_registration
+      password: crss_registration
+      driverClassName: org.postgresql.Driver
+
+  redis:
+      database: 5

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

@@ -0,0 +1,22 @@
+spring:
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: crss_meterprocess
+      driverClassName: org.postgresql.Driver
+  crss-metering:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
+      username: crss_metering
+      password: crss_metering
+      driverClassName: org.postgresql.Driver
+  crss-registration:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=registration
+      username: crss_registration
+      password: crss_registration
+      driverClassName: org.postgresql.Driver
+
+  redis:
+    database: 4

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

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

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

@@ -1,27 +0,0 @@
-spring:
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@10.64.0.4:1521:XE
-      username: crss_meterprocess
-      password: crss_meterprocess
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-  crss-metering:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@10.64.0.4:1521:XE
-      username: crss_metering
-      password: crss_metering
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-  crss-registration:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@10.64.0.4:1521:XE
-      username: crss_reg
-      password: crss_reg
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-  jpa:
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.Oracle10gDialect
-

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

@@ -0,0 +1,16 @@
+spring:
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=meterprocess
+      username: crss_sit_meterprocess
+      password: PmfXsUQp
+  crss-metering:
+    datasource:
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=metering
+      username: crss_sit_metering
+      password: XmI6Yr1B
+  crss-registration:
+    datasource:
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=registration
+      username: crss_sit_registration
+      password: 6UZU8ilC

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

@@ -3,7 +3,7 @@ spring:
     datasource:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
-      password: crss_meterprocess
+      password: D9JpfUtT
   crss-metering:
     datasource:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=metering
@@ -12,5 +12,5 @@ spring:
   crss-registration:
     datasource:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=registration
-      username: crss_reg
-      password: B3XxYcAb
+      username: crss_registration
+      password: 51UF3JA9

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

@@ -1,43 +0,0 @@
-spring:
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_meterprocess
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  crss-metering:
-    datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_metering
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  crss-registration:
-    datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_reg
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  jpa:
-    show-sql: false
-    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
-logging:
-  level:
-    com.pemc: debug

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

@@ -1,19 +1,18 @@
 spring:
   crss-registration:
     dataSource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_reg
-      username: admin
-      password: password
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_reg
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_meterprocess
-      username: admin
-      password: password
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_meterprocess
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
 
-  jpa:
-    properties:
-      hibernate:
-        hbm2ddl:
-          auto: none
   redis:
-    host: redis.marathon.l4lb.thisdcos.directory
+    host: localhost
+    port: 6379
+

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

@@ -1,19 +1,43 @@
 spring:
+  cloud:
+    stream:
+      bindings:
+        output:
+          content-type: application/json
   crss-registration:
     dataSource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_reg
-      username: crss_reg
-      password: crss_reg
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=registration
+      username: crss_registration
+      password: crss_registration
+      driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_meterprocess
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
+      driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
 
   jpa:
-    properties:
+      show-sql: false
       hibernate:
-        hbm2ddl:
-          auto: none
+        ddl-auto: none
+      properties:
+        hibernate:
+          dialect: org.hibernate.dialect.PostgreSQLDialect
+          namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
+          hbm2ddl:
+            auto: none
+          temp:
+            use_jdbc_metadata_defaults: false
   redis:
     host: redis.marathon.l4lb.thisdcos.directory
+    port: 6379
+logging:
+  level:
+    com.pemc: debug

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

@@ -1,34 +0,0 @@
-spring:
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-      username: crss_meterprocess_main
-      password: crss
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-  crss-metering:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-      username: crss_meterprocess_metering
-      password: crss
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-      maxPoolSize: 5
-  crss-registration:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-      username: crss_meterprocess_reg
-      password: crss
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-      maxPoolSize: 5
-
-  jpa:
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.Oracle10gDialect
-        hbm2ddl:
-          auto: none
-logging:
-  level:
-    com.pemc: debug

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

@@ -0,0 +1,16 @@
+spring:
+  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
+  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
+
+  redis:
+    database: 5

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

@@ -0,0 +1,16 @@
+spring:
+  crss-registration:
+    dataSource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=registration
+      username: crss_registration
+      password: crss_registration
+      driverClassName: org.postgresql.Driver
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: crss_meterprocess
+      driverClassName: org.postgresql.Driver
+
+  redis:
+    database: 4

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

@@ -0,0 +1,13 @@
+spring:
+  crss-registration:
+    dataSource:
+      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_reg
+      username: admin
+      password: password
+      driverClassName: org.postgresql.Driver
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_meterprocess
+      username: admin
+      password: password
+      driverClassName: org.postgresql.Driver

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

@@ -1,24 +0,0 @@
-spring:
-  crss-registration:
-      dataSource:
-        jdbcUrl: jdbc:oracle:thin:@10.64.0.4:1521:XE
-        username: crss_reg
-        password: crss_reg
-        driverClassName: oracle.jdbc.driver.OracleDriver
-        connectionTimeout: 10000
-        maxPoolSize: 5
-  crss-main:
-      datasource:
-        jdbcUrl: jdbc:oracle:thin:@10.64.0.4:1521:XE
-        username: crss_meterprocess
-        password: crss_meterprocess
-        driverClassName: oracle.jdbc.driver.OracleDriver
-        connectionTimeout: 10000
-        maxPoolSize: 5
-
-  jpa:
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.Oracle10gDialect
-        hbm2ddl:
-          auto: none

crss-meterprocess-stream-mapper/crss-meterprocess-stream-mapper-top-sit.yml

@@ -0,0 +1,11 @@
+spring:
+  crss-registration:
+    dataSource:
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=registration
+      username: crss_sit_registration
+      password: 6UZU8ilC
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=meterprocess
+      username: crss_sit_meterprocess
+      password: PmfXsUQp

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

@@ -2,18 +2,10 @@ spring:
   crss-registration:
     dataSource:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=registration
-      username: crss_reg
-      password: B3XxYcAb
+      username: crss_registration
+      password: 51UF3JA9
   crss-main:
     datasource:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
-      password: crss_meterprocess
-
-  jpa:
-    properties:
-      hibernate:
-        hbm2ddl:
-          auto: none
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
+      password: D9JpfUtT

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

@@ -1,43 +0,0 @@
-spring:
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-  crss-registration:
-    dataSource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_reg
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_meterprocess
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-
-  jpa:
-    show-sql: false
-    hibernate:
-      ddl-auto: none
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
-        temp:
-          use_jdbc_metadata_defaults: false
-  redis:
-    host: localhost
-    port: 6379
-
-
-logging:
-  level:
-    com.pemc: debug

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

@@ -1,28 +0,0 @@
-spring:
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_meterprocess
-      username: admin
-      password: password
-  crss-metering:
-    datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_metering
-      username: admin
-      password: password
-  crss-registration:
-    datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_reg
-      username: admin
-      password: password
-
-  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

@@ -1,21 +1,34 @@
 spring:
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_meterprocess
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
+      driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_metering
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=metering
       username: crss_metering
       password: crss_metering
+      driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_reg
-      username: crss_reg
-      password: crss_reg
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=registration
+      username: crss_registration
+      password: crss_registration
+      driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
 
   jpa:
+    show-sql: false
     hibernate:
       ddl-auto: none
     properties:
@@ -25,4 +38,15 @@ spring:
         hbm2ddl:
           auto: none
         temp:
-          use_jdbc_metadata_defaults: false
+          use_jdbc_metadata_defaults: false
+        default_schema: public
+
+  cloud:
+    stream:
+      bindings:
+        output:
+          content-type: application/json
+
+logging:
+  level:
+    com.pemc: debug

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

@@ -1,22 +0,0 @@
-spring:
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-      username: crss_meterprocess_main
-      password: crss
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-  crss-metering:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-      username: crss_meterprocess_metering
-      password: crss
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-  crss-registration:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-      username: crss_meterprocess_reg
-      password: crss
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000

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

@@ -0,0 +1,22 @@
+spring:
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: crss_meterprocess
+      driverClassName: org.postgresql.Driver
+  crss-metering:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
+      username: crss_metering
+      password: crss_metering
+      driverClassName: org.postgresql.Driver
+  crss-registration:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=registration
+      username: crss_registration
+      password: crss_registration
+      driverClassName: org.postgresql.Driver
+
+  redis:
+      database: 5

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

@@ -0,0 +1,22 @@
+spring:
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: crss_meterprocess
+      driverClassName: org.postgresql.Driver
+  crss-metering:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
+      username: crss_metering
+      password: crss_metering
+      driverClassName: org.postgresql.Driver
+  crss-registration:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=registration
+      username: crss_registration
+      password: crss_registration
+      driverClassName: org.postgresql.Driver
+
+  redis:
+    database: 4

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

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

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

@@ -1,22 +0,0 @@
-spring:
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@10.64.0.4:1521:XE
-      username: crss_meterprocess
-      password: crss_meterprocess
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-  crss-metering:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@10.64.0.4:1521:XE
-      username: crss_metering
-      password: crss_metering
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-  crss-registration:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@10.64.0.4:1521:XE
-      username: crss_reg
-      password: crss_reg
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000

crss-meterprocess-stream-processor-daily-validate/crss-meterprocess-stream-processor-daily-validate-top-sit.yml

@@ -0,0 +1,16 @@
+spring:
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=meterprocess
+      username: crss_sit_meterprocess
+      password: PmfXsUQp
+  crss-metering:
+    datasource:
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=metering
+      username: crss_sit_metering
+      password: XmI6Yr1B
+  crss-registration:
+    datasource:
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=registration
+      username: crss_sit_registration
+      password: 6UZU8ilC

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

@@ -3,25 +3,14 @@ spring:
     datasource:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
-      password: crss_meterprocess
+      password: D9JpfUtT
   crss-metering:
     datasource:
-      jdbcUrl: jjdbc:edb://10.176.11.23:5432/crss?currentSchema=metering
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=metering
       username: crss_metering
       password: Fh7UcXpW
   crss-registration:
     datasource:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=registration
-      username: crss_reg
-      password: B3XxYcAb
-
-  jpa:
-    hibernate:
-      ddl-auto: none
-    properties:
-      hibernate:
-        namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
-        hbm2ddl:
-          auto: none
-        temp:
-          use_jdbc_metadata_defaults: false
+      username: crss_registration
+      password: 51UF3JA9

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

@@ -1,38 +0,0 @@
-spring:
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_meterprocess
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  crss-metering:
-    datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_metering
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  crss-registration:
-    datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_reg
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  jpa:
-    show-sql: false
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-logging:
-  level:
-    com.pemc: debug

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

@@ -2,10 +2,29 @@
 spring:
   profiles: dailyExtract
   datasource:
-    driver-class-name: org.postgresql.Driver
-    password: crss_metering
+    url: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=metering
     username: crss_metering
-    url: jdbc:postgresql://192.168.233.9:5432/crss_metering
+    password: crss_metering
+    driver-class-name: org.postgresql.Driver
+    maxPoolSize: 5
+    test-on-borrow: true
+    validation-query: SELECT 1
+  cloud:
+    stream:
+      bindings:
+        output:
+          content-type: application/json
+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);"
+
+trigger:
+  fixed-delay: 5
+  time-unit: SECONDS
+
+logging:
+  level:
+    com.pemc: DEBUG
 
 ---
 
@@ -13,17 +32,55 @@ spring:
 spring:
   profiles: monthlyExtract
   datasource:
-    driver-class-name: org.postgresql.Driver
-    password: crss_metering
+    url: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=metering
     username: crss_metering
-    url: jdbc:postgresql://192.168.233.9:5432/crss_metering
+    password: crss_metering
+    driver-class-name: org.postgresql.Driver
+    maxPoolSize: 5
+    test-on-borrow: true
+    validation-query: SELECT 1
+  cloud:
+    stream:
+      bindings:
+        output:
+          content-type: application/json
+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);"
+
+trigger:
+  fixed-delay: 5
+  time-unit: SECONDS
+
+logging:
+  level:
+    com.pemc: DEBUG
 
 ---
 
 # default
 spring:
   datasource:
-    driver-class-name: org.postgresql.Driver
-    password: crss_metering
+    url: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=metering
     username: crss_metering
-    url: jdbc:postgresql://192.168.233.9:5432/crss_metering
+    password: crss_metering
+    driver-class-name: org.postgresql.Driver
+    maxPoolSize: 5
+    test-on-borrow: true
+    validation-query: SELECT 1
+  cloud:
+    stream:
+      bindings:
+        output:
+          content-type: application/json
+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);"
+
+trigger:
+  fixed-delay: 5
+  time-unit: SECONDS
+
+logging:
+  level:
+    com.pemc: DEBUG

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

@@ -1,73 +0,0 @@
-#daily extract
-spring:
-  profiles: dailyExtract
-  datasource:
-    driver-class-name: oracle.jdbc.driver.OracleDriver
-    password: crss
-    username: crss_meterprocess_metering
-    url: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-jdbc:
-  max-rows-per-poll: 1
-  query: "select * from txn_meter_data_daily where consumed <> 'Y' or consumed is null or consumed = ''"
-  split: true
-  update: "update txn_meter_data_daily set consumed = 'Y' where meter_data_id in (:meter_data_id)"
-
-trigger:
-#  cron: '0/1 * * * * ?'
-#  date-format: 'MM/dd/yyyy'
-  fixed-delay: 100
-  initial-delay: 100
-  max-messages: 1
-  time-unit: MILLISECONDS
-
-
-logging:
-  level:
-    org.springframework: DEBUG
-
----
-
-#Monthly extract
-spring:
-  profiles: monthlyExtract
-  datasource:
-    driver-class-name: oracle.jdbc.driver.OracleDriver
-    password: crss
-    username: crss_meterprocess_metering
-    url: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-jdbc:
-  max-rows-per-poll: 1
-  query: "select * from txn_meter_data_monthly where consumed <> 'Y' or consumed is null or consumed = ''"
-  split: true
-  update: "update txn_meter_data_monthly set consumed = 'Y' where meter_data_id in (:meter_data_id)"
-
-trigger:
-#  cron: '0/1 * * * * ?'
-#  date-format: 'MM/dd/yyyy'
-  fixed-delay: 100
-  initial-delay: 100
-  max-messages: 1
-  time-unit: MILLISECONDS
-
----
-
-# default
-spring:
-  datasource:
-    driver-class-name: oracle.jdbc.driver.OracleDriver
-    password: crss
-    username: crss_meterprocess_metering
-    url: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-jdbc:
-  max-rows-per-poll: 1
-  query: "select * from txn_meter_data_monthly where consumed <> 'Y' or consumed is null or consumed = ''"
-  split: true
-  update: "update txn_meter_data_monthly set consumed = 'Y' where meter_data_id in (:meter_data_id)"
-
-trigger:
-#  cron: '0/1 * * * * ?'
-#  date-format: 'MM/dd/yyyy'
-  fixed-delay: 100
-  initial-delay: 100
-  max-messages: 1
-  time-unit: MILLISECONDS

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

@@ -0,0 +1,39 @@
+#daily extract
+spring:
+  profiles: dailyExtract
+  datasource:
+    url: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
+    username: crss_metering
+    password: crss_metering
+    driver-class-name: org.postgresql.Driver
+
+  redis:
+    database: 5
+
+---
+
+#Monthly extract
+spring:
+  profiles: monthlyExtract
+  datasource:
+    url: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
+    username: crss_metering
+    password: crss_metering
+    driver-class-name: org.postgresql.Driver
+
+  redis:
+    database: 5
+
+---
+
+# default
+spring:
+  datasource:
+    url: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
+    username: crss_metering
+    password: crss_metering
+    driver-class-name: org.postgresql.Driver
+
+  redis:
+    database: 5
+

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

@@ -0,0 +1,39 @@
+#daily extract
+spring:
+  profiles: dailyExtract
+  datasource:
+    url: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
+    username: crss_metering
+    password: crss_metering
+    driver-class-name: org.postgresql.Driver
+
+  redis:
+    database: 4
+
+---
+
+#Monthly extract
+spring:
+  profiles: monthlyExtract
+  datasource:
+    url: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
+    username: crss_metering
+    password: crss_metering
+    driver-class-name: org.postgresql.Driver
+
+  redis:
+    database: 4
+
+---
+
+# default
+spring:
+  datasource:
+    url: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
+    username: crss_metering
+    password: crss_metering
+    driver-class-name: org.postgresql.Driver
+
+  redis:
+    database: 4
+

crss-meterprocess-stream-source-daily-raw/crss-meterprocess-stream-source-daily-raw-dev.yml → crss-meterprocess-stream-source-daily-raw/crss-meterprocess-stream-source-daily-raw-qa.yml

@@ -2,10 +2,10 @@
 spring:
   profiles: dailyExtract
   datasource:
-    driver-class-name: org.postgresql.Driver
-    password: password
+    url: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_metering
     username: admin
-    url: jdbc:postgresql://192.168.236.2:5432/crss_metering
+    password: password
+    driver-class-name: org.postgresql.Driver
 
 ---
 
@@ -13,17 +13,19 @@ spring:
 spring:
   profiles: monthlyExtract
   datasource:
-    driver-class-name: org.postgresql.Driver
-    password: password
+    url: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_metering
     username: admin
-    url: jdbc:postgresql://192.168.236.2:5432/crss_metering
+    password: password
+    driver-class-name: org.postgresql.Driver
 
 ---
 
 # default
 spring:
   datasource:
-    driver-class-name: org.postgresql.Driver
-    password: password
+    url: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_metering
     username: admin
-    url: jdbc:postgresql://192.168.236.2:5432/crss_metering
+    password: password
+    driver-class-name: org.postgresql.Driver
+
+

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

@@ -1,53 +0,0 @@
-#daily extract
-spring:
-  profiles: dailyExtract
-  datasource:
-    driver-class-name: oracle.jdbc.driver.OracleDriver
-    password: crss_metering
-    username: crss_metering
-    url: jdbc:oracle:thin:@10.64.0.4:1521:XE
-
-jdbc:
-  max-rows-per-poll: 1
-  query: "select * from txn_meter_data_daily where consumed <> 'Y' or consumed is null or consumed = ''"
-  split: true
-  update: "update txn_meter_data_daily set consumed = 'Y' where meter_data_id in (:meter_data_id)"
-
-trigger:
-#  cron: '0/1 * * * * ?'
-#  date-format: 'MM/dd/yyyy'
-  fixed-delay: 100
-  initial-delay: 100
-  max-messages: 1
-  time-unit: MILLISECONDS
-
-
-logging:
-  level:
-    org.springframework: DEBUG
-
----
-
-#Monthly extract
-spring:
-  profiles: monthlyExtract
-  datasource:
-    driver-class-name: oracle.jdbc.driver.OracleDriver
-    password: crss_metering
-    username: crss_metering
-    url: jdbc:oracle:thin:@10.64.0.4:1521:XE
-
-jdbc:
-  max-rows-per-poll: 1
-  query: "select * from txn_meter_data_monthly where consumed <> 'Y' or consumed is null or consumed = ''"
-  split: true
-  update: "update txn_meter_data_monthly set consumed = 'Y' where meter_data_id in (:meter_data_id)"
-
-trigger:
-#  cron: '0/1 * * * * ?'
-#  date-format: 'MM/dd/yyyy'
-  fixed-delay: 100
-  initial-delay: 100
-  max-messages: 1
-  time-unit: MILLISECONDS
-

crss-meterprocess-stream-source-daily-raw/crss-meterprocess-stream-source-daily-raw-top-sit.yml

@@ -0,0 +1,28 @@
+#daily extract
+spring:
+  profiles: dailyExtract
+  datasource:
+    url: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=metering
+    username: crss_sit_metering
+    password: XmI6Yr1B
+
+---
+
+#Monthly extract
+spring:
+  profiles: monthlyExtract
+  datasource:
+    url: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=metering
+    username: crss_sit_metering
+    password: XmI6Yr1B
+
+---
+
+# default
+spring:
+  datasource:
+    url: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=metering
+    username: crss_sit_metering
+    password: XmI6Yr1B
+
+

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

@@ -3,7 +3,7 @@ spring:
   profiles: dailyExtract
   datasource:
     url: jdbc:edb://10.176.11.23:5432/crss?currentSchema=metering
-    username: crss_meterprocess
+    username: crss_metering
     password: Fh7UcXpW
 
 ---
@@ -13,7 +13,7 @@ spring:
   profiles: monthlyExtract
   datasource:
     url: jdbc:edb://10.176.11.23:5432/crss?currentSchema=metering
-    username: crss_meterprocess
+    username: crss_metering
     password: Fh7UcXpW
 
 ---
@@ -22,5 +22,6 @@ spring:
 spring:
   datasource:
     url: jdbc:edb://10.176.11.23:5432/crss?currentSchema=metering
-    username: crss_meterprocess
-    password: Fh7UcXpW
+    username: crss_metering
+    password: Fh7UcXpW
+

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

@@ -1,86 +0,0 @@
-#daily extract
-spring:
-  profiles: dailyExtract
-  datasource:
-    driver-class-name: org.postgresql.Driver
-    password: postgres
-    username: postgres
-    url: jdbc:postgresql://localhost:5432/crss_metering
-    maxPoolSize: 5
-    test-on-borrow: true
-    validation-query: SELECT 1
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-jdbc:
-  query: "select * from txn_meter_data_daily where consumed <> TRUE or consumed is null limit 10000;"
-  update: "update txn_meter_data_daily set consumed = TRUE where meter_data_id in (:meter_data_id);"
-
-trigger:
-  fixed-delay: 5
-  time-unit: SECONDS
-
-logging:
-  level:
-    com.pemc: DEBUG
-
----
-
-#Monthly extract
-spring:
-  profiles: monthlyExtract
-  datasource:
-    driver-class-name: org.postgresql.Driver
-    password: postgres
-    username: postgres
-    url: jdbc:postgresql://localhost:5432/crss_metering
-    maxPoolSize: 5
-    test-on-borrow: true
-    validation-query: SELECT 1
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-jdbc:
-  query: "select * from txn_meter_data_monthly where consumed <> TRUE or consumed is null limit 10000;"
-  update: "update txn_meter_data_monthly set consumed = TRUE where meter_data_id in (:meter_data_id);"
-
-trigger:
-  fixed-delay: 5
-  time-unit: SECONDS
-
-logging:
-  level:
-    com.pemc: DEBUG
-
----
-
-# default
-spring:
-  datasource:
-    driver-class-name: org.postgresql.Driver
-    password: postgres
-    username: postgres
-    url: jdbc:postgresql://localhost:5432/crss_metering
-    maxPoolSize: 5
-    test-on-borrow: true
-    validation-query: SELECT 1
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-jdbc:
-  query: "select * from txn_meter_data_monthly where consumed <> TRUE or consumed is null limit 10000;"
-  update: "update txn_meter_data_monthly set consumed = TRUE where meter_data_id in (:meter_data_id);"
-
-trigger:
-  fixed-delay: 5
-  time-unit: SECONDS
-
-logging:
-  level:
-    com.pemc: DEBUG

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

@@ -1,32 +1,19 @@
 spring:
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_dataflow
-      username: admin
-      password: password
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_dataflow
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_meterprocess
-      username: admin
-      password: password
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_meterprocess
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
   crss-nmms:
       datasource:
-        jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_nmms
-        username: admin
-        password: password
-  jpa:
-    show-sql: true
-    generate-ddl: true
-  profiles:
-    include: mesos
-  cloud:
-    deployer:
-      mesos:
-        chronos:
-          apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 1024
-
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-batch:
-  # resourceLocation: ${resourceLocation} - property expansion defaulted in app's application.yml
+        jdbcUrl: jdbc:postgresql://localhost:5432/crss_nmms
+        username: postgres
+        password: postgres
+        driverClassName: org.postgresql.Driver

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

@@ -1,33 +1,31 @@
 spring:
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_dataflow
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
+      driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_meterprocess
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
+      driverClassName: org.postgresql.Driver
   crss-nmms:
       datasource:
-        jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_nmms
+        jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=nmms
         username: crss_nmms
         password: crss_nmms
-  jpa:
-    show-sql: true
-    generate-ddl: true
+        driverClassName: org.postgresql.Driver
+
   profiles:
     include: mesos
+
   cloud:
     deployer:
       mesos:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 3072
+          memory: 1024
 
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
 
-batch:
-  # resourceLocation: ${resourceLocation} - property expansion defaulted in app's application.yml

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

@@ -0,0 +1,32 @@
+spring:
+  crss-dataflow:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataflow
+      username: crss_dataflow
+      password: crss_dataflow
+      driverClassName: org.postgresql.Driver
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: crss_meterprocess
+      driverClassName: org.postgresql.Driver
+  crss-nmms:
+      datasource:
+        jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=nmms
+        username: crss_nmms
+        password: crss_nmms
+        driverClassName: org.postgresql.Driver
+
+  profiles:
+    include: mesos
+
+  cloud:
+    deployer:
+      mesos:
+        chronos:
+          apiEndpoint: http://master.mesos/service/chronos/v1
+          memory: 1024
+
+  redis:
+    database: 5

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

@@ -0,0 +1,33 @@
+spring:
+  crss-dataflow:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataflow
+      username: crss_dataflow
+      password: crss_dataflow
+      driverClassName: org.postgresql.Driver
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: crss_meterprocess
+      driverClassName: org.postgresql.Driver
+  crss-nmms:
+      datasource:
+        jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=nmms
+        username: crss_nmms
+        password: crss_nmms
+        driverClassName: org.postgresql.Driver
+
+  profiles:
+    include: mesos
+
+  cloud:
+    deployer:
+      mesos:
+        chronos:
+          apiEndpoint: http://master.mesos/service/chronos/v1
+          memory: 1024
+
+  redis:
+    database: 4
+

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

@@ -0,0 +1,29 @@
+spring:
+  crss-dataflow:
+    datasource:
+      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_dataflow
+      username: admin
+      password: password
+      driverClassName: org.postgresql.Driver
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_meterprocess
+      username: admin
+      password: password
+      driverClassName: org.postgresql.Driver
+  crss-nmms:
+      datasource:
+        jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_nmms
+        username: admin
+        password: password
+        driverClassName: org.postgresql.Driver
+
+  profiles:
+    include: mesos
+
+  cloud:
+    deployer:
+      mesos:
+        chronos:
+          apiEndpoint: http://master.mesos/service/chronos/v1
+          memory: 1024

crss-meterprocess-task-stlready/crss-meterprocess-task-stlready-top-sit.yml

@@ -0,0 +1,35 @@
+spring:
+  crss-dataflow:
+    datasource:
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=dataflow
+      username: crss_sit_dataflow
+      password: uYgE8bqG
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=meterprocess
+      username: crss_sit_meterprocess
+      password: PmfXsUQp
+  crss-nmms:
+      datasource:
+        jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=nmms
+        username: crss_sit_nmms
+        password: tEglXBQd
+
+  profiles:
+    include: mesos
+
+  cloud:
+    deployer:
+      mesos:
+        chronos:
+          apiEndpoint: http://master.mesos/service/chronos/v1
+          memory: 8192
+          cpu: 1
+        dcos:
+          authorizationToken: eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJleHAiOjQ2NTI4Mzg3NzAsInVpZCI6ImRjb3NfaGlzdG9yeV9zZXJ2aWNlIn0.aurTiuKJtg_o2sPxbBQUH1MGNoOV0VQjnLmP7ztyqwv70oLOJReM58UN0Hb62HBjmFgb1WJ-5buRdZxwgF9u5PWuSK4dyQXScdC82LkREbBinqtGtAXCxWpAkcGBVAlUEymMhyzGD16BPdfNpXGm7N3EBUnfF2zgZcQpAjwpD7NUJvYeT2dG9zcHpE_cvQG26Fw-qcd3QoOxMBUofceghirFSgVSGMOHotYCLnExquTcLgRbPBfYkFDKAORB-pluyO556KKf348lOTkvGqYBs79c4nJWuR8urQK4KLJQZ6n7H3yMsprXwfhwQ_jc13zcbG7oVVddF_-LXkGmVJqTew
+
+batch:
+  maxWorkers: 15
+  partitionSize:
+    stl: 100000
+