From: FrancescoFioraEst Date: Mon, 8 Dec 2025 17:05:43 +0000 (+0000) Subject: Remove duplication of Spring configs for participants X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;ds=inline;p=policy%2Fclamp.git Remove duplication of Spring configs for participants Issue-ID: POLICY-5511 Change-Id: I73e392bc71787654b66e9d73e098decc712b08ea Signed-off-by: FrancescoFioraEst --- diff --git a/packages/policy-clamp-docker/src/main/docker/a1pms-participant.sh b/packages/policy-clamp-docker/src/main/docker/a1pms-participant.sh index 4df2fa467..f6f208d77 100644 --- a/packages/policy-clamp-docker/src/main/docker/a1pms-participant.sh +++ b/packages/policy-clamp-docker/src/main/docker/a1pms-participant.sh @@ -19,16 +19,6 @@ # ============LICENSE_END========================================================= # -if [ "$#" -eq 1 ]; then - CONFIG_FILE=$1 -fi - -if [ -z "$CONFIG_FILE" ]; then - CONFIG_FILE="${POLICY_HOME}/etc/A1pmsParticipantParameters.yaml" -fi - -echo "Policy clamp A1 Pms participant config file: $CONFIG_FILE" - if [ -f "${POLICY_HOME}/etc/mounted/logback.xml" ]; then echo "overriding logback xml file" cp -f "${POLICY_HOME}"/etc/mounted/logback.xml "${POLICY_HOME}"/etc/ @@ -36,9 +26,4 @@ fi "$JAVA_HOME"/bin/java \ -Dlogging.config="${POLICY_HOME}/etc/logback.xml" \ - -Dserver.ssl.keyStore="${KEYSTORE}" \ - -Dserver.ssl.keyStorePassword="${KEYSTORE_PASSWD}" \ - -Djavax.net.ssl.trustStore="${TRUSTSTORE}" \ - -Djavax.net.ssl.trustStorePassword="${TRUSTSTORE_PASSWD}" \ - -jar /app/app.jar \ - --spring.config.location="${CONFIG_FILE}" + -jar /app/app.jar diff --git a/packages/policy-clamp-docker/src/main/docker/http-participant.sh b/packages/policy-clamp-docker/src/main/docker/http-participant.sh index 06ee43b13..f6f208d77 100644 --- a/packages/policy-clamp-docker/src/main/docker/http-participant.sh +++ b/packages/policy-clamp-docker/src/main/docker/http-participant.sh @@ -19,16 +19,6 @@ # ============LICENSE_END========================================================= # -if [ "$#" -eq 1 ]; then - CONFIG_FILE=$1 -fi - -if [ -z "$CONFIG_FILE" ]; then - CONFIG_FILE="${POLICY_HOME}/etc/HttpParticipantParameters.yaml" -fi - -echo "Policy clamp HTTP participant config file: $CONFIG_FILE" - if [ -f "${POLICY_HOME}/etc/mounted/logback.xml" ]; then echo "overriding logback xml file" cp -f "${POLICY_HOME}"/etc/mounted/logback.xml "${POLICY_HOME}"/etc/ @@ -36,5 +26,4 @@ fi "$JAVA_HOME"/bin/java \ -Dlogging.config="${POLICY_HOME}/etc/logback.xml" \ - -jar /app/app.jar \ - --spring.config.location="${CONFIG_FILE}" + -jar /app/app.jar diff --git a/packages/policy-clamp-docker/src/main/docker/kserve-participant.sh b/packages/policy-clamp-docker/src/main/docker/kserve-participant.sh index db085c596..856ce1291 100644 --- a/packages/policy-clamp-docker/src/main/docker/kserve-participant.sh +++ b/packages/policy-clamp-docker/src/main/docker/kserve-participant.sh @@ -19,16 +19,6 @@ # ============LICENSE_END========================================================= # -if [ "$#" -eq 1 ]; then - CONFIG_FILE=$1 -fi - -if [ -z "$CONFIG_FILE" ]; then - CONFIG_FILE="${POLICY_HOME}/etc/KserveParticipantParameters.yaml" -fi - -echo "Policy clamp Kserve participant config file: $CONFIG_FILE" - if [ -f "${POLICY_HOME}/etc/mounted/logback.xml" ]; then echo "overriding logback xml file" cp -f "${POLICY_HOME}"/etc/mounted/logback.xml "${POLICY_HOME}"/etc/ @@ -36,5 +26,4 @@ fi "$JAVA_HOME"/bin/java \ -Dlogging.config="${POLICY_HOME}/etc/logback.xml" \ - -jar /app/app.jar \ - --spring.config.location="${CONFIG_FILE}" + -jar /app/app.jar diff --git a/packages/policy-clamp-docker/src/main/docker/kubernetes-participant.sh b/packages/policy-clamp-docker/src/main/docker/kubernetes-participant.sh index 972eed353..095d0a431 100644 --- a/packages/policy-clamp-docker/src/main/docker/kubernetes-participant.sh +++ b/packages/policy-clamp-docker/src/main/docker/kubernetes-participant.sh @@ -19,14 +19,6 @@ # ============LICENSE_END========================================================= # -if [ "$#" -eq 1 ]; then - CONFIG_FILE=$1 -fi - -if [ -z "$CONFIG_FILE" ]; then - CONFIG_FILE="${POLICY_HOME}/etc/KubernetesParticipantParameters.yaml" -fi - echo "Policy clamp Kubernetes participant config file: $CONFIG_FILE" if [ -f "${POLICY_HOME}/etc/mounted/logback.xml" ]; then @@ -36,5 +28,4 @@ fi "$JAVA_HOME"/bin/java \ -Dlogging.config="${POLICY_HOME}/etc/logback.xml" \ - -jar /app/app.jar \ - --spring.config.location="${CONFIG_FILE}" + -jar /app/app.jar diff --git a/packages/policy-clamp-docker/src/main/docker/policy-participant.sh b/packages/policy-clamp-docker/src/main/docker/policy-participant.sh index 7543a380f..f6f208d77 100644 --- a/packages/policy-clamp-docker/src/main/docker/policy-participant.sh +++ b/packages/policy-clamp-docker/src/main/docker/policy-participant.sh @@ -19,16 +19,6 @@ # ============LICENSE_END========================================================= # -if [ "$#" -eq 1 ]; then - CONFIG_FILE=$1 -fi - -if [ -z "$CONFIG_FILE" ]; then - CONFIG_FILE="${POLICY_HOME}/etc/PolicyParticipantParameters.yaml" -fi - -echo "Policy clamp policy participant config file: $CONFIG_FILE" - if [ -f "${POLICY_HOME}/etc/mounted/logback.xml" ]; then echo "overriding logback xml file" cp -f "${POLICY_HOME}"/etc/mounted/logback.xml "${POLICY_HOME}"/etc/ @@ -36,5 +26,4 @@ fi "$JAVA_HOME"/bin/java \ -Dlogging.config="${POLICY_HOME}/etc/logback.xml" \ - -jar /app/app.jar \ - --spring.config.location="${CONFIG_FILE}" + -jar /app/app.jar diff --git a/packages/policy-clamp-docker/src/main/docker/sim-participant.sh b/packages/policy-clamp-docker/src/main/docker/sim-participant.sh index ed44bcd51..856ce1291 100644 --- a/packages/policy-clamp-docker/src/main/docker/sim-participant.sh +++ b/packages/policy-clamp-docker/src/main/docker/sim-participant.sh @@ -19,16 +19,6 @@ # ============LICENSE_END========================================================= # -if [ "$#" -eq 1 ]; then - CONFIG_FILE=$1 -fi - -if [ -z "$CONFIG_FILE" ]; then - CONFIG_FILE="${POLICY_HOME}/etc/SimulatorParticipantParameters.yaml" -fi - -echo "Policy clamp Simulator participant config file: $CONFIG_FILE" - if [ -f "${POLICY_HOME}/etc/mounted/logback.xml" ]; then echo "overriding logback xml file" cp -f "${POLICY_HOME}"/etc/mounted/logback.xml "${POLICY_HOME}"/etc/ @@ -36,5 +26,4 @@ fi "$JAVA_HOME"/bin/java \ -Dlogging.config="${POLICY_HOME}/etc/logback.xml" \ - -jar /app/app.jar \ - --spring.config.location="${CONFIG_FILE}" + -jar /app/app.jar diff --git a/packages/policy-clamp-tarball/src/main/resources/etc/A1pmsParticipantParameters.yaml b/packages/policy-clamp-tarball/src/main/resources/etc/A1pmsParticipantParameters.yaml deleted file mode 100644 index 787dc9b94..000000000 --- a/packages/policy-clamp-tarball/src/main/resources/etc/A1pmsParticipantParameters.yaml +++ /dev/null @@ -1,70 +0,0 @@ -spring: - security: - user: - name: participantUser - password: zb!XztG34 - autoconfigure: - exclude: - - org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration - - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration - - org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration - - org.springframework.boot.autoconfigure.data.web.SpringDataWebAutoConfiguration -security: - enable-csrf: false - -a1pms: - baseUrl: http://a1policymanagement.onap:8081 - headers: - content-type: application/json - endpoints: - health: /a1-policy/v2/rics - services: /a1-policy/v2/services - service: /a1-policy/v2/services/{service_id} - -participant: - intermediaryParameters: - topics: - operationTopic: policy-acruntime-participant - syncTopic: acm-ppnt-sync - reportingTimeIntervalMs: 120000 - description: Participant Description - participantId: 101c62b3-8918-41b9-a747-d21eb79c6c00 - clampAutomationCompositionTopics: - topicSources: - - topic: ${participant.intermediaryParameters.topics.operationTopic} - servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: NOOP - fetchTimeout: 15000 - - topic: ${participant.intermediaryParameters.topics.syncTopic} - servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: NOOP - fetchTimeout: 15000 - topicSinks: - - topic: ${participant.intermediaryParameters.topics.operationTopic} - servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: NOOP - participantSupportedElementTypes: - - - typeName: org.onap.policy.clamp.acm.A1PMSAutomationCompositionElement - typeVersion: 1.0.1 - -management: - endpoints: - web: - base-path: / - exposure: - include: health, metrics, prometheus - endpoint: - health: - show-details: always - probes: - enabled: true - show-components: always - -server: - port: 8086 - servlet: - context-path: /onap/policy/clamp/acm/a1pmsparticipant diff --git a/packages/policy-clamp-tarball/src/main/resources/etc/HttpParticipantParameters.yaml b/packages/policy-clamp-tarball/src/main/resources/etc/HttpParticipantParameters.yaml deleted file mode 100644 index 376ee4255..000000000 --- a/packages/policy-clamp-tarball/src/main/resources/etc/HttpParticipantParameters.yaml +++ /dev/null @@ -1,64 +0,0 @@ -spring: - security: - user: - name: participantUser - password: zb!XztG34 - autoconfigure: - exclude: - - org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration - - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration - - org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration - - org.springframework.boot.autoconfigure.data.web.SpringDataWebAutoConfiguration - -security: - enable-csrf: false -participant: - intermediaryParameters: - topics: - operationTopic: policy-acruntime-participant - syncTopic: acm-ppnt-sync - reportingTimeIntervalMs: 120000 - description: Participant Description - participantId: 101c62b3-8918-41b9-a747-d21eb79c6c01 - clampAutomationCompositionTopics: - topicSources: - - topic: ${participant.intermediaryParameters.topics.operationTopic} - servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: NOOP - fetchTimeout: 15000 - useHttps: true - - topic: ${participant.intermediaryParameters.topics.syncTopic} - servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: NOOP - fetchTimeout: 15000 - useHttps: true - topicSinks: - - topic: ${participant.intermediaryParameters.topics.operationTopic} - servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: NOOP - useHttps: true - participantSupportedElementTypes: - - - typeName: org.onap.policy.clamp.acm.HttpAutomationCompositionElement - typeVersion: 1.0.0 - -management: - endpoints: - web: - base-path: / - exposure: - include: health, metrics, prometheus - endpoint: - health: - show-details: always - probes: - enabled: true - show-components: always - -server: - port: 8084 - servlet: - context-path: /onap/policy/clamp/acm/httpparticipant diff --git a/packages/policy-clamp-tarball/src/main/resources/etc/KserveParticipantParameters.yaml b/packages/policy-clamp-tarball/src/main/resources/etc/KserveParticipantParameters.yaml deleted file mode 100644 index f4b9aa720..000000000 --- a/packages/policy-clamp-tarball/src/main/resources/etc/KserveParticipantParameters.yaml +++ /dev/null @@ -1,76 +0,0 @@ -spring: - cloud: - kubernetes: - enabled: false - discovery: - enabled: false - security: - user: - name: participantUser - password: zb!XztG34 - autoconfigure: - exclude: - - org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration - - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration - - org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration - - org.springframework.boot.autoconfigure.data.web.SpringDataWebAutoConfiguration - - io.kubernetes.client.spring.extended.manifests.config.KubernetesManifestsAutoConfiguration - - io.kubernetes.client.spring.extended.network.config.KubernetesLoadBalancerAutoConfiguration -security: - enable-csrf: false - -participant: - intermediaryParameters: - topics: - operationTopic: policy-acruntime-participant - syncTopic: acm-ppnt-sync - reportingTimeIntervalMs: 120000 - description: Participant Description - participantId: 101c62b3-8918-41b9-a747-d21eb79c6c04 - clampAutomationCompositionTopics: - topicSources: - - topic: ${participant.intermediaryParameters.topics.operationTopic} - servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: NOOP - fetchTimeout: 15000 - - topic: ${participant.intermediaryParameters.topics.syncTopic} - servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: NOOP - fetchTimeout: 15000 - topicSinks: - - topic: ${participant.intermediaryParameters.topics.operationTopic} - servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: NOOP - participantSupportedElementTypes: - - - typeName: org.onap.policy.clamp.acm.KserveAutomationCompositionElement - typeVersion: 1.0.1 - -customresourcedefinition: - group: serving.kserve.io - version: v1beta1 - plural: inferenceservices - grace-period: 10 - -management: - endpoints: - web: - base-path: / - exposure: - include: health, metrics, prometheus - endpoint: - health: - show-details: always - probes: - enabled: true - show-components: always - -server: - port: 8087 - servlet: - context-path: /onap/policy/clamp/acm/kserveparticipant - - diff --git a/packages/policy-clamp-tarball/src/main/resources/etc/KubernetesParticipantParameters.yaml b/packages/policy-clamp-tarball/src/main/resources/etc/KubernetesParticipantParameters.yaml deleted file mode 100644 index eed8c74ca..000000000 --- a/packages/policy-clamp-tarball/src/main/resources/etc/KubernetesParticipantParameters.yaml +++ /dev/null @@ -1,99 +0,0 @@ -spring: - security: - user: - name: participantUser - password: zb!XztG34 - autoconfigure: - exclude: - - org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration - - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration - - org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration - - org.springframework.boot.autoconfigure.data.web.SpringDataWebAutoConfiguration - -security: - enable-csrf: false - -participant: - localChartDirectory: /home/policy/local-charts - infoFileName: CHART_INFO.json - intermediaryParameters: - topics: - operationTopic: policy-acruntime-participant - syncTopic: acm-ppnt-sync - reportingTimeIntervalMs: 120000 - description: Participant Description - participantId: 101c62b3-8918-41b9-a747-d21eb79c6c02 - clampAutomationCompositionTopics: - topicSources: - - - topic: ${participant.intermediaryParameters.topics.operationTopic} - servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: NOOP - fetchTimeout: 15000 - useHttps: true - - - topic: ${participant.intermediaryParameters.topics.syncTopic} - servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: NOOP - fetchTimeout: 15000 - useHttps: true - topicSinks: - - - topic: ${participant.intermediaryParameters.topics.operationTopic} - servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: NOOP - useHttps: true - participantSupportedElementTypes: - - - typeName: org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement - typeVersion: 1.0.0 - -management: - endpoints: - web: - base-path: / - exposure: - include: health, metrics, prometheus - endpoint: - health: - show-details: always - probes: - enabled: true - show-components: always - -server: - port: 8083 - servlet: - context-path: /onap/policy/clamp/acm/k8sparticipant - -logging: - # Configuration of logging - level: - ROOT: ERROR - org.springframework: ERROR - org.springframework.data: ERROR - org.springframework.web.reactive.function.client.ExchangeFunctions: ERROR - org.onap.policy.clamp.acm.participant.kubernetes: INFO - file: - name: /var/log/onap/policy/clamp/application.log - -chart: - api: - enabled: false - -# Update the config here for permitting repositories and protocols -helm: - repos: - - - repoName: kong - address: https://charts.konghq.com - - - repoName: bitnami - address: https://charts.bitnami.com/bitnami - - protocols: - - http - - https diff --git a/packages/policy-clamp-tarball/src/main/resources/etc/PolicyParticipantParameters.yaml b/packages/policy-clamp-tarball/src/main/resources/etc/PolicyParticipantParameters.yaml deleted file mode 100644 index ea7ccf153..000000000 --- a/packages/policy-clamp-tarball/src/main/resources/etc/PolicyParticipantParameters.yaml +++ /dev/null @@ -1,83 +0,0 @@ -spring: - security: - user: - name: participantUser - password: zb!XztG34 - autoconfigure: - exclude: - - org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration - - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration - - org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration - - org.springframework.boot.autoconfigure.data.web.SpringDataWebAutoConfiguration - -participant: - pdpGroup: defaultGroup - pdpType: apex - policyApiParameters: - clientName: api - hostname: policy-api - port: 6969 - userName: policyadmin - password: zb!XztG34 - useHttps: true - allowSelfSignedCerts: true - policyPapParameters: - clientName: pap - hostname: policy-pap - port: 6969 - userName: policyadmin - password: zb!XztG34 - useHttps: true - allowSelfSignedCerts: true - intermediaryParameters: - topics: - operationTopic: policy-acruntime-participant - syncTopic: acm-ppnt-sync - reportingTimeIntervalMs: 120000 - description: Participant Description - participantId: 101c62b3-8918-41b9-a747-d21eb79c6c03 - clampAutomationCompositionTopics: - topicSources: - - - topic: ${participant.intermediaryParameters.topics.operationTopic} - servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: NOOP - fetchTimeout: 15000 - useHttps: true - - - topic: ${participant.intermediaryParameters.topics.syncTopic} - servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: NOOP - fetchTimeout: 15000 - useHttps: true - topicSinks: - - - topic: ${participant.intermediaryParameters.topics.operationTopic} - servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: NOOP - useHttps: true - participantSupportedElementTypes: - - - typeName: org.onap.policy.clamp.acm.PolicyAutomationCompositionElement - typeVersion: 1.0.0 - -management: - endpoints: - web: - base-path: / - exposure: - include: health, metrics, prometheus - endpoint: - health: - show-details: always - probes: - enabled: true - show-components: always - -server: - port: 8085 - servlet: - context-path: /onap/policy/clamp/acm/policyparticipant diff --git a/packages/policy-clamp-tarball/src/main/resources/etc/SimulatorParticipantParameters.yaml b/packages/policy-clamp-tarball/src/main/resources/etc/SimulatorParticipantParameters.yaml deleted file mode 100644 index 69f2d473b..000000000 --- a/packages/policy-clamp-tarball/src/main/resources/etc/SimulatorParticipantParameters.yaml +++ /dev/null @@ -1,65 +0,0 @@ -spring: - security: - user: - name: participantUser - password: zb!XztG34 - autoconfigure: - exclude: - - org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration - - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration - - org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration - - org.springframework.boot.autoconfigure.data.web.SpringDataWebAutoConfiguration - -security: - enable-csrf: false -participant: - intermediaryParameters: - topics: - operationTopic: policy-acruntime-participant - syncTopic: acm-ppnt-sync - reportingTimeIntervalMs: 120000 - description: Participant Description - participantId: ${participantId:101c62b3-8918-41b9-a747-d21eb79c6c90} - threadPoolSize: 10 - clampAutomationCompositionTopics: - topicSources: - - topic: ${participant.intermediaryParameters.topics.operationTopic} - servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: NOOP - fetchTimeout: 15000 - useHttps: ${useHttps:true} - - topic: ${participant.intermediaryParameters.topics.syncTopic} - servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: NOOP - fetchTimeout: 15000 - useHttps: ${useHttps:true} - topicSinks: - - topic: ${participant.intermediaryParameters.topics.operationTopic} - servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: NOOP - useHttps: ${useHttps:true} - participantSupportedElementTypes: - - - typeName: ${supportedElementTypeName:org.onap.policy.clamp.acm.SimAutomationCompositionElement} - typeVersion: ${supportedElementTypeVersion:1.0.0} - -management: - endpoints: - web: - base-path: / - exposure: - include: health, metrics, prometheus - endpoint: - health: - show-details: always - probes: - enabled: true - show-components: always - -server: - port: 8087 - servlet: - context-path: /onap/policy/clamp/acm/simparticipant diff --git a/participant/participant-impl/participant-impl-a1pms/src/main/resources/config/application.yaml b/participant/participant-impl/participant-impl-a1pms/src/main/resources/config/application.yaml index 95b078103..eab268655 100644 --- a/participant/participant-impl/participant-impl-a1pms/src/main/resources/config/application.yaml +++ b/participant/participant-impl/participant-impl-a1pms/src/main/resources/config/application.yaml @@ -1,8 +1,10 @@ spring: + application: + name: a1pms-ppnt security: user: - name: participantUser - password: zb!XztG34 + name: ${HTTP_USER:participantUser} + password: ${HTTP_PASSWORD:zb!XztG34} autoconfigure: exclude: - org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration @@ -13,7 +15,7 @@ security: enable-csrf: false a1pms: - baseUrl: http://a1policymanagement.onap:8081 + baseUrl: ${a1pmsBaseUrl:http://a1policymanagement.onap:8081} headers: content-type: application/json endpoints: @@ -27,39 +29,83 @@ participant: operationTopic: policy-acruntime-participant syncTopic: acm-ppnt-sync reportingTimeIntervalMs: 120000 - description: Participant Description + description: Participant A1pms participantId: 101c62b3-8918-41b9-a747-d21eb79c6c00 clampAutomationCompositionTopics: topicSources: - topic: ${participant.intermediaryParameters.topics.operationTopic} servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: NOOP + - ${kafkaServer:kafka:9092} + topicCommInfrastructure: ${topicCommInfrastructure:NOOP} fetchTimeout: 15000 + useHttps: ${kafkaUseHttps:false} + allowTracing: ${allowTracing:false} + additionalProps: + group.id: policy-clamp-ac-a1pms-ppnt + allow.auto.create.topics: ${allowAutoCreateTopics:true} + security.protocol: ${kafkaSecurityProtocol:PLAINTEXT} + sasl.mechanism: ${kafkaSaslMechanism:GSSAPI} + sasl.jaas.config: ${kafkaSaslJaasConfig:} - topic: ${participant.intermediaryParameters.topics.syncTopic} servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: NOOP + - ${kafkaServer:kafka:9092} + topicCommInfrastructure: ${topicCommInfrastructure:NOOP} fetchTimeout: 15000 + useHttps: ${kafkaUseHttps:false} + allowTracing: ${allowTracing:false} + additionalProps: + allow.auto.create.topics: ${allowAutoCreateTopics:true} + security.protocol: ${kafkaSecurityProtocol:PLAINTEXT} + sasl.mechanism: ${kafkaSaslMechanism:GSSAPI} + sasl.jaas.config: ${kafkaSaslJaasConfig:} topicSinks: - topic: ${participant.intermediaryParameters.topics.operationTopic} servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: NOOP + - ${kafkaServer:kafka:9092} + topicCommInfrastructure: ${topicCommInfrastructure:NOOP} + useHttps: ${kafkaUseHttps:false} + allowTracing: ${allowTracing:false} + additionalProps: + allow.auto.create.topics: ${allowAutoCreateTopics:true} + security.protocol: ${kafkaSecurityProtocol:PLAINTEXT} + sasl.mechanism: ${kafkaSaslMechanism:GSSAPI} + sasl.jaas.config: ${kafkaSaslJaasConfig:} participantSupportedElementTypes: - typeName: org.onap.policy.clamp.acm.A1PMSAutomationCompositionElement typeVersion: 1.0.1 management: + tracing: + propagation: + produce: ${jaegerProducerType:B3} + sampling: + probability: ${jaegerSamplingProbability:1.0} endpoints: web: base-path: / exposure: include: health, metrics, prometheus + endpoint: + health: + access: unrestricted + show-details: always + probes: + enabled: true + show-components: always + server: - port: 8086 + port: 6969 + ssl: + enabled: false servlet: context-path: /onap/policy/clamp/acm/a1pmsparticipant - +tracing: + enabled: ${allowTracing:false} + exporter: + endpoint: ${tracingExporterEndpoint:http://jaeger:4318/v1/traces} + protocol: ${tracingExporterProtocol:http} + sampler: + jaeger-remote: + endpoint: ${tracingSamplerEndpoint:http://jaeger:14250} diff --git a/participant/participant-impl/participant-impl-http/src/main/resources/config/application.yaml b/participant/participant-impl/participant-impl-http/src/main/resources/config/application.yaml index 539d30f8a..ce2588546 100644 --- a/participant/participant-impl/participant-impl-http/src/main/resources/config/application.yaml +++ b/participant/participant-impl/participant-impl-http/src/main/resources/config/application.yaml @@ -1,8 +1,10 @@ spring: + application: + name: http-ppnt security: user: - name: participantUser - password: zb!XztG34 + name: ${HTTP_USER:participantUser} + password: ${HTTP_PASSWORD:zb!XztG34} autoconfigure: exclude: - org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration @@ -18,37 +20,83 @@ participant: operationTopic: policy-acruntime-participant syncTopic: acm-ppnt-sync reportingTimeIntervalMs: 120000 - description: Participant Description + description: Participant Http participantId: 101c62b3-8918-41b9-a747-d21eb79c6c01 clampAutomationCompositionTopics: topicSources: - topic: ${participant.intermediaryParameters.topics.operationTopic} servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: NOOP + - ${kafkaServer:kafka:9092} + topicCommInfrastructure: ${topicCommInfrastructure:NOOP} fetchTimeout: 15000 + useHttps: ${kafkaUseHttps:false} + allowTracing: ${allowTracing:false} + additionalProps: + group.id: policy-clamp-ac-http-ppnt + allow.auto.create.topics: ${allowAutoCreateTopics:true} + security.protocol: ${kafkaSecurityProtocol:PLAINTEXT} + sasl.mechanism: ${kafkaSaslMechanism:GSSAPI} + sasl.jaas.config: ${kafkaSaslJaasConfig:} - topic: ${participant.intermediaryParameters.topics.syncTopic} servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: NOOP + - ${kafkaServer:kafka:9092} + topicCommInfrastructure: ${topicCommInfrastructure:NOOP} fetchTimeout: 15000 + useHttps: ${kafkaUseHttps:false} + allowTracing: ${allowTracing:false} + additionalProps: + allow.auto.create.topics: ${allowAutoCreateTopics:true} + security.protocol: ${kafkaSecurityProtocol:PLAINTEXT} + sasl.mechanism: ${kafkaSaslMechanism:GSSAPI} + sasl.jaas.config: ${kafkaSaslJaasConfig:} topicSinks: - topic: ${participant.intermediaryParameters.topics.operationTopic} servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: NOOP + - ${kafkaServer:kafka:9092} + topicCommInfrastructure: ${topicCommInfrastructure:NOOP} + useHttps: ${kafkaUseHttps:false} + allowTracing: ${allowTracing:false} + additionalProps: + allow.auto.create.topics: ${allowAutoCreateTopics:true} + security.protocol: ${kafkaSecurityProtocol:PLAINTEXT} + sasl.mechanism: ${kafkaSaslMechanism:GSSAPI} + sasl.jaas.config: ${kafkaSaslJaasConfig:} participantSupportedElementTypes: - typeName: org.onap.policy.clamp.acm.HttpAutomationCompositionElement typeVersion: 1.0.0 management: + tracing: + propagation: + produce: ${jaegerProducerType:B3} + sampling: + probability: ${jaegerSamplingProbability:1.0} endpoints: web: base-path: / exposure: include: health, metrics, prometheus + endpoint: + health: + access: unrestricted + show-details: always + probes: + enabled: true + show-components: always + server: - port: 8084 + port: 6969 + ssl: + enabled: false servlet: context-path: /onap/policy/clamp/acm/httpparticipant + +tracing: + enabled: ${allowTracing:false} + exporter: + endpoint: ${tracingExporterEndpoint:http://jaeger:4318/v1/traces} + protocol: ${tracingExporterProtocol:http} + sampler: + jaeger-remote: + endpoint: ${tracingSamplerEndpoint:http://jaeger:14250} diff --git a/participant/participant-impl/participant-impl-kserve/src/main/resources/config/application.yaml b/participant/participant-impl/participant-impl-kserve/src/main/resources/config/application.yaml index 29efba32a..20bbcb3db 100644 --- a/participant/participant-impl/participant-impl-kserve/src/main/resources/config/application.yaml +++ b/participant/participant-impl/participant-impl-kserve/src/main/resources/config/application.yaml @@ -1,4 +1,6 @@ spring: + application: + name: kserve-ppnt cloud: kubernetes: enabled: false @@ -6,16 +8,16 @@ spring: enabled: false security: user: - name: participantUser - password: zb!XztG34 + name: ${HTTP_USER:participantUser} + password: ${HTTP_PASSWORD:zb!XztG34} autoconfigure: exclude: - org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration - org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration - org.springframework.boot.autoconfigure.data.web.SpringDataWebAutoConfiguration -# - io.kubernetes.client.spring.extended.manifests.config.KubernetesManifestsAutoConfiguration -# - io.kubernetes.client.spring.extended.network.config.KubernetesLoadBalancerAutoConfiguration + - io.kubernetes.client.spring.extended.manifests.config.KubernetesManifestsAutoConfiguration + - io.kubernetes.client.spring.extended.network.config.KubernetesLoadBalancerAutoConfiguration security: enable-csrf: false @@ -26,32 +28,51 @@ participant: operationTopic: policy-acruntime-participant syncTopic: acm-ppnt-sync reportingTimeIntervalMs: 120000 - description: Participant Description + description: Participant Kserve participantId: 101c62b3-8918-41b9-a747-d21eb79c6c04 clampAutomationCompositionTopics: topicSources: - topic: ${participant.intermediaryParameters.topics.operationTopic} servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: NOOP + - ${kafkaServer:kafka:9092} + topicCommInfrastructure: ${topicCommInfrastructure:NOOP} fetchTimeout: 15000 + useHttps: ${kafkaUseHttps:false} + allowTracing: ${allowTracing:false} + additionalProps: + group.id: policy-clamp-ac-kserve-ppnt + allow.auto.create.topics: ${allowAutoCreateTopics:true} + security.protocol: ${kafkaSecurityProtocol:PLAINTEXT} + sasl.mechanism: ${kafkaSaslMechanism:GSSAPI} + sasl.jaas.config: ${kafkaSaslJaasConfig:} - topic: ${participant.intermediaryParameters.topics.syncTopic} servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: NOOP + - ${kafkaServer:kafka:9092} + topicCommInfrastructure: ${topicCommInfrastructure:NOOP} fetchTimeout: 15000 + useHttps: ${kafkaUseHttps:false} + allowTracing: ${allowTracing:false} + additionalProps: + allow.auto.create.topics: ${allowAutoCreateTopics:true} + security.protocol: ${kafkaSecurityProtocol:PLAINTEXT} + sasl.mechanism: ${kafkaSaslMechanism:GSSAPI} + sasl.jaas.config: ${kafkaSaslJaasConfig:} topicSinks: - topic: ${participant.intermediaryParameters.topics.operationTopic} servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: NOOP + - ${kafkaServer:kafka:9092} + topicCommInfrastructure: ${topicCommInfrastructure:NOOP} + useHttps: ${kafkaUseHttps:false} + allowTracing: ${allowTracing:false} + additionalProps: + allow.auto.create.topics: ${allowAutoCreateTopics:true} + security.protocol: ${kafkaSecurityProtocol:PLAINTEXT} + sasl.mechanism: ${kafkaSaslMechanism:GSSAPI} + sasl.jaas.config: ${kafkaSaslJaasConfig:} participantSupportedElementTypes: - typeName: org.onap.policy.clamp.acm.KserveAutomationCompositionElement typeVersion: 1.0.1 - - - typeName: org.onap.policy.clamp.acm.AutomationCompositionElement - typeVersion: 1.0.0 customresourcedefinition: group: serving.kserve.io @@ -60,14 +81,36 @@ customresourcedefinition: grace-period: 10 management: + tracing: + propagation: + produce: ${jaegerProducerType:B3} + sampling: + probability: ${jaegerSamplingProbability:1.0} endpoints: web: base-path: / exposure: include: health, metrics, prometheus + endpoint: + health: + access: unrestricted + show-details: always + probes: + enabled: true + show-components: always + server: - port: 8087 + port: 6969 servlet: context-path: /onap/policy/clamp/acm/kserveparticipant + ssl: + enabled: false - +tracing: + enabled: ${allowTracing:false} + exporter: + endpoint: ${tracingExporterEndpoint:http://jaeger:4318/v1/traces} + protocol: ${tracingExporterProtocol:http} + sampler: + jaeger-remote: + endpoint: ${tracingSamplerEndpoint:http://jaeger:14250} diff --git a/participant/participant-impl/participant-impl-kserve/src/test/resources/application-test.yaml b/participant/participant-impl/participant-impl-kserve/src/test/resources/application-test.yaml index 562de49ce..30c4b73f5 100644 --- a/participant/participant-impl/participant-impl-kserve/src/test/resources/application-test.yaml +++ b/participant/participant-impl/participant-impl-kserve/src/test/resources/application-test.yaml @@ -7,11 +7,11 @@ participant: topicSources: - topic: policy-acruntime-participant servers: - - ${topicServer:kafka:9092} + - kafka:9092 topicCommInfrastructure: NOOP fetchTimeout: 15000 topicSinks: - topic: policy-acruntime-participant servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: NOOP \ No newline at end of file + - kafka:9092 + topicCommInfrastructure: NOOP diff --git a/participant/participant-impl/participant-impl-kubernetes/src/main/resources/config/application.yaml b/participant/participant-impl/participant-impl-kubernetes/src/main/resources/config/application.yaml index 8991a49d6..ebf74dac7 100644 --- a/participant/participant-impl/participant-impl-kubernetes/src/main/resources/config/application.yaml +++ b/participant/participant-impl/participant-impl-kubernetes/src/main/resources/config/application.yaml @@ -1,8 +1,10 @@ spring: + application: + name: k8s-ppnt security: user: - name: participantUser - password: zb!XztG34 + name: ${HTTP_USER:participantUser} + password: ${HTTP_PASSWORD:zb!XztG34} autoconfigure: exclude: - org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration @@ -27,38 +29,75 @@ participant: operationTopic: policy-acruntime-participant syncTopic: acm-ppnt-sync reportingTimeIntervalMs: 120000 - description: Participant Description + description: Participant k8s participantId: 101c62b3-8918-41b9-a747-d21eb79c6c02 clampAutomationCompositionTopics: topicSources: - topic: ${participant.intermediaryParameters.topics.operationTopic} servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: NOOP + - ${kafkaServer:kafka:9092} + topicCommInfrastructure: ${topicCommInfrastructure:NOOP} fetchTimeout: 15000 + useHttps: ${kafkaUseHttps:false} + allowTracing: ${allowTracing:false} + additionalProps: + group.id: policy-clamp-ac-k8s-ppnt + allow.auto.create.topics: ${allowAutoCreateTopics:true} + security.protocol: ${kafkaSecurityProtocol:PLAINTEXT} + sasl.mechanism: ${kafkaSaslMechanism:GSSAPI} + sasl.jaas.config: ${kafkaSaslJaasConfig:} - topic: ${participant.intermediaryParameters.topics.syncTopic} servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: NOOP + - ${kafkaServer:kafka:9092} + topicCommInfrastructure: ${topicCommInfrastructure:NOOP} fetchTimeout: 15000 + useHttps: ${kafkaUseHttps:false} + allowTracing: ${allowTracing:false} + additionalProps: + allow.auto.create.topics: ${allowAutoCreateTopics:true} + security.protocol: ${kafkaSecurityProtocol:PLAINTEXT} + sasl.mechanism: ${kafkaSaslMechanism:GSSAPI} + sasl.jaas.config: ${kafkaSaslJaasConfig:} topicSinks: - topic: ${participant.intermediaryParameters.topics.operationTopic} servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: NOOP + - ${kafkaServer:kafka:9092} + topicCommInfrastructure: ${topicCommInfrastructure:NOOP} + useHttps: ${kafkaUseHttps:false} + allowTracing: ${allowTracing:false} + additionalProps: + allow.auto.create.topics: ${allowAutoCreateTopics:true} + security.protocol: ${kafkaSecurityProtocol:PLAINTEXT} + sasl.mechanism: ${kafkaSaslMechanism:GSSAPI} + sasl.jaas.config: ${kafkaSaslJaasConfig:} participantSupportedElementTypes: - typeName: org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement typeVersion: 1.0.0 management: + tracing: + propagation: + produce: ${jaegerProducerType:B3} + sampling: + probability: ${jaegerSamplingProbability:1.0} endpoints: web: base-path: / exposure: include: health, metrics, prometheus + endpoint: + health: + access: unrestricted + show-details: always + probes: + enabled: true + show-components: always + server: - port: 8083 + port: 6969 + ssl: + enabled: false servlet: context-path: /onap/policy/clamp/acm/k8sparticipant @@ -90,3 +129,12 @@ helm: protocols: - http - https + +tracing: + enabled: ${allowTracing:false} + exporter: + endpoint: ${tracingExporterEndpoint:http://jaeger:4318/v1/traces} + protocol: ${tracingExporterProtocol:http} + sampler: + jaeger-remote: + endpoint: ${tracingSamplerEndpoint:http://jaeger:14250} diff --git a/participant/participant-impl/participant-impl-policy/src/main/resources/config/application.yaml b/participant/participant-impl/participant-impl-policy/src/main/resources/config/application.yaml index 9411dff68..ba2643c6b 100644 --- a/participant/participant-impl/participant-impl-policy/src/main/resources/config/application.yaml +++ b/participant/participant-impl/participant-impl-policy/src/main/resources/config/application.yaml @@ -1,8 +1,10 @@ spring: + application: + name: pf-ppnt security: user: - name: participantUser - password: zb!XztG34 + name: ${HTTP_USER:participantUser} + password: ${HTTP_PASSWORD:zb!XztG34} autoconfigure: exclude: - org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration @@ -17,55 +19,100 @@ participant: clientName: api hostname: policy-api port: 6969 - userName: policyadmin - password: zb!XztG34 - useHttps: true + userName: ${API_USER} + password: ${API_PASSWORD} + useHttps: false allowSelfSignedCerts: true policyPapParameters: clientName: pap hostname: policy-pap port: 6969 - userName: policyadmin - password: zb!XztG34 - useHttps: true + userName: ${PAP_USER} + password: ${PAP_PASSWORD} + useHttps: false allowSelfSignedCerts: true intermediaryParameters: topics: operationTopic: policy-acruntime-participant syncTopic: acm-ppnt-sync reportingTimeIntervalMs: 120000 - description: Participant Description + description: Participant Policy participantId: 101c62b3-8918-41b9-a747-d21eb79c6c03 clampAutomationCompositionTopics: topicSources: - topic: ${participant.intermediaryParameters.topics.operationTopic} servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: NOOP + - ${kafkaServer:kafka:9092} + topicCommInfrastructure: ${topicCommInfrastructure:NOOP} fetchTimeout: 15000 + useHttps: ${kafkaUseHttps:false} + allowTracing: ${allowTracing:false} + additionalProps: + group.id: policy-clamp-ac-pf-ppnt + allow.auto.create.topics: ${allowAutoCreateTopics:true} + security.protocol: ${kafkaSecurityProtocol:PLAINTEXT} + sasl.mechanism: ${kafkaSaslMechanism:GSSAPI} + sasl.jaas.config: ${kafkaSaslJaasConfig:} - topic: ${participant.intermediaryParameters.topics.syncTopic} servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: NOOP + - ${kafkaServer:kafka:9092} + topicCommInfrastructure: ${topicCommInfrastructure:NOOP} fetchTimeout: 15000 + useHttps: ${kafkaUseHttps:false} + allowTracing: ${allowTracing:false} + additionalProps: + allow.auto.create.topics: ${allowAutoCreateTopics:true} + security.protocol: ${kafkaSecurityProtocol:PLAINTEXT} + sasl.mechanism: ${kafkaSaslMechanism:GSSAPI} + sasl.jaas.config: ${kafkaSaslJaasConfig:} topicSinks: - topic: ${participant.intermediaryParameters.topics.operationTopic} servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: NOOP + - ${kafkaServer:kafka:9092} + topicCommInfrastructure: ${topicCommInfrastructure:NOOP} + useHttps: ${kafkaUseHttps:false} + allowTracing: ${allowTracing:false} + additionalProps: + allow.auto.create.topics: ${allowAutoCreateTopics:true} + security.protocol: ${kafkaSecurityProtocol:PLAINTEXT} + sasl.mechanism: ${kafkaSaslMechanism:GSSAPI} + sasl.jaas.config: ${kafkaSaslJaasConfig:} participantSupportedElementTypes: - typeName: org.onap.policy.clamp.acm.PolicyAutomationCompositionElement typeVersion: 1.0.0 management: + tracing: + propagation: + produce: ${jaegerProducerType:B3} + sampling: + probability: ${jaegerSamplingProbability:1.0} endpoints: web: base-path: / exposure: include: health, metrics, prometheus + endpoint: + health: + access: unrestricted + show-details: always + probes: + enabled: true + show-components: always + server: - port: 8085 + port: 6969 + ssl: + enabled: false servlet: context-path: /onap/policy/clamp/acm/policyparticipant +tracing: + enabled: ${allowTracing:false} + exporter: + endpoint: ${tracingExporterEndpoint:http://jaeger:4318/v1/traces} + protocol: ${tracingExporterProtocol:http} + sampler: + jaeger-remote: + endpoint: ${tracingSamplerEndpoint:http://jaeger:14250} diff --git a/participant/participant-impl/participant-impl-simulator/src/main/resources/config/application.yaml b/participant/participant-impl/participant-impl-simulator/src/main/resources/config/application.yaml index 63a46ef76..d7a88f950 100644 --- a/participant/participant-impl/participant-impl-simulator/src/main/resources/config/application.yaml +++ b/participant/participant-impl/participant-impl-simulator/src/main/resources/config/application.yaml @@ -1,8 +1,10 @@ spring: + application: + name: ${applicationName:sim-ppnt} security: user: - name: participantUser - password: zb!XztG34 + name: ${HTTP_USER:participantUser} + password: ${HTTP_PASSWORD:zb!XztG34} autoconfigure: exclude: - org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration @@ -18,44 +20,91 @@ participant: operationTopic: policy-acruntime-participant syncTopic: acm-ppnt-sync reportingTimeIntervalMs: 120000 - description: Participant Description - participantId: 101c62b3-8918-41b9-a747-d21eb79c6c90 + description: Participant Simulator + participantId: ${participantId:101c62b3-8918-41b9-a747-d21eb79c6c90} threadPoolSize: 10 - topicValidation: true + topicValidation: ${topicValidation:false} clampAdminTopics: servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: NOOP + - ${kafkaServer:kafka:9092} + topicCommInfrastructure: ${topicCommInfrastructure:NOOP} fetchTimeout: 15000 + useHttps: ${kafkaUseHttps:false} clampAutomationCompositionTopics: topicSources: - topic: ${participant.intermediaryParameters.topics.operationTopic} servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: NOOP + - ${kafkaServer:kafka:9092} + topicCommInfrastructure: ${topicCommInfrastructure:NOOP} fetchTimeout: 15000 + useHttps: ${kafkaUseHttps:false} + allowTracing: ${allowTracing:false} + additionalProps: + group.id: ${groupId} + allow.auto.create.topics: ${allowAutoCreateTopics:true} + security.protocol: ${kafkaSecurityProtocol:PLAINTEXT} + sasl.mechanism: ${kafkaSaslMechanism:GSSAPI} + sasl.jaas.config: ${kafkaSaslJaasConfig:} - topic: ${participant.intermediaryParameters.topics.syncTopic} servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: NOOP + - ${kafkaServer:kafka:9092} + topicCommInfrastructure: ${topicCommInfrastructure:NOOP} fetchTimeout: 15000 + useHttps: ${kafkaUseHttps:false} + allowTracing: ${allowTracing:false} + additionalProps: + allow.auto.create.topics: ${allowAutoCreateTopics:true} + security.protocol: ${kafkaSecurityProtocol:PLAINTEXT} + sasl.mechanism: ${kafkaSaslMechanism:GSSAPI} + sasl.jaas.config: ${kafkaSaslJaasConfig:} topicSinks: - topic: ${participant.intermediaryParameters.topics.operationTopic} servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: NOOP + - ${kafkaServer:kafka:9092} + topicCommInfrastructure: ${topicCommInfrastructure:NOOP} + useHttps: ${kafkaUseHttps:false} + allowTracing: ${allowTracing:false} + additionalProps: + allow.auto.create.topics: ${allowAutoCreateTopics:true} + security.protocol: ${kafkaSecurityProtocol:PLAINTEXT} + sasl.mechanism: ${kafkaSaslMechanism:GSSAPI} + sasl.jaas.config: ${kafkaSaslJaasConfig:} participantSupportedElementTypes: - - typeName: org.onap.policy.clamp.acm.SimAutomationCompositionElement - typeVersion: 1.0.0 + typeName: ${supportedElementTypeName:org.onap.policy.clamp.acm.SimAutomationCompositionElement} + typeVersion: ${supportedElementTypeVersion:1.0.0} management: + tracing: + propagation: + produce: ${jaegerProducerType:B3} + sampling: + probability: ${jaegerSamplingProbability:1.0} endpoints: web: base-path: / exposure: include: health, metrics, prometheus + endpoint: + health: + access: unrestricted + show-details: always + probes: + enabled: true + show-components: always + server: - port: 8084 + port: 6969 + ssl: + enabled: false servlet: - context-path: /onap/policy/clamp/acm/simparticipant + context-path: /onap/policy/simparticipant + +tracing: + enabled: ${allowTracing:false} + exporter: + endpoint: ${tracingExporterEndpoint:http://jaeger:4318/v1/traces} + protocol: ${tracingExporterProtocol:http} + sampler: + jaeger-remote: + endpoint: ${tracingSamplerEndpoint:http://jaeger:14250}