centralized common prod/dr config

application-dr.yml

@@ -0,0 +1,11 @@
+graylog:
+  host: 10.176.13.123
+
+crss:
+  database.ip: 10.176.13.131
+  emdb: jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS_LIST=(LOAD_BALANCE=OFF)(FAILOVER=ON)
+        (ADDRESS=(PROTOCOL=TCP)(HOST=192.168.74.165)(PORT=1521))
+        (ADDRESS=(PROTOCOL=TCP)(HOST=192.168.74.166)(PORT=1521))
+        (ADDRESS=(PROTOCOL=TCP)(HOST=192.168.74.167)(PORT=1521)))
+        (CONNECT_DATA=(SERVICE_NAME=emdbdr)(SERVER=DEDICATED)))
+  ad.ip: "10.176.152.106"

application.yml

@@ -61,7 +61,13 @@ crss:
   api.gateway: http://edge-server.marathon.l4lb.thisdcos.directory:8080
   security.url: ${crss.api.gateway}/uaa
   dispatch.interval: 5
-
+  database.ip: 10.176.11.131
+  emdb: jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS_LIST=(LOAD_BALANCE=OFF)(FAILOVER=ON)
+        (ADDRESS=(PROTOCOL=TCP)(HOST=192.168.94.165)(PORT=1521))
+        (ADDRESS=(PROTOCOL=TCP)(HOST=192.168.94.166)(PORT=1521))
+        (ADDRESS=(PROTOCOL=TCP)(HOST=192.168.94.167)(PORT=1521)))
+        (CONNECT_DATA=(SERVICE_NAME=emdbdr)(SERVER=DEDICATED)))
+  ad.ip: "192.168.41.106"
 cfg:
   general:
     interval: 5

crss-admin/crss-admin.yml

@@ -11,7 +11,7 @@ spring:
       gzipped: true
 
   datasource:
-    url: jdbc:edb://10.176.13.131:5432/crss?currentSchema=admin
+    url: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=admin
     username: crss_admin
     password: YReYA7fI
 
@@ -38,7 +38,7 @@ spring:
 crss:
   ldap:
     protocol: LDAPS
-    host: "10.176.152.108"
+    host: ${crss.ad.ip}
     port: 636
     root-dn: "dc=wesmsys,dc=local"
     user-search-base: MO,MP,SO

crss-audit/crss-audit.yml

@@ -2,7 +2,7 @@ spring:
   profiles.include: client-sec
   crss-audit:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.13.131:5432/crss?currentSchema=audit
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=audit
       username: crss_audit
       password: S0CuFyj6
       driverClassName: com.edb.Driver

crss-data/crss-data.yml

@@ -2,7 +2,7 @@ spring:
   profiles:
     include: client-sec
   datasource:
-    url: jdbc:edb://10.176.13.131:5432/crss?currentSchema=dataextraction
+    url: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=dataextraction
     username: crss_dataextraction
     password: xgZx2FqM
 kettle:
@@ -14,7 +14,7 @@ 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.13.131:5432/crss?currentSchema=dataextraction
+      url: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=dataextraction
       username: crss_dataextraction
       password: xgZx2FqM
       hikari:
@@ -27,11 +27,7 @@ crss:
   datawarehouse:
     datasource:
       platform: oracle
-      url: jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS_LIST=(LOAD_BALANCE=OFF)(FAILOVER=ON)
-           (ADDRESS=(PROTOCOL=TCP)(HOST=192.168.74.165)(PORT=1521))
-           (ADDRESS=(PROTOCOL=TCP)(HOST=192.168.74.166)(PORT=1521))
-           (ADDRESS=(PROTOCOL=TCP)(HOST=192.168.74.167)(PORT=1521)))
-           (CONNECT_DATA=(SERVICE_NAME=emdbdr)(SERVER=DEDICATED)))
+      url: ${crss.emdb}
       username: crss_dw
       password: crss_dw
       driverClassName: oracle.jdbc.OracleDriver
@@ -41,7 +37,7 @@ crss:
         minimumIdle: 2
   registration:
      datasource:
-       url: jdbc:edb://10.176.13.131:5432/crss?currentSchema=registration
+       url: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=registration
        username: crss_registration
        password: 51UF3JA9
        hikari:

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

@@ -7,7 +7,7 @@ spring:
       maximumPoolSize: 10
       test-on-borrow: true
       validation-query: SELECT 1
-      jdbcUrl: jdbc:edb://10.176.13.131:5432/crss?currentSchema=dataflow
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: lgcCpwy0
   jpa:

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

@@ -2,7 +2,7 @@ spring:
   profiles.include: client-sec
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.13.131:5432/crss?currentSchema=nmms
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=nmms
       username: crss_nmms
       password: lbgg1i2Y
       driverClassName: com.edb.Driver

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

@@ -1,10 +1,7 @@
 spring:
   crss-emdb:
     datasource:
-      jdbcUrl: jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS_LIST=(LOAD_BALANCE=OFF)(FAILOVER=ON)
-              (ADDRESS=(PROTOCOL=TCP)(HOST=192.168.74.162)(PORT=1521))
-              (ADDRESS=(PROTOCOL=TCP)(HOST=192.168.74.164)(PORT=1521)))
-              (CONNECT_DATA=(SERVICE_NAME=emdbdr)(SERVER=DEDICATED)))
+      jdbcUrl: ${crss.emdb}
       username: crss_tod
       password: crss_tod
       driverClassName: oracle.jdbc.OracleDriver
@@ -12,7 +9,7 @@ spring:
       maximumPoolSize: 3
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.13.131:5432/crss?currentSchema=dataflow
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: lgcCpwy0
       driverClassName: com.edb.Driver
@@ -22,7 +19,7 @@ spring:
       validation-query: SELECT 1
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.13.131:5432/crss?currentSchema=nmms
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=nmms
       username: crss_nmms
       password: lbgg1i2Y
       driverClassName: com.edb.Driver
@@ -32,7 +29,7 @@ spring:
       validation-query: SELECT 1
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.13.131:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=registration
       username: crss_registration
       password: 51UF3JA9
       driverClassName: com.edb.Driver

crss-metering/crss-metering.yml

@@ -2,7 +2,7 @@ spring:
   profiles:
     include: client-sec,pg-query
   datasource:
-    url: jdbc:edb://10.176.13.131:5432/crss?currentSchema=metering
+    url: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=metering
     username: crss_metering
     password: Fh7UcXpW
     hikari:

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

@@ -2,7 +2,7 @@ spring:
   profiles.include: client-sec
   crss-main:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.13.131:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: com.edb.Driver
@@ -12,7 +12,7 @@ spring:
       validation-query: SELECT 1
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.13.131:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=registration
       username: crss_registration
       password: 51UF3JA9
       driverClassName: com.edb.Driver
@@ -22,7 +22,7 @@ spring:
       validation-query: SELECT 1
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.13.131:5432/crss?currentSchema=nmms
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=nmms
       username: crss_nmms
       password: lbgg1i2Y
       driverClassName: com.edb.Driver

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

@@ -1,7 +1,7 @@
 spring:
   crss-main:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.13.131:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: com.edb.Driver
@@ -11,7 +11,7 @@ spring:
       validation-query: SELECT 1
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.13.131:5432/crss?currentSchema=metering
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=metering
       username: crss_metering
       password: Fh7UcXpW
       driverClassName: com.edb.Driver
@@ -21,7 +21,7 @@ spring:
       validation-query: SELECT 1
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.13.131:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=registration
       username: crss_registration
       password: 51UF3JA9
       driverClassName: com.edb.Driver

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

@@ -1,7 +1,7 @@
 spring:
   crss-registration:
     dataSource:
-      jdbcUrl: jdbc:edb://10.176.13.131:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=registration
       username: crss_registration
       password: 51UF3JA9
       driverClassName: com.edb.Driver
@@ -11,7 +11,7 @@ spring:
       validation-query: SELECT 1
   crss-main:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.13.131:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: com.edb.Driver

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

@@ -1,7 +1,7 @@
 spring:
   crss-main:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.13.131:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: com.edb.Driver
@@ -11,7 +11,7 @@ spring:
       validation-query: SELECT 1
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.13.131:5432/crss?currentSchema=metering
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=metering
       username: crss_metering
       password: Fh7UcXpW
       driverClassName: com.edb.Driver
@@ -21,7 +21,7 @@ spring:
       validation-query: SELECT 1
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.13.131:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=registration
       username: crss_registration
       password: 51UF3JA9
       driverClassName: com.edb.Driver

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

@@ -2,7 +2,7 @@
 spring:
   profiles: dailyExtract
   datasource:
-    url: jdbc:edb://10.176.13.131:5432/crss?currentSchema=metering
+    url: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=metering
     username: crss_metering
     password: Fh7UcXpW
     driver-class-name: com.edb.Driver
@@ -34,7 +34,7 @@ logging:
 spring:
   profiles: monthlyExtract
   datasource:
-    url: jdbc:edb://10.176.13.131:5432/crss?currentSchema=metering
+    url: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=metering
     username: crss_metering
     password: Fh7UcXpW
     driver-class-name: com.edb.Driver
@@ -65,7 +65,7 @@ logging:
 # default
 spring:
   datasource:
-    url: jdbc:edb://10.176.13.131:5432/crss?currentSchema=metering
+    url: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=metering
     username: crss_metering
     password: Fh7UcXpW
     driver-class-name: com.edb.Driver

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

@@ -1,7 +1,7 @@
 spring:
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.13.131:5432/crss?currentSchema=dataflow
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=dataflow
       url: jdbc:edb://10.176.13.131:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: lgcCpwy0

crss-mtr/crss-mtr.yml

@@ -1,8 +1,8 @@
 spring:
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.13.131:5432/crss?currentSchema=dataflow
-      url: jdbc:edb://10.176.13.131:5432/crss?currentSchema=dataflow
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=dataflow
+      url: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: lgcCpwy0
       driverClassName: com.edb.Driver
@@ -12,8 +12,8 @@ spring:
       validation-query: SELECT 1
   crss-main:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.13.131:5432/crss?currentSchema=meterprocess
-      url: jdbc:edb://10.176.13.131:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=meterprocess
+      url: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: com.edb.Driver
@@ -23,8 +23,8 @@ spring:
       validation-query: SELECT 1
   crss-registration:
     dataSource:
-      jdbcUrl: jdbc:edb://10.176.13.131:5432/crss?currentSchema=registration
-      url: jdbc:edb://10.176.13.131:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=registration
+      url: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=registration
       username: crss_registration
       password: 51UF3JA9
       driverClassName: com.edb.Driver

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

@@ -2,7 +2,7 @@ spring:
   profiles.include: client-sec
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.13.131:5432/crss?currentSchema=settlement&ApplicationName=stlApp
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=settlement&ApplicationName=stlApp
       username: crss_settlement
       password: i17SMOPm
       driverClassName: com.edb.Driver
@@ -12,7 +12,7 @@ spring:
       validation-query: SELECT 1
   crss-worklist:
     datasource:
-        jdbcUrl: jdbc:edb://10.176.13.131:5432/crss?currentSchema=worklist
+        jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=worklist
         username: crss_worklist
         password: c3XL8Lcb
         driverClassName: com.edb.Driver
@@ -20,7 +20,7 @@ spring:
         maximumPoolSize: 3
   crss-main:
     datasource:
-        jdbcUrl: jdbc:edb://10.176.13.131:5432/crss?currentSchema=meterprocess
+        jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=meterprocess
         username: crss_meterprocess
         password: D9JpfUtT
         driverClassName: com.edb.Driver

crss-uaa/crss-uaa-ldap.yml

@@ -1,7 +1,7 @@
 crss:
   ldap:
     protocol: LDAPS
-    host: "10.176.152.106"
+    host: ${crss.ad.ip}
     port: 636
     root-dn: "dc=wesmsys,dc=local"
     user-search-base: MO,MP,SO