From: FrancescoFioraEst Date: Fri, 2 Jan 2026 09:17:44 +0000 (+0000) Subject: Remove duplication of logback.xml in participants X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=3e751b6117450240525faeae27b7136adff5faee;p=policy%2Fclamp.git Remove duplication of logback.xml in participants Issue-ID: POLICY-5512 Change-Id: I5830fc50cae0d56adf9e7c8da2ab34781ac40163 Signed-off-by: FrancescoFioraEst --- diff --git a/packages/policy-clamp-docker/src/main/docker/A1pmsParticipant.Dockerfile b/packages/policy-clamp-docker/src/main/docker/A1pmsParticipant.Dockerfile index 89d1ea080..4d03d9b9c 100644 --- a/packages/policy-clamp-docker/src/main/docker/A1pmsParticipant.Dockerfile +++ b/packages/policy-clamp-docker/src/main/docker/A1pmsParticipant.Dockerfile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------- # ============LICENSE_START======================================================= -# Copyright (C) 2021-2025 OpenInfra Foundation Europe. All rights reserved. +# Copyright (C) 2021-2026 OpenInfra Foundation Europe. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -47,13 +47,10 @@ RUN mkdir -p $POLICY_LOGS $POLICY_HOME && \ COPY --chown=policy:policy --from=tarball /extracted $POLICY_HOME WORKDIR $POLICY_HOME -COPY --chown=policy:policy a1pms-participant.sh bin/ COPY --chown=policy:policy /maven/policy-clamp-participant-impl-a1pms.jar /app/app.jar -RUN chmod 755 bin/*.sh - EXPOSE 8086 USER policy -WORKDIR $POLICY_HOME/bin -ENTRYPOINT [ "./a1pms-participant.sh" ] +WORKDIR $POLICY_HOME +ENTRYPOINT [ "java", "-jar", "/app/app.jar" ] diff --git a/packages/policy-clamp-docker/src/main/docker/HttpParticipant.Dockerfile b/packages/policy-clamp-docker/src/main/docker/HttpParticipant.Dockerfile index 391076bd3..00ce1f385 100644 --- a/packages/policy-clamp-docker/src/main/docker/HttpParticipant.Dockerfile +++ b/packages/policy-clamp-docker/src/main/docker/HttpParticipant.Dockerfile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------- # ============LICENSE_START======================================================= -# Copyright (C) 2021-2025 OpenInfra Foundation Europe. All rights reserved. +# Copyright (C) 2021-2026 OpenInfra Foundation Europe. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -47,13 +47,10 @@ RUN mkdir -p $POLICY_LOGS $POLICY_HOME && \ COPY --chown=policy:policy --from=tarball /extracted $POLICY_HOME WORKDIR $POLICY_HOME -COPY --chown=policy:policy http-participant.sh bin/ COPY --chown=policy:policy /maven/policy-clamp-participant-impl-http.jar /app/app.jar -RUN chmod 755 bin/*.sh - EXPOSE 8084 USER policy -WORKDIR $POLICY_HOME/bin -ENTRYPOINT [ "./http-participant.sh" ] +WORKDIR $POLICY_HOME +ENTRYPOINT [ "java", "-jar", "/app/app.jar" ] diff --git a/packages/policy-clamp-docker/src/main/docker/KserveParticipant.Dockerfile b/packages/policy-clamp-docker/src/main/docker/KserveParticipant.Dockerfile index dd48aeec6..0632c4eba 100644 --- a/packages/policy-clamp-docker/src/main/docker/KserveParticipant.Dockerfile +++ b/packages/policy-clamp-docker/src/main/docker/KserveParticipant.Dockerfile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------- # ============LICENSE_START======================================================= -# Copyright (C) 2023-2025 OpenInfra Foundation Europe. All rights reserved. +# Copyright (C) 2023-2026 OpenInfra Foundation Europe. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -47,13 +47,10 @@ RUN mkdir -p $POLICY_HOME $POLICY_LOGS && \ COPY --chown=policy:policy --from=tarball /extracted $POLICY_HOME WORKDIR $POLICY_HOME -COPY --chown=policy:policy kserve-participant.sh bin/ COPY --chown=policy:policy /maven/policy-clamp-participant-impl-kserve.jar /app/app.jar -RUN chmod 755 bin/*.sh - EXPOSE 8087 USER policy -WORKDIR $POLICY_HOME/bin -ENTRYPOINT [ "./kserve-participant.sh" ] +WORKDIR $POLICY_HOME +ENTRYPOINT [ "java", "-jar", "/app/app.jar" ] diff --git a/packages/policy-clamp-docker/src/main/docker/KubernetesParticipant.Dockerfile b/packages/policy-clamp-docker/src/main/docker/KubernetesParticipant.Dockerfile index 19e37dfc4..be452081f 100644 --- a/packages/policy-clamp-docker/src/main/docker/KubernetesParticipant.Dockerfile +++ b/packages/policy-clamp-docker/src/main/docker/KubernetesParticipant.Dockerfile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------- # ============LICENSE_START======================================================= -# Copyright (C) 2021-2025 OpenInfra Foundation Europe. All rights reserved. +# Copyright (C) 2021-2026 OpenInfra Foundation Europe. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -47,7 +47,6 @@ RUN mkdir -p $POLICY_HOME $POLICY_LOGS && \ COPY --chown=policy:policy --from=tarball /extracted $POLICY_HOME WORKDIR $POLICY_HOME -COPY --chown=policy:policy kubernetes-participant.sh bin/ COPY --chown=policy:policy /maven/policy-clamp-participant-impl-kubernetes.jar /app/app.jar RUN chmod 755 bin/*.sh && \ @@ -65,7 +64,5 @@ RUN chmod 755 bin/*.sh && \ EXPOSE 8083 USER policy -WORKDIR $POLICY_HOME/bin -ENTRYPOINT [ "./kubernetes-participant.sh" ] - - +WORKDIR $POLICY_HOME +ENTRYPOINT [ "java", "-jar", "/app/app.jar" ] diff --git a/packages/policy-clamp-docker/src/main/docker/PolicyParticipant.Dockerfile b/packages/policy-clamp-docker/src/main/docker/PolicyParticipant.Dockerfile index 16bab02de..434b44732 100644 --- a/packages/policy-clamp-docker/src/main/docker/PolicyParticipant.Dockerfile +++ b/packages/policy-clamp-docker/src/main/docker/PolicyParticipant.Dockerfile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------- # ============LICENSE_START======================================================= -# Copyright (C) 2021-2025 OpenInfra Foundation Europe. All rights reserved. +# Copyright (C) 2021-2026 OpenInfra Foundation Europe. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -47,13 +47,10 @@ RUN mkdir -p $POLICY_HOME $POLICY_LOGS && \ COPY --chown=policy:policy --from=tarball /extracted $POLICY_HOME WORKDIR $POLICY_HOME -COPY --chown=policy:policy policy-participant.sh bin/ COPY --chown=policy:policy /maven/policy-clamp-participant-impl-policy.jar /app/app.jar -RUN chmod 755 bin/*.sh - EXPOSE 8085 USER policy -WORKDIR $POLICY_HOME/bin -ENTRYPOINT [ "./policy-participant.sh" ] +WORKDIR $POLICY_HOME +ENTRYPOINT [ "java", "-jar", "/app/app.jar" ] diff --git a/packages/policy-clamp-docker/src/main/docker/SimParticipant.Dockerfile b/packages/policy-clamp-docker/src/main/docker/SimParticipant.Dockerfile index afc8a2385..050779f40 100644 --- a/packages/policy-clamp-docker/src/main/docker/SimParticipant.Dockerfile +++ b/packages/policy-clamp-docker/src/main/docker/SimParticipant.Dockerfile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------- # ============LICENSE_START======================================================= -# Copyright (C) 2023-2025 OpenInfra Foundation Europe. All rights reserved. +# Copyright (C) 2023-2026 OpenInfra Foundation Europe. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -47,13 +47,10 @@ RUN mkdir -p $POLICY_LOGS $POLICY_HOME && \ COPY --chown=policy:policy --from=tarball /extracted $POLICY_HOME WORKDIR $POLICY_HOME -COPY --chown=policy:policy sim-participant.sh bin/ COPY --chown=policy:policy /maven/policy-clamp-participant-impl-sim.jar /app/app.jar -RUN chmod 755 bin/*.sh - EXPOSE 8084 USER policy -WORKDIR $POLICY_HOME/bin -ENTRYPOINT [ "./sim-participant.sh" ] +WORKDIR $POLICY_HOME +ENTRYPOINT [ "java", "-jar", "/app/app.jar" ] diff --git a/packages/policy-clamp-docker/src/main/docker/a1pms-participant.sh b/packages/policy-clamp-docker/src/main/docker/a1pms-participant.sh deleted file mode 100644 index f6f208d77..000000000 --- a/packages/policy-clamp-docker/src/main/docker/a1pms-participant.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env sh -# -# ============LICENSE_START======================================================= -# Copyright (C) 2021-2022, 2025 OpenInfra Foundation Europe. All rights reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END========================================================= -# - -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/ -fi - -"$JAVA_HOME"/bin/java \ - -Dlogging.config="${POLICY_HOME}/etc/logback.xml" \ - -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 deleted file mode 100644 index f6f208d77..000000000 --- a/packages/policy-clamp-docker/src/main/docker/http-participant.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env sh -# -# ============LICENSE_START======================================================= -# Copyright (C) 2021-2022, 2025 OpenInfra Foundation Europe. All rights reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END========================================================= -# - -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/ -fi - -"$JAVA_HOME"/bin/java \ - -Dlogging.config="${POLICY_HOME}/etc/logback.xml" \ - -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 deleted file mode 100644 index 856ce1291..000000000 --- a/packages/policy-clamp-docker/src/main/docker/kserve-participant.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env sh -# -# ============LICENSE_START======================================================= -# Copyright (C) 2023, 2025 OpenInfra Foundation Europe. All rights reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END========================================================= -# - -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/ -fi - -"$JAVA_HOME"/bin/java \ - -Dlogging.config="${POLICY_HOME}/etc/logback.xml" \ - -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 deleted file mode 100644 index 095d0a431..000000000 --- a/packages/policy-clamp-docker/src/main/docker/kubernetes-participant.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env sh -# -# ============LICENSE_START======================================================= -# Copyright (C) 2021-2022, 2025 OpenInfra Foundation Europe. All rights reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END========================================================= -# - -echo "Policy clamp Kubernetes 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/ -fi - -"$JAVA_HOME"/bin/java \ - -Dlogging.config="${POLICY_HOME}/etc/logback.xml" \ - -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 deleted file mode 100644 index f6f208d77..000000000 --- a/packages/policy-clamp-docker/src/main/docker/policy-participant.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env sh -# -# ============LICENSE_START======================================================= -# Copyright (C) 2021-2022, 2025 OpenInfra Foundation Europe. All rights reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END========================================================= -# - -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/ -fi - -"$JAVA_HOME"/bin/java \ - -Dlogging.config="${POLICY_HOME}/etc/logback.xml" \ - -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 deleted file mode 100644 index 856ce1291..000000000 --- a/packages/policy-clamp-docker/src/main/docker/sim-participant.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env sh -# -# ============LICENSE_START======================================================= -# Copyright (C) 2023, 2025 OpenInfra Foundation Europe. All rights reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END========================================================= -# - -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/ -fi - -"$JAVA_HOME"/bin/java \ - -Dlogging.config="${POLICY_HOME}/etc/logback.xml" \ - -jar /app/app.jar diff --git a/packages/policy-clamp-tarball/src/main/resources/etc/logback-default.xml b/packages/policy-clamp-tarball/src/main/resources/etc/logback-default.xml deleted file mode 100644 index 33446c543..000000000 --- a/packages/policy-clamp-tarball/src/main/resources/etc/logback-default.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - Clamp - - - - - - %d %contextName [%t] %level %logger{36} - %msg%n - - - - - - - - - ${VAR_LOG}/clamp.log - - %d %-5relative [procId=${processId}] [%thread] %-5level - %logger{26} - %msg %n %ex{full} - - - - - - - - - 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 eab268655..2aa6183f0 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 @@ -28,6 +28,18 @@ participant: topics: operationTopic: policy-acruntime-participant syncTopic: acm-ppnt-sync + threadPoolSize: 10 + topicValidation: ${TOPIC_VALIDATION:false} + clampAdminTopics: + servers: + - ${kafkaServer:kafka:9092} + topicCommInfrastructure: ${topicCommInfrastructure:NOOP} + fetchTimeout: 15000 + useHttps: ${kafkaUseHttps:false} + additionalProps: + security.protocol: ${kafkaSecurityProtocol:PLAINTEXT} + sasl.mechanism: ${kafkaSaslMechanism:GSSAPI} + sasl.jaas.config: ${kafkaSaslJaasConfig:} reportingTimeIntervalMs: 120000 description: Participant A1pms participantId: 101c62b3-8918-41b9-a747-d21eb79c6c00 diff --git a/participant/participant-impl/participant-impl-a1pms/src/main/resources/logback.xml b/participant/participant-impl/participant-impl-a1pms/src/main/resources/logback.xml new file mode 100644 index 000000000..8287d38c4 --- /dev/null +++ b/participant/participant-impl/participant-impl-a1pms/src/main/resources/logback.xml @@ -0,0 +1,114 @@ + + + + + + + + + + + + + ${logDir}/${errorLog}.log + + ${logDir}/${errorLog}.%d{yyyy-MM-dd}.%i.log.zip + + 50MB + 30 + 10GB + + + WARN + + + [%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n + + + + + + + + + ${logDir}/${debugLog}.log + + ${logDir}/${debugLog}.%d{yyyy-MM-dd}.%i.log.zip + + 50MB + 30 + 10GB + + + [%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n + + + + + + + + + ${logDir}/${networkLog}.log + + ${logDir}/${networkLog}.%d{yyyy-MM-dd}.%i.log.zip + + 50MB + 30 + 10GB + + + [%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%t]%m%n + + + + + + + + + + [%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n + + + + + + + + + + + + + + + + + + + + + + + + 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 ce2588546..0f2510586 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 @@ -19,6 +19,18 @@ participant: topics: operationTopic: policy-acruntime-participant syncTopic: acm-ppnt-sync + threadPoolSize: 10 + topicValidation: ${TOPIC_VALIDATION:false} + clampAdminTopics: + servers: + - ${kafkaServer:kafka:9092} + topicCommInfrastructure: ${topicCommInfrastructure:NOOP} + fetchTimeout: 15000 + useHttps: ${kafkaUseHttps:false} + additionalProps: + security.protocol: ${kafkaSecurityProtocol:PLAINTEXT} + sasl.mechanism: ${kafkaSaslMechanism:GSSAPI} + sasl.jaas.config: ${kafkaSaslJaasConfig:} reportingTimeIntervalMs: 120000 description: Participant Http participantId: 101c62b3-8918-41b9-a747-d21eb79c6c01 diff --git a/participant/participant-impl/participant-impl-http/src/main/resources/logback.xml b/participant/participant-impl/participant-impl-http/src/main/resources/logback.xml new file mode 100644 index 000000000..8287d38c4 --- /dev/null +++ b/participant/participant-impl/participant-impl-http/src/main/resources/logback.xml @@ -0,0 +1,114 @@ + + + + + + + + + + + + + ${logDir}/${errorLog}.log + + ${logDir}/${errorLog}.%d{yyyy-MM-dd}.%i.log.zip + + 50MB + 30 + 10GB + + + WARN + + + [%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n + + + + + + + + + ${logDir}/${debugLog}.log + + ${logDir}/${debugLog}.%d{yyyy-MM-dd}.%i.log.zip + + 50MB + 30 + 10GB + + + [%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n + + + + + + + + + ${logDir}/${networkLog}.log + + ${logDir}/${networkLog}.%d{yyyy-MM-dd}.%i.log.zip + + 50MB + 30 + 10GB + + + [%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%t]%m%n + + + + + + + + + + [%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n + + + + + + + + + + + + + + + + + + + + + + + + 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 20bbcb3db..f09e4b6e0 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 @@ -27,6 +27,18 @@ participant: topics: operationTopic: policy-acruntime-participant syncTopic: acm-ppnt-sync + threadPoolSize: 10 + topicValidation: ${TOPIC_VALIDATION:false} + clampAdminTopics: + servers: + - ${kafkaServer:kafka:9092} + topicCommInfrastructure: ${topicCommInfrastructure:NOOP} + fetchTimeout: 15000 + useHttps: ${kafkaUseHttps:false} + additionalProps: + security.protocol: ${kafkaSecurityProtocol:PLAINTEXT} + sasl.mechanism: ${kafkaSaslMechanism:GSSAPI} + sasl.jaas.config: ${kafkaSaslJaasConfig:} reportingTimeIntervalMs: 120000 description: Participant Kserve participantId: 101c62b3-8918-41b9-a747-d21eb79c6c04 diff --git a/participant/participant-impl/participant-impl-kserve/src/main/resources/logback.xml b/participant/participant-impl/participant-impl-kserve/src/main/resources/logback.xml new file mode 100644 index 000000000..8287d38c4 --- /dev/null +++ b/participant/participant-impl/participant-impl-kserve/src/main/resources/logback.xml @@ -0,0 +1,114 @@ + + + + + + + + + + + + + ${logDir}/${errorLog}.log + + ${logDir}/${errorLog}.%d{yyyy-MM-dd}.%i.log.zip + + 50MB + 30 + 10GB + + + WARN + + + [%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n + + + + + + + + + ${logDir}/${debugLog}.log + + ${logDir}/${debugLog}.%d{yyyy-MM-dd}.%i.log.zip + + 50MB + 30 + 10GB + + + [%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n + + + + + + + + + ${logDir}/${networkLog}.log + + ${logDir}/${networkLog}.%d{yyyy-MM-dd}.%i.log.zip + + 50MB + 30 + 10GB + + + [%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%t]%m%n + + + + + + + + + + [%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n + + + + + + + + + + + + + + + + + + + + + + + + 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 ebf74dac7..60d4796d2 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 @@ -28,6 +28,18 @@ participant: topics: operationTopic: policy-acruntime-participant syncTopic: acm-ppnt-sync + threadPoolSize: 10 + topicValidation: ${TOPIC_VALIDATION:false} + clampAdminTopics: + servers: + - ${kafkaServer:kafka:9092} + topicCommInfrastructure: ${topicCommInfrastructure:NOOP} + fetchTimeout: 15000 + useHttps: ${kafkaUseHttps:false} + additionalProps: + security.protocol: ${kafkaSecurityProtocol:PLAINTEXT} + sasl.mechanism: ${kafkaSaslMechanism:GSSAPI} + sasl.jaas.config: ${kafkaSaslJaasConfig:} reportingTimeIntervalMs: 120000 description: Participant k8s participantId: 101c62b3-8918-41b9-a747-d21eb79c6c02 diff --git a/participant/participant-impl/participant-impl-kubernetes/src/main/resources/logback.xml b/participant/participant-impl/participant-impl-kubernetes/src/main/resources/logback.xml new file mode 100644 index 000000000..8287d38c4 --- /dev/null +++ b/participant/participant-impl/participant-impl-kubernetes/src/main/resources/logback.xml @@ -0,0 +1,114 @@ + + + + + + + + + + + + + ${logDir}/${errorLog}.log + + ${logDir}/${errorLog}.%d{yyyy-MM-dd}.%i.log.zip + + 50MB + 30 + 10GB + + + WARN + + + [%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n + + + + + + + + + ${logDir}/${debugLog}.log + + ${logDir}/${debugLog}.%d{yyyy-MM-dd}.%i.log.zip + + 50MB + 30 + 10GB + + + [%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n + + + + + + + + + ${logDir}/${networkLog}.log + + ${logDir}/${networkLog}.%d{yyyy-MM-dd}.%i.log.zip + + 50MB + 30 + 10GB + + + [%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%t]%m%n + + + + + + + + + + [%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n + + + + + + + + + + + + + + + + + + + + + + + + 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 ba2643c6b..7ce3154bf 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 @@ -35,6 +35,18 @@ participant: topics: operationTopic: policy-acruntime-participant syncTopic: acm-ppnt-sync + threadPoolSize: 10 + topicValidation: ${TOPIC_VALIDATION:false} + clampAdminTopics: + servers: + - ${kafkaServer:kafka:9092} + topicCommInfrastructure: ${topicCommInfrastructure:NOOP} + fetchTimeout: 15000 + useHttps: ${kafkaUseHttps:false} + additionalProps: + security.protocol: ${kafkaSecurityProtocol:PLAINTEXT} + sasl.mechanism: ${kafkaSaslMechanism:GSSAPI} + sasl.jaas.config: ${kafkaSaslJaasConfig:} reportingTimeIntervalMs: 120000 description: Participant Policy participantId: 101c62b3-8918-41b9-a747-d21eb79c6c03 diff --git a/participant/participant-impl/participant-impl-policy/src/main/resources/logback.xml b/participant/participant-impl/participant-impl-policy/src/main/resources/logback.xml new file mode 100644 index 000000000..8287d38c4 --- /dev/null +++ b/participant/participant-impl/participant-impl-policy/src/main/resources/logback.xml @@ -0,0 +1,114 @@ + + + + + + + + + + + + + ${logDir}/${errorLog}.log + + ${logDir}/${errorLog}.%d{yyyy-MM-dd}.%i.log.zip + + 50MB + 30 + 10GB + + + WARN + + + [%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n + + + + + + + + + ${logDir}/${debugLog}.log + + ${logDir}/${debugLog}.%d{yyyy-MM-dd}.%i.log.zip + + 50MB + 30 + 10GB + + + [%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n + + + + + + + + + ${logDir}/${networkLog}.log + + ${logDir}/${networkLog}.%d{yyyy-MM-dd}.%i.log.zip + + 50MB + 30 + 10GB + + + [%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%t]%m%n + + + + + + + + + + [%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n + + + + + + + + + + + + + + + + + + + + + + + + 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 d7a88f950..0ad1378df 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 @@ -23,13 +23,17 @@ participant: description: Participant Simulator participantId: ${participantId:101c62b3-8918-41b9-a747-d21eb79c6c90} threadPoolSize: 10 - topicValidation: ${topicValidation:false} + topicValidation: ${TOPIC_VALIDATION:false} clampAdminTopics: servers: - ${kafkaServer:kafka:9092} topicCommInfrastructure: ${topicCommInfrastructure:NOOP} fetchTimeout: 15000 useHttps: ${kafkaUseHttps:false} + additionalProps: + security.protocol: ${kafkaSecurityProtocol:PLAINTEXT} + sasl.mechanism: ${kafkaSaslMechanism:GSSAPI} + sasl.jaas.config: ${kafkaSaslJaasConfig:} clampAutomationCompositionTopics: topicSources: - topic: ${participant.intermediaryParameters.topics.operationTopic} diff --git a/participant/participant-impl/participant-impl-simulator/src/main/resources/logback.xml b/participant/participant-impl/participant-impl-simulator/src/main/resources/logback.xml new file mode 100644 index 000000000..8287d38c4 --- /dev/null +++ b/participant/participant-impl/participant-impl-simulator/src/main/resources/logback.xml @@ -0,0 +1,114 @@ + + + + + + + + + + + + + ${logDir}/${errorLog}.log + + ${logDir}/${errorLog}.%d{yyyy-MM-dd}.%i.log.zip + + 50MB + 30 + 10GB + + + WARN + + + [%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n + + + + + + + + + ${logDir}/${debugLog}.log + + ${logDir}/${debugLog}.%d{yyyy-MM-dd}.%i.log.zip + + 50MB + 30 + 10GB + + + [%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n + + + + + + + + + ${logDir}/${networkLog}.log + + ${logDir}/${networkLog}.%d{yyyy-MM-dd}.%i.log.zip + + 50MB + 30 + 10GB + + + [%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%t]%m%n + + + + + + + + + + [%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n + + + + + + + + + + + + + + + + + + + + + + + +