From b28b81c1992ec38ae23e5191815e922812e03934 Mon Sep 17 00:00:00 2001 From: Ishrath Ahamed Date: Fri, 25 Apr 2025 09:55:09 +0530 Subject: [PATCH] fix: update Kafka and Redis connection details in configuration files --- .../configrepo/CSI-JAVA-EHR-COMMON.yml | 2 +- .../configrepo/CSI-JAVA-EHR-CONFIG.yml | 2 +- .../configrepo/application-java-csi-uat.yml | 33 +++++----- .../configrepo/application-net-csi-uat.yml | 62 +++++++++---------- Config-Server/configrepo/application.yml | 2 +- configmaps/iam-service-configs.yml | 2 - configmaps/service-configs-otp.yaml | 2 +- 7 files changed, 47 insertions(+), 58 deletions(-) diff --git a/Config-Server/configrepo/CSI-JAVA-EHR-COMMON.yml b/Config-Server/configrepo/CSI-JAVA-EHR-COMMON.yml index 5989865..2b47d74 100755 --- a/Config-Server/configrepo/CSI-JAVA-EHR-COMMON.yml +++ b/Config-Server/configrepo/CSI-JAVA-EHR-COMMON.yml @@ -65,7 +65,7 @@ csi: persistence: audit: true kafka: - bootstrapAddress: 10.201.216.25:9092,10.201.216.26:9093,10.201.216.27:9094 + bootstrapAddress: 172.15.100.80:9092,172.15.100.81:9092,172.15.100.82:9092 topic: csi_audit dateformat: format: yyyy-MM-dd HH:mm:ss diff --git a/Config-Server/configrepo/CSI-JAVA-EHR-CONFIG.yml b/Config-Server/configrepo/CSI-JAVA-EHR-CONFIG.yml index fce8ff3..5398274 100755 --- a/Config-Server/configrepo/CSI-JAVA-EHR-CONFIG.yml +++ b/Config-Server/configrepo/CSI-JAVA-EHR-CONFIG.yml @@ -44,7 +44,7 @@ csi: dateformat: format: yyyy/MM/dd HH:mm:ss kafka: - bootstrap-servers: 10.201.216.25:9092,10.201.216.26:9093,10.201.216.27:9094 + bootstrap-servers: 172.15.100.80:9092,172.15.100.81:9092,172.15.100.82:9092 group-id: medical-rejected: medical-rejected medical-issued: medical-issued diff --git a/Config-Server/configrepo/application-java-csi-uat.yml b/Config-Server/configrepo/application-java-csi-uat.yml index ba569a4..ab21549 100755 --- a/Config-Server/configrepo/application-java-csi-uat.yml +++ b/Config-Server/configrepo/application-java-csi-uat.yml @@ -5,9 +5,7 @@ eureka: defaultZone: http://localhost:8761/eureka/ fetch-registry: false register-with-eureka: false -#feign: -# hystrix: -# enabled: true + hystrix: shareSecurityContex: true command: @@ -26,11 +24,13 @@ hystrix: coreSize: 30 maximumSize: 35 allowMaximumSizeToDivergeFromCoreSize: true + ribbon: ConnectTimeout: 770000 MaxAutoRetries: 1 MaxAutoRetriesNextServer: 1 ReadTimeout: 770000 + management: endpoint: health: @@ -38,11 +38,13 @@ management: health: redis: enabled: false + opentracing: jaeger: http-sender: url: http://jaeger-collector:14268/api/traces enable-b3-propagation: true + kafka: numPartitions: 3 replicationFactor: 3 @@ -50,6 +52,7 @@ kafka: general-notifications: noty.c.notificationrequestfromextenalcommand notification: noty.c.notificationrequestfromextenalcommand notification_topic: noty.c.notificationrequestfromextenalcommand + spring: liquibase: enabled: false @@ -59,12 +62,6 @@ spring: host: redis timeout: 20000 port: 3060 -# sentinel: -# master: mymaster -# nodes: 10.9.203.26:6379 -# cluster: -# max-redirects: 8 -# nodes: 10.4.41.60:7010,10.4.41.60:7011,10.4.41.60:7012,10.4.41.61:7013,10.4.41.61:7014,10.4.41.61:7015,10.4.41.62:7016,10.4.41.62:7018 http: multipart: max-file-size: 200MB @@ -76,30 +73,28 @@ spring: redis: sentinel: master: mymaster - nodes: 10.201.216.30:26379,10.201.216.31:26379,10.201.216.32:26379 + nodes: 172.15.100.41:26379,172.15.100.40:26379,172.15.100.39:26379 kafka: - bootstrap-servers: 10.201.216.25:9092,10.201.216.26:9093,10.201.216.27:9094 + bootstrap-servers: 172.15.100.80:9092,172.15.100.81:9092,172.15.100.82:9092 numPartitions: 3 replicationFactor: 3 consumer: - bootstrap-servers: 10.201.216.25:9092,10.201.216.26:9093,10.201.216.27:9094 + bootstrap-servers: 172.15.100.80:9092,172.15.100.81:9092,172.15.100.82:9092 rabbitmq: host: 10.4.41.7 port: 5672 username: admin password: admin - #liquibase: - # enabled: false -#liquibase: -# enabled: false + server: shutdown: graceful shutdown.timeout: 30s + csi: env: - prefix: net-hmg-uat + prefix: net-csi-uat mongo: - host: 10.201.216.35 + host: 172.15.100.24 port: 27017 jpa: event: @@ -120,7 +115,7 @@ phr: auth-key: client-secret: "3001029e-27e2-4165-98c7-f0ac6496d0eb" kafka: - bootstrap-servers: 10.201.216.25:9092,10.201.216.26:9093,10.201.216.27:9094 + bootstrap-servers: 172.15.100.80:9092,172.15.100.81:9092,172.15.100.82:9092 auto-offset-reset: latest group-id: discharge: phr-discharge diff --git a/Config-Server/configrepo/application-net-csi-uat.yml b/Config-Server/configrepo/application-net-csi-uat.yml index 2789e16..83a7fba 100755 --- a/Config-Server/configrepo/application-net-csi-uat.yml +++ b/Config-Server/configrepo/application-net-csi-uat.yml @@ -14,7 +14,7 @@ Mongo: # Kafka kafka: - servers: "10.201.216.25:9092,10.201.216.26:9093,10.201.216.27:9094" + servers: "172.15.100.80:9092,172.15.100.81:9092,172.15.100.82:9092" service_name: default-net period: 100 batchSizeLimit: 100 @@ -22,9 +22,7 @@ kafka: # Redis redis: client: - # host: "10.201.216.30:3060,10.201.216.31:3060,10.201.216.32:3060" - host: "10.201.216.30:6379,10.201.216.31:6379,10.201.216.32:6379" -# "10.4.41.60:7010,10.4.41.60:7011,10.4.41.60:7012,10.4.41.61:7013,10.4.41.61:7014,10.4.41.61:7015,10.4.41.62:7016,10.4.41.62:7018" + host: "172.15.100.41:26379,172.15.100.40:26379,172.15.100.39:26379" # RabbitMQ rabbitmq_server_id: &rabbitmq_server_id "10.4.41.7" @@ -37,11 +35,9 @@ rabbitmq_server_vhost: &rabbitmq_server_vhost "~" Provider: "PostgreSQL" CommandTimoutInMins: 1.0 database: - host: "10.201.215.11" - # primaryHost: "10.201.215.11" - # secondaryHost: "10.201.215.11" + host: "172.15.100.28" port: 5432 - serviceName: "HMG_UAT" + serviceName: "temp-quat" transportConnectTimeout: 5 connectTimeout: 5 retryDelay: 10 @@ -49,54 +45,54 @@ database: failOver: "ON" loadBalance: "off" lab: - dbName: "HMG_UAT" + dbName: "temp-quat" userId: "lb_labservice" - password: "hmguat@csi" + password: "quatpg123" labPatient: - dbName: "HMG_UAT" + dbName: "temp-quat" userId: "lb_patient" - password: "hmguat@csi" + password: "quatpg123" pharmacy: - dbName: "HMG_UAT" + dbName: "temp-quat" userId: "ph_pharmacy" - password: "hmguat@csi" + password: "quatpg123" bloodBank: - dbName: "HMG_UAT" + dbName: "temp-quat" userId: "bb_bloodbank" - password: "hmguat@csi" + password: "quatpg123" renal: - dbName: "HMG_UAT" + dbName: "temp-quat" userId: "re_hemdialy" - password: "hmguat@csi" + password: "quatpg123" erFuncti: - dbName: "HMG_UAT" + dbName: "temp-quat" userId: "er_erfun" - password: "hmguat@csi" + password: "quatpg123" opdPatient: - dbName: "HMG_UAT" + dbName: "temp-quat" userId: "eh_npatient" - password: "hmguat@csi" + password: "quatpg123" opdMaster: - dbName: "HMG_UAT" + dbName: "temp-quat" userId: "eh_nmaster" - password: "hmguat@csi" + password: "quatpg123" ehrDischarge: - dbName: "HMG_UAT" + dbName: "temp-quat" userId: "eh_ndischarge" - password: "hmguat@csi" + password: "quatpg123" medispan: provider: "PostgreSQL" - dbName: "HMG_UAT" + dbName: "temp-quat" userId: "ph_medispan" - password: "hmguat@csi" + password: "quatpg123" himServi: - dbName: "HMG_UAT" + dbName: "temp-quat" userId: "hm_himservice" - password: "hmguat@csi" + password: "quatpg123" hhc: - dbName: "HMG_UAT" + dbName: "temp-quat" userId: "csi_hhc" - password: "hmguat@csi" + password: "quatpg123" # Global Parameters End ================================================= # Eureka Configuration Starts =========================================== @@ -384,7 +380,7 @@ Serilog: Args: batchSizeLimit: 50 period: 5 - brokers: "10.201.216.25:9092,10.201.216.26:9093,10.201.216.27:9094" + brokers: "172.15.100.80:9092,172.15.100.81:9092,172.15.100.82:9092" topic: "log-sinks-kafka-hmg-uat" Properties: Application: "Kafka" diff --git a/Config-Server/configrepo/application.yml b/Config-Server/configrepo/application.yml index 863601e..b7648a9 100755 --- a/Config-Server/configrepo/application.yml +++ b/Config-Server/configrepo/application.yml @@ -4,7 +4,7 @@ AppSettings: SiteTitle: "Application.yml" AppName: "test App" kafka: - brokers: "10.201.216.25:9092,10.201.216.26:9093,10.201.216.27:9094" + brokers: "172.15.100.80:9092,172.15.100.81:9092,172.15.100.82:9092" topic: csi_demo_final batchSizeLimit: 50 period: 1 diff --git a/configmaps/iam-service-configs.yml b/configmaps/iam-service-configs.yml index 685cd1b..75c5b17 100644 --- a/configmaps/iam-service-configs.yml +++ b/configmaps/iam-service-configs.yml @@ -3,12 +3,10 @@ data: LOG4J_FORMAT_MSG_NO_LOOKUPS: 'true' DB_VENDOR: postgres DB_SCHEMA: sc_iam - # SPRING_JPA_HIBERNATE_DDL-AUTO: none REPORTING_EXCHANGE_NAME: csi.reporting REPORTING_PORT: "5672" KEYCLOAK_HOSTNAME: csi.dev.cloudsol.lk REPORTING_QUEUE_NAME: csi-reporting - # DB_CONNECTION_STRING: jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=10.201.217.11)(PORT=1521))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME =VIDA4PDB))) DB_CONNECTION_STRING: jdbc:postgresql://172.15.100.28:5432/temp-quat-database kind: ConfigMap metadata: diff --git a/configmaps/service-configs-otp.yaml b/configmaps/service-configs-otp.yaml index c9bb5be..e65ab55 100644 --- a/configmaps/service-configs-otp.yaml +++ b/configmaps/service-configs-otp.yaml @@ -1,7 +1,7 @@ apiVersion: v1 data: SPRING_REDIS_SENTINEL_MASTER: mymaster - SPRING_REDIS_SENTINEL_NODES: 172.15.100.41:26379,172.15.100.40:26379,172.15.100.39:26379,10.201.218.46:26379,10.201.218.47:26379 + SPRING_REDIS_SENTINEL_NODES: 172.15.100.41:26379,172.15.100.40:26379,172.15.100.39:26379 KAFKA_BOOTSTRAP_SERVERS: 172.15.100.80:9092,172.15.100.81:9092,172.15.100.82:9092 SPRING_REDIS_HOST: 172.15.100.41:6379 kind: ConfigMap