From 513561b7a9ff3e33ea008e7bdc6cf822dbcfe1c9 Mon Sep 17 00:00:00 2001 From: "adheli.tavares" Date: Thu, 16 Jan 2025 14:03:12 +0000 Subject: Remove MariaDB support - change configurations to use PostgreSQL as default - remove unused configurations Issue-ID: POLICY-5196 Change-Id: I22ce625ff16e94375f5a93b803a71044f2d5f008 Signed-off-by: adheli.tavares --- .../src/main/resources/etc/papParameters.yaml | 87 +++++++++++----------- 1 file changed, 42 insertions(+), 45 deletions(-) (limited to 'packages') diff --git a/packages/policy-pap-tarball/src/main/resources/etc/papParameters.yaml b/packages/policy-pap-tarball/src/main/resources/etc/papParameters.yaml index 4d37affe..52a42539 100644 --- a/packages/policy-pap-tarball/src/main/resources/etc/papParameters.yaml +++ b/packages/policy-pap-tarball/src/main/resources/etc/papParameters.yaml @@ -7,14 +7,11 @@ spring: converters: preferred-json-mapper: gson datasource: - url: jdbc:mariadb://mariadb:3306/policyadmin - driverClassName: org.mariadb.jdbc.Driver + url: jdbc:postgresql://postgres:5432/policyadmin + driverClassName: org.postgresql.Driver username: policy_user password: policy_user jpa: - properties: - hibernate: - dialect: org.hibernate.dialect.MariaDB103Dialect hibernate: ddl-auto: none naming: @@ -23,11 +20,17 @@ spring: server: port: 6969 + servlet: + context-path: /policy/pap/v1 ssl: enabled: false pap: name: PapGroup + topic: + pdp-pap.name: policy-pdp-pap + notification.name: policy-notification + heartbeat.name: policy-heartbeat pdpParameters: heartBeatMs: 120000 updateParameters: @@ -38,47 +41,39 @@ pap: maxWaitMs: 30000 topicParameterGroup: topicSources: - - topic: POLICY-PDP-PAP - servers: - - kafka - topicCommInfrastructure: NOOP - fetchTimeout: 15000 - - topic: POLICY-HEARTBEAT - effectiveTopic: POLICY-PDP-PAP - consumerGroup: policy-pap - servers: - - kafka - topicCommInfrastructure: NOOP - fetchTimeout: 15000 + - topic: ${pap.topic.pdp-pap.name} + servers: + - kafka:9092 + topicCommInfrastructure: kafka + useHttps: false + fetchTimeout: 15000 + - topic: ${pap.topic.heartbeat.name} + effectiveTopic: ${pap.topic.pdp-pap.name} + consumerGroup: policy-pap + servers: + - kafka:9092 + topicCommInfrastructure: kafka + useHttps: false + fetchTimeout: 15000 topicSinks: - - topic: POLICY-PDP-PAP - servers: - - kafka - topicCommInfrastructure: NOOP - - topic: POLICY-NOTIFICATION - servers: - - kafka - topicCommInfrastructure: NOOP + - topic: ${pap.topic.pdp-pap.name} + servers: + - kafka:9092 + topicCommInfrastructure: kafka + useHttps: false + - topic: ${pap.topic.notification.name} + servers: + - kafka:9092 + topicCommInfrastructure: kafka + useHttps: false healthCheckRestClientParameters: - - clientName: api - hostname: policy-api - port: 6969 - userName: policyadmin - password: zb!XztG34 - useHttps: true - basePath: policy/api/v1/healthcheck - - clientName: distribution - hostname: policy-distribution - port: 6969 - userName: healthcheck - password: zb!XztG34 - useHttps: true - basePath: healthcheck - - clientName: kafka - hostname: kafka - port: 3905 - useHttps: true - basePath: topics + - clientName: api + hostname: policy-api + port: 6969 + userName: policyadmin + password: zb!XztG34 + useHttps: false + basePath: policy/api/v1/healthcheck management: endpoints: @@ -86,4 +81,6 @@ management: base-path: / exposure: include: health, metrics, prometheus - path-mapping.prometheus: metrics + path-mapping: + -metrics: plain-metrics + -prometheus: metrics -- cgit