Merge "Re-arrange application properties"

1 files changed, 105 insertions, 104 deletions

diff --git a/a1-policy-management/config/application.yaml b/a1-policy-management/config/application.yaml
index 9dcfc338..205c21a1 100644
--- a/a1-policy-management/config/application.yaml
+++ b/a1-policy-management/config/application.yaml
@@ -20,115 +20,84 @@
 # SPDX-License-Identifier: Apache-2.0
 # ============LICENSE_END=========================================================
 #
-spring:
-  application:
-    name: a1-pms
-  profiles:
-    active: prod
-  main:
-    allow-bean-definition-overriding: true
-  aop:
-    auto: false
-  r2dbc:
-    # Configuration of the postgres database to be used by the application.
-    # These values can be passed via configmap/secret/env variable based on the installation.
-    url: "r2dbc:postgresql://127.0.0.1:5432/a1pms"
-    username: a1pms
-    password: mypwd
-  flyway:
-    # Configuration of the postgres database to be used for database migration.
-    # This is where the flyway maintains the information about the sql files loaded.
-    # These values can be passed via configmap/secret/env variable based on the installation.
-    # By default, Flyway uses location classpath:db/migration to load the sql files.
-    # This can be overridden using "flyway.locations" to have a different location.
-    url: "jdbc:postgresql://127.0.0.1:5432/a1pms"
-    user: a1pms
-    password: mypwd
-    baseline-on-migrate: true
-management:
-  tracing:
-    propagation:
-      produce: ${ONAP_PROPAGATOR_PRODUCE:[W3C]}
-    sampling:
-      probability: 1.0
-  endpoints:
-    web:
-      exposure:
-        # Enabling of springboot actuator features. See springboot documentation.
-        include: "loggers,logfile,health,info,metrics,threaddump,heapdump,shutdown"
-  endpoint:
-    shutdown:
-      enabled: true
-lifecycle:
-  timeout-per-shutdown-phase: "20s"
-springdoc:
-  show-actuator: true
-logging:
-  # Configuration of logging
-  level:
-    ROOT: ERROR
-    org.springframework: ERROR
-    org.springframework.data: ERROR
-    org.springframework.web.reactive.function.client.ExchangeFunctions: ERROR
-    org.springframework.web.servlet.DispatcherServlet: ERROR
-    org.onap.ccsdk.oran.a1policymanagementservice: INFO
-  pattern:
-    console: "%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] [%thread] %logger{20} - %msg%n"
-    file: "%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] [%thread] %logger{20} - %msg%n"
-  file:
-    name: /var/log/policy-agent/application.log
-server:
-   # Configuration of the HTTP/REST server. The parameters are defined and handeled by the springboot framework.
-   # See springboot documentation.
-   port : 8433
-   http-port: 8081
-   shutdown: "graceful"
-   ssl:
-      key-store-type: JKS
-      key-store-password: policy_agent
-      key-store: /opt/app/policy-agent/etc/cert/keystore.jks
-      key-password: policy_agent
-      key-alias: policy_agent
-      # trust-store-password:
-      # trust-store:
+
 app:
-  # Location of the component configuration file.
-  filepath: /opt/app/policy-agent/data/application_configuration.json
-  webclient:
-    # Configuration of the trust store used for the HTTP client (outgoing requests)
-    # The file location and the password for the truststore is only relevant if trust-store-used == true
-    # Note that the same keystore as for the server is used.
-    trust-store-used: false
-    trust-store-password: policy_agent
-    trust-store: /opt/app/policy-agent/etc/cert/truststore.jks
-    # Configuration of usage of HTTP Proxy for the southbound accesses.
-    # The HTTP proxy (if configured) will only be used for accessing NearRT RIC:s
-    # proxy-type can be either HTTP, SOCKS4 or SOCKS5
-    http.proxy-host:
-    http.proxy-port: 0
-    http.proxy-type: HTTP
-  # path where the service can store data. This parameter is not relevant if S3 Object store is configured.
-  vardata-directory: /var/policy-management-service
-  # the config-file-schema-path referres to a location in the jar file. If this property is empty or missing,
-  # no schema validation will be executed.
-  config-file-schema-path: /application_configuration_schema.json
   # A file containing an authorization token, which shall be inserted in each HTTP header (authorization).
   # If the file name is empty, no authorization token is sent.
   auth-token-file:
   # A URL to authorization provider such as OPA. Each time an A1 Policy is accessed, a call to this
   # authorization provider is done for access control. If this is empty, no fine grained access control is done.
   authorization-provider:
+  # the config-file-schema-path referres to a location in the jar file. If this property is empty or missing,
+  # no schema validation will be executed.
+  config-file-schema-path: /application_configuration_schema.json
+  # Postgres database usage is enabled using the below parameter.
+  # If this is enabled, the application will use postgres database for storage.
+  # This overrides the s3(s3.bucket) or file store(vardata-directory) configuration if enabled.
+  database-enabled: false
+  # Location of the component configuration file.
+  filepath: /opt/app/policy-agent/data/application_configuration.json
   # S3 object store usage is enabled by defining the bucket to use. This will override the vardata-directory parameter.
   s3:
     endpointOverride: http://localhost:9000
     accessKeyId: minio
     secretAccessKey: miniostorage
     bucket:
-  # Postgres database usage is enabled using the below parameter.
-  # If this is enabled, the application will use postgres database for storage.
-  # This overrides the s3(s3.bucket) or file store(vardata-directory) configuration if enabled.
-  database-enabled: false
+  webclient:
+    # Configuration of usage of HTTP Proxy for the southbound accesses.
+    # The HTTP proxy (if configured) will only be used for accessing NearRT RIC:s
+    # proxy-type can be either HTTP, SOCKS4 or SOCKS5
+    http.proxy-host:
+    http.proxy-port: 0
+    http.proxy-type: HTTP
+    # Configuration of the trust store used for the HTTP client (outgoing requests)
+    # The file location and the password for the truststore is only relevant if trust-store-used == true
+    # Note that the same keystore as for the server is used.
+    trust-store-used: false
+    trust-store-password: policy_agent
+    trust-store: /opt/app/policy-agent/etc/cert/truststore.jks
+  # path where the service can store data. This parameter is not relevant if S3 Object store is configured.
+  vardata-directory: /var/policy-management-service
+lifecycle:
+  timeout-per-shutdown-phase: "20s"
+logging:
+  # Configuration of logging
+  file:
+    name: /var/log/policy-agent/application.log
+  level:
+    ROOT: ERROR
+    org.onap.ccsdk.oran.a1policymanagementservice: INFO
+    org.springframework: ERROR
+    org.springframework.data: ERROR
+    org.springframework.web.reactive.function.client.ExchangeFunctions: ERROR
+    org.springframework.web.servlet.DispatcherServlet: ERROR
+  pattern:
+    console: "%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] [%thread] %logger{20} - %msg%n"
+    file: "%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] [%thread] %logger{20} - %msg%n"
+management:
+  endpoint:
+    shutdown:
+      enabled: true
+  endpoints:
+    web:
+      exposure:
+        # Enabling of springboot actuator features. See springboot documentation.
+        include: "loggers,logfile,health,info,metrics,threaddump,heapdump,shutdown"
+  tracing:
+    propagation:
+      produce: ${ONAP_PROPAGATOR_PRODUCE:[W3C]}
+    sampling:
+      probability: 1.0
 otel:
+  exporter:
+    otlp:
+      traces:
+        endpoint: ${ONAP_OTEL_EXPORTER_ENDPOINT:http://jaeger:4317}
+        protocol: ${ONAP_OTEL_EXPORTER_PROTOCOL:grpc}
+  logs:
+    exporter: none
+  metrics:
+    exporter: none
   sdk:
     disabled: ${ONAP_SDK_DISABLED:true}
     south: ${ONAP_TRACING_SOUTHBOUND:true}
@@ -136,12 +105,44 @@ otel:
     sampler:
       jaeger_remote:
         endpoint: ${ONAP_OTEL_SAMPLER_JAEGER_REMOTE_ENDPOINT:http://jaeger:14250}
-  exporter:
-    otlp:
-      traces:
-        protocol: ${ONAP_OTEL_EXPORTER_PROTOCOL:grpc}
-        endpoint: ${ONAP_OTEL_EXPORTER_ENDPOINT:http://jaeger:4317}
-  metrics:
-    exporter: none
-  logs:
-    exporter: none
+server:
+  # Configuration of the HTTP/REST server. The parameters are defined and handeled by the springboot framework.
+  # See springboot documentation.
+  port : 8433
+  http-port: 8081
+  shutdown: "graceful"
+  ssl:
+    key-store-type: JKS
+    key-store-password: policy_agent
+    key-store: /opt/app/policy-agent/etc/cert/keystore.jks
+    key-password: policy_agent
+    key-alias: policy_agent
+    # trust-store-password:
+    # trust-store:
+spring:
+  aop:
+    auto: false
+  application:
+    name: a1-pms
+  flyway:
+    # Configuration of the postgres database to be used for database migration.
+    # This is where the flyway maintains the information about the sql files loaded.
+    # These values can be passed via configmap/secret/env variable based on the installation.
+    # By default, Flyway uses location classpath:db/migration to load the sql files.
+    # This can be overridden using "flyway.locations" to have a different location.
+    baseline-on-migrate: true
+    url: "jdbc:postgresql://127.0.0.1:5432/a1pms"
+    user: a1pms
+    password: mypwd
+  main:
+    allow-bean-definition-overriding: true
+  profiles:
+    active: prod
+  r2dbc:
+    # Configuration of the postgres database to be used by the application.
+    # These values can be passed via configmap/secret/env variable based on the installation.
+    url: "r2dbc:postgresql://127.0.0.1:5432/a1pms"
+    username: a1pms
+    password: mypwd
+springdoc:
+  show-actuator: true
\ No newline at end of file