CmHandle registration/module sync watchdog performance improvment

[cps.git] / cps-application / src / main / resources / application.yml

diff --git a/cps-application/src/main/resources/application.yml b/cps-application/src/main/resources/application.yml
index e185bf2..56515df 100644 (file)
--- a/cps-application/src/main/resources/application.yml
+++ b/cps-application/src/main/resources/application.yml
@@ -1,7 +1,7 @@
 #  ============LICENSE_START=======================================================\r
 #  Copyright (C) 2021 Pantheon.tech\r
-#  Modifications Copyright (C) 2021 Bell Canada\r
-#  Modifications Copyright (C) 2021 Nordix Foundation\r
+#  Modifications Copyright (C) 2021-2022 Bell Canada\r
+#  Modifications Copyright (C) 2021-2022 Nordix Foundation\r
 #  ================================================================================\r
 #  Licensed under the Apache License, Version 2.0 (the "License");\r
 #  you may not use this file except in compliance with the License.\r
@@ -24,11 +24,14 @@ server:
 rest:\r
     api:\r
         cps-base-path: /cps/api\r
-        ncmp-base-path: /cps-ncmp/api\r
+        ncmp-base-path: /ncmp\r
+        ncmp-inventory-base-path: /ncmpInventory\r
 \r
 spring:\r
     main:\r
         banner-mode: "off"\r
+    application:\r
+        name: "cps-application"\r
     jpa:\r
         ddl-auto: create\r
         open-in-view: false\r
@@ -38,11 +41,17 @@ spring:
                 dialect: org.hibernate.dialect.PostgreSQLDialect\r
 \r
     datasource:\r
-        url: jdbc:postgresql://${DB_HOST}:5432/cpsdb\r
+        url: jdbc:postgresql://${DB_HOST}:${DB_PORT:5432}/cpsdb\r
         username: ${DB_USERNAME}\r
         password: ${DB_PASSWORD}\r
         driverClassName: org.postgresql.Driver\r
-        initialization-mode: always\r
+        hikari:\r
+            minimumIdle: 5\r
+            maximumPoolSize: 80\r
+            idleTimeout: 60000\r
+            connectionTimeout: 120000\r
+            leakDetectionThreshold: 2000\r
+            pool-name: CpsDatabasePool\r
 \r
     cache:\r
         type: caffeine\r
@@ -67,22 +76,62 @@ spring:
         producer:\r
             value-serializer: org.springframework.kafka.support.serializer.JsonSerializer\r
             client-id: cps-core\r
+        consumer:\r
+            group-id: ${NCMP_CONSUMER_GROUP_ID:ncmp-group}\r
+            key-deserializer: org.springframework.kafka.support.serializer.ErrorHandlingDeserializer\r
+            value-deserializer: org.springframework.kafka.support.serializer.ErrorHandlingDeserializer\r
+            properties:\r
+                spring.deserializer.key.delegate.class: org.apache.kafka.common.serialization.StringDeserializer\r
+                spring.deserializer.value.delegate.class: org.springframework.kafka.support.serializer.JsonDeserializer\r
+                spring.json.value.default.type: org.onap.cps.ncmp.event.model.DmiAsyncRequestResponseEvent\r
+                spring.json.use.type.headers: false\r
+\r
+    jackson:\r
+      default-property-inclusion: NON_NULL\r
+      serialization:\r
+        FAIL_ON_EMPTY_BEANS: false\r
+    sql:\r
+      init:\r
+        mode: ALWAYS\r
+app:\r
+    ncmp:\r
+        async-m2m:\r
+            topic: ${NCMP_ASYNC_M2M_TOPIC:ncmp-async-m2m}\r
+    lcm:\r
+        events:\r
+            topic: ${LCM_EVENTS_TOPIC:ncmp-events}\r
 \r
 notification:\r
+    enabled: true\r
     data-updated:\r
-        enabled: false\r
-        topic: ${CPS_CHANGE_EVENT_TOPIC:cps.cfg-state-events}\r
+        topic: ${CPS_CHANGE_EVENT_TOPIC:cps.data-updated-events}\r
         filters:\r
-            enabled-dataspaces: ${DATASPACE_FILTER_PATTERNS:""}\r
+            enabled-dataspaces: ${NOTIFICATION_DATASPACE_FILTER_PATTERNS:""}\r
+    async:\r
+        executor:\r
+            core-pool-size: 2\r
+            max-pool-size: 10\r
+            queue-capacity: 500\r
+            wait-for-tasks-to-complete-on-shutdown: true\r
+            thread-name-prefix: Async-\r
+            time-out-value-in-ms: 2000\r
 \r
 springdoc:\r
     swagger-ui:\r
-        url: /openapi.yml\r
-        path: /swagger-ui/index.html\r
+        disable-swagger-default-url: true\r
+        urlsPrimaryName: cps-core\r
+        urls:\r
+            - name: cps-core\r
+              url: /api-docs/cps-core/openapi.yaml\r
+            - name: cps-ncmp\r
+              url: /api-docs/cps-ncmp/openapi.yaml\r
+            - name: cps-ncmp-inventory\r
+              url: /api-docs/cps-ncmp/openapi-inventory.yaml\r
+\r
 \r
 security:\r
     # comma-separated uri patterns which do not require authorization\r
-    permit-uri: /manage/**,/swagger-ui/**,/swagger-resources/**,/v3/api-docs\r
+    permit-uri: /manage/**,/swagger-ui.html,/swagger-ui/**,/swagger-resources/**,/api-docs/**\r
     auth:\r
         username: ${CPS_USERNAME}\r
         password: ${CPS_PASSWORD}\r
@@ -104,11 +153,28 @@ management:
                 enabled: true\r
 \r
 logging:\r
+    format: json\r
     level:\r
         org:\r
             springframework: INFO\r
+            onap:\r
+                cps: INFO\r
 \r
 dmi:\r
     auth:\r
         username: ${DMI_USERNAME}\r
         password: ${DMI_PASSWORD}\r
+    api:\r
+        base-path: dmi\r
+\r
+timers:\r
+    advised-modules-sync:\r
+        sleep-time-ms: 5000\r
+    locked-modules-sync:\r
+        sleep-time-ms: 300000\r
+    cm-handle-data-sync:\r
+        sleep-time-ms: 30000\r
+\r
+modules-sync-watchdog:\r
+    async-executor:\r
+        parallelism-level: 10
\ No newline at end of file