diff --git a/BUILD_DOC.md b/BUILD_DOC.md deleted file mode 100644 index 598d567c9..000000000 --- a/BUILD_DOC.md +++ /dev/null @@ -1,23 +0,0 @@ -### 编译SkyWalking Protocol / Build SkyWalking Protocol -- 编译工程 -- build -```shell -$cd github/sky-walking/skywalking-protocol -$mvn clean install -Dmaven.test.skip=true -``` - -### 编译SkyWalking主工程 / Build SkyWalking -```shell -$cd github/sky-walking -$mvn clean install -Dmaven.test.skip=true -``` - -- 从各工程目录中获取安装包 - - SkyWalking Agent: github/sky-walking/skywalking-collector/skywalking-agent/target/skywalking-agent-2.0-2016.jar - - SkyWalking Server: github/sky-walking/skywalking-server/target/installer - - SkyWalking Alarm: github/sky-walking/skywalking-alarm/target/installer - - SkyWalking WebUI: github/sky-walking/skywalking-webui/skywalking.war - - SkyWalking Analysis: github/sky-walking/skywalking-analysis/skywalking-analysis-2.0-2016.jar - - 上传skywalking-analysis-2.0-2016.jar. Upload the skywalking-analysis-2.0-2016.jar - - 上传start-analysis.sh到同一目录. Upload the start-analysis.sh to the same directory - - 为start-analysis.sh创建crontable定时任务，30分钟执行一次。create crontable for shell, set cycle=30min. diff --git a/CONFIG_DOC.md b/CONFIG_DOC.md deleted file mode 100644 index 7dfb65f43..000000000 --- a/CONFIG_DOC.md +++ /dev/null @@ -1,158 +0,0 @@ -### 初始化MySQL数据库 -- 初始化管理数据库，根据[数据库脚本](https://github.com/wu-sheng/sky-walking/blob/master/skywalking-webui/src/main/sql/table.mysql)初始化管理数据库。其中，脚本中如下SQL片段需要修改 -- initialize database using [database-script](https://github.com/wu-sheng/sky-walking/blob/master/skywalking-webui/src/main/sql/table.mysql) -```sql ---配置告警邮件的发送人和SMTP信息 ---set sender and smtp of alarm e-mail -INSERT INTO `system_config` (`config_id`,`conf_key`,`conf_value`,`val_type`,`val_desc`,`create_time`,`sts`,`modify_time`) VALUES (1000,'mail_info','{\"mail.host\":\"mail.asiainfo.com\",\"mail.transport.protocol\":\"smtp\",\"mail.smtp.auth\":\"true\",\"mail.smtp.starttls.enable\":\"false\",\"mail.username\":\"testA\",\"mail.password\":\"******\",\"mail.sender\":\"mailSender@asiainfo.com\"}','json','默认邮件发送人信息','2015-12-10 11:54:06','A','2015-12-10 11:54:06'); ---配置部署页面地址，用于告警邮件内的链接 ---set webui addr of internet -INSERT INTO `system_config` (`config_id`,`conf_key`,`conf_value`,`val_type`,`val_desc`,`create_time`,`sts`,`modify_time`) VALUES (1001,'portal_addr','http://10.1.235.197:48080/skywalking/','string','默认门户地址','2015-12-10 15:23:53','A','2015-12-10 15:23:53'); ---配置SkyWalking Server的集群地址（内网地址） ---set LAN addrs of server cluster -INSERT INTO `system_config` (`config_id`,`conf_key`,`conf_value`,`val_type`,`val_desc`,`create_time`,`sts`,`modify_time`) VALUES (1002,'servers_addr','10.1.235.197:34000;10.1.235.197:35000;','string','日志采集地址','2015-12-10 15:23:53','A','2015-12-10 15:23:53'); ---配置SkyWalking Server的集群地址（外网地址） ---set internet addrs of server cluster -INSERT INTO `system_config` (`config_id`,`conf_key`,`conf_value`,`val_type`,`val_desc`,`create_time`,`sts`,`modify_time`) VALUES (1003,'servers_addr_1','60.194.3.183:34000;60.194.3.183:35000;60.194.3.184:34000;60.194.3.184:35000;','string','日志采集地址-外网','2015-12-10 15:23:53','A','2015-12-10 15:23:53'); ---配置告警类型 ---config types of alarm -INSERT INTO `system_config` (`config_id`,`conf_key`,`conf_value`,`val_type`,`val_desc`,`create_time`,`sts`,`modify_time`) VALUES ('1004', 'alarm_type_info', '[{"type":"default","label":"exception","desc":"System Exception"},{"type":"ExecuteTime-PossibleError","label":"remark","desc":"Excution Time > 5s"},{"type":"ExecuteTime-Warning","label":"remark","desc":"Excution Time > 500ms"}]', 'json', '告警类型', '2016-04-18 16:04:51', 'A', '2016-04-18 16:04:53'); -``` -- 注：2016-4-21日前的版本升级，system_config表config_id=1000,SQL语句更新，请注意修改，新增配置config_id=1004 -- 注：2016-4-8日前的版本升级，请升级脚本中的相关片段 -- execute update scripts, if update from the version which releases before 2016-4-8 -``` -# alter table since 2016-4-8 -... -``` -- 注：2016-5-26日前的版本升级，请升级脚本中的相关片段 -- execute update scripts, if update from the version which releases before 2016-5-26 -``` -# alter table since 2016-5-26 -... -``` - - -### 配置SkyWalking Server / Config SkyWalking Server -- 根据服务器环境修改/config/config.properties -- config '/config/config.properties' -```properties -#服务器收集数据监听端口 -#server listening port of collecting data -server.port=34000 - -#数据缓存文件目录，请确保此目录有一定的存储容量 -#directory of cache data files. -buffer.data_buffer_file_parent_directory=D:/test-data/data/buffer -#偏移量注册文件的目录，这里为系统绝对路径 -#directory of offset data file -registerpersistence.register_file_parent_directory=d:/test-data/data/offset - -#hbase zk quorum，hbase的zk地址 -hbaseconfig.zk_hostname=10.1.235.197,10.1.235.198,10.1.235.199 -#hbase zk port，hbase的zk使用端口 -hbaseconfig.client_port=29181 - -#告警数据暂存的Redis配置 -#redis ip,port to save alarm data -alarm.redis_server=10.1.241.18:16379 -``` -- 启动服务 -- start server -```shell -$cd installer/bin -$./swserver.sh -``` -- 可根据需要部署多个实例 -- Multiple instances can be deployed， according to the needs of processing capacity. -- 启动服务前，请注意hbase的客户端使用机器名而非ip连接主机，请在server所在机器上正确配置hosts文件，否则会造成数据无法入库 - -### 配置SkyWalking Alarm / Config SkyWalking Alarm -- 根据服务器环境修改/config/config.properties -- config '/config/config.properties' -```properties -#zookeeper连接地址,用于协调集群，可以和hbase的zookeeper共用 -zkpath.connect_str=10.1.241.18:29181,10.1.241.19:29181,10.1.241.20:29181 - -#管理数据库的JDBC连接信息 -#数据库连接地址 -db.url=jdbc:mysql://10.1.241.20:31306/sw_db -#数据库用户名 -db.user_name=sw_dbusr01 -#数据库密码 -db.password=sw_dbusr01 - -#告警信息存在的redis服务器地址，需要和skywalking-server的alarm.redis_server设置一致 -alarm.redis_server=127.0.0.1:6379 -``` -- 启动服务 -- start server -```shell -$cd installer/bin -$./sw-alarm-server.sh -``` -- 可根据需要部署多个实例，根据实例启动数量，自动负载均衡 -- Multiple instances can be deployed， according to the needs of processing capacity. Multiple instances will load balance automatically. - -### 配置SkyWalking WebUI / Config SkyWalking WebUI -- 修改配置文件WEB-INF/classes/config.properties -- config 'WEB-INF/classes/config.properties' -```properties -#hbase的连接地址 -hbaseconfig.quorum=10.1.235.197,10.1.235.198,10.1.235.199 -hbaseconfig.client_port=29181 -``` -- 修改配置文件jdbc.properties -- config 'jdbc.properties' -```properties -#管理数据库的JDBC连接信息 -jdbc.url=jdbc:mysql://10.1.228.202:31316/test -jdbc.username=devrdbusr21 -jdbc.password=devrdbusr21 -``` - -### 配置SkyWalking Analysis / Config SkyWalking Analysis -- 将HBase安装包拷贝到Hadoop安装目录下. Copy HBase installation package to the Hadoop installation directory. -- 用HBase的主节点的配置覆盖HBase的安装包里面的配置. Use the configuration of the HBase master node converting the new Hbase package -- 在.bash_profile文件添加下面的配置,(需要根据实际情况进行配置). Add the following configuration to .base_profile -``` -export HBASE_HOME=/aifs01/users/hdpusr01/hbase-1.1.2 -export PATH=$HBASE_HOME/bin:$PATH -``` -- 运行以下命令. Run the command as follow. -``` -source .bash_profile -echo ${HBASE_HOME} -``` -- 以上配置用于运行HBase MR任务，仅供参考 - -- 修改配置文件analysis.conf -- config 'analysis.conf' -``` -#hbase连接信息 -hbase.zk_quorum=10.1.235.197,10.1.235.198,10.1.235.199 -hbase.zk_client_port=29181 - -#mysql连接信息 -mysql.url=jdbc:mysql://10.1.228.202:31316/test -mysql.username=devrdbusr21 -mysql.password=devrdbusr21 -``` - -- 修改权限. Change mode start-analysis.sh -``` -> chmod +x start-analysis.sh -``` - -- 创建crontab并运行脚本. Create crontab and run the command. -Crontab表达式见[更多](http://tool.lu/crontab/).Crontab express:[more](http://tool.lu/crontab/) -``` -> crontab -e -# 此处为每20分钟执行start-analysis.sh脚本. Executed start-analysis script every 20 minutes. -*/20 * * * * start-analysis.sh -``` - -- 查看日志. tail the log -``` -skywalking-analysis/log> tail -f map-reduce.log -``` diff --git a/QA/IS_RUNNING.md b/QA/IS_RUNNING.md deleted file mode 100644 index 0c0ece6e4..000000000 --- a/QA/IS_RUNNING.md +++ /dev/null @@ -1,12 +0,0 @@ -- 通过[log4j或者log4j2](../HOW_TO_FIND_TID.md)插件，显示tid，反映SDK的运行情况。 -``` -#tid:N/A，代表环境设置不正确或监控已经关闭 -#tid: ,代表测试当前访问不在监控范围 - - -#tid:1.0a2.1453065000002.c3f8779.27878.30.184，标识此次访问的tid信息，示例如下 -[DEBUG] Returning handler method [public org.springframework.web.servlet.ModelAndView com.ai.cloud.skywalking.example.controller.OrderSaveController.save(javax.servlet.http.HttpServletRequest)] TID:1.0a2.1453192613272.2e0c63e.11144.58.1 2016-01-19 16:36:53.288 org.springframework.beans.factory.support.DefaultListableBeanFactory -``` - -- 通过web应用的http调用入口，通过reponse的header信息，找到此次调用的traceid。前提：此web应用的url，已经使用skywalking-web-plugin进行监控。 - diff --git a/QA/SERVER_RUNNING_STAUTS.md b/QA/SERVER_RUNNING_STAUTS.md deleted file mode 100644 index 7b6d41961..000000000 --- a/QA/SERVER_RUNNING_STAUTS.md +++ /dev/null @@ -1,95 +0,0 @@ -### 通过服务器日志的Server Health Collector Report分析运行情况 -- Health Report会在服务器定时出现，报告在两次报告时间段内的运行情况 - -1. ServerReceiver反映服务端接收数据的情况 -1. DataBufferThread反映接收到的数据，异步写入log文件的情况 -1. PersistenceThread反映log文件中的内容读取情况 -1. PersistenceThread extra:hbase反映log文件中的内容，持久化到hbase的情况 -1. RedisInspectorThread反映和redis的连接池检测情况 - -- Health Report示例如下 -``` ----------Server Health Collector Report--------- -id -[INFO]DataBuffer flush data to local file:1460445849010-a4ea1e20927b40d290ebd4f5f3e08705(t:1460598787106) - -id -[INFO]DataBuffer flush data to local file:1460445849012-0ec5a44474bc4969a9194fa1b1cadf73(t:1460598848608) - -id -[INFO]DataBuffer flush data to local file:1460445849012-4182e3d0205e48968b59fe9fbb0923b4(t:1460598668464) - -id -[INFO]DataBuffer flush data to local file:1460445849013-54216553363343fe8b39221a0691cf40(t:1460598788488) - -id -[INFO]DataBuffer flush data to local file:1460445849013-531a955690764a56ac0490db531bec10(t:1460598727104) - -id -[INFO]DataBuffer flush data to local file:1460445849014-e0163d8c8b8446d6812a11e89cd48b0e(t:1460598787722) - -id -[INFO]DataBuffer flush data to local file:1460445849014-340435a1dd9e49f088af039c2e9e85af(t:1460598787510) - -id -[INFO]DataBuffer flush data to local file:1460445849015-5dacc5f6fb38442eb484b50a240568df(t:1460598727508) - -id -[INFO]read 224 chars from local file:1460445849014-340435a1dd9e49f088af039c2e9e85af(t:1460598787534) - -id -[INFO]save 1 BuriedPointEntries.(t:1460598787549) - -id -[INFO]read 268 chars from local file:1460445849013-531a955690764a56ac0490db531bec10(t:1460598727121) - -id -[INFO]save 1 BuriedPointEntries.(t:1460598727129) - -id -[INFO]read 238 chars from local file:1460445849013-54216553363343fe8b39221a0691cf40(t:1460598788522) - -id -[INFO]save 1 BuriedPointEntries.(t:1460598788532) - -id -[INFO]read 526 chars from local file:1460445849014-e0163d8c8b8446d6812a11e89cd48b0e(t:1460598787770) - -id -[INFO]save 1 BuriedPointEntries.(t:1460598787775) - -id -[INFO]read 238 chars from local file:1460445849010-a4ea1e20927b40d290ebd4f5f3e08705(t:1460598787126) - -id -[INFO]save 1 BuriedPointEntries.(t:1460598787135) - -id -[INFO]read 583 chars from local file:1460445849012-4182e3d0205e48968b59fe9fbb0923b4(t:1460598668466) - -id -[INFO]save 1 BuriedPointEntries.(t:1460598668473) - -id -[INFO]read 819 chars from local file:1460445849015-5dacc5f6fb38442eb484b50a240568df(t:1460598727531) - -id -[INFO]save 2 BuriedPointEntries.(t:1460598727542) - -id -[INFO]read 462 chars from local file:1460445849012-0ec5a44474bc4969a9194fa1b1cadf73(t:1460598848648) - -id -[INFO]save 3 BuriedPointEntries.(t:1460598848757) - -id -[INFO]alarm redis connectted.(t:1460598845054) - -id -[INFO]flush memory register to file.(t:1460598848748) - -id -[INFO]DataBuffer reveiving data.(t:1460598845300) - ------------------------------------------------- -``` \ No newline at end of file diff --git a/QA/TID_CANNOT_BE_SEARCH.md b/QA/TID_CANNOT_BE_SEARCH.md deleted file mode 100644 index cbf8272c4..000000000 --- a/QA/TID_CANNOT_BE_SEARCH.md +++ /dev/null @@ -1,26 +0,0 @@ -排查步骤： -1. 首先检查server端的buffer物理文件是否有TID -2. 如果不存在，则检查客户端的授权文件中的服务端地址是否正确或者网络是否能够ping通服务端 -3. 如果存在有，则查看服务端的日志，查看持久化线程是否卡死在入HBase的过程中，一般正常的日志如下: -``` -id -[INFO]read 217 chars from local file:1456395555088-c8c670ceb8db4e2186a544e589db2d3e(t:1459900864671) - -id -[INFO]save 1 BuriedPointEntries.(t:1459900864676) - -id -[INFO]read 270 chars from local file:1456395555087-0436594d077747279cebeeece70a0ce6(t:1459900864673) - -id -[INFO]save 1 BuriedPointEntries.(t:1459900864678) - -id -[INFO]read 217 chars from local file:1456395555014-93b0879718ee4156926090de3037ac27(t:1459900744687) - -id -[INFO]save 1 BuriedPointEntries.(t:1459900744692) -``` - -持久化线程卡死HBase原因： -一般情况，如果网络通顺的话，检查部署Server端的机器中/etc/hosts是否配置HBase的域名映射 diff --git a/QA/deploy-sw_analysis-problem.md b/QA/deploy-sw_analysis-problem.md deleted file mode 100644 index 141655b9e..000000000 --- a/QA/deploy-sw_analysis-problem.md +++ /dev/null @@ -1,36 +0,0 @@ -#FAQ - -#常见命令 Common Commands： -``` -#上传所有jar包. Upload all jar file to hdfs -./hdfs dfs -put /aifs01/users/devhdp01/hadoop-2.6.0/share/hadoop/common/lib/*.jar /aifs01/users/devhdp01/hadoop-2.6.0/share/hadoop/common/lib/ - -#创建目录. Make directory into hdfs -./hdfs dfs -mkdir -p /aifs01/users/devhdp01/hbase-1.1.2/lib/ -``` - -## Jar包找不到. Jar File cannot be find. -###日志. Detail -``` -Exception in thread "main" java.io.FileNotFoundException: File does not exist: hdfs://host-10-1-241-18:9000/aifs01/users/devhdp01/hbase-1.1.2/lib/hbase-hadoop-compat-1.1.2.jar - at org.apache.hadoop.hdfs.DistributedFileSystem$18.doCall(DistributedFileSystem.java:1122) - at org.apache.hadoop.hdfs.DistributedFileSystem$18.doCall(DistributedFileSystem.java:1114) - at org.apache.hadoop.fs.FileSystemLinkResolver.resolve(FileSystemLinkResolver.java:81) - at org.apache.hadoop.hdfs.DistributedFileSystem.getFileStatus(DistributedFileSystem.java:1114) - at org.apache.hadoop.mapreduce.filecache.ClientDistributedCacheManager.getFileStatus(ClientDistributedCacheManager.java:288) - at org.apache.hadoop.mapreduce.filecache.ClientDistributedCacheManager.getFileStatus(ClientDistributedCacheManager.java:224) - at org.apache.hadoop.mapreduce.filecache.ClientDistributedCacheManager.determineTimestamps(ClientDistributedCacheManager.java:93) - at org.apache.hadoop.mapreduce.filecache.ClientDistributedCacheManager.determineTimestampsAndCacheVisibilities(ClientDistributedCacheManager.java:57) -``` -###解决.Resolve -1. 创建目录. Make directory into hdfs -``` -${HADOOP_HOME}/bin>./hdfs dfs -mkdir -p /aifs01/users/devhdp01/hbase-1.1.2/lib/ -``` -2. 上传文件. Upload jar file to hdfs -``` -${HADOOP_HOME}/bin>./hdfs dfs -put /aifs01/users/devhdp01/hbase-1.1.2/lib/hbase-hadoop-compat-1.1.2.jar /aifs01/users/devhdp01/hbase-1.1.2/lib/ -``` - -## 分析失败, 如何分析之前的数据. After analyis failed. Cannot analysis the data before now. -1. 删除start-analysis.sh脚本中${SW_ANALYSIS_HOME}对应的目录，默认分析三个月之前的数据 \ No newline at end of file diff --git a/README.md b/README.md index f9971ebc2..b21ce80a7 100644 --- a/README.md +++ b/README.md @@ -11,8 +11,8 @@ SkyWalking: Large-Scale Distributed Systems Tracing Infrastructure, also known D [![Join the chat at https://gitter.im/sky-walking/Lobby](https://badges.gitter.im/sky-walking/Lobby.svg)](https://gitter.im/sky-walking/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![sky-walking-org](https://img.shields.io/badge/organization-sky--walking--ecosystem-brightgreen.svg)](https://github.com/skywalking-developer) -[![Release Version](https://img.shields.io/badge/sky--walking-1.0--release-brightgreen.svg)](https://github.com/wu-sheng/sky-walking/releases) -[![Dev Version](https://img.shields.io/badge/sky--walking-2.0--ontesting-yellow.svg)](https://github.com/wu-sheng/sky-walking) +[![Release Version](https://img.shields.io/badge/sky--walking-2.0--release-brightgreen.svg)](https://github.com/wu-sheng/sky-walking/releases) +[![Dev Version](https://img.shields.io/badge/sky--walking-2.1--ondev-yellow.svg)](https://github.com/wu-sheng/sky-walking) # Abstract * An open source Large-Scale Distributed Systems Tracing Infrastructure, also known a ditributed tracer. diff --git a/doc/protocol.md b/doc/protocol.md deleted file mode 100644 index a18735b22..000000000 --- a/doc/protocol.md +++ /dev/null @@ -1,69 +0,0 @@ -## network-protocol -* 描述采集传输过程中的包结构 - - - - - - - - - - - - - - - - - - - - - -
包长度（4位）正文校验和（4位）
子数据包1子数据包2…… (n)
子包长度（4位)子包类型（4位）子包正文子包长度（4位)子包类型（4位）子包正文…… (n)
- -## buffer-file-protocol -* 描述collector-server使用本地缓存的文件结构 - -### 标准文件结构 - - - - - - - - - - - - - - - - - - - - -
包长度（4位）正文分隔符（4位）127,127,127,127
子数据包1子数据包2…… (n)
子包长度（4位)子包类型（4位）子包正文子包长度（4位)子包类型（4位）子包正文…… (n)
- -### 文件结束标识性数据包 - - - - - - - - - - - - - - -
包长度（4位）正文分隔符（4位）127,127,127,127
子数据包1
子包长度（4位)子包类型（4位）EOFSpan
- -* 更为详细的结构，可以参考protocol.xlsx diff --git a/doc/protocol.xlsx b/doc/protocol.xlsx deleted file mode 100644 index f02cd12da..000000000 Binary files a/doc/protocol.xlsx and /dev/null differ diff --git a/pom.xml b/pom.xml index e9b544e1b..20273d5c0 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.a.eye skywalking - 2.0-2016 + 2.1-2017 skywalking-commons diff --git a/skywalking-alarm/pom.xml b/skywalking-alarm/pom.xml index c8cb9c2b0..0f7233805 100644 --- a/skywalking-alarm/pom.xml +++ b/skywalking-alarm/pom.xml @@ -4,7 +4,7 @@ skywalking com.a.eye - 2.0-2016 + 2.1-2017 skywalking-alarm diff --git a/skywalking-application-toolkit/pom.xml b/skywalking-application-toolkit/pom.xml index 0542dc054..19be7c443 100644 --- a/skywalking-application-toolkit/pom.xml +++ b/skywalking-application-toolkit/pom.xml @@ -3,7 +3,7 @@ skywalking com.a.eye - 2.0-2016 + 2.1-2017 4.0.0 skywalking-application-toolkit diff --git a/skywalking-application-toolkit/skywalking-toolkit-log4j-1.x/pom.xml b/skywalking-application-toolkit/skywalking-toolkit-log4j-1.x/pom.xml index 7b4c46b39..465b125a1 100644 --- a/skywalking-application-toolkit/skywalking-toolkit-log4j-1.x/pom.xml +++ b/skywalking-application-toolkit/skywalking-toolkit-log4j-1.x/pom.xml @@ -5,7 +5,7 @@ skywalking-application-toolkit com.a.eye - 2.0-2016 + 2.1-2017 4.0.0 diff --git a/skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/pom.xml b/skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/pom.xml index 4e9a90090..d7d16ea95 100644 --- a/skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/pom.xml +++ b/skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/pom.xml @@ -5,7 +5,7 @@ skywalking-application-toolkit com.a.eye - 2.0-2016 + 2.1-2017 4.0.0 diff --git a/skywalking-application-toolkit/skywalking-toolkit-logback-1.x/pom.xml b/skywalking-application-toolkit/skywalking-toolkit-logback-1.x/pom.xml index 0b7511667..3674226ba 100644 --- a/skywalking-application-toolkit/skywalking-toolkit-logback-1.x/pom.xml +++ b/skywalking-application-toolkit/skywalking-toolkit-logback-1.x/pom.xml @@ -5,7 +5,7 @@ skywalking-application-toolkit com.a.eye - 2.0-2016 + 2.1-2017 4.0.0 diff --git a/skywalking-application-toolkit/skywalking-toolkit-trace-context/pom.xml b/skywalking-application-toolkit/skywalking-toolkit-trace-context/pom.xml index 848b94744..4c67f947d 100644 --- a/skywalking-application-toolkit/skywalking-toolkit-trace-context/pom.xml +++ b/skywalking-application-toolkit/skywalking-toolkit-trace-context/pom.xml @@ -4,7 +4,7 @@ skywalking-application-toolkit com.a.eye - 2.0-2016 + 2.1-2017 4.0.0 diff --git a/skywalking-commons/pom.xml b/skywalking-commons/pom.xml index 5e104e67d..cd6b72216 100644 --- a/skywalking-commons/pom.xml +++ b/skywalking-commons/pom.xml @@ -3,7 +3,7 @@ skywalking com.a.eye - 2.0-2016 + 2.1-2017 4.0.0 diff --git a/skywalking-commons/skywalking-health-report/pom.xml b/skywalking-commons/skywalking-health-report/pom.xml index 506f13422..f492fc0ba 100644 --- a/skywalking-commons/skywalking-health-report/pom.xml +++ b/skywalking-commons/skywalking-health-report/pom.xml @@ -3,7 +3,7 @@ skywalking-commons com.a.eye - 2.0-2016 + 2.1-2017 4.0.0 diff --git a/skywalking-commons/skywalking-logging/pom.xml b/skywalking-commons/skywalking-logging/pom.xml index 6802cab9a..de6812c1e 100644 --- a/skywalking-commons/skywalking-logging/pom.xml +++ b/skywalking-commons/skywalking-logging/pom.xml @@ -3,7 +3,7 @@ skywalking-commons com.a.eye - 2.0-2016 + 2.1-2017 4.0.0 diff --git a/skywalking-commons/skywalking-logging/skywalking-logging-api/pom.xml b/skywalking-commons/skywalking-logging/skywalking-logging-api/pom.xml index 792273a89..2c31de0b6 100644 --- a/skywalking-commons/skywalking-logging/skywalking-logging-api/pom.xml +++ b/skywalking-commons/skywalking-logging/skywalking-logging-api/pom.xml @@ -5,7 +5,7 @@ skywalking-logging com.a.eye - 2.0-2016 + 2.1-2017 4.0.0 diff --git a/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/pom.xml b/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/pom.xml index f01053079..f27ac70fa 100644 --- a/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/pom.xml +++ b/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/pom.xml @@ -5,7 +5,7 @@ skywalking-logging com.a.eye - 2.0-2016 + 2.1-2017 4.0.0 diff --git a/skywalking-commons/skywalking-registry/pom.xml b/skywalking-commons/skywalking-registry/pom.xml index 4f54004ba..78dfe5d0a 100644 --- a/skywalking-commons/skywalking-registry/pom.xml +++ b/skywalking-commons/skywalking-registry/pom.xml @@ -3,7 +3,7 @@ skywalking-commons com.a.eye - 2.0-2016 + 2.1-2017 4.0.0 diff --git a/skywalking-commons/skywalking-util/pom.xml b/skywalking-commons/skywalking-util/pom.xml index 2c4c46830..81527a910 100644 --- a/skywalking-commons/skywalking-util/pom.xml +++ b/skywalking-commons/skywalking-util/pom.xml @@ -3,7 +3,7 @@ skywalking-commons com.a.eye - 2.0-2016 + 2.1-2017 4.0.0 diff --git a/skywalking-network/pom.xml b/skywalking-network/pom.xml index 3ba73a507..fb486f416 100644 --- a/skywalking-network/pom.xml +++ b/skywalking-network/pom.xml @@ -3,7 +3,7 @@ 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"> com.a.eye - 2.0-2016 + 2.1-2017 4.0.0 skywalking-network diff --git a/skywalking-sniffer/pom.xml b/skywalking-sniffer/pom.xml index a04076de1..686d9f0eb 100644 --- a/skywalking-sniffer/pom.xml +++ b/skywalking-sniffer/pom.xml @@ -5,7 +5,7 @@ skywalking com.a.eye - 2.0-2016 + 2.1-2017 4.0.0 diff --git a/skywalking-sniffer/skywalking-agent/dependency-reduced-pom.xml b/skywalking-sniffer/skywalking-agent/dependency-reduced-pom.xml index a597e2a39..6bae01f06 100644 --- a/skywalking-sniffer/skywalking-agent/dependency-reduced-pom.xml +++ b/skywalking-sniffer/skywalking-agent/dependency-reduced-pom.xml @@ -3,7 +3,7 @@ skywalking-sniffer com.a.eye - 2.0-2016 + 2.1-2017 4.0.0 skywalking-agent diff --git a/skywalking-sniffer/skywalking-agent/pom.xml b/skywalking-sniffer/skywalking-agent/pom.xml index dd5f87559..ad9d82398 100644 --- a/skywalking-sniffer/skywalking-agent/pom.xml +++ b/skywalking-sniffer/skywalking-agent/pom.xml @@ -5,7 +5,7 @@ com.a.eye skywalking-sniffer - 2.0-2016 + 2.1-2017 skywalking-agent diff --git a/skywalking-sniffer/skywalking-api/pom.xml b/skywalking-sniffer/skywalking-api/pom.xml index 896abf467..fa325f107 100644 --- a/skywalking-sniffer/skywalking-api/pom.xml +++ b/skywalking-sniffer/skywalking-api/pom.xml @@ -5,7 +5,7 @@ com.a.eye skywalking-sniffer - 2.0-2016 + 2.1-2017 diff --git a/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/pom.xml b/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/pom.xml index 7878566e7..3e6b99c3d 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/pom.xml +++ b/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/pom.xml @@ -3,7 +3,7 @@ skywalking-sdk-plugin com.a.eye - 2.0-2016 + 2.1-2017 4.0.0 diff --git a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml index ab3ce8620..af08523cd 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml +++ b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml @@ -6,7 +6,7 @@ com.a.eye skywalking-sdk-plugin - 2.0-2016 + 2.1-2017 skywalking-httpClient-4.x-plugin @@ -23,7 +23,7 @@ com.a.eye skywalking-api - 2.0-2016 + 2.1-2017 diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/pom.xml b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/pom.xml index f155218b4..7f1fc789b 100755 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/pom.xml +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/pom.xml @@ -3,7 +3,7 @@ skywalking-sdk-plugin com.a.eye - 2.0-2016 + 2.1-2017 4.0.0 diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/pom.xml b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/pom.xml index c6c75fc69..9f5f0018a 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/pom.xml +++ b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/pom.xml @@ -6,7 +6,7 @@ com.a.eye skywalking-sdk-plugin - 2.0-2016 + 2.1-2017 skywalking-jedis-2.x-plugin diff --git a/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/pom.xml b/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/pom.xml index 5459c261a..14194690b 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/pom.xml +++ b/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/pom.xml @@ -3,7 +3,7 @@ skywalking-sdk-plugin com.a.eye - 2.0-2016 + 2.1-2017 4.0.0 diff --git a/skywalking-sniffer/skywalking-sdk-plugin/pom.xml b/skywalking-sniffer/skywalking-sdk-plugin/pom.xml index e47c91342..ef51eeedf 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/pom.xml +++ b/skywalking-sniffer/skywalking-sdk-plugin/pom.xml @@ -6,7 +6,7 @@ com.a.eye skywalking-sniffer - 2.0-2016 + 2.1-2017 skywalking-sdk-plugin diff --git a/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml b/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml index b90764dc5..d11c63818 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml +++ b/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml @@ -3,7 +3,7 @@ skywalking-sdk-plugin com.a.eye - 2.0-2016 + 2.1-2017 4.0.0 diff --git a/skywalking-sniffer/skywalking-toolkit-activation/pom.xml b/skywalking-sniffer/skywalking-toolkit-activation/pom.xml index be0690c5d..3e31fada8 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/pom.xml +++ b/skywalking-sniffer/skywalking-toolkit-activation/pom.xml @@ -5,7 +5,7 @@ skywalking-sniffer com.a.eye - 2.0-2016 + 2.1-2017 4.0.0 pom diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/pom.xml b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/pom.xml index d4e9a17cd..c7f98f575 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/pom.xml +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/pom.xml @@ -5,7 +5,7 @@ skywalking-toolkit-activation com.a.eye - 2.0-2016 + 2.1-2017 4.0.0 diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-2.x-activation/pom.xml b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-2.x-activation/pom.xml index 4cabad547..968158f3e 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-2.x-activation/pom.xml +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-2.x-activation/pom.xml @@ -5,7 +5,7 @@ skywalking-toolkit-activation com.a.eye - 2.0-2016 + 2.1-2017 4.0.0 diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-logback-1.x-activation/pom.xml b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-logback-1.x-activation/pom.xml index d3f815723..66fcb6349 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-logback-1.x-activation/pom.xml +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-logback-1.x-activation/pom.xml @@ -5,7 +5,7 @@ skywalking-toolkit-activation com.a.eye - 2.0-2016 + 2.1-2017 4.0.0 diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/pom.xml b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/pom.xml index 873703d8e..4bcf8902c 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/pom.xml +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/pom.xml @@ -4,7 +4,7 @@ skywalking-toolkit-activation com.a.eye - 2.0-2016 + 2.1-2017 4.0.0 diff --git a/skywalking-storage-center/pom.xml b/skywalking-storage-center/pom.xml index 1115373a7..7f5df67ef 100644 --- a/skywalking-storage-center/pom.xml +++ b/skywalking-storage-center/pom.xml @@ -5,7 +5,7 @@ skywalking com.a.eye - 2.0-2016 + 2.1-2017 4.0.0 diff --git a/skywalking-storage-center/skywalking-routing/pom.xml b/skywalking-storage-center/skywalking-routing/pom.xml index 21b804042..36549239d 100644 --- a/skywalking-storage-center/skywalking-routing/pom.xml +++ b/skywalking-storage-center/skywalking-routing/pom.xml @@ -4,7 +4,7 @@ skywalking-storage-center com.a.eye - 2.0-2016 + 2.1-2017 4.0.0 @@ -28,7 +28,7 @@ com.a.eye skywalking-util - 2.0-2016 + 2.1-2017 diff --git a/skywalking-storage-center/skywalking-storage/pom.xml b/skywalking-storage-center/skywalking-storage/pom.xml index ac25084e0..562e78048 100644 --- a/skywalking-storage-center/skywalking-storage/pom.xml +++ b/skywalking-storage-center/skywalking-storage/pom.xml @@ -5,7 +5,7 @@ skywalking-storage-center com.a.eye - 2.0-2016 + 2.1-2017 skywalking-storage diff --git a/skywalking-webui/pom.xml b/skywalking-webui/pom.xml index 607732a8b..adefaa905 100644 --- a/skywalking-webui/pom.xml +++ b/skywalking-webui/pom.xml @@ -6,7 +6,7 @@ skywalking com.a.eye - 2.0-2016 + 2.1-2017 skywalking-webui