From 2625de9e904e1389a9d99e5cd90f9f462d0fec72 Mon Sep 17 00:00:00 2001 From: Wojciech Sliwka Date: Fri, 7 Jun 2019 15:53:08 +0200 Subject: Send logs to logstash Removing logback from vid container as it is not used at all Setting eelf variable to read configuration from /tmp/logback.xml -place which is mounted in oom /tmp/logback.xml has logpath set to /var/log/onap/ Change-Id: I8045e1d63f8f2b7574684f0758475555463fe8b1 Issue-ID: VID-485 Signed-off-by: Wojciech Sliwka --- deliveries/src/main/docker/docker-files/Dockerfile | 7 +- .../main/docker/docker-files/conf.d/logback.xml | 371 --------------------- .../docker-files/conf.d/logback_template.xml | 348 ------------------- deliveries/src/main/scripts/localize_logback.sh | 17 - deliveries/src/main/scripts/localize_war.sh | 5 - 5 files changed, 3 insertions(+), 745 deletions(-) delete mode 100755 deliveries/src/main/docker/docker-files/conf.d/logback.xml delete mode 100755 deliveries/src/main/docker/docker-files/conf.d/logback_template.xml delete mode 100755 deliveries/src/main/scripts/localize_logback.sh (limited to 'deliveries/src') diff --git a/deliveries/src/main/docker/docker-files/Dockerfile b/deliveries/src/main/docker/docker-files/Dockerfile index b169aa441..106b8a394 100755 --- a/deliveries/src/main/docker/docker-files/Dockerfile +++ b/deliveries/src/main/docker/docker-files/Dockerfile @@ -4,8 +4,6 @@ FROM tomcat:9.0-jre8-alpine RUN apk update && apk add openjdk8 vim net-tools RUN adduser --disabled-password onap onap -RUN mkdir -p /opt/app -COPY conf.d/ /etc/onap/vid/conf.d/ # MariaDB variables ENV VID_MYSQL_HOST="vid-mariadb-docker-instance" \ @@ -84,7 +82,8 @@ ENV VID_CONTACT_US_LINK="https://todo_contact_us_link.com" \ # Custom options ENV JAVA_OPTS="-Xmx1536m -Xms1536m" -ENV CATALINA_OPTS="-Dvid.keystore.password=${VID_KEYSTORE_PASSWORD} -Dvid.keyalias=vid@vid.onap.org -Dvid.keystore.filename=${VID_KEYSTORE_FILENAME}" +ENV CATALINA_OPTS="-Dvid.keystore.password=${VID_KEYSTORE_PASSWORD} -Dvid.keyalias=vid@vid.onap.org -Dvid.keystore.filename=${VID_KEYSTORE_FILENAME} -Dcom.att.eelf.logging.file=logback.xml -Dcom.att.eelf.logging.path=/tmp" + ADD maven/config/org.onap.vid.jks ${VID_KEYSTORE_FILENAME} ADD maven/config/org.onap.vid.trust.jks ${VID_TRUSTSTORE_FILENAME} @@ -92,7 +91,7 @@ ADD maven/config/server.xml ${VID_TOMCAT_PATH} ADD maven/scripts/*.sh /tmp/vid/ ADD maven/artifacts/vid.war /tmp/vid/stage/ -RUN chown onap:onap /tmp/vid /usr/local/tomcat /etc/onap/vid /opt/app -R +RUN chown onap:onap /tmp/vid /usr/local/tomcat /opt/app -R RUN chmod +x /tmp/vid/localize.sh USER onap CMD ["/tmp/vid/localize.sh"] diff --git a/deliveries/src/main/docker/docker-files/conf.d/logback.xml b/deliveries/src/main/docker/docker-files/conf.d/logback.xml deleted file mode 100755 index 09d241456..000000000 --- a/deliveries/src/main/docker/docker-files/conf.d/logback.xml +++ /dev/null @@ -1,371 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${defaultLoggerPattern} - - - - - - - - - - - - ${logDirectory}/${generalLogName}.log - - - ${logDirectory}/${generalLogName}.%d{yyyy-MM-dd}.log.zip - - - 30 - 3GB - - - - ${applicationLoggerPattern} - - - - - - 256 - - true - - - - - - - - - - - - - - - - - - - ${logDirectory}/${auditLogName}.log - - - ${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.log.zip - - - 30 - 3GB - - - - ${auditLoggerPattern} - - - - 256 - - - - - ${logDirectory}/${metricsLogName}.log - - - ${logDirectory}/${metricsLogName}.%d{yyyy-MM-dd}.log.zip - - - 30 - 3GB - - - - ${metricsLoggerPattern} - - - - - - 256 - - - - - ${logDirectory}/${errorLogName}.log - - - ${logDirectory}/${errorLogName}.%d{yyyy-MM-dd}.log.zip - - - 30 - 3GB - - - - ${errorLoggerPattern} - - - - - 256 - - - - - ${debugLogDirectory}/${debugLogName}.log - - - ${logDirectory}/${debugLogName}.%d{yyyy-MM-dd}.log.zip - - - 30 - 3GB - - - - ${defaultLoggerPattern} - - - - - 256 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/deliveries/src/main/docker/docker-files/conf.d/logback_template.xml b/deliveries/src/main/docker/docker-files/conf.d/logback_template.xml deleted file mode 100755 index 8d92ffebc..000000000 --- a/deliveries/src/main/docker/docker-files/conf.d/logback_template.xml +++ /dev/null @@ -1,348 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${defaultPattern} - - - - - - - - - - - - ${logDirectory}/${generalLogName}.log - - ${logDirectory}/${generalLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${defaultPattern} - - - - - - 256 - - - - - - - - - - - - - - - - - - - ${logDirectory}/${auditLogName}.log - - ${logDirectory}/${auditLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${defaultPattern} - - - - 256 - - - - - ${logDirectory}/${metricsLogName}.log - - ${logDirectory}/${metricsLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - - ${defaultPattern} - - - - - - 256 - - - - - ${logDirectory}/${errorLogName}.log - - ${logDirectory}/${errorLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${defaultPattern} - - - - - 256 - - - - - ${debugLogDirectory}/${debugLogName}.log - - ${debugLogDirectory}/${debugLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${debugLoggerPattern} - - - - - 256 - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/deliveries/src/main/scripts/localize_logback.sh b/deliveries/src/main/scripts/localize_logback.sh deleted file mode 100755 index 90ce883cc..000000000 --- a/deliveries/src/main/scripts/localize_logback.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -BASE_DIR=/etc/onap/vid/conf.d -FINAL_CONFIG_FILE=${BASE_DIR}/logback.xml -TEMPLATE_CONFIG_FILE=${BASE_DIR}/logback_template.xml - -echo "Localizing the VID logback configuration" - -mkdir -p "${VID_LOG_DIR}" - -sed -e 's/${VID_LOG_LEVEL}/'${VID_LOG_LEVEL}'/g' \ - -e 's,${VID_LOG_DIR},'${VID_LOG_DIR}',g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || { - echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}" - exit 3 - } - -echo "Localized ${FINAL_CONFIG_FILE} successfully." diff --git a/deliveries/src/main/scripts/localize_war.sh b/deliveries/src/main/scripts/localize_war.sh index 53a928e84..29cdc5137 100755 --- a/deliveries/src/main/scripts/localize_war.sh +++ b/deliveries/src/main/scripts/localize_war.sh @@ -1,10 +1,5 @@ #!/bin/bash -source /tmp/vid/localize_logback.sh || { - echo "ERROR: Localizing logback.xml failed" - exit 1 -} - source /tmp/vid/localize_portal.sh $1 || { echo "ERROR: Localizing portal.properties failed" exit 1 -- cgit 1.2.3-korg