mvn clean install
```
-### Docker Image
+### Running Locally
+Build the image (it will go into your local docker repository)
```
-git clone ssh://vv770d@gerrit.onap.org:29418/dcaegen2/collectors/ves
-mvn clean deploy
+mvn clean package
+```
+
+Run the image using docker-compose.yml
+```
+docker-compose up
```
+### Environment variables in Docker Container
+Most of the configuration of how VESCollector should be started and managed is done through environment variables.
+Some of them are set during the image build process and some of them are defined manually or by
+a particular deployment system.
+
+Variables set manually / coming from deployment system:
+- COLLECTOR_IP
+- DMAAPHOST - should contain an address to DMaaP, so that event publishing can work
+- CBSPOLLTIMER - it should be put in here if we want to automatically fetch configuration from CBS.
+- CONSUL_HOST - used with conjunction with CBSPOLLTIMER, should be a host address (without port! e.g http://my-ip-or-host) where Consul service lies
+- CONFIG_BINDING_SERVICE - used with conjunction with CBSPOLLTIMER, should be a name of CBS as it is registered in Consul
+- HOSTNAME - used with conjunction with CBSPOLLTIMER, should be a name of VESCollector application as it is registered in CBS catalog
+
+### Docker file system layout
+The main directory where all code resides in docker container
+looks like this and is located in /opt/app/VESCollector
+```
+<host>:/opt/app/VESCollector# ls
+Dockerfile bin etc lib logs specs tomcat.8080
+```
+- bin contains sh scripts (path here is denoted by env var $SCRIPTS_PATH)
+- etc contains various application configuration, most notably it reflects 'etc' directory from repository
+- lib contains all libraries that are pulled into the app during maven build
+- logs contains all application logs, especially collector.log file which is a main log file denoted by $MAIN_LOG_FILE variable
+- specs contains json schemas specs for ves-collector
+
+## Managing application in Docker container
+Scripts directory contain .sh scripts that are used to start & stop & configure the VESCollector application
+inside the docker image.
+These scripts are packaged inside the docker image by a mvn assembly & docker plugins.
+
+## How the application starts inside container
+General flow goes like this
+- Docker image is build, and it points docker-entry.sh as the entrypoint.
+- Docker-entry point, depending on the deployment type,
+configures a bunch of things and starts the application in a separate process
+and loops indefinitely to hold the docker container process.
+
+### Release images
For R1 - image/version pushed to nexus3
```
nexus3.onap.org:10003/snapshots/onap/org.onap.dcaegen2.collectors.ves.vescollector 1.1
<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
<param name="threshold" value="INFO" />
<layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="[%d{ABSOLUTE}][%-5p][%-10t]%m%n" />
- </layout>
- </appender>
-
- <appender name="FILE" class="org.apache.log4j.RollingFileAppender">
- <param name="threshold" value="INFO" />
- <param name="File" value="logs/collector.log" />
- <param name="MaxFileSize" value="32MB"/>
- <param name="MaxBackupIndex" value="20"/>
- <layout class="org.apache.log4j.PatternLayout">
- <!-- param name="ConversionPattern" value="[%d{ABSOLUTE}][%-5p][%-10t][%-5c][%4L]%m%n" / -->
- <param name="ConversionPattern" value="[%d{ISO8601}][%-5p][%-10t][%-5c]%m%n" />
+ <param name="ConversionPattern" value="[%d{ISO8601}][%-5p][%-10t][%c] - %m%n"/>
</layout>
</appender>
<param name="MaxFileSize" value="32MB"/>
<param name="MaxBackupIndex" value="10"/>
<layout class="org.apache.log4j.PatternLayout">
- <!-- param name="ConversionPattern" value="[%d{ABSOLUTE}][%-5p][%-10t][%-5c][%4L]%m%n" / -->
<param name="ConversionPattern" value="[%d{ISO8601}][%-5p][%-10t][%-5c]%m%n" />
</layout>
</appender>
<param name="MaxFileSize" value="32MB"/>
<param name="MaxBackupIndex" value="10"/>
<layout class="org.apache.log4j.PatternLayout">
- <!-- param name="ConversionPattern" value="[%d{ABSOLUTE}][%-5p][%-10t][%-5c][%4L]%m%n" / -->
<param name="ConversionPattern" value="[%d{ISO8601}][%-5p][%-10t][%-5c]%m%n" />
</layout>
</appender>
-
+
<appender name="EFILE" class="org.apache.log4j.RollingFileAppender">
<param name="threshold" value="INFO" />
<param name="File" value="logs/error.log" />
<param name="MaxFileSize" value="32MB"/>
<param name="MaxBackupIndex" value="5"/>
<layout class="org.apache.log4j.PatternLayout">
- <!-- param name="ConversionPattern" value="[%d{ABSOLUTE}][%-5p][%-10t][%-5c][%4L]%m%n" / -->
<param name="ConversionPattern" value="[%d{ISO8601}][%-5p][%-10t][%-5c]%m%n" />
</layout>
</appender>
-
+
<!--
ECOMP logging setup
-
+
NOTES:
-
+
1. files are written to "./logs/<filename>". You must setup the environment
so that ./logs is a symlink to the correct location according to the ECOMP
log standard. For example, "/opt/logs/DCAE/highlandParkVcScope". If that's
not possible, change the File setting in each appender appropriately.
-->
-
<appender name="ECOMP_AUDIT" class="org.apache.log4j.RollingFileAppender">
<param name="threshold" value="DEBUG" />
<param name="File" value="./logs/ecomp/audit.log" />
<logger name="org.onap.dcae.commonFunction.EventPublisher" additivity="false">
<level value="debug"/>
<appender-ref ref="CONSOLE" />
- <appender-ref ref="FILE" />
</logger>
-
<logger name="com.att.nsa.apiClient.http.HttpClient" additivity="false">
<level value="info"/>
- <appender-ref ref="FILE" />
<appender-ref ref="CONSOLE" />
</logger>
<logger name="com.att.nsa.cambria.client.impl.CambriaSimplerBatchPublisher" additivity="false">
<level value="info"/>
- <appender-ref ref="FILE" />
<appender-ref ref="CONSOLE" />
</logger>
<root>
<level value="DEBUG" />
- <appender-ref ref="FILE" />
<appender-ref ref="CONSOLE" />
<appender-ref ref="ECOMP_AUDIT" />
<appender-ref ref="ECOMP_DEBUG" />
--- /dev/null
+/opt/app/VESCollector/logs/collector.log {
+ size 64M
+ rotate 10
+ copytruncate
+ dateext
+ dateformat .%Y-%m-%dT%H:%M:%S
+}
\ No newline at end of file
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<imageTags>
<tag>latest</tag>
</imageTags>
-
<baseImage>openjdk:8-jre-slim</baseImage>
<env>
<HOSTALIASES>/etc/host.aliases</HOSTALIASES>
</resources>
<runs>
<run>chmod +x bin/*.sh</run> <!-- Maven is loosing file permissions during artifacts copy -->
+ <run>
+ <![CDATA[apt-get update && apt-get install -y --no-install-recommends logrotate && apt-get clean all]]>
+ </run>
+ <run>chmod 0644 etc/logrotate.conf</run>
</runs>
<exposes>
<expose>8080</expose>
</goals>
<configuration>
<image>${docker.image.name}:latest</image>
- <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}</newName>
+ <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}
+ </newName>
<pushImage>true</pushImage>
</configuration>
</execution>
</goals>
<configuration>
<image>${docker.image.name}:latest</image>
- <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}-${maven.build.timestamp}Z</newName>
+ <newName>
+ ${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}-${maven.build.timestamp}Z
+ </newName>
<pushImage>true</pushImage>
</configuration>
</execution>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>with-system-proxy</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <configuration>
+ <buildArgs>
+ <http_proxy>${env.http_proxy}</http_proxy>
+ </buildArgs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
<reporting>
<plugins>
<plugin>
-#!/bin/sh\r
+#!/bin/bash\r
\r
###\r
# ============LICENSE_START=======================================================\r
# PROJECT\r
# ================================================================================\r
# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.\r
+# Copyright (C) 2018 Nokia Networks Intellectual Property. All rights reserved.\r
# ================================================================================\r
# Licensed under the Apache License, Version 2.0 (the "License");\r
# you may not use this file except in compliance with the License.\r
# limitations under the License.\r
# ============LICENSE_END=========================================================\r
###\r
+source bin/logger.sh\r
\r
-# redirect stdout/stderr to a file\r
-#exec &> /opt/app/VESCollector/logs/console.txt\r
+start() {\r
+ log "Starting application"\r
+ appPids=`pidof java`\r
\r
-usage() {\r
- echo "VESrestfulCollector.sh <start/stop>"\r
+ if [ ! -z ${appPids} ]; then\r
+ logWarn "Tried to start an application, but it is already running on PID(s): ${appPids}. Startup aborted."\r
+ exit 1\r
+ fi\r
+\r
+ ${JAVA_HOME}/bin/java -cp "etc:lib/*" \\r
+ -Xms256m -Xmx512m \\r
+ -XX:ErrorFile=logs/java_error%p.log \\r
+ -XX:+HeapDumpOnOutOfMemoryError \\r
+ -Dhttps.protocols=TLSv1.1,TLSv1.2 \\r
+ org.onap.dcae.commonFunction.CommonStartup $* & &>> logs/collector.log\r
}\r
\r
+stop() {\r
+ log "Stopping application"\r
+ appPids=`pidof java`\r
\r
-BASEDIR=/opt/app/VESCollector/\r
-\r
-collector_start() {\r
- echo `date +"%Y%m%d.%H%M%S%3N"` - collector_start | tee -a ${BASEDIR}/logs/console.txt\r
- collectorPid=`pidof org.onap.dcae.commonFunction`\r
-\r
- if [ ! -z "$collectorPid" ]; then\r
- echo "WARNING: VES Restful Collector already running as PID $collectorPid" | tee -a ${BASEDIR}/logs/console.txt\r
- echo "Startup Aborted!!!" | tee -a ${BASEDIR}/logs/console.txt\r
- exit 1\r
- fi\r
-\r
-\r
- # run java. The classpath is the etc dir for config files, and the lib dir\r
- # for all the jars.\r
- #cd /opt/app/VESCollector/\r
- cd ${BASEDIR}\r
- #nohup $JAVA -cp "etc${PATHSEP}lib/*" $JAVA_OPTS -Dhttps.protocols=TLSv1.1,TLSv1.2 $MAINCLASS $* &\r
- nohup $JAVA -cp "etc${PATHSEP}lib/*" -Xms256m -Xmx512m -XX:ErrorFile=/opt/app/VESCollector/logs/java_error%p.log -XX:+HeapDumpOnOutOfMemoryError -Dhttps.protocols=TLSv1.1,TLSv1.2 $MAINCLASS $* &\r
- if [ $? -ne 0 ]; then\r
- echo "VES Restful Collector has been started!!!" | tee -a ${BASEDIR}/logs/console.txt\r
+ if [ ! -z ${appPids} ]; then\r
+ echo "Killing java PID(s): ${appPids}"\r
+ kill -9 ${appPids}\r
+ sleep 5\r
+ if [ ! $(pidof java) ]; then\r
+ log "Application stopped"\r
+ else\r
+ logWarn "Application did not stop after 5 seconds"\r
fi\r
-\r
-\r
-}\r
-\r
-collector_stop() {\r
- echo `date +"%Y%m%d.%H%M%S%3N"` - collector_stop\r
- collectorPid=`pidof org.onap.dcae.commonFunction`\r
- if [ ! -z "$collectorPid" ]; then\r
- echo "Stopping PID $collectorPid"\r
-\r
- kill -9 $collectorPid\r
- sleep 5\r
- if [ ! "$(pidof org.onap.dcae.commonFunction)" ]; then\r
- echo "VES Restful Collector has been stopped!!!"\r
- else\r
- echo "VES Restful Collector is being stopped!!!"\r
- fi\r
- else\r
- echo "WARNING: No VES Collector instance is currently running";\r
- exit 1\r
- fi\r
-\r
-\r
+ else\r
+ logWarn "Tried to stop an application, but it was not running";\r
+ fi\r
}\r
\r
collector_configupdate() {\r
+ if [ -z ${CONSUL_HOST} ] || [ -z ${CONFIG_BINDING_SERVICE} ] || [ -z ${HOSTNAME} ]; then\r
+ log "Using standard controller configuration (no dynamic configuration done)"\r
+ else\r
+ ${JAVA_HOME}/bin/java -cp "etc:lib/*" org.onap.dcae.controller.FetchDynamicConfig $*\r
\r
- echo `date +"%Y%m%d.%H%M%S%3N"` - collector_configupdate\r
- if [ -z "$CONSUL_HOST" ] || [ -z "$CONFIG_BINDING_SERVICE" ] || [ -z "$HOSTNAME" ]; then\r
- echo "INFO: USING STANDARD CONTROLLER CONFIGURATION"\r
+ if [ $? -ne 0 ]; then\r
+ logWarn "Failed to fetch dynamic configuration from consul into container /opt/app/KV-Configuration.json"\r
else\r
+ log "Dynamic config fetched and written successfully into container /opt/app/KV-Configuration.json"\r
+ fi\r
\r
- echo "INFO: DYNAMIC CONFIG INTERFACE SUPPORTED"\r
- # move into base directory\r
-\r
- #BASEDIR=`dirname $0`\r
- #cd $BASEDIR/..\r
- cd /opt/app/VESCollector\r
-\r
- CONFIG_FETCH=org.onap.dcae.controller.FetchDynamicConfig\r
- $JAVA -cp "etc${PATHSEP}lib/*" $CONFIG_FETCH $*\r
+ if [ -f /opt/app/KV-Configuration.json ]; then\r
+ ${JAVA_HOME}/bin/java -cp "etc:lib/*" org.onap.dcae.controller.LoadDynamicConfig $*\r
if [ $? -ne 0 ]; then\r
- echo "ERROR: Failed to fetch dynamic configuration from consul into container /opt/app/KV-Configuration.json"\r
- else\r
- echo "INFO: Dynamic config fetched and written successfully into container /opt/app/KV-Configuration.json"\r
- fi\r
-\r
-\r
- if [ -f /opt/app/KV-Configuration.json ]; then\r
-\r
- CONFIG_UPDATER=org.onap.dcae.controller.LoadDynamicConfig\r
- $JAVA -cp "etc${PATHSEP}lib/*" $CONFIG_UPDATER $*\r
- if [ $? -ne 0 ]; then\r
- echo "ERROR: Failed to update dynamic configuration into Application"\r
- else\r
- echo "INFO: Dynamic config updated successfully into VESCollector configuration!"\r
- fi\r
-\r
- # Identify alias names from keystore and password provided\r
-\r
- paramName="collector.keystore.alias"\r
- localpropertyfile="/opt/app/VESCollector/etc/collector.properties"\r
- tmpfile="/opt/app/VESCollector/etc/collector.properties.tmp"\r
-\r
- keystore=`grep collector.keystore.file.location $localpropertyfile | tr -d '[:space:]' | cut -d"=" -f2`\r
- keypwdfile=`grep collector.keystore.passwordfile $localpropertyfile | tr -d '[:space:]' | cut -d"=" -f2`\r
-\r
- echo "/usr/bin/keytool -list -keystore $keystore < $keypwdfile | grep "PrivateKeyEntry" | cut -d"," -f1"\r
- tmpalias=`/usr/bin/keytool -list -keystore $keystore < $keypwdfile | grep "PrivateKeyEntry" | cut -d"," -f1`\r
- echo "tmpalias:" $tmpalias\r
- alias=`echo $tmpalias | cut -d":" -f2`\r
- echo "alias:" $alias\r
- sed "s~$paramName=.*~$paramName=$alias~g" $localpropertyfile > $tmpfile\r
- echo `cat $tmpfile > $localpropertyfile`\r
- rm $tmpfile\r
- echo "INFO: Keystore alias updated into configuration"\r
-\r
+ echo "ERROR: Failed to update dynamic configuration into Application"\r
else\r
- echo "ERROR: Configuration file /opt/app/KV-Configuration.json missing"\r
+ echo "INFO: Dynamic config updated successfully into VESCollector configuration!"\r
fi\r
-\r
+ paramName="collector.keystore.alias"\r
+ localpropertyfile="etc/collector.properties"\r
+ tmpfile="etc/collector.properties.tmp"\r
+ keystore=`grep collector.keystore.file.location $localpropertyfile | tr -d '[:space:]' | cut -d"=" -f2`\r
+ keypwdfile=`grep collector.keystore.passwordfile $localpropertyfile | tr -d '[:space:]' | cut -d"=" -f2`\r
+ echo "/usr/bin/keytool -list -keystore $keystore < $keypwdfile | grep "PrivateKeyEntry" | cut -d"," -f1"\r
+ tmpalias=`/usr/bin/keytool -list -keystore $keystore < $keypwdfile | grep "PrivateKeyEntry" | cut -d"," -f1`\r
+ alias=`echo $tmpalias | cut -d":" -f2`\r
+ sed "s~$paramName=.*~$paramName=$alias~g" $localpropertyfile > $tmpfile\r
+ echo `cat $tmpfile > $localpropertyfile`\r
+ rm $tmpfile\r
+ log "Keystore alias updated"\r
+ else\r
+ logWarn "Configuration file /opt/app/KV-Configuration.json missing"\r
fi\r
+ fi\r
}\r
\r
-\r
-## Check usage\r
-if [ $# -ne 1 ]; then\r
- usage\r
- exit\r
-fi\r
-\r
-\r
-## Pre-setting\r
-\r
-# use JAVA_HOME if provided\r
-if [ -z "$JAVA_HOME" ]; then\r
- echo "ERROR: JAVA_HOME not setup"\r
- echo "Startup Aborted!!"\r
- exit 1\r
- #JAVA=java\r
-else\r
- JAVA=$JAVA_HOME/bin/java\r
-fi\r
-\r
-\r
-MAINCLASS=org.onap.dcae.commonFunction.CommonStartup\r
-\r
-# determine a path separator that works for this platform\r
-PATHSEP=":"\r
-case "$(uname -s)" in\r
-\r
- Darwin)\r
- ;;\r
-\r
- Linux)\r
- ;;\r
-\r
- CYGWIN*|MINGW32*|MSYS*)\r
- PATHSEP=";"\r
- ;;\r
-\r
- *)\r
- ;;\r
-esac\r
-\r
-\r
-\r
-\r
case $1 in\r
- "start")\r
- collector_configupdate | tee -a ${BASEDIR}/logs/console.txt\r
- collector_start\r
- ;;\r
- "stop")\r
- collector_stop | tee -a ${BASEDIR}/logs/console.txt\r
- ;;\r
- *)\r
- usage\r
- ;;\r
+ "start") collector_configupdate; start ;;\r
+ "stop") stop ;;\r
+ *) echo "Bad usage. Should be: /bin/bash <this> start/stop"\r
esac\r
\r
+++ /dev/null
-###
-# ============LICENSE_START=======================================================
-# PROJECT
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. 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.
-# ============LICENSE_END=========================================================
-###
-
-#!/bin/sh
-
-#secPid=`pgrep -f com.att.dcae.commonFunction.CommonStartup` --> master
-secPid=`pgrep -f org.onap.dcae.commonFunction.CommonStartup`
-
-
-if [ "${secPid}" ]
-then
- #errorcnt = `grep -c "CambriaSimplerBatchPublisher - Send failed" ../logs/collector.log`
- errorcnt=`tail -1000 ../logs/collector.log | grep -c "CambriaSimplerBatchPublisher - Send failed"`
-
- if [ $errorcnt -gt 10 ]
- then
- echo "VESCollecter_Is_HavingError to publish"
- else
- echo "VESCollecter_Is_Running as PID $secPid"
- fi
-else
- echo "VESCollecter_Is_Not_Running"
-fi
-exit
-#!/bin/sh\r
+#!/bin/bash\r
###\r
# ============LICENSE_START=======================================================\r
# PROJECT\r
# ================================================================================\r
# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.\r
+# Copyright (C) 2018 Nokia Networks Intellectual Property. All rights reserved.\r
# ================================================================================\r
# Licensed under the Apache License, Version 2.0 (the "License");\r
# you may not use this file except in compliance with the License.\r
# limitations under the License.\r
# ============LICENSE_END=========================================================\r
###\r
+source bin/logger.sh\r
\r
-if [ ! -z "$COLLECTOR_IP" ]; then\r
- echo $COLLECTOR_IP $(hostname).dcae.simpledemo.onap.org >> /etc/hosts\r
-fi\r
+# Redirect all stdout & stderr to a main log file, but also let it print into the console\r
+# At the time this script is invoked, these directories and files do not exist yet, so we need to create them\r
+mkdir -p logs\r
+touch logs/collector.log\r
+exec &> >(tee -a logs/collector.log)\r
\r
-if [ ! -z "$DMAAPHOST" ]; then\r
- if [ -z "$(echo $DMAAPHOST | sed -e 's/[0-9\.]//g')" ]; then \r
- echo "$DMAAPHOST onap-dmaap" >> /etc/hosts\r
- else\r
- echo "onap-dmaap $DMAAPHOST" >> /etc/host.aliases\r
- fi\r
-else\r
- echo "DMAAPHOST ENV NOT SET!! PUBLISH WILL NOT BE SUPPORTED"\r
+log "Enabling log rotation for collector.log"\r
+loggedCommand "cp etc/logrotate.conf /etc/logrotate.d"\r
+echo "* * * * * root logrotate /etc/logrotate.conf" >> /etc/crontab\r
+log "Restarting cron"\r
+loggedCommand "service cron reload"\r
+loggedCommand "service cron start"\r
+\r
+log "Main application entry-point invoked"\r
+\r
+if [ ! -z ${COLLECTOR_IP} ]; then\r
+ log "Collector ip (${COLLECTOR_IP}) (env var 'COLLECTOR_IP') found, adding entry to /etc/hosts"\r
+ echo ${COLLECTOR_IP} $(hostname).dcae.simpledemo.onap.org >> /etc/hosts\r
fi\r
\r
-if [ -z "$CONSUL_HOST" ] || [ -z "$CONFIG_BINDING_SERVICE" ] || [ -z "$HOSTNAME" ]; then\r
- echo "INFO: USING STANDARD ALONE CONFIGURATION SETUP"\r
- ## For Container supporting both classic and GEN2 controller - below line should be uncommented, provided service manager package is included\r
- #/opt/app/manager/start-manager.sh\r
+if [ ! -z ${DMAAPHOST} ]; then\r
+ if [ -z "$(echo ${DMAAPHOST} | sed -e 's/[0-9\.]//g')" ]; then\r
+ log "DMaaP host (${DMAAPHOST}) (env var 'DMAAPHOST') found, adding entry to /etc/hosts"\r
+ echo "${DMAAPHOST} onap-dmaap" >> /etc/hosts\r
+ else\r
+ log "DMaaP host (${DMAAPHOST}) (env var 'DMAAPHOST') found, adding entry to /etc/host.aliases"\r
+ echo "onap-dmaap ${DMAAPHOST}" >> /etc/host.aliases\r
+ fi\r
else\r
- echo "INFO: USING DCAEGEN2 CONTROLLER"\r
+ logWarn "DMaaP host (env var 'DMAAPHOST') is missing. Events will not be published to DMaaP"\r
fi\r
\r
-/opt/app/VESCollector/bin/VESrestfulCollector.sh stop\r
-/opt/app/VESCollector/bin/VESrestfulCollector.sh start &\r
+log "Scheduling application to be started, looping indefinitely to hold the docker process"\r
+bin/VESrestfulCollector.sh stop\r
+bin/VESrestfulCollector.sh start &\r
\r
-# Add below if config polling should be enabled\r
-# More specific to K8 deployment in ONAP\r
-if [ ! -z "$CBSPOLLTIMER" ]; then\r
- /opt/app/VESCollector/bin/VESConfigPoller.sh &\r
+# Add below if config polling should be enabled. More specific to K8 deployment in ONAP\r
+if [ ! -z ${CBSPOLLTIMER} ]; then\r
+ log "Configuration poll time (${CBSPOLLTIMER}) (env var 'CBSPOLLTIMER') found, enabling configuration polling from CBS"\r
+ bin/VESConfigPoller.sh &\r
fi\r
\r
while true; do sleep 1000; done\r
--- /dev/null
+#!/bin/bash
+###
+# ============LICENSE_START=======================================================
+# PROJECT
+# ================================================================================
+# Copyright (C) 2018 Nokia Networks Intellectual Property. 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.
+# ============LICENSE_END=========================================================
+###
+
+log() {
+ logMessage "INFO " "$1"
+}
+
+logWarn() {
+ logMessage "WARN " "$1"
+}
+
+logError() {
+ logMessage "ERROR" "$1"
+}
+
+# Mimics log4j formatter so log files are consistent
+logMessage() {
+ echo "[$(date -u +'%Y-%m-%d %H:%M:%S,%3N')][$1][$(printf "%-9s %s\n" "PID $$")][$0] - $2"
+}
+
+# Run command, catch all the stdout and stderr and based on whether it succeeded, take the output,
+# and log them using common formatter.
+# It is done, so that the log files could be consistent and not look like swiss cheese having
+# nicely formatted lines surrounded with raw command outputs
+# All log lines that are logged by those external comments are prepended with (ext process) so they
+# can be distinguished from hand-rolled messages
+loggedCommand() {
+ output=$($1 2>&1)
+ if [ ! -z "${output}" ]; then
+ if [ $? -eq 0 ]; then
+ while read -r line; do
+ log "(ext process) $line"
+ done <<< "$output"
+ else
+ while read -r line; do
+ logError "(ext process) $line"
+ done <<< "$output"
+ fi
+ fi
+}
\ No newline at end of file
# PROJECT
# ================================================================================
# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2018 Nokia Networks Intellectual Property. 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.
# limitations under the License.
# ============LICENSE_END=========================================================
###
+source bin/logger.sh
-
-if [ -z "$CONSUL_HOST" ] || [ -z "$CONFIG_BINDING_SERVICE" ] || [ -z "$HOSTNAME" ]; then
- echo "INFO: USING STANDARD CONTROLLER"
- /opt/app/manager/start-manager.sh
+if [ -z ${CONSUL_HOST} ] || [ -z ${CONFIG_BINDING_SERVICE} ] || [ -z ${HOSTNAME} ]; then
+ log "Using standard controller (start-manager.sh)"
+ /opt/app/manager/start-manager.sh
else
- echo "INFO: USING DCAEGEN2 CONTROLLER"
- /opt/app/VESCollector/bin/VESrestfulCollector.sh stop
- /opt/app/VESCollector/bin/VESrestfulCollector.sh start &
-fi
-#while true; do sleep 1000; done
+ log "Using DCAEGEN2 controller (VESrestfulCollector.sh)"
+ bin/VESrestfulCollector.sh stop
+ bin/VESrestfulCollector.sh start &
+fi
\ No newline at end of file
+++ /dev/null
-#!/bin/bash
-
-###
-# ============LICENSE_START=======================================================
-# PROJECT
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. 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.
-# ============LICENSE_END=========================================================
-###
-
-
-IMAGE="dcae-controller-ves-collector"
-VER="latest"
-HOST=$(hostname)
-NAME="ves-collector-$HOST"
-HOST=$(hostname -f)
-
-HOST_VM_LOGDIR="/var/log/${HOST}-docker"
-
-CMD="/bin/bash"
-# remove the imate, interactive terminal, map exposed port
-set -x
-#docker run -d -p 8080:8080/tcp -p 8443:8443/tcp -P --name ${NAME} ${IMAGE}:${VER}
-#docker run -td --name ${NAME} ${IMAGE}:${VER} ${CMD}
-#docker run -td --name ${NAME} ${IMAGE}:${VER}
-docker run -td -p 8080:8080/tcp -p 8443:8443/tcp -P --name ${NAME} ${IMAGE}:${VER} ${CMD}
-
+++ /dev/null
-#!/bin/bash
-
-###
-# ============LICENSE_START=======================================================
-# PROJECT
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. 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.
-# ============LICENSE_END=========================================================
-###
-
-
-IMAGE="dcae-controller-ves-collector"
-VER="latest"
-HOST=$(hostname)
-NAME="ves-collector-$HOST"
-HOST=$(hostname -f)
-CMD="/bin/bash"
-
-HOST_VM_LOGDIR="/var/log/${HOST}-docker-${IMAGE}"
-
-# remove the imate, interactive terminal, map exposed port
-set -x
-docker run --rm -it -v ${HOST_VM_LOGDIR}/manager_ves-collector:/opt/app/manager/logs \
- -v ${HOST_VM_LOGDIR}/VEScollector:/opt/app/VEScollector/logs \
- -v /etc/dcae:/etc/dcae \
- --name ${NAME} ${IMAGE}:${VER} \
- ${CMD}
Code Review / dcaegen2 / collectors / ves.git / commitdiff