Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
killuaz丶x
SkyWalking
提交
9bd79b92
S
SkyWalking
项目概览
killuaz丶x
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / 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,发现更多精彩内容 >>
提交
9bd79b92
编写于
9月 09, 2017
作者:
P
pengys5
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Change ui jetty server discovery port change to 10800
上级
b4b77408
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
28 addition
and
21 deletion
+28
-21
apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/AgentServerJettyModuleDefine.java
...ector/agentserver/jetty/AgentServerJettyModuleDefine.java
+2
-0
apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/handler/UIJettyServerHandler.java
...ector/agentserver/jetty/handler/UIJettyServerHandler.java
+1
-1
apm-collector/apm-collector-boot/src/main/resources/application.yml
...tor/apm-collector-boot/src/main/resources/application.yml
+25
-18
apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/UIJettyModuleDefine.java
...kywalking/apm/collector/ui/jetty/UIJettyModuleDefine.java
+0
-2
未找到文件。
apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/AgentServerJettyModuleDefine.java
浏览文件 @
9bd79b92
...
@@ -6,6 +6,7 @@ import org.skywalking.apm.collector.agentserver.AgentServerModuleDefine;
...
@@ -6,6 +6,7 @@ import org.skywalking.apm.collector.agentserver.AgentServerModuleDefine;
import
org.skywalking.apm.collector.agentserver.AgentServerModuleGroupDefine
;
import
org.skywalking.apm.collector.agentserver.AgentServerModuleGroupDefine
;
import
org.skywalking.apm.collector.agentserver.jetty.handler.AgentStreamGRPCServerHandler
;
import
org.skywalking.apm.collector.agentserver.jetty.handler.AgentStreamGRPCServerHandler
;
import
org.skywalking.apm.collector.agentserver.jetty.handler.AgentStreamJettyServerHandler
;
import
org.skywalking.apm.collector.agentserver.jetty.handler.AgentStreamJettyServerHandler
;
import
org.skywalking.apm.collector.agentserver.jetty.handler.UIJettyServerHandler
;
import
org.skywalking.apm.collector.core.cluster.ClusterDataListener
;
import
org.skywalking.apm.collector.core.cluster.ClusterDataListener
;
import
org.skywalking.apm.collector.core.framework.Handler
;
import
org.skywalking.apm.collector.core.framework.Handler
;
import
org.skywalking.apm.collector.core.module.ModuleConfigParser
;
import
org.skywalking.apm.collector.core.module.ModuleConfigParser
;
...
@@ -52,6 +53,7 @@ public class AgentServerJettyModuleDefine extends AgentServerModuleDefine {
...
@@ -52,6 +53,7 @@ public class AgentServerJettyModuleDefine extends AgentServerModuleDefine {
List
<
Handler
>
handlers
=
new
LinkedList
<>();
List
<
Handler
>
handlers
=
new
LinkedList
<>();
handlers
.
add
(
new
AgentStreamGRPCServerHandler
());
handlers
.
add
(
new
AgentStreamGRPCServerHandler
());
handlers
.
add
(
new
AgentStreamJettyServerHandler
());
handlers
.
add
(
new
AgentStreamJettyServerHandler
());
handlers
.
add
(
new
UIJettyServerHandler
());
return
handlers
;
return
handlers
;
}
}
}
}
apm-collector/apm-collector-
ui/src/main/java/org/skywalking/apm/collector/ui
/jetty/handler/UIJettyServerHandler.java
→
apm-collector/apm-collector-
agentserver/src/main/java/org/skywalking/apm/collector/agentserver
/jetty/handler/UIJettyServerHandler.java
浏览文件 @
9bd79b92
package
org.skywalking.apm.collector.
ui
.jetty.handler
;
package
org.skywalking.apm.collector.
agentserver
.jetty.handler
;
import
com.google.gson.JsonArray
;
import
com.google.gson.JsonArray
;
import
com.google.gson.JsonElement
;
import
com.google.gson.JsonElement
;
...
...
apm-collector/apm-collector-boot/src/main/resources/application.yml
浏览文件 @
9bd79b92
...
@@ -2,25 +2,32 @@ cluster:
...
@@ -2,25 +2,32 @@ cluster:
zookeeper
:
zookeeper
:
hostPort
:
localhost:2181
hostPort
:
localhost:2181
sessionTimeout
:
100000
sessionTimeout
:
100000
# redis:
#agent_server:
# jetty:
# host: localhost
# host: localhost
# port: 6379
# port: 10800
agentstream
:
# context_path: /
grpc
:
#agent_register:
host
:
localhost
# grpc:
port
:
1000
# host: localhost
jetty
:
# port: 11800
host
:
localhost
# jetty:
port
:
2000
# host: localhost
context_path
:
/
# port: 12800
discovery
:
# context_path: /
grpc
:
localhost
#agent_stream:
port
:
1000
# grpc:
ui
:
# host: localhost
jetty
:
# port: 11800
host
:
localhost
# jetty:
port
:
12800
# host: localhost
context_path
:
/
# port: 12800
# context_path: /
#ui:
# jetty:
# host: localhost
# port: 12800
# context_path: /
storage
:
storage
:
elasticsearch
:
elasticsearch
:
cluster_name
:
CollectorDBCluster
cluster_name
:
CollectorDBCluster
...
...
apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/UIJettyModuleDefine.java
浏览文件 @
9bd79b92
...
@@ -14,7 +14,6 @@ import org.skywalking.apm.collector.ui.jetty.handler.SegmentTopGetHandler;
...
@@ -14,7 +14,6 @@ import org.skywalking.apm.collector.ui.jetty.handler.SegmentTopGetHandler;
import
org.skywalking.apm.collector.ui.jetty.handler.SpanGetHandler
;
import
org.skywalking.apm.collector.ui.jetty.handler.SpanGetHandler
;
import
org.skywalking.apm.collector.ui.jetty.handler.TraceDagGetHandler
;
import
org.skywalking.apm.collector.ui.jetty.handler.TraceDagGetHandler
;
import
org.skywalking.apm.collector.ui.jetty.handler.TraceStackGetHandler
;
import
org.skywalking.apm.collector.ui.jetty.handler.TraceStackGetHandler
;
import
org.skywalking.apm.collector.ui.jetty.handler.UIJettyServerHandler
;
import
org.skywalking.apm.collector.ui.jetty.handler.application.ApplicationsGetHandler
;
import
org.skywalking.apm.collector.ui.jetty.handler.application.ApplicationsGetHandler
;
import
org.skywalking.apm.collector.ui.jetty.handler.instancehealth.InstanceHealthGetHandler
;
import
org.skywalking.apm.collector.ui.jetty.handler.instancehealth.InstanceHealthGetHandler
;
import
org.skywalking.apm.collector.ui.jetty.handler.instancemetric.InstanceMetricGetOneTimeBucketHandler
;
import
org.skywalking.apm.collector.ui.jetty.handler.instancemetric.InstanceMetricGetOneTimeBucketHandler
;
...
@@ -59,7 +58,6 @@ public class UIJettyModuleDefine extends UIModuleDefine {
...
@@ -59,7 +58,6 @@ public class UIJettyModuleDefine extends UIModuleDefine {
@Override
public
List
<
Handler
>
handlerList
()
{
@Override
public
List
<
Handler
>
handlerList
()
{
List
<
Handler
>
handlers
=
new
LinkedList
<>();
List
<
Handler
>
handlers
=
new
LinkedList
<>();
handlers
.
add
(
new
UIJettyServerHandler
());
handlers
.
add
(
new
TraceDagGetHandler
());
handlers
.
add
(
new
TraceDagGetHandler
());
handlers
.
add
(
new
SegmentTopGetHandler
());
handlers
.
add
(
new
SegmentTopGetHandler
());
handlers
.
add
(
new
TraceStackGetHandler
());
handlers
.
add
(
new
TraceStackGetHandler
());
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录