diff --git a/docker-compose.yml b/docker-compose.yml
index 6568da932..ae2ebce2e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -37,6 +37,8 @@ services:
image: skywalking/skywalking-routing:2.0-2016
expose:
- "23000"
+ ports:
+ - "23000:23000"
depends_on:
- registry-center-server
links:
@@ -68,7 +70,6 @@ services:
environment:
MYSQL_DATABASE: test
MYSQL_ROOT_PASSWORD: root
- STARTUP_SQL: /Users/xin/workbench/sky-walking/skywalking-webui/src/main/sql/table.mysql
registry-center-server:
image: zookeeper:3.4.9
diff --git a/skywalking-alarm/bin/sw-alarm-server.sh b/skywalking-alarm/bin/sw-alarm-server.sh
index d1cf33a33..d90099aae 100644
--- a/skywalking-alarm/bin/sw-alarm-server.sh
+++ b/skywalking-alarm/bin/sw-alarm-server.sh
@@ -30,6 +30,7 @@ SW_ALARM_ALARM_LOG_DIR="${SW_ALARM_ALARM_SERVER_BIN_DIR}/../logs"
SW_ALARM_ALARM_CFG_DIR="${SW_ALARM_ALARM_SERVER_BIN_DIR}/../config"
if [ ! -d "${SW_ALARM_ALARM_LOG_DIR}" ]; then
+ echo "create directory $SW_ALARM_ALARM_LOG_DIR"
mkdir -p ${SW_ALARM_ALARM_LOG_DIR}
fi
@@ -43,7 +44,7 @@ fi
CLASSPATH="$SW_ALARM_ALARM_CFG_DIR:$CLASSPATH"
-for i in "${SW_ALARM_ALARM_SERVER_BIN_DIR}"/../lib/*.jar
+for i in "${SW_ALARM_ALARM_SERVER_BIN_DIR}"/../libs/*.jar
do
CLASSPATH="$i:$CLASSPATH"
done
@@ -52,4 +53,5 @@ echo "CLASSPATH=$CLASSPATH"
JAVA_OPTS="$JAVA_OPTS -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false"
-$JAVA ${JAVA_OPTS} -classpath $CLASSPATH com.ai.cloud.skywalking.alarm.AlarmProcessServer >> ${SW_ALARM_ALARM_SERVER_BIN_DIR}/../log/sw-alarm-server.log & 2>&1&
+$JAVA ${JAVA_OPTS} -classpath $CLASSPATH com.a.eye.skywalking.alarm.AlarmProcessServer >> ${SW_ALARM_ALARM_LOG_DIR}/sw-alarm-server.log & 2>&1&
+
diff --git a/skywalking-alarm/docker/Dockerfile b/skywalking-alarm/docker/Dockerfile
index a86110a1e..08a4818c7 100644
--- a/skywalking-alarm/docker/Dockerfile
+++ b/skywalking-alarm/docker/Dockerfile
@@ -16,9 +16,10 @@ ENV ALARM_COORDINATE_ZK_ADDRESS=localhost:2181 \
ADD skywalking-alarm.tar /usr/local/
COPY config.properties /usr/local/skywalking-alarm/config
+COPY sw-alarm-server.sh /usr/local/skywalking-alarm/bin
COPY docker-entrypoint.sh /
-RUN chmod +x /docker-entrypoint.sh
+RUN chmod +x /docker-entrypoint.sh && chmod +x /usr/local/skywalking-alarm/bin/sw-alarm-server.sh
ENTRYPOINT ["/docker-entrypoint.sh"]
CMD ["/usr/local/skywalking-alarm/bin/sw-alarm-server.sh"]
diff --git a/skywalking-alarm/docker/docker-entrypoint.sh b/skywalking-alarm/docker/docker-entrypoint.sh
index 1cd1094aa..591370cf8 100644
--- a/skywalking-alarm/docker/docker-entrypoint.sh
+++ b/skywalking-alarm/docker/docker-entrypoint.sh
@@ -37,4 +37,6 @@ eval sed -i -e 's/\{WEBUI_DEPLOY_ADDRESS\}/$WEBUI_DEPLOY_ADDRESS/' /usr/local/sk
echo "replace WEBUI_CONTEXT_NAME with $WEBUI_CONTEXT_NAME"
eval sed -i -e 's/\{WEBUI_CONTEXT_NAME\}/$WEBUI_CONTEXT_NAME/' /usr/local/skywalking-alarm/config/config.properties
+mkdir -p /usr/local/skywalking-alarm/logs
+
exec "$@"
diff --git a/skywalking-alarm/docker/sw-alarm-server.sh b/skywalking-alarm/docker/sw-alarm-server.sh
new file mode 100644
index 000000000..36f37bc2f
--- /dev/null
+++ b/skywalking-alarm/docker/sw-alarm-server.sh
@@ -0,0 +1,57 @@
+#!/bin/sh
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false
+os400=false
+darwin=false
+case "`uname`" in
+CYGWIN*) cygwin=true;;
+OS400*) os400=true;;
+Darwin*) darwin=true;;
+esac
+
+# resolve links - $0 may be a softlink
+SW_ALARM_ALARM_SERVER_BIN="$0"
+
+while [ -h "$SW_ALARM_ALARM_SERVER_BIN" ]; do
+ ls=`ls -ld "$SW_ALARM_ALARM_SERVER_BIN"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ SW_ALARM_ALARM_SERVER_BIN="$link"
+ else
+ SW_ALARM_ALARM_SERVER_BIN=`dirname "$SW_ALARM_ALARM_SERVER_BIN"`/"$link"
+ fi
+done
+
+# Get standard environment variables
+SW_ALARM_ALARM_SERVER_BIN_DIR=`dirname "$SW_ALARM_ALARM_SERVER_BIN"`
+SW_ALARM_ALARM_PREFIX="${SW_ALARM_ALARM_SERVER_BIN_DIR}/.."
+SW_ALARM_ALARM_LOG_DIR="${SW_ALARM_ALARM_SERVER_BIN_DIR}/../logs"
+SW_ALARM_ALARM_CFG_DIR="${SW_ALARM_ALARM_SERVER_BIN_DIR}/../config"
+
+if [ ! -d "${SW_ALARM_ALARM_LOG_DIR}" ]; then
+ echo "create directory $SW_ALARM_ALARM_LOG_DIR"
+ mkdir -p ${SW_ALARM_ALARM_LOG_DIR}
+fi
+
+#echo $SW_ALARM_ALARM_SERVER_BIN_DIR
+#set java home
+if [ "$JAVA_HOME" != "" ]; then
+ JAVA="$JAVA_HOME/bin/java"
+else
+ JAVA=java
+fi
+
+CLASSPATH="$SW_ALARM_ALARM_CFG_DIR:$CLASSPATH"
+
+for i in "${SW_ALARM_ALARM_SERVER_BIN_DIR}"/../libs/*.jar
+do
+ CLASSPATH="$i:$CLASSPATH"
+done
+
+echo "CLASSPATH=$CLASSPATH"
+
+JAVA_OPTS="$JAVA_OPTS -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false"
+
+$JAVA ${JAVA_OPTS} -classpath $CLASSPATH com.a.eye.skywalking.alarm.AlarmProcessServer
+
diff --git a/skywalking-alarm/src/main/assembly/assembly.xml b/skywalking-alarm/src/main/assembly/assembly.xml
index 0b9652595..16a4d7da0 100644
--- a/skywalking-alarm/src/main/assembly/assembly.xml
+++ b/skywalking-alarm/src/main/assembly/assembly.xml
@@ -26,7 +26,7 @@
/config
- ${project.build.directory}/${build.finalName}
+ ${project.build.directory}
/libs
${build.finalName}.jar
diff --git a/skywalking-storage-center/skywalking-routing/docker/Dockerfile b/skywalking-storage-center/skywalking-routing/docker/Dockerfile
index 4d1b55df7..75e3b1e00 100644
--- a/skywalking-storage-center/skywalking-routing/docker/Dockerfile
+++ b/skywalking-storage-center/skywalking-routing/docker/Dockerfile
@@ -6,8 +6,9 @@ ENV SERVER_PORT=23000 \
ADD skywalking-routing.tar /usr/local/
COPY config.properties /usr/local/skywalking-routing/config/
+COPY routingServer.sh /usr/local/skywalking-routing/bin
COPY docker-entrypoint.sh /
-RUN chmod +x /docker-entrypoint.sh
+RUN chmod +x /docker-entrypoint.sh && chmod +x /usr/local/skywalking-routing/bin/routingServer.sh
EXPOSE 23000
diff --git a/skywalking-storage-center/skywalking-routing/docker/routingServer.sh b/skywalking-storage-center/skywalking-routing/docker/routingServer.sh
new file mode 100644
index 000000000..19eb4f2de
--- /dev/null
+++ b/skywalking-storage-center/skywalking-routing/docker/routingServer.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+ROUTING_HOME=`dirname "$0"`/..
+ROUTING_CFG_DIR="${ROUTING_HOME}/config"
+ROUTING_LOG_DIR="${ROUTING_HOME}/logs"
+
+if [ "$JAVA_HOME" != "" ]; then
+ JAVA="$JAVA_HOME/bin/java"
+else
+ JAVA=java
+fi
+
+if [ ! -d "${ROUTING_LOG_DIR}" ]; then
+ mkdir -p ${ROUTING_LOG_DIR}
+fi
+
+CLASSPATH="$ROUTING_CFG_DIR:$CLASSPATH"
+
+for i in "${ROUTING_HOME}"/libs/*.jar
+do
+ CLASSPATH="$i:$CLASSPATH"
+done
+
+echo "CLASSPATH=$CLASSPATH"
+
+
+$JAVA ${JAVA_OPTS} -classpath $CLASSPATH com.a.eye.skywalking.routing.Main
\ No newline at end of file
diff --git a/skywalking-storage-center/skywalking-routing/src/main/assembly/assembly.xml b/skywalking-storage-center/skywalking-routing/src/main/assembly/assembly.xml
index aedd831af..fcc0e6685 100644
--- a/skywalking-storage-center/skywalking-routing/src/main/assembly/assembly.xml
+++ b/skywalking-storage-center/skywalking-routing/src/main/assembly/assembly.xml
@@ -26,7 +26,7 @@
/config
- ${project.build.directory}/${build.finalName}
+ ${project.build.directory}
/libs
${build.finalName}.jar
diff --git a/skywalking-storage-center/skywalking-storage/bin/storageServer.sh b/skywalking-storage-center/skywalking-storage/bin/storageServer.sh
index e43ab6005..49b09bd1a 100644
--- a/skywalking-storage-center/skywalking-storage/bin/storageServer.sh
+++ b/skywalking-storage-center/skywalking-storage/bin/storageServer.sh
@@ -21,7 +21,7 @@ fi
CLASSPATH="$STORAGE_CFG_DIR:$CLASSPATH"
-for i in "${STORAGE_SERVER_BIN_DIR}"/../lib/*.jar
+for i in "${STORAGE_SERVER_BIN_DIR}"/../libs/*.jar
do
CLASSPATH="$i:$CLASSPATH"
done
@@ -29,4 +29,4 @@ done
echo "CLASSPATH=$CLASSPATH"
-$JAVA ${JAVA_OPTS} -DDATA_INDEX_HOME=${STORAGE_SERVER_BIN_DIR}/../data/index -classpath $CLASSPATH com.a.eye.skywalking.storage.Main >> ${STORAGE_SERVER_BIN_DIR}/../logs/storage-server.log & 2>&1&
+$JAVA ${JAVA_OPTS} -DSTORAGE_HOME=${STORAGE_SERVER_BIN_DIR}/.. -DDATA_INDEX_HOME=${STORAGE_SERVER_BIN_DIR}/../data/index -classpath $CLASSPATH com.a.eye.skywalking.storage.Main >> ${STORAGE_SERVER_BIN_DIR}/../logs/storage-server.log & 2>&1&
diff --git a/skywalking-storage-center/skywalking-storage/docker/Dockerfile b/skywalking-storage-center/skywalking-storage/docker/Dockerfile
index 6cc6eb926..a8638d645 100644
--- a/skywalking-storage-center/skywalking-storage/docker/Dockerfile
+++ b/skywalking-storage-center/skywalking-storage/docker/Dockerfile
@@ -1,17 +1,32 @@
FROM openjdk:8u111-jdk
+# grab gosu for easy step-down from root
+ENV GOSU_VERSION 1.7
+RUN set -x \
+ && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
+ && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
+ && export GNUPGHOME="$(mktemp -d)" \
+ && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
+ && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
+ && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \
+ && chmod +x /usr/local/bin/gosu \
+ && gosu nobody true
+
+RUN useradd -r elasticsearch
+
ENV SERVER_PORT=34000 \
REGISTRY_CENTER_URL=localhost:2181
-ADD skywalking-storage.tar /usr/local/
-COPY config.properties /usr/local/skywalking-storage/config
-COPY docker-entrypoint.sh /
+ADD skywalking-storage.tar /home/elasticsearch
+COPY config.properties /home/elasticsearch/skywalking-storage/config
+COPY docker-entrypoint.sh /home/elasticsearch/skywalking-storage/bin
+COPY storageServer.sh /home/elasticsearch/skywalking-storage/bin
-RUN chmod +x /docker-entrypoint.sh
+RUN chmod +x /home/elasticsearch/skywalking-storage/bin/docker-entrypoint.sh && chmod +x /home/elasticsearch/skywalking-storage/bin/storageServer.sh && mkdir -p /home/elasticsearch/skywalking-storage/data/file && chown -R elasticsearch:elasticsearch /home/elasticsearch
-VOLUME ["/usr/local/skywalking-storage/data/file", "/usr/local/skywalking-storage/data/index/data"]
+VOLUME ["/home/elasticsearch/skywalking-storage/data/file", "/home/elasticsearch/skywalking-storage/data/index/data"]
-EXPOSE 34000
+EXPOSE 34000 8000
-ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD ["/usr/local/skywalking-storage/bin/storageServer.sh"]
+ENTRYPOINT ["/home/elasticsearch/skywalking-storage/bin/docker-entrypoint.sh"]
+CMD ["/home/elasticsearch/skywalking-storage/bin/storageServer.sh"]
diff --git a/skywalking-storage-center/skywalking-storage/docker/docker-entrypoint.sh b/skywalking-storage-center/skywalking-storage/docker/docker-entrypoint.sh
index d0645e428..77e1e7579 100644
--- a/skywalking-storage-center/skywalking-storage/docker/docker-entrypoint.sh
+++ b/skywalking-storage-center/skywalking-storage/docker/docker-entrypoint.sh
@@ -1,9 +1,10 @@
#!/bin/bash
+set -e
echo "replace SERVER_PORT with $SERVER_PORT"
-eval sed -i -e 's/\{SERVER_PORT\}/$SERVER_PORT/' /usr/local/skywalking-storage/config/config.properties
+eval sed -i -e 's/\{SERVER_PORT\}/$SERVER_PORT/' /home/elasticsearch/skywalking-storage/config/config.properties
echo "replace REGISTRY_CENTER_URL with $REGISTRY_CENTER_URL"
-eval sed -i -e 's/\{REGISTRY_CENTER_URL\}/$REGISTRY_CENTER_URL/' /usr/local/skywalking-storage/config/config.properties
+eval sed -i -e 's/\{REGISTRY_CENTER_URL\}/$REGISTRY_CENTER_URL/' /home/elasticsearch/skywalking-storage/config/config.properties
-exec "$@"
\ No newline at end of file
+gosu elasticsearch "$@"
\ No newline at end of file
diff --git a/skywalking-storage-center/skywalking-storage/docker/storageServer.sh b/skywalking-storage-center/skywalking-storage/docker/storageServer.sh
new file mode 100644
index 000000000..fad51d2ea
--- /dev/null
+++ b/skywalking-storage-center/skywalking-storage/docker/storageServer.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+STORAGE_SERVER_BIN="$0"
+
+# Get standard environment variables
+STORAGE_SERVER_BIN_DIR=`dirname "$STORAGE_SERVER_BIN"`
+STORAGE_PREFIX="${STORAGE_SERVER_BIN_DIR}/.."
+STORAGE_LOG_DIR="${STORAGE_SERVER_BIN_DIR}/../logs"
+STORAGE_CFG_DIR="${STORAGE_SERVER_BIN_DIR}/../config"
+
+#echo $STORAGE_SERVER_BIN_DIR
+#set java home
+if [ "$JAVA_HOME" != "" ]; then
+ JAVA="$JAVA_HOME/bin/java"
+else
+ JAVA=java
+fi
+
+CLASSPATH="$STORAGE_CFG_DIR:$CLASSPATH"
+
+for i in "${STORAGE_SERVER_BIN_DIR}"/../libs/*.jar
+do
+ CLASSPATH="$i:$CLASSPATH"
+done
+
+echo "CLASSPATH=$CLASSPATH"
+
+
+$JAVA ${JAVA_OPTS} -DSTORAGE_HOME=${STORAGE_SERVER_BIN_DIR}/.. -DDATA_INDEX_HOME=${STORAGE_SERVER_BIN_DIR}/../data/index -classpath $CLASSPATH com.a.eye.skywalking.storage.Main
diff --git a/skywalking-storage-center/skywalking-storage/lib/dataindex-es-5.0.1.zip b/skywalking-storage-center/skywalking-storage/lib/dataindex-es-5.0.1.zip
old mode 100755
new mode 100644
index ac17dd32a..93cacb968
Binary files a/skywalking-storage-center/skywalking-storage/lib/dataindex-es-5.0.1.zip and b/skywalking-storage-center/skywalking-storage/lib/dataindex-es-5.0.1.zip differ
diff --git a/skywalking-storage-center/skywalking-storage/src/main/assembly/assembly.xml b/skywalking-storage-center/skywalking-storage/src/main/assembly/assembly.xml
index 946533e4e..61d914c1c 100644
--- a/skywalking-storage-center/skywalking-storage/src/main/assembly/assembly.xml
+++ b/skywalking-storage-center/skywalking-storage/src/main/assembly/assembly.xml
@@ -25,6 +25,13 @@
src/main/resources
/config
+
+ ${project.build.directory}
+ /libs
+
+ ${build.finalName}.jar
+
+
${project.build.directory}/${build.finalName}/data/index
/data/index
diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/Main.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/Main.java
index 0c9e69ad5..270f24272 100644
--- a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/Main.java
+++ b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/Main.java
@@ -18,6 +18,7 @@ import com.a.eye.skywalking.storage.listener.SearchListener;
import com.a.eye.skywalking.storage.listener.StorageListener;
import com.a.eye.skywalking.registry.assist.NetUtils;
+import java.io.File;
import java.io.IOException;
import java.util.Map;
import java.util.Properties;
@@ -40,6 +41,7 @@ public class Main {
public static void main(String[] args) {
try {
+ System.out.println(" =========== ::::::::::: {} " + System.getProperty("STORAGE_HOME") + File.separator );
initConfig();
HealthCollector.init(SERVER_REPORTER_NAME);
diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/util/PathResolver.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/util/PathResolver.java
index 9b04decc8..a784acb4e 100644
--- a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/util/PathResolver.java
+++ b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/util/PathResolver.java
@@ -7,7 +7,7 @@ public class PathResolver {
private final static String STORAGE_HOME;
static {
- STORAGE_HOME = System.getProperty("user.dir") + File.separator + "..";
+ STORAGE_HOME = System.getProperty("STORAGE_HOME") + File.separator;
}
public static String getAbsolutePath(String path) {
diff --git a/skywalking-storage-center/skywalking-storage/src/main/resources/log4j.properties b/skywalking-storage-center/skywalking-storage/src/main/resources/log4j.properties
index 045bc32c7..14cd87187 100644
--- a/skywalking-storage-center/skywalking-storage/src/main/resources/log4j.properties
+++ b/skywalking-storage-center/skywalking-storage/src/main/resources/log4j.properties
@@ -1,23 +1,13 @@
-# logger #
-log4j.rootLogger=Rolling_File,CONSOLE
-log4j.logger.org.apache=OFF
-log4j.logger.io.netty=OFF
-log4j.org.elasticsearch=OFF
-log4j.org.I0Itec=OFF
-log4j.logger.com.a.eye.skywalking.network.dependencies.io.grpc=OFF
-log4j.logger.com.a.eye.skywalking.network.dependencies.io.netty=OFF
+# log4j properties #
-log4j.appender.Rolling_File=org.apache.log4j.RollingFileAppender
-log4j.appender.Rolling_File.Threshold=WARN
-log4j.appender.Rolling_File.File=../logs/storage-server-log4j.log
-log4j.appender.Rolling_File.Append=true
-log4j.appender.Rolling_File.MaxFileSize=100MB
-log4j.appender.Rolling_File.MaxBackupIndex=5
-log4j.appender.Rolling_File.layout=org.apache.log4j.PatternLayout
-log4j.appender.Rolling_File.layout.ConversionPattern=%d %-5p %c{1}:%L - %m%n
+# logger #
+log4j.rootLogger=DEBUG,CONSOLE
+log4j.logger.org=ON
+#log4j.logger.org.systemgo.devframework=DEBUG
# Console Appender #
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.Target=System.out
log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
log4j.appender.CONSOLE.layout.ConversionPattern=%d %-5p %c{1}:%L - %m%n
+
diff --git a/skywalking-storage-center/skywalking-storage/src/main/resources/log4j2.xml b/skywalking-storage-center/skywalking-storage/src/main/resources/log4j2.xml
index 6dadba678..91e20d37a 100644
--- a/skywalking-storage-center/skywalking-storage/src/main/resources/log4j2.xml
+++ b/skywalking-storage-center/skywalking-storage/src/main/resources/log4j2.xml
@@ -1,23 +1,13 @@
-
-
-
-
-
-
-
- %d %-5p %c{1}:%L - %m%n
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file