Merge branch '2.7.x'

crss-admin/crss-admin.yml

@@ -20,9 +20,11 @@ spring:
     subject:
       prefix: "[CRSS]"
     # Set to local mailserver for testing. Pleaase unset after.
-    host: 192.168.10.96
+    # host: 192.168.10.96
+    host: 192.168.10.175
     port: 25
-    username: crss-mailer@wesm.ph
+    # username: crss-mailer@wesm.ph
+    username: crss-mailer@iemop.ph
     password: Cr551234
     #host: mailserver.marathon.l4lb.thisdcos.directory
     #port: 3025

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

@@ -1,7 +1,7 @@
 spring:
   crss-main:
     datasource:
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=meterprocess&ApplicationName=streamingSink
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: com.edb.Driver
@@ -11,7 +11,7 @@ spring:
       validation-query: SELECT 1
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=metering
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=metering&ApplicationName=streamingSink
       username: crss_metering
       password: Fh7UcXpW
       driverClassName: com.edb.Driver
@@ -21,7 +21,7 @@ spring:
       validation-query: SELECT 1
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=registration&ApplicationName=streamingSink
       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://${crss.database.ip}:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=registration&ApplicationName=streamingMapper
       username: crss_registration
       password: 51UF3JA9
       driverClassName: com.edb.Driver
@@ -11,7 +11,7 @@ spring:
       validation-query: SELECT 1
   crss-main:
     datasource:
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=meterprocess&ApplicationName=streamingMapper
       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://${crss.database.ip}:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=meterprocess&ApplicationName=streamingValidate
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: com.edb.Driver
@@ -11,7 +11,7 @@ spring:
       validation-query: SELECT 1
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=metering
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=metering&ApplicationName=streamingValidate
       username: crss_metering
       password: Fh7UcXpW
       driverClassName: com.edb.Driver
@@ -21,7 +21,7 @@ spring:
       validation-query: SELECT 1
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=registration&ApplicationName=streamingValidate
       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://${crss.database.ip}:5432/crss?currentSchema=metering
+    url: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=metering&ApplicationName=streamingSource
     username: crss_metering
     password: Fh7UcXpW
     driver-class-name: com.edb.Driver

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

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

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

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

crss-mtr/crss-mtr.yml

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