调整脚本和文档

luolluol · Feb 19, 2016 · e593116 · e593116
1 parent 04445aa
commit e593116
Show file tree

Hide file tree

Showing 18 changed files with 141 additions and 60 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ dubbokeeper在1.0.1版本对监控数据存储模块抽离出来，做为单独
 
 在1.0.0版本中暂时提供了mysql以及1.0.0中已有的lucene存储
 
-这样做的目的是使得dubbokeeper的监控数据收集端能够集群部署（使用lucene如果使用传统的磁盘存储，而不是网盘，将不支持集群部署）
+这样做的目的是使得dubbokeeper的监控数据收集端能够集群部署（使用lucene如果使用传统的磁盘存储，而不是网盘，将不支持集群部署,如果使用lucene存储，需要jdk1.7+）
 
 所以1.0.1以后的版本，对dubbokeeper的部署将包含两部分，一部分是监控数据存储端以及另一部分是监控数据展示的部署
 
@@ -50,30 +50,27 @@ dubbokeeper在1.0.1版本对监控数据存储模块抽离出来，做为单独
 其中`xxx-dubbokeeper-ui`下会有一个war包，将该war包部署到tomcat或者jetty里面（或者其他servlet容器），那么就部署好了监控展示应用了
 
 
->3、调整配置
-
-`xxx-dubbokeeper-ui`下会有一个war包解压出来后读对其中`WEB-INF/classes/dubbo.properties`文件中的配置项进行调整。
+>3、监控数据暂时端调整配置
 
+对上面的war包解压出来后对其中`WEB-INF/classes/dubbo.properties`文件中的配置项进行调整。
 
 ```xml
 #monitor的应用名，可根据自己情况自定义
-dubbo.application.name=common-monitor
+dubbo.application.name=monitor-ui
 #应用的拥有者
 dubbo.application.owner=bieber
-#连接的dubbo注册中心地址
+#连接的dubbo注册中心地址，保持部署监控数据存储的zk地址一样
 dubbo.registry.address=zookeeper://localhost:2181
-#暴露MonitorServer接口的协议
-dubbo.protocol.name=dubbo
-#暴露MonitorServer接口的端口
-dubbo.protocol.port=20884
+
+#use netty4
+dubbo.reference.client=netty4
 
 #peeper config
 #监控的zookeeper连接列表，多个通过‘,’(英文逗号)隔开。
 peeper.zookeepers=localhost:2181
 #监控的zookeeper连接会话超时时间
 peeper.zookeeper.session.timeout=60000
 
-#monitor lucene config
 #被监控端同步监控数据周期时间，可不配置，默认是一分钟同步一次
 monitor.collect.interval=60000
 
@@ -82,14 +79,26 @@ monitor.collect.interval=60000
 monitor.log.home=/usr/dev/op_disk/monitor-log
 ```
 
+>4、监控数据存储端配置调整以及启动
+
+通过上面编译后会得到`xxx-dubbokeeper-server`目录，在改名了的`xxx-server`下面包含三个子目录`bin`,`conf`以及`lib`。
+
+`bin`:启动存储端的脚本，实行`start-xx.sh(bat)`则启动该应用<br>
+
+`conf`:存储端的相关配置，具体配置下面会介绍<br>
+
+`lib`:应用依赖的相关jar包<br>
+
+
+下面列出不同存储的对配置的相关描述
+
+[lucene存储配置介绍](doc/storage/lucene/doc.md)
 
->4、部署成功
+[mysql存储配置介绍](doc/storage/mysql/doc.md)
 
-![](https://raw.githubusercontent.com/dubboclub/resources/master/dubbokeeper.png)
 
-###其他信息
-> 预览地址：http://dk.dubboclub.net/dubbokeeper
 
+按照上面对应存储配置完毕之后，执行`start-xx.sh(bat)`，便启动了dk的存储
 
 
 
diff --git a/bin/setting.sh b/bin/setting.sh
diff --git a/bin/start-lucene.bat b/bin/start-lucene.bat
@@ -1,7 +1,7 @@
 setlocal
 call "%~dp0setting.bat"
 
-SET DUBBO_PROPERTIES=%CONFDIR%\dubbo-lucene.properties
+SET DUBBO_PROPERTIES=dubbo-lucene.properties
 echo on
-java -Dmonitor.log.home="%LOG_DIR%" -Ddubbo.properties.file="%DUBBO_PROPERTIES%" -cp "%CLASSPATH%" "%MAINCLASS%" start
+java "-Dmonitor.log.home=%LOG_HOME%" "-Ddubbo.properties.file=%DUBBO_PROPERTIES%" -cp "%CLASSPATH%" "%MAINCLASS%" start
 endlocal
diff --git a/bin/start-lucene.sh b/bin/start-lucene.sh
@@ -1,11 +1,17 @@
 #!/bin/bash
 DK_HOME=$(pwd)
-"$DK_HOME/setting.sh"
+CONFDIR="${DK_HOME}/../conf"
+LOG_HOME="${DK_HOME}/../logs"
+CLASSPATH="${DK_HOME}/../lib/*:${CONFDIR}"
+MAINCLASS="com.dubboclub.dk.server.Main"
 
-if [ "$JAVA_HOME" != "" ]; then
-  JAVA="$JAVA_HOME/bin/java"
+if [ "$JAVA_HOME" !="" ]; then
+
+	JAVA="$JAVA_HOME/bin/java"
 else
-  JAVA=java
+	JAVA=java
 fi
-DUBBO_PROPERTIES=${CONFDIR}/dubbo-lucene.properties
-"$JAVA" "-Dmonitor.log.home=${LOG_DIR} -Ddubbo.properties.file=${DUBBO_PROPERTIES}" -cp "${CLASSPATH}" "${MAINCLASS}" start
+
+DUBBO_PROPERTIES="dubbo-lucene.properties"
+
+"$JAVA" "-Dmonitor.log.home=${LOG_HOME}" "-Ddubbo.properties.file=${DUBBO_PROPERTIES}" -cp $CLASSPATH "${MAINCLASS}" start
diff --git a/bin/start-mongodb.bat b/bin/start-mongodb.bat
@@ -1,7 +1,7 @@
 setlocal
 call "%~dp0setting.bat"
 
-SET DUBBO_PROPERTIES=%CONFDIR%\dubbo-mongodb.properties
+SET DUBBO_PROPERTIES=dubbo-mongodb.properties
 echo on
-java -Dmonitor.log.home="%LOG_DIR%" -Ddubbo.properties.file="%DUBBO_PROPERTIES%" -cp "%CLASSPATH%" "%MAINCLASS%" start
+java "-Dmonitor.log.home=%LOG_HOME%" "-Ddubbo.properties.file=%DUBBO_PROPERTIES%" -cp "%CLASSPATH%" "%MAINCLASS%" start
 endlocal
diff --git a/bin/start-mongodb.sh b/bin/start-mongodb.sh
@@ -1,11 +1,17 @@
 #!/bin/bash
 DK_HOME=$(pwd)
-"$DK_HOME/setting.sh"
+CONFDIR="${DK_HOME}/../conf"
+LOG_HOME="${DK_HOME}/../logs"
+CLASSPATH="${DK_HOME}/../lib/*:${CONFDIR}"
+MAINCLASS="com.dubboclub.dk.server.Main"
 
-if [ "$JAVA_HOME" != "" ]; then
-  JAVA="$JAVA_HOME/bin/java"
+if [ "$JAVA_HOME" !="" ]; then
+
+	JAVA="$JAVA_HOME/bin/java"
 else
-  JAVA=java
+	JAVA=java
 fi
-DUBBO_PROPERTIES=${CONFDIR}/dubbo-mongodb.properties
-"$JAVA" "-Dmonitor.log.home=${LOG_DIR} -Ddubbo.properties.file=${DUBBO_PROPERTIES}" -cp "${CLASSPATH}" "${MAINCLASS}" start
+
+DUBBO_PROPERTIES="dubbo-mongodb.properties"
+
+"$JAVA" "-Dmonitor.log.home=${LOG_HOME}" "-Ddubbo.properties.file=${DUBBO_PROPERTIES}" -cp $CLASSPATH "${MAINCLASS}" start
diff --git a/bin/start-mysql.bat b/bin/start-mysql.bat
@@ -3,5 +3,5 @@ call "%~dp0setting.bat"
 
 SET DUBBO_PROPERTIES=dubbo-mysql.properties
 echo on
-java -Dmonitor.log.home="%LOG_DIR%" -Ddubbo.properties.file="%DUBBO_PROPERTIES%" -cp "%CLASSPATH%" "%MAINCLASS%" start
+java "-Dmonitor.log.home=%LOG_HOME%" "-Ddubbo.properties.file=%DUBBO_PROPERTIES%" -cp "%CLASSPATH%" "%MAINCLASS%" start
 endlocal
diff --git a/bin/start-mysql.sh b/bin/start-mysql.sh
@@ -1,11 +1,17 @@
 #!/bin/bash
 DK_HOME=$(pwd)
-"$DK_HOME/setting.sh"
+CONFDIR="${DK_HOME}/../conf"
+LOG_HOME="${DK_HOME}/../logs"
+CLASSPATH="${DK_HOME}/../lib/*:${CONFDIR}"
+MAINCLASS="com.dubboclub.dk.server.Main"
 
-if [ "$JAVA_HOME" != "" ]; then
-  JAVA="$JAVA_HOME/bin/java"
+if [ "$JAVA_HOME" !="" ]; then
+
+	JAVA="$JAVA_HOME/bin/java"
 else
-  JAVA=java
+	JAVA=java
 fi
-DUBBO_PROPERTIES=${CONFDIR}/dubbo-mysql.properties
-"$JAVA" "-Dmonitor.log.home=${LOG_DIR} -Ddubbo.properties.file=${DUBBO_PROPERTIES}" -cp "${CLASSPATH}" "${MAINCLASS}" start
+
+DUBBO_PROPERTIES="dubbo-mysql.properties"
+
+"$JAVA" "-Dmonitor.log.home=${LOG_HOME}" "-Ddubbo.properties.file=${DUBBO_PROPERTIES}" -cp $CLASSPATH "${MAINCLASS}" start
diff --git a/...per-server/src/main/resources/logback.xml → conf/logback.xml b/...per-server/src/main/resources/logback.xml → conf/logback.xml
@@ -6,9 +6,9 @@
     <timestamp key="byDate" datePattern="yyyyMMdd" />
 
     <appender name="dubboRolling" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_HOME}/DUBBO.log</file>
+        <file>${LOG_HOME}/dubbo-framework/DUBBO.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${DUBBO_LOG_HOME}/DUBBO-%d{yyyy-MM-dd}.%i.zip</fileNamePattern>
+            <fileNamePattern>${LOG_HOME}/dubbo-framework/DUBBO-%d{yyyy-MM-dd}.%i.zip</fileNamePattern>
             <maxHistory>30</maxHistory>
             <TimeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                 <MaxFileSize>100MB</MaxFileSize>
@@ -20,9 +20,9 @@
         </encoder>
     </appender>
     <appender name="dkRolling" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_HOME}/DubboKeeper.log</file>
+        <file>${LOG_HOME}/dubbokeeper/DubboKeeper.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${DUBBO_LOG_HOME}/DubboKeeper-%d{yyyy-MM-dd}.%i.zip</fileNamePattern>
+            <fileNamePattern>${LOG_HOME}/dubbokeeper/DubboKeeper-%d{yyyy-MM-dd}.%i.zip</fileNamePattern>
             <maxHistory>30</maxHistory>
             <TimeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                 <MaxFileSize>100MB</MaxFileSize>
@@ -33,12 +33,6 @@
             <immediateFlush>true</immediateFlush>
         </encoder>
     </appender>
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-            <immediateFlush>true</immediateFlush>
-        </encoder>
-    </appender>
     <!--dubbo-->
     <logger
             name="com.alibaba.dubbo"
@@ -51,7 +45,7 @@
             level="DEBUG">
         <appender-ref ref="dkRolling" />
     </logger>
-    <root level="DEBUG">
+    <!--<root level="DEBUG">
              <appender-ref ref="STDOUT" />
-   </root>
+   </root>-->
 </configuration>
diff --git a/doc/storage/lucene/doc.md b/doc/storage/lucene/doc.md
@@ -0,0 +1,26 @@
+```xml
+#dubbo应用名称
+dubbo.application.name=mysql-monitor
+#dubbo应用所有者
+dubbo.application.owner=bieber
+#dubbo的注册中心地址，保存和被监控应用一个注册中心
+dubbo.registry.address=zookeeper://10.59.32.145:2181
+#监控数据收集协议
+dubbo.protocol.name=dubbo
+#监控数据收集协议端口
+dubbo.protocol.port=20884
+
+#被监控端同步监控数据周期时间，可不配置，默认是一分钟同步一次
+monitor.collect.interval=100
+#use netty4
+dubbo.provider.transporter=netty4
+
+#monitor lucene config
+#lucene存储数据的方式,当前支持mmap(存储在内存里面),niofs（nio的方式存储在磁盘）,simple（最简单的io方式存储）
+monitor.lucene.directory.type=niofs
+#lucene存储索引文件的目录
+monitor.lucene.directory=/monitor
+#lucene提交的平率，表示没接受几条数据提交一次（lucene只有提交过的数据，才能查询得到）
+monitor.lucene.commit.frequency=10
+
+```
diff --git a/doc/storage/mysql/deploy.md b/doc/storage/mysql/deploy.md
diff --git a/doc/storage/mysql/doc.md b/doc/storage/mysql/doc.md
@@ -0,0 +1,38 @@
+###初始化数据库
+
+既然是基于mysql存储的，肯定第一步是创建一个数据库，数据库名可以自定义一个，编码采用utf-8
+
+创建完数据库之后，执行[数据库表初始化脚本](sql/application.sql)
+
+###调整配置参数
+
+```xml
+#dubbo应用名称
+dubbo.application.name=mysql-monitor
+#dubbo应用所有者
+dubbo.application.owner=bieber
+#dubbo的注册中心地址，保存和被监控应用一个注册中心
+dubbo.registry.address=zookeeper://10.59.32.145:2181
+#监控数据收集协议
+dubbo.protocol.name=dubbo
+#监控数据收集协议端口
+dubbo.protocol.port=20884
+
+#被监控端同步监控数据周期时间，可不配置，默认是一分钟同步一次
+monitor.collect.interval=100
+#use netty4
+dubbo.provider.transporter=netty4
+
+#mysql相关信息
+#mysql数据库地址
+dubbo.monitor.mysql.url=jdbc:mysql://localhost:3306/dubbokeeper
+#mysql数据库用户名
+dubbo.monitor.mysql.username=root
+#mysql数据库用户密码
+dubbo.monitor.mysql.password=root
+#mysql数据库链接池最大连接数
+dubbo.monitor.mysql.pool.max=10
+#mysql数据库链接池最小连接数
+dubbo.monitor.mysql.pool.min=10
+```
+
diff --git a/dubbokeeper-server/src/main/java/com/dubboclub/dk/server/Main.java b/dubbokeeper-server/src/main/java/com/dubboclub/dk/server/Main.java
@@ -36,7 +36,6 @@ private static void stop(){
     }
 
     private static void start(){
-        System.out.println(System.getProperty("dubbo.properties.file"));
         ClassPathXmlApplicationContext classPathXmlApplicationContext = new ClassPathXmlApplicationContext("classpath*:/META-INF/spring/*.xml");
         classPathXmlApplicationContext.start();
         running=true;

diff --git a/...lucene-storage/src/main/java/com/dubboclub/dk/storage/lucene/LuceneStatisticsStorage.java b/...lucene-storage/src/main/java/com/dubboclub/dk/storage/lucene/LuceneStatisticsStorage.java
@@ -22,6 +22,7 @@
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.MMapDirectory;
 import org.apache.lucene.store.NIOFSDirectory;
+import org.apache.lucene.store.SimpleFSDirectory;
 import org.apache.lucene.util.BytesRef;
 import org.springframework.beans.factory.InitializingBean;
 
@@ -772,7 +773,7 @@ private Directory generateLuceneDirectory(Path path) throws IOException {
                 luceneDirectory = new NIOFSDirectory(path);
                 break;
             case SIMPLE:
-                luceneDirectory = new NIOFSDirectory(path);
+                luceneDirectory = new SimpleFSDirectory(path);
                 break;
         }
         return luceneDirectory;

diff --git a/dubbokeeper-ui/src/main/resources/dubbo.properties b/dubbokeeper-ui/src/main/resources/dubbo.properties
@@ -1,10 +1,8 @@
 dubbo.application.name=common-monitor
 dubbo.application.owner=bieber
 dubbo.registry.address=zookeeper://10.59.32.145:2181
-dubbo.protocol.name=dubbo
-dubbo.protocol.port=20884
 
-#usered netty4
+#use netty4
 dubbo.reference.client=netty4
 
 #peeper config

diff --git a/release-lucene.xml b/release-lucene.xml
@@ -12,6 +12,7 @@
                 <include>bin/*lucene.*</include>
                 <include>bin/setting.*</include>
                 <include>conf/*lucene.properties</include>
+                <include>conf/logback.xml</include>
             </includes>
         </fileSet>
     </fileSets>

diff --git a/release-mongodb.xml b/release-mongodb.xml
@@ -12,6 +12,7 @@
                 <include>bin/*mongodb.*</include>
                 <include>bin/setting.*</include>
                 <include>conf/*mongodb.properties</include>
+                <include>conf/logback.xml</include>
             </includes>
         </fileSet>
     </fileSets>

diff --git a/release-mysql.xml b/release-mysql.xml
@@ -12,6 +12,7 @@
                 <include>bin/*mysql.*</include>
                 <include>bin/setting.*</include>
                 <include>conf/*mysql.properties</include>
+                <include>conf/logback.xml</include>
             </includes>
         </fileSet>
     </fileSets>