diff --git a/doc/cygnus-ngsi/installation_and_administration_guide/install_with_docker.md b/doc/cygnus-ngsi/installation_and_administration_guide/install_with_docker.md index 3dbe37027..4526de449 100644 --- a/doc/cygnus-ngsi/installation_and_administration_guide/install_with_docker.md +++ b/doc/cygnus-ngsi/installation_and_administration_guide/install_with_docker.md @@ -158,14 +158,14 @@ As seen above, the default configuration distributed with the image is tied to c * Multiagent: * Enable multiagent cygnus: CYGNUS_MULTIAGENT environment variable. If enabled, each sink will run in a diferent port: -| sink | port | -|--:|--:| -| mysql | 5050 | -| mongo | 5051 | -| ckan | 5052 | -| hdfs | 5053 | -| postgresql | 5054 | -| cartodb | 5055 | +| sink | port | admin_port | +|--:|--:|--:| +| mysql | 5050 | 5080 | +| mongo | 5051 | 5081 | +| ckan | 5052 | 5082 | +| hdfs | 5053 | 5083 | +| postgresql | 5054 | 5084 | +| cartodb | 5055 | 5085 | * MySQL: diff --git a/docker/cygnus-ngsi/Dockerfile b/docker/cygnus-ngsi/Dockerfile index aace4ad83..b48b02107 100644 --- a/docker/cygnus-ngsi/Dockerfile +++ b/docker/cygnus-ngsi/Dockerfile @@ -30,7 +30,7 @@ ENV CYGNUS_AGENT_NAME "cygnus-ngsi" ENV CYGNUS_LOG_LEVEL "INFO" ENV CYGNUS_LOG_APPENDER "console" ENV CYGNUS_SERVICE_PORT "5050" -ENV CYGNUS_API_PORT "5081" +ENV CYGNUS_API_PORT "5080" ENV CYGNUS_MULTIAGENT false # These variables are optional ENV variables to docker runtime diff --git a/docker/cygnus-ngsi/cygnus-entrypoint.sh b/docker/cygnus-ngsi/cygnus-entrypoint.sh index 0788fff44..75249a395 100755 --- a/docker/cygnus-ngsi/cygnus-entrypoint.sh +++ b/docker/cygnus-ngsi/cygnus-entrypoint.sh @@ -74,7 +74,7 @@ if [ "$CYGNUS_MYSQL_HOST" != "" ]; then if [ "${CYGNUS_MULTIAGENT,,}" == "true" ]; then # Run the Cygnus command - ${FLUME_HOME}/bin/cygnus-flume-ng agent --conf ${CYGNUS_CONF_PATH} -f ${FLUME_HOME}/conf/${AGENT_CONF_FILE} -n ${CYGNUS_AGENT_NAME} -p 5081 -Dflume.root.logger=${CYGNUS_LOG_LEVEL},${CYGNUS_LOG_APPENDER} -Duser.timezone=UTC -Dfile.encoding=UTF-8 & + ${FLUME_HOME}/bin/cygnus-flume-ng agent --conf ${CYGNUS_CONF_PATH} -f ${FLUME_HOME}/conf/${AGENT_CONF_FILE} -n ${CYGNUS_AGENT_NAME} -p 5080 -Dflume.root.logger=${CYGNUS_LOG_LEVEL},${CYGNUS_LOG_APPENDER} -Duser.timezone=UTC -Dfile.encoding=UTF-8 & fi fi @@ -179,7 +179,7 @@ if [ "$CYGNUS_MONGO_HOSTS" != "" ]; then if [ "${CYGNUS_MULTIAGENT,,}" == "true" ]; then # Run the Cygnus command - ${FLUME_HOME}/bin/cygnus-flume-ng agent --conf ${CYGNUS_CONF_PATH} -f ${FLUME_HOME}/conf/${AGENT_CONF_FILE} -n ${CYGNUS_AGENT_NAME} -p 5082 -Dflume.root.logger=${CYGNUS_LOG_LEVEL},${CYGNUS_LOG_APPENDER} -Duser.timezone=UTC -Dfile.encoding=UTF-8 & + ${FLUME_HOME}/bin/cygnus-flume-ng agent --conf ${CYGNUS_CONF_PATH} -f ${FLUME_HOME}/conf/${AGENT_CONF_FILE} -n ${CYGNUS_AGENT_NAME} -p 5081 -Dflume.root.logger=${CYGNUS_LOG_LEVEL},${CYGNUS_LOG_APPENDER} -Duser.timezone=UTC -Dfile.encoding=UTF-8 & fi fi @@ -233,7 +233,7 @@ if [ "$CYGNUS_CKAN_HOST" != "" ]; then if [ "${CYGNUS_MULTIAGENT,,}" == "true" ]; then # Run the Cygnus command - ${FLUME_HOME}/bin/cygnus-flume-ng agent --conf ${CYGNUS_CONF_PATH} -f ${FLUME_HOME}/conf/${AGENT_CONF_FILE} -n ${CYGNUS_AGENT_NAME} -p 5083 -Dflume.root.logger=${CYGNUS_LOG_LEVEL},${CYGNUS_LOG_APPENDER} -Duser.timezone=UTC -Dfile.encoding=UTF-8 & + ${FLUME_HOME}/bin/cygnus-flume-ng agent --conf ${CYGNUS_CONF_PATH} -f ${FLUME_HOME}/conf/${AGENT_CONF_FILE} -n ${CYGNUS_AGENT_NAME} -p 5082 -Dflume.root.logger=${CYGNUS_LOG_LEVEL},${CYGNUS_LOG_APPENDER} -Duser.timezone=UTC -Dfile.encoding=UTF-8 & fi fi @@ -306,7 +306,7 @@ if [ "$CYGNUS_HDFS_HOST" != "" ]; then if [ "${CYGNUS_MULTIAGENT,,}" == "true" ]; then # Run the Cygnus command - ${FLUME_HOME}/bin/cygnus-flume-ng agent --conf ${CYGNUS_CONF_PATH} -f ${FLUME_HOME}/conf/${AGENT_CONF_FILE} -n ${CYGNUS_AGENT_NAME} -p 5084 -Dflume.root.logger=${CYGNUS_LOG_LEVEL},${CYGNUS_LOG_APPENDER} -Duser.timezone=UTC -Dfile.encoding=UTF-8 & + ${FLUME_HOME}/bin/cygnus-flume-ng agent --conf ${CYGNUS_CONF_PATH} -f ${FLUME_HOME}/conf/${AGENT_CONF_FILE} -n ${CYGNUS_AGENT_NAME} -p 5083 -Dflume.root.logger=${CYGNUS_LOG_LEVEL},${CYGNUS_LOG_APPENDER} -Duser.timezone=UTC -Dfile.encoding=UTF-8 & fi fi @@ -352,7 +352,7 @@ if [ "$CYGNUS_POSTGRESQL_HOST" != "" ]; then if [ "${CYGNUS_MULTIAGENT,,}" == "true" ]; then # Run the Cygnus command - ${FLUME_HOME}/bin/cygnus-flume-ng agent --conf ${CYGNUS_CONF_PATH} -f ${FLUME_HOME}/conf/${AGENT_CONF_FILE} -n ${CYGNUS_AGENT_NAME} -p 5085 -Dflume.root.logger=${CYGNUS_LOG_LEVEL},${CYGNUS_LOG_APPENDER} -Duser.timezone=UTC -Dfile.encoding=UTF-8 & + ${FLUME_HOME}/bin/cygnus-flume-ng agent --conf ${CYGNUS_CONF_PATH} -f ${FLUME_HOME}/conf/${AGENT_CONF_FILE} -n ${CYGNUS_AGENT_NAME} -p 5084 -Dflume.root.logger=${CYGNUS_LOG_LEVEL},${CYGNUS_LOG_APPENDER} -Duser.timezone=UTC -Dfile.encoding=UTF-8 & fi fi @@ -372,7 +372,7 @@ if [ "$CYGNUS_CARTO_USER" != "" ]; then sed -i '/"key":/c "key":"'${CYGNUS_CARTO_KEY}'"' ${FLUME_HOME}/conf/cartodb_keys.conf if [ "${CYGNUS_MULTIAGENT,,}" == "true" ]; then # Run the Cygnus command - ${FLUME_HOME}/bin/cygnus-flume-ng agent --conf ${CYGNUS_CONF_PATH} -f ${FLUME_HOME}/conf/${AGENT_CONF_FILE} -n ${CYGNUS_AGENT_NAME} -p 5086 -Dflume.root.logger=${CYGNUS_LOG_LEVEL},${CYGNUS_LOG_APPENDER} -Duser.timezone=UTC -Dfile.encoding=UTF-8 & + ${FLUME_HOME}/bin/cygnus-flume-ng agent --conf ${CYGNUS_CONF_PATH} -f ${FLUME_HOME}/conf/${AGENT_CONF_FILE} -n ${CYGNUS_AGENT_NAME} -p 5085 -Dflume.root.logger=${CYGNUS_LOG_LEVEL},${CYGNUS_LOG_APPENDER} -Duser.timezone=UTC -Dfile.encoding=UTF-8 & fi fi