From: FrancescoFioraEst Date: Thu, 5 Feb 2026 14:17:12 +0000 (+0000) Subject: Remove duplication of logback.xml in ACM runtime X-Git-Tag: 9.0.1~6 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=5d90df15f49d0a7b3bbfda1eeb084a76a3c13ab9;p=policy%2Fclamp.git Remove duplication of logback.xml in ACM runtime Issue-ID: POLICY-5512 Change-Id: I3fcd067221332702eb8e530c31992578b776cd98 Signed-off-by: FrancescoFioraEst --- diff --git a/packages/policy-clamp-docker/src/main/docker/AcmRuntime.Dockerfile b/packages/policy-clamp-docker/src/main/docker/AcmRuntime.Dockerfile index 3ef25f57e..fedfeb6a9 100644 --- a/packages/policy-clamp-docker/src/main/docker/AcmRuntime.Dockerfile +++ b/packages/policy-clamp-docker/src/main/docker/AcmRuntime.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 acm-runtime.sh bin/ COPY --chown=policy:policy /maven/policy-clamp-runtime-acm.jar /app/app.jar RUN pip uninstall -y setuptools || true @@ -61,4 +60,4 @@ EXPOSE 6969 USER policy WORKDIR $POLICY_HOME/bin -ENTRYPOINT [ "./acm-runtime.sh" ] +ENTRYPOINT [ "java", "-jar", "/app/app.jar" ] diff --git a/packages/policy-clamp-docker/src/main/docker/acm-runtime.sh b/packages/policy-clamp-docker/src/main/docker/acm-runtime.sh deleted file mode 100644 index df2a06e80..000000000 --- a/packages/policy-clamp-docker/src/main/docker/acm-runtime.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env sh -# -# ============LICENSE_START======================================================= -# Copyright (C) 2021-2022, 2025,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. -# 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/participant/participant-impl/participant-impl-a1pms/src/main/resources/logback.xml b/participant/participant-impl/participant-impl-a1pms/src/main/resources/logback.xml index 8287d38c4..e7c376d1c 100644 --- a/participant/participant-impl/participant-impl-a1pms/src/main/resources/logback.xml +++ b/participant/participant-impl/participant-impl-a1pms/src/main/resources/logback.xml @@ -19,72 +19,7 @@ SPDX-License-Identifier: Apache-2.0 ============LICENSE_END========================================================= --> - - - - - - - - - - ${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 @@ -96,18 +31,14 @@ - - - - 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 index 8287d38c4..e7c376d1c 100644 --- a/participant/participant-impl/participant-impl-http/src/main/resources/logback.xml +++ b/participant/participant-impl/participant-impl-http/src/main/resources/logback.xml @@ -19,72 +19,7 @@ SPDX-License-Identifier: Apache-2.0 ============LICENSE_END========================================================= --> - - - - - - - - - - ${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 @@ -96,18 +31,14 @@ - - - - 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 index 8287d38c4..e7c376d1c 100644 --- a/participant/participant-impl/participant-impl-kserve/src/main/resources/logback.xml +++ b/participant/participant-impl/participant-impl-kserve/src/main/resources/logback.xml @@ -19,72 +19,7 @@ SPDX-License-Identifier: Apache-2.0 ============LICENSE_END========================================================= --> - - - - - - - - - - ${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 @@ -96,18 +31,14 @@ - - - - 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 index 8287d38c4..e7c376d1c 100644 --- a/participant/participant-impl/participant-impl-kubernetes/src/main/resources/logback.xml +++ b/participant/participant-impl/participant-impl-kubernetes/src/main/resources/logback.xml @@ -19,72 +19,7 @@ SPDX-License-Identifier: Apache-2.0 ============LICENSE_END========================================================= --> - - - - - - - - - - ${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 @@ -96,18 +31,14 @@ - - - - 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 index 8287d38c4..e7c376d1c 100644 --- a/participant/participant-impl/participant-impl-policy/src/main/resources/logback.xml +++ b/participant/participant-impl/participant-impl-policy/src/main/resources/logback.xml @@ -19,72 +19,7 @@ SPDX-License-Identifier: Apache-2.0 ============LICENSE_END========================================================= --> - - - - - - - - - - ${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 @@ -96,18 +31,14 @@ - - - - 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 index 8287d38c4..e7c376d1c 100644 --- a/participant/participant-impl/participant-impl-simulator/src/main/resources/logback.xml +++ b/participant/participant-impl/participant-impl-simulator/src/main/resources/logback.xml @@ -19,72 +19,7 @@ SPDX-License-Identifier: Apache-2.0 ============LICENSE_END========================================================= --> - - - - - - - - - - ${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 @@ -96,18 +31,14 @@ - - - - diff --git a/runtime-acm/src/main/resources/application.yaml b/runtime-acm/src/main/resources/application.yaml index c0e7a142f..1e02a64be 100644 --- a/runtime-acm/src/main/resources/application.yaml +++ b/runtime-acm/src/main/resources/application.yaml @@ -92,6 +92,7 @@ runtime: management: server: port: ${PROMETHEUS_PORT:6970} + base-path: ${PROMETHEUS_PATH:/onap/policy/clamp/acm} tracing: propagation: produce: ${JAEGER_PRODUCER_TYPE:B3} diff --git a/runtime-acm/src/main/resources/logback.xml b/runtime-acm/src/main/resources/logback.xml new file mode 100644 index 000000000..2cfc31812 --- /dev/null +++ b/runtime-acm/src/main/resources/logback.xml @@ -0,0 +1,52 @@ + + + + + + + + + + yyyy-MM-dd'T'HH:mm:ss.SSS+00:00 + ${TIMEZONE} + ${LOGBACK_STATIC_PARAMS} + + + + + + + + + + + + + + + + + + + + +