From 06c7f1b483aac8f68d6ac0f365d37533dcef2fa3 Mon Sep 17 00:00:00 2001 From: wusheng Date: Thu, 26 May 2016 14:24:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A7=E9=87=8F=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BUILD_DOC.md | 61 +++++++++++++++++- .../bin => QA}/deploy-sw_analysis-problem.md | 0 README.md | 1 + .../bin/How-to-deploy-sw_analysis.md | 64 ------------------- skywalking-webui/src/main/sql/table.mysql | 5 +- 5 files changed, 63 insertions(+), 68 deletions(-) rename {skywalking-analysis/bin => QA}/deploy-sw_analysis-problem.md (100%) delete mode 100644 skywalking-analysis/bin/How-to-deploy-sw_analysis.md diff --git a/BUILD_DOC.md b/BUILD_DOC.md index a2d901cb6..07e6608b1 100644 --- a/BUILD_DOC.md +++ b/BUILD_DOC.md @@ -76,6 +76,13 @@ INSERT INTO `system_config` (`config_id`,`conf_key`,`conf_value`,`val_type`,`val # 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 Alarm / Build SkyWalking Alarm - 编译工程 @@ -140,12 +147,60 @@ $mvn package - startup tomcat of webui ### 编译安装SkyWalking Analysis / Build SkyWalking Analysis -- 暂未提供 -- next version +#### 前置步骤,仅供参考 Prepared deploy 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} +``` + +- 修改配置文件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 +``` + +- 编译工程 +- build +```shell +$cd github/sky-walking/skywalking-analysis +$mvn package -Dmaven.test.skip=true +``` + +- 上传skywalking-analysis-1.0-SNAPSHOT.jar. Upload the skywalking-analysis-1.0-SNAPSHOT.jar +- 上传start-analysis.sh. Upload the start-analysis.sh +- 修改权限. Change mode start-analysis.sh +``` +> chmod +x start-analysis.sh +``` + +- 运行脚本. Run the command. +``` +>./start-analysis.sh +``` + +- 查看日志. tail the log +``` +skywalking-analysis/log> tail -f map-reduce.log +``` ## 使用maven发布各插件工程 / build and deploy plugins - build and deploy skywalking-sdk-plugin(dubbo-plugin，spring-plugin，web-plugin，jdbc-plugin，httpclient-4.2.x-plugin，httpclient-4.3.x-plugin, etc.) - 请跳过maven.test环节，避免打包失败 ```properties -Dmaven.test.skip=true -``` \ No newline at end of file +``` diff --git a/skywalking-analysis/bin/deploy-sw_analysis-problem.md b/QA/deploy-sw_analysis-problem.md similarity index 100% rename from skywalking-analysis/bin/deploy-sw_analysis-problem.md rename to QA/deploy-sw_analysis-problem.md diff --git a/README.md b/README.md index 58bde7d9f..a03bb4d02 100644 --- a/README.md +++ b/README.md @@ -147,6 +147,7 @@ export SKYWALKING_RUN=true - [SkyWalking SDK是否已经工作？ Is SkyWalking SDK Running?](QA/IS_RUNNING.md) - [tid在web-ui上无法查询. tid can't be search on web-ui](QA/TID_CANNOT_BE_SEARCH.md) - [SkyWalking Server的运行情况. The status of SkyWalking Server](QA/SERVER_RUNNING_STAUTS.md) +- [SkyWalking Analysis部署运行常见问题. The FAQ of SkyWalking Analysis deployment](QA/deploy-sw_analysis-problem.md) # 源代码说明 * [追踪日志明细存储结构说明. the storage structure of tracking logs](skywalking-server/doc/hbase_table_desc.md) diff --git a/skywalking-analysis/bin/How-to-deploy-sw_analysis.md b/skywalking-analysis/bin/How-to-deploy-sw_analysis.md deleted file mode 100644 index d6a102b05..000000000 --- a/skywalking-analysis/bin/How-to-deploy-sw_analysis.md +++ /dev/null @@ -1,64 +0,0 @@ -# 怎么部署分析模块 How to deploy skywalking-analysis - -## 前置步骤 Prepared deploy skywalking-analysis -1. 将HBase安装包拷贝到Hadoop安装目录下. Copy HBase installation package to the Hadoop installation directory. -2. 用HBase的主节点的配置覆盖HBase的安装包里面的配置. Use the configuration of the HBase master node converting the new Hbase package -3. 在.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 -``` -4. 运行以下命令. Run the command as follow. -``` -source .bash_profile -echo ${HBASE_HOME} -``` - - -## 部署模块 Deploy package -1. git clone analysis工程. Clone the analysis code from github -2. 根据实际情况修改src/main/resources目录下的analysis.conf. Modify the analysis.conf file that inside src/main/resources directory. -``` -hbase.zk_quorum=10.1.235.197,10.1.235.198,10.1.235.199 -hbase.zk_client_port=29181 - -mysql.url=jdbc:mysql://10.1.228.202:31316/test -mysql.username=devrdbusr21 -mysql.password=devrdbusr21 -``` -3. 运行skywalking-webui包下的创建Table的命令. Run the create table sql script. -``` -# 新增sw_chain_detail，用于调用链分析表 -CREATE TABLE `sw_chain_detail` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `viewpoint` varchar(8192) COLLATE utf8_bin DEFAULT NULL, - `treeId` varchar(40) COLLATE utf8_bin DEFAULT NULL, - `uid` varchar(32) COLLATE utf8_bin DEFAULT NULL, - `traceLevelId` varchar(32) COLLATE utf8_bin DEFAULT NULL, - `create_time` timestamp NULL DEFAULT NULL, - `update_time` timestamp NULL DEFAULT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `id_UNIQUE` (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=8146 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; -SELECT * FROM sw_chain_detail; -``` -4. 打包. Package the project - -``` -package -Dmaven.test.skip=true -``` -5. 上传skywalking-analysis-1.0-SNAPSHOT.jar. Upload the skywalking-analysis-1.0-SNAPSHOT.jar -6. 上传start-analysis.sh. Upload the start-analysis.sh -7. 修改权限. Change mode start-analysis.sh -``` -> chmod +x start-analysis.sh -``` -8. 运行脚本. Run the command. -``` ->./start-analysis.sh -``` -9. 查看日志. tail the log -``` -skywalking-analysis/log> tail -1f map-reduce.log -``` - diff --git a/skywalking-webui/src/main/sql/table.mysql b/skywalking-webui/src/main/sql/table.mysql index 06912ecf0..210b27340 100644 --- a/skywalking-webui/src/main/sql/table.mysql +++ b/skywalking-webui/src/main/sql/table.mysql @@ -251,7 +251,11 @@ ALTER TABLE `application_info` ADD COLUMN `update_time` DATETIME NULL AFTER `sts`, ADD COLUMN `app_desc` VARCHAR(1024) NULL AFTER `update_time`; +# alter table since 2016-5-26 # 新增sw_chain_detail，用于调用链分析表 +-- ----------------------------------------------------- +-- Table `sw_chain_detail` +-- ----------------------------------------------------- CREATE TABLE `sw_chain_detail` ( `id` int(11) NOT NULL AUTO_INCREMENT, `viewpoint` varchar(8192) COLLATE utf8_bin DEFAULT NULL, @@ -263,4 +267,3 @@ CREATE TABLE `sw_chain_detail` ( PRIMARY KEY (`id`), UNIQUE KEY `id_UNIQUE` (`id`) ) ENGINE=InnoDB AUTO_INCREMENT=8146 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; -SELECT * FROM sw_chain_detail; \ No newline at end of file