Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
阿信在这里
SkyWalking
提交
12b41c1d
S
SkyWalking
项目概览
阿信在这里
/
SkyWalking
与 Fork 源项目一致
Fork自
山不在高_有仙则灵 / SkyWalking
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
12b41c1d
编写于
12月 17, 2016
作者:
A
ascrutae
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复部分问题
上级
2c3e3ce3
变更
22
隐藏空白更改
内联
并排
Showing
22 changed file
with
163 addition
and
24 deletion
+163
-24
docker-compose.yml
docker-compose.yml
+32
-0
pom.xml
pom.xml
+9
-0
skywalking-alarm/docker/Dockerfile
skywalking-alarm/docker/Dockerfile
+0
-0
skywalking-alarm/docker/docker-entrypoint.sh
skywalking-alarm/docker/docker-entrypoint.sh
+5
-0
skywalking-alarm/pom.xml
skywalking-alarm/pom.xml
+13
-2
skywalking-alarm/src/main/resources/config.properties
skywalking-alarm/src/main/resources/config.properties
+1
-1
skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/pom.xml
...ation/skywalking-toolkit-trace-context-activation/pom.xml
+1
-7
skywalking-storage-center/skywalking-routing/docker/Dockerfile
...lking-storage-center/skywalking-routing/docker/Dockerfile
+0
-0
skywalking-storage-center/skywalking-routing/docker/docker-entrypoint.sh
...age-center/skywalking-routing/docker/docker-entrypoint.sh
+5
-0
skywalking-storage-center/skywalking-routing/src/main/resources/config.properties
...r/skywalking-routing/src/main/resources/config.properties
+2
-2
skywalking-storage-center/skywalking-storage/docker/Dockerfile
...lking-storage-center/skywalking-storage/docker/Dockerfile
+0
-0
skywalking-storage-center/skywalking-storage/docker/docker-entrypoint.sh
...age-center/skywalking-storage/docker/docker-entrypoint.sh
+5
-0
skywalking-storage-center/skywalking-storage/src/main/resources/config.properties
...r/skywalking-storage/src/main/resources/config.properties
+1
-1
skywalking-webui/docker/Dockerfile
skywalking-webui/docker/Dockerfile
+18
-0
skywalking-webui/docker/config.properties
skywalking-webui/docker/config.properties
+3
-0
skywalking-webui/docker/docker-entrypoint.sh
skywalking-webui/docker/docker-entrypoint.sh
+16
-0
skywalking-webui/docker/jdbc.properties
skywalking-webui/docker/jdbc.properties
+8
-0
skywalking-webui/pom.xml
skywalking-webui/pom.xml
+31
-4
skywalking-webui/src/main/resources/config.properties
skywalking-webui/src/main/resources/config.properties
+1
-2
skywalking-webui/src/main/resources/jdbc.properties
skywalking-webui/src/main/resources/jdbc.properties
+1
-1
skywalking-webui/src/main/resources/spring/application-jdbc.xml
...king-webui/src/main/resources/spring/application-jdbc.xml
+11
-4
skywalking-webui/src/main/resources/table.mysql
skywalking-webui/src/main/resources/table.mysql
+0
-0
未找到文件。
docker-compose.yml
0 → 100644
浏览文件 @
12b41c1d
version
:
'
2'
services
:
skywalking-webui
:
image
:
skywalking/skywalking-webui:2.0-2016
expose
:
-
"
8080"
ports
:
-
"
8080:8080"
depends_on
:
-
mysql-server
-
registry-center-server
links
:
-
mysql-server
-
registry-center-server
environment
:
-
MYSQL_URL=mysql-server:3306
-
REGISTRY_CENTER_URL=registry-center-server:2181
mysql-server
:
image
:
mysql:5.6
expose
:
-
"
3306"
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
expose
:
-
"
2181"
\ No newline at end of file
pom.xml
浏览文件 @
12b41c1d
...
@@ -24,6 +24,7 @@
...
@@ -24,6 +24,7 @@
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
<compiler.version>
1.8
</compiler.version>
<compiler.version>
1.8
</compiler.version>
<powermock.version>
1.6.4
</powermock.version>
<powermock.version>
1.6.4
</powermock.version>
<docker.plugin.version>
0.4.13
</docker.plugin.version>
</properties>
</properties>
<dependencies>
<dependencies>
...
@@ -71,6 +72,14 @@
...
@@ -71,6 +72,14 @@
<encoding>
${project.build.sourceEncoding}
</encoding>
<encoding>
${project.build.sourceEncoding}
</encoding>
</configuration>
</configuration>
</plugin>
</plugin>
<plugin>
<groupId>
com.spotify
</groupId>
<artifactId>
docker-maven-plugin
</artifactId>
<version>
${docker.plugin.version}
</version>
<configuration>
<skipDocker>
true
</skipDocker>
</configuration>
</plugin>
</plugins>
</plugins>
</build>
</build>
...
...
skywalking-alarm/docker/Dockerfile
0 → 100644
浏览文件 @
12b41c1d
skywalking-alarm/docker/docker-entrypoint.sh
0 → 100644
浏览文件 @
12b41c1d
#!/bin/bash
exec
"
$@
"
\ No newline at end of file
skywalking-alarm/pom.xml
浏览文件 @
12b41c1d
<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"
>
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>
<modelVersion>
4.0.0
</modelVersion>
<parent>
<artifactId>
skywalking
</artifactId>
<groupId>
com.a.eye
</groupId>
<version>
2.0-2016
</version>
</parent>
<groupId>
com.a.eye
</groupId>
<artifactId>
skywalking-alarm
</artifactId>
<artifactId>
skywalking-alarm
</artifactId>
<version>
2.0-2016
</version>
<packaging>
jar
</packaging>
<packaging>
jar
</packaging>
<name>
skywalking-alarm
</name>
<name>
skywalking-alarm
</name>
...
@@ -98,6 +101,14 @@
...
@@ -98,6 +101,14 @@
</excludes>
</excludes>
</configuration>
</configuration>
</plugin>
</plugin>
<plugin>
<groupId>
com.spotify
</groupId>
<artifactId>
docker-maven-plugin
</artifactId>
<version>
${docker.plugin.version}
</version>
<configuration>
<skipDocker>
true
</skipDocker>
</configuration>
</plugin>
</plugins>
</plugins>
</build>
</build>
</project>
</project>
skywalking-alarm/src/main/resources/config.properties
浏览文件 @
12b41c1d
...
@@ -35,7 +35,7 @@ coordinator.check_all_process_thread_interval=500
...
@@ -35,7 +35,7 @@ coordinator.check_all_process_thread_interval=500
#数据库驱动类
#数据库驱动类
db.driver_class
=
com.mysql.jdbc.Driver
db.driver_class
=
com.mysql.jdbc.Driver
#数据库连接地址
#数据库连接地址
db.url
=
jdbc:mysql://localhost:330
7
/test
db.url
=
jdbc:mysql://localhost:330
6
/test
#数据库用户名
#数据库用户名
db.user_name
=
root
db.user_name
=
root
#数据库密码
#数据库密码
...
...
skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/pom.xml
浏览文件 @
12b41c1d
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
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"
>
xsi:schemaLocation=
"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
>
<parent>
<parent>
<artifactId>
skywalking-
application-toolkit
</artifactId>
<artifactId>
skywalking-
toolkit-activation
</artifactId>
<groupId>
com.a.eye
</groupId>
<groupId>
com.a.eye
</groupId>
<version>
2.0-2016
</version>
<version>
2.0-2016
</version>
</parent>
</parent>
...
@@ -12,12 +12,6 @@
...
@@ -12,12 +12,6 @@
<packaging>
jar
</packaging>
<packaging>
jar
</packaging>
<name>
skywalking-toolkit-trace-context-activation
</name>
<name>
skywalking-toolkit-trace-context-activation
</name>
<url>
http://maven.apache.org
</url>
<properties>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
</properties>
<dependencies>
<dependencies>
<dependency>
<dependency>
<groupId>
com.a.eye
</groupId>
<groupId>
com.a.eye
</groupId>
...
...
skywalking-storage-center/skywalking-routing/docker/Dockerfile
0 → 100644
浏览文件 @
12b41c1d
skywalking-storage-center/skywalking-routing/docker/docker-entrypoint.sh
0 → 100644
浏览文件 @
12b41c1d
#!/bin/bash
exec
"
$@
"
\ No newline at end of file
skywalking-storage-center/skywalking-routing/src/main/resources/config.properties
浏览文件 @
12b41c1d
...
@@ -7,7 +7,7 @@ server.port=23000
...
@@ -7,7 +7,7 @@ server.port=23000
# the type of registry center (default: zookeeper)
# the type of registry center (default: zookeeper)
#registrycenter.type=zookeeper
#registrycenter.type=zookeeper
# the connect url that registry center
# the connect url that registry center
registrycenter.connect_url
=
127.0.0.1
:2181
registrycenter.connect_url
=
localhost
:2181
# auth schema that registry center
# auth schema that registry center
#registrycenter.auth_schema=
#registrycenter.auth_schema=
# the auth info that registry center
# the auth info that registry center
...
@@ -21,7 +21,7 @@ registrycenter.connect_url=127.0.0.1:2181
...
@@ -21,7 +21,7 @@ registrycenter.connect_url=127.0.0.1:2181
#
#
#disruptor.flush_size=100
#disruptor.flush_size=100
# the connect url for alarm
# the connect url for alarm
alarm.redis_server
=
127.0.0.1
:6379
alarm.redis_server
=
localhost
:6379
#
#
#alarm.alarm_off_flag=true
#alarm.alarm_off_flag=true
#
#
...
...
skywalking-storage-center/skywalking-storage/docker/Dockerfile
0 → 100644
浏览文件 @
12b41c1d
skywalking-storage-center/skywalking-storage/docker/docker-entrypoint.sh
0 → 100644
浏览文件 @
12b41c1d
#!/bin/bash
exec
"
$@
"
\ No newline at end of file
skywalking-storage-center/skywalking-storage/src/main/resources/config.properties
浏览文件 @
12b41c1d
...
@@ -23,7 +23,7 @@ server.port=34000
...
@@ -23,7 +23,7 @@ server.port=34000
#registrycenter.auth_schema=
#registrycenter.auth_schema=
#
#
# the registry center connect url (Default: zookeeper)
# the registry center connect url (Default: zookeeper)
registrycenter.connect_url
=
127.0.0.1
:2181
registrycenter.connect_url
=
localhost
:2181
#
#
# the prefix of path that each storage node register
# the prefix of path that each storage node register
#registrycenter.path_prefix=/skywalking/storage_list/
#registrycenter.path_prefix=/skywalking/storage_list/
...
...
skywalking-webui/docker/Dockerfile
0 → 100644
浏览文件 @
12b41c1d
FROM
tomcat:8.0.39-jre8
ENV
JPDA_ADDRESS="8000" \
JPDA_TRANSPORT="dt_socket" \
MYSQL_URL=localhost:3306 \
MYSQL_USER=root \
MYSQL_PASSWORD=root \
REGISTRY_CENTER_URL=localhost:2181
COPY
skywalking /usr/local/tomcat/webapps/skywalking
COPY
classes /usr/local/tomcat/webapps/skywalking/WEB-INF/classes/
COPY
jdbc.properties /usr/local/tomcat/webapps/skywalking/WEB-INF/classes/
COPY
config.properties /usr/local/tomcat/webapps/skywalking/WEB-INF/classes/
COPY
docker-entrypoint.sh /
RUN
chmod
+x /docker-entrypoint.sh
ENTRYPOINT
["/docker-entrypoint.sh"]
CMD
["catalina.sh", "jpda", "run"]
\ No newline at end of file
skywalking-webui/docker/config.properties
0 → 100644
浏览文件 @
12b41c1d
# the registry center connect url (Default: zookeeper)
registrycenter.connect_url
=
{registry_center_url}
skywalking-webui/docker/docker-entrypoint.sh
0 → 100644
浏览文件 @
12b41c1d
#!/bin/bash
# replace all variables
echo
"replace mysql-server with
$MYSQL_URL
"
eval sed
-i
-e
's/\{mysql-server\}/$MYSQL_URL/'
/usr/local/tomcat/webapps/skywalking/WEB-INF/classes/jdbc.properties
echo
"replace mysql-username with
$MYSQL_USER
"
eval sed
-i
-e
's/\{mysql-username\}/$MYSQL_USER/'
/usr/local/tomcat/webapps/skywalking/WEB-INF/classes/jdbc.properties
echo
"replace mysql-password with
$MYSQL_PASSWORD
"
eval sed
-i
-e
's/\{mysql-password\}/$MYSQL_PASSWORD/'
/usr/local/tomcat/webapps/skywalking/WEB-INF/classes/jdbc.properties
echo
"replace registry_center_url with
$REGISTRY_CENTER_URL
"
eval sed
-i
-e
's/\{registry_center_url\}/$REGISTRY_CENTER_URL/'
/usr/local/tomcat/webapps/skywalking/WEB-INF/classes/config.properties
exec
"
$@
"
\ No newline at end of file
skywalking-webui/docker/jdbc.properties
0 → 100644
浏览文件 @
12b41c1d
jdbc.driverClassName
=
com.mysql.jdbc.Driver
jdbc.url
=
jdbc:mysql://{mysql-server}/test
jdbc.username
=
{mysql-username}
jdbc.password
=
{mysql-password}
jdbc.maxTotal
=
200
jdbc.maxIdle
=
50
jdbc.maxWaitMillis
=
1000
jdbc.defaultAutoCommit
=
false
skywalking-webui/pom.xml
浏览文件 @
12b41c1d
<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"
>
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>
<modelVersion>
4.0.0
</modelVersion>
...
@@ -14,9 +15,6 @@
...
@@ -14,9 +15,6 @@
<properties>
<properties>
<project.spring.version>
4.1.6.RELEASE
</project.spring.version>
<project.spring.version>
4.1.6.RELEASE
</project.spring.version>
</properties>
</properties>
<build>
<finalName>
skywalking
</finalName>
</build>
<dependencies>
<dependencies>
<dependency>
<dependency>
...
@@ -117,4 +115,33 @@
...
@@ -117,4 +115,33 @@
</dependency>
</dependency>
</dependencies>
</dependencies>
<build>
<finalName>
skywalking
</finalName>
<plugins>
<plugin>
<groupId>
com.spotify
</groupId>
<artifactId>
docker-maven-plugin
</artifactId>
<version>
${docker.plugin.version}
</version>
<configuration>
<skipDocker>
false
</skipDocker>
<dockerDirectory>
${project.basedir}/docker
</dockerDirectory>
<imageName>
skywalking/skywalking-webui
</imageName>
<imageTags>
<imageTag>
${project.version}
</imageTag>
</imageTags>
<resources>
<resource>
<targetPath>
/skywalking
</targetPath>
<directory>
${project.build.directory}/${project.build.finalName}
</directory>
</resource>
<resource>
<targetPath>
/classes
</targetPath>
<directory>
${project.build.directory}/classes
</directory>
</resource>
</resources>
</configuration>
</plugin>
</plugins>
</build>
</project>
</project>
skywalking-webui/src/main/resources/config.properties
浏览文件 @
12b41c1d
# the registry center connect url (Default: zookeeper)
# the registry center connect url (Default: zookeeper)
registrycenter.connect_url
=
127.0.0.1
:2181
registrycenter.connect_url
=
localhost
:2181
skywalking-webui/src/main/resources/jdbc.properties
浏览文件 @
12b41c1d
jdbc.driverClassName
=
com.mysql.jdbc.Driver
jdbc.driverClassName
=
com.mysql.jdbc.Driver
jdbc.url
=
jdbc:mysql://localhost:330
7
/test
jdbc.url
=
jdbc:mysql://localhost:330
6
/test
jdbc.username
=
root
jdbc.username
=
root
jdbc.password
=
root
jdbc.password
=
root
jdbc.maxTotal
=
200
jdbc.maxTotal
=
200
...
...
skywalking-webui/src/main/resources/spring/application-jdbc.xml
浏览文件 @
12b41c1d
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xmlns:tx=
"http://www.springframework.org/schema/tx"
xmlns:tx=
"http://www.springframework.org/schema/tx"
xmlns:aop=
"http://www.springframework.org/schema/aop"
xmlns:aop=
"http://www.springframework.org/schema/aop"
xmlns:jdbc=
"http://www.springframework.org/schema/jdbc"
xsi:schemaLocation=
"http://www.springframework.org/schema/beans
xsi:schemaLocation=
"http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://www.springframework.org/schema/tx
http://www.springframework.org/schema/tx
...
@@ -10,10 +11,12 @@
...
@@ -10,10 +11,12 @@
http://www.springframework.org/schema/tx
http://www.springframework.org/schema/tx
http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
http://www.springframework.org/schema/aop
http://www.springframework.org/schema/aop
http://www.springframework.org/schema/aop/spring-aop-3.0.xsd"
>
http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
http://www.springframework.org/schema/jdbc
http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd"
>
<!-- 配置数据源 -->
<!-- 配置数据源 -->
<bean
id=
"dataSource"
class=
"com.zaxxer.hikari.HikariDataSource"
>
<bean
id=
"dataSource"
class=
"com.zaxxer.hikari.HikariDataSource"
lazy-init=
"true"
>
<property
name=
"driverClassName"
value=
"${jdbc.driverClassName}"
/>
<property
name=
"driverClassName"
value=
"${jdbc.driverClassName}"
/>
<property
name=
"jdbcUrl"
value=
"${jdbc.url}"
/>
<property
name=
"jdbcUrl"
value=
"${jdbc.url}"
/>
<property
name=
"username"
value=
"${jdbc.username}"
/>
<property
name=
"username"
value=
"${jdbc.username}"
/>
...
@@ -21,15 +24,19 @@
...
@@ -21,15 +24,19 @@
</bean>
</bean>
<bean
id=
"jdbcTemplate"
<bean
id=
"jdbcTemplate"
class=
"org.springframework.jdbc.core.JdbcTemplate"
>
class=
"org.springframework.jdbc.core.JdbcTemplate"
lazy-init=
"true"
>
<property
name=
"dataSource"
ref=
"dataSource"
/>
<property
name=
"dataSource"
ref=
"dataSource"
/>
</bean>
</bean>
<bean
id=
"transactionManager"
<bean
id=
"transactionManager"
class=
"org.springframework.jdbc.datasource.DataSourceTransactionManager"
>
class=
"org.springframework.jdbc.datasource.DataSourceTransactionManager"
lazy-init=
"true"
>
<property
name=
"dataSource"
ref=
"dataSource"
/>
<property
name=
"dataSource"
ref=
"dataSource"
/>
</bean>
</bean>
<jdbc:initialize-database
data-source=
"dataSource"
enabled=
"true"
>
<jdbc:script
location=
"classpath:table.mysql"
/>
</jdbc:initialize-database>
<!--AOP 事务配置-->
<!--AOP 事务配置-->
<tx:advice
id=
"txAdvice"
transaction-manager=
"transactionManager"
>
<tx:advice
id=
"txAdvice"
transaction-manager=
"transactionManager"
>
<tx:attributes>
<tx:attributes>
...
...
skywalking-webui/src/main/
sql
/table.mysql
→
skywalking-webui/src/main/
resources
/table.mysql
浏览文件 @
12b41c1d
文件已移动
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录