Commit ff5f08ea authored by 吴晟's avatar 吴晟 Committed by GitHub
Browse files

Merge pull request #101 from wu-sheng/feature/3.0 

Merge the 3.0-preview
parents 4cce7006 2fb18ebc

.travis.yml

+0 −3
Original line number Diff line number Diff line
@@ -9,9 +9,6 @@ install: 


script:

  - jdk_switcher use oraclejdk8

  - cd skywalking-network

  - mvn clean install

  - cd ..

  - mvn clean install



after_success:

README.md

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ SkyWalking: Large-Scale Distributed Systems Tracing Infrastructure, also known D 
# News

* sky-walking v3.0 iteration begins... The top 2 important features are: [`Update the trace-structure`](https://github.com/wu-sheng/sky-walking/issues/83) and [`Analyze trace, and bring metric/analytic/cause up`](https://github.com/wu-sheng/sky-walking/issues/84)

* See feature codes at [branch feature/3.0](https://github.com/wu-sheng/sky-walking/tree/feature/3.0)

* The new UI release on [wu-sheng/sky-walking-ui](https://github.com/wu-sheng/sky-walking-ui)



# Abstract

* An open source Large-Scale Distributed Systems Tracing Infrastructure, also known a ditributed tracer.

pom.xml

+55 −63
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<project xmlns="http://maven.apache.org/POM/4.0.0"

         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

<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">

	<modelVersion>4.0.0</modelVersion>



	<groupId>com.a.eye</groupId>

	<artifactId>skywalking</artifactId>

    <version>2.2-2017</version>

	<version>3.0-2017</version>



	<licenses>

		<license>
@@ -29,11 +28,9 @@ 


	<modules>

		<module>skywalking-commons</module>

        <module>skywalking-alarm</module>

        <module>skywalking-webui</module>

		<module>skywalking-sniffer</module>

        <module>skywalking-storage-center</module>

		<module>skywalking-application-toolkit</module>

		<module>skywalking-collector</module>

	</modules>

	<packaging>pom</packaging>
@@ -53,6 +50,7 @@ 
	<properties>

		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

		<compiler.version>1.8</compiler.version>

		<scala.compiler.version>2.11.7</scala.compiler.version>

		<powermock.version>1.6.4</powermock.version>

		<docker.plugin.version>0.4.13</docker.plugin.version>

		<skywalking.version>2.1-2017</skywalking.version>
@@ -137,6 +135,9 @@ 
                <version>4.1.0</version>

                <configuration>

                    <repoToken>GGTAeHsfVql3x1BmTFaJvxC27f5sfcZNg</repoToken>

                    <sourceDirectories>

                        <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>

                    </sourceDirectories>

                </configuration>

            </plugin>

            <!-- 覆盖率 -->
@@ -145,6 +146,7 @@ 
                <artifactId>cobertura-maven-plugin</artifactId>

                <version>2.7</version>

                <configuration>

                    <check>true</check>

                    <encoding>UTF-8</encoding>

                    <aggregate>true</aggregate>

                    <formats>
@@ -152,22 +154,12 @@ 
                        <format>html</format>

                    </formats>

                    <instrumentation>

                        <excludes>

                            <exclude>com/a/eye/skywalking/trace/proto/*.class</exclude>

                        </excludes>

                    </instrumentation>

                </configuration>

            </plugin>

        </plugins>

    </build>



    <repositories>

        <repository>

            <snapshots>

                <enabled>false</enabled>

            </snapshots>

            <id>bintray</id>

            <name>bintray</name>

            <url>https://jcenter.bintray.com</url>

        </repository>

    </repositories>





</project>

skywalking-alarm/bin/sw-alarm-server.sh

deleted100644 → 0
+0 −57
Original line number Diff line number Diff line 
#!/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 >> ${SW_ALARM_ALARM_LOG_DIR}/sw-alarm-server.log & 2>&1&

skywalking-alarm/docker/Dockerfile

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
FROM openjdk:8u111-jdk



ENV ALARM_COORDINATE_ZK_ADDRESS=localhost:2181 \

    MYSQL_SERVER=localhost:3306 \

    MYSQL_USER=root \

    MYSQL_PASSWORD=root \

    REDIS_SERVER=localhost:6379 \

    ALARM_MAIL_HOST=smtp.mail.com \

    MAIL_SSL_ENABLE=true \

    MAIL_USER_NAME=skywalking \

    MAIL_PASSWORD=skywalking \

    MAIL_SENDER_MAIL=skywalking@mail.com \

    WEBUI_DEPLOY_ADDRESS=localhost:8080 \

    WEBUI_CONTEXT_NAME=skywalking





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 && 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"]