Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
阿信在这里
SkyWalking
提交
ca20d088
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,发现更多精彩内容 >>
提交
ca20d088
编写于
3月 04, 2018
作者:
P
peng-yongsheng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use application mapping to get the actual application id for the alarm title.
上级
0006cb4b
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
31 addition
and
13 deletion
+31
-13
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/query/AlarmQuery.java
.../apache/skywalking/apm/collector/ui/query/AlarmQuery.java
+3
-3
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/AlarmService.java
...che/skywalking/apm/collector/ui/service/AlarmService.java
+23
-6
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ApplicationTopologyService.java
.../apm/collector/ui/service/ApplicationTopologyService.java
+1
-1
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ClusterTopologyService.java
...king/apm/collector/ui/service/ClusterTopologyService.java
+1
-1
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/TopologyBuilder.java
.../skywalking/apm/collector/ui/service/TopologyBuilder.java
+3
-2
未找到文件。
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/query/AlarmQuery.java
浏览文件 @
ca20d088
...
...
@@ -58,11 +58,11 @@ public class AlarmQuery implements Query {
switch
(
alarmType
)
{
case
APPLICATION:
return
getAlarmService
().
loadApplicationAlarmList
(
keyword
,
startTimeBucket
,
endTimeBucket
,
page
.
getLimit
(),
page
.
getFrom
());
return
getAlarmService
().
loadApplicationAlarmList
(
keyword
,
duration
.
getStep
(),
startTimeBucket
,
endTimeBucket
,
page
.
getLimit
(),
page
.
getFrom
());
case
SERVER:
return
getAlarmService
().
loadInstanceAlarmList
(
keyword
,
startTimeBucket
,
endTimeBucket
,
page
.
getLimit
(),
page
.
getFrom
());
return
getAlarmService
().
loadInstanceAlarmList
(
keyword
,
duration
.
getStep
(),
startTimeBucket
,
endTimeBucket
,
page
.
getLimit
(),
page
.
getFrom
());
case
SERVICE:
return
getAlarmService
().
loadServiceAlarmList
(
keyword
,
startTimeBucket
,
endTimeBucket
,
page
.
getLimit
(),
page
.
getFrom
());
return
getAlarmService
().
loadServiceAlarmList
(
keyword
,
duration
.
getStep
(),
startTimeBucket
,
endTimeBucket
,
page
.
getLimit
(),
page
.
getFrom
());
default
:
return
new
Alarm
();
}
...
...
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/AlarmService.java
浏览文件 @
ca20d088
...
...
@@ -32,6 +32,7 @@ import org.apache.skywalking.apm.collector.core.util.Const;
import
org.apache.skywalking.apm.collector.storage.StorageModule
;
import
org.apache.skywalking.apm.collector.storage.dao.ui.IApplicationAlarmListUIDAO
;
import
org.apache.skywalking.apm.collector.storage.dao.ui.IApplicationAlarmUIDAO
;
import
org.apache.skywalking.apm.collector.storage.dao.ui.IApplicationMappingUIDAO
;
import
org.apache.skywalking.apm.collector.storage.dao.ui.IInstanceAlarmUIDAO
;
import
org.apache.skywalking.apm.collector.storage.dao.ui.IInstanceUIDAO
;
import
org.apache.skywalking.apm.collector.storage.dao.ui.IServiceAlarmUIDAO
;
...
...
@@ -56,6 +57,7 @@ public class AlarmService {
private
final
Gson
gson
=
new
Gson
();
private
final
IInstanceUIDAO
instanceDAO
;
private
final
IApplicationAlarmUIDAO
applicationAlarmUIDAO
;
private
final
IApplicationMappingUIDAO
applicationMappingUIDAO
;
private
final
IInstanceAlarmUIDAO
instanceAlarmUIDAO
;
private
final
IServiceAlarmUIDAO
serviceAlarmUIDAO
;
private
final
IApplicationAlarmListUIDAO
applicationAlarmListUIDAO
;
...
...
@@ -67,6 +69,7 @@ public class AlarmService {
public
AlarmService
(
ModuleManager
moduleManager
)
{
this
.
instanceDAO
=
moduleManager
.
find
(
StorageModule
.
NAME
).
getService
(
IInstanceUIDAO
.
class
);
this
.
applicationAlarmUIDAO
=
moduleManager
.
find
(
StorageModule
.
NAME
).
getService
(
IApplicationAlarmUIDAO
.
class
);
this
.
applicationMappingUIDAO
=
moduleManager
.
find
(
StorageModule
.
NAME
).
getService
(
IApplicationMappingUIDAO
.
class
);
this
.
instanceAlarmUIDAO
=
moduleManager
.
find
(
StorageModule
.
NAME
).
getService
(
IInstanceAlarmUIDAO
.
class
);
this
.
serviceAlarmUIDAO
=
moduleManager
.
find
(
StorageModule
.
NAME
).
getService
(
IServiceAlarmUIDAO
.
class
);
this
.
applicationAlarmListUIDAO
=
moduleManager
.
find
(
StorageModule
.
NAME
).
getService
(
IApplicationAlarmListUIDAO
.
class
);
...
...
@@ -74,12 +77,16 @@ public class AlarmService {
this
.
serviceNameCacheService
=
moduleManager
.
find
(
CacheModule
.
NAME
).
getService
(
ServiceNameCacheService
.
class
);
}
public
Alarm
loadApplicationAlarmList
(
String
keyword
,
long
startTimeBucket
,
long
endTimeBucket
,
public
Alarm
loadApplicationAlarmList
(
String
keyword
,
Step
step
,
long
startTimeBucket
,
long
endTimeBucket
,
int
limit
,
int
from
)
throws
ParseException
{
logger
.
debug
(
"keyword: {}, startTimeBucket: {}, endTimeBucket: {}, limit: {}, from: {}"
,
keyword
,
startTimeBucket
,
endTimeBucket
,
limit
,
from
);
Alarm
alarm
=
applicationAlarmUIDAO
.
loadAlarmList
(
keyword
,
startTimeBucket
,
endTimeBucket
,
limit
,
from
);
List
<
IApplicationMappingUIDAO
.
ApplicationMapping
>
applicationMappings
=
applicationMappingUIDAO
.
load
(
step
,
startTimeBucket
,
endTimeBucket
);
Map
<
Integer
,
Integer
>
mappings
=
new
HashMap
<>();
applicationMappings
.
forEach
(
applicationMapping
->
mappings
.
put
(
applicationMapping
.
getMappingApplicationId
(),
applicationMapping
.
getApplicationId
()));
alarm
.
getItems
().
forEach
(
item
->
{
String
applicationCode
=
applicationCacheService
.
getApplicationById
(
item
.
getId
(
)).
getApplicationCode
();
String
applicationCode
=
applicationCacheService
.
getApplicationById
(
mappings
.
getOrDefault
(
item
.
getId
(),
item
.
getId
()
)).
getApplicationCode
();
switch
(
item
.
getCauseType
())
{
case
SLOW_RESPONSE:
item
.
setTitle
(
"Application "
+
applicationCode
+
RESPONSE_TIME_ALARM
);
...
...
@@ -92,13 +99,18 @@ public class AlarmService {
return
alarm
;
}
public
Alarm
loadInstanceAlarmList
(
String
keyword
,
long
startTimeBucket
,
long
endTimeBucket
,
public
Alarm
loadInstanceAlarmList
(
String
keyword
,
Step
step
,
long
startTimeBucket
,
long
endTimeBucket
,
int
limit
,
int
from
)
throws
ParseException
{
logger
.
debug
(
"keyword: {}, startTimeBucket: {}, endTimeBucket: {}, limit: {}, from: {}"
,
keyword
,
startTimeBucket
,
endTimeBucket
,
limit
,
from
);
Alarm
alarm
=
instanceAlarmUIDAO
.
loadAlarmList
(
keyword
,
startTimeBucket
,
endTimeBucket
,
limit
,
from
);
List
<
IApplicationMappingUIDAO
.
ApplicationMapping
>
applicationMappings
=
applicationMappingUIDAO
.
load
(
step
,
startTimeBucket
,
endTimeBucket
);
Map
<
Integer
,
Integer
>
mappings
=
new
HashMap
<>();
applicationMappings
.
forEach
(
applicationMapping
->
mappings
.
put
(
applicationMapping
.
getMappingApplicationId
(),
applicationMapping
.
getApplicationId
()));
alarm
.
getItems
().
forEach
(
item
->
{
Instance
instance
=
instanceDAO
.
getInstance
(
item
.
getId
());
String
applicationCode
=
applicationCacheService
.
getApplicationById
(
instance
.
getApplicationId
(
)).
getApplicationCode
();
String
applicationCode
=
applicationCacheService
.
getApplicationById
(
mappings
.
getOrDefault
(
instance
.
getApplicationId
(),
instance
.
getApplicationId
()
)).
getApplicationCode
();
String
serverName
=
buildServerName
(
instance
.
getOsInfo
());
switch
(
item
.
getCauseType
())
{
case
SLOW_RESPONSE:
...
...
@@ -113,13 +125,18 @@ public class AlarmService {
return
alarm
;
}
public
Alarm
loadServiceAlarmList
(
String
keyword
,
long
startTimeBucket
,
long
endTimeBucket
,
public
Alarm
loadServiceAlarmList
(
String
keyword
,
Step
step
,
long
startTimeBucket
,
long
endTimeBucket
,
int
limit
,
int
from
)
throws
ParseException
{
logger
.
debug
(
"keyword: {}, startTimeBucket: {}, endTimeBucket: {}, limit: {}, from: {}"
,
keyword
,
startTimeBucket
,
endTimeBucket
,
limit
,
from
);
Alarm
alarm
=
serviceAlarmUIDAO
.
loadAlarmList
(
keyword
,
startTimeBucket
,
endTimeBucket
,
limit
,
from
);
List
<
IApplicationMappingUIDAO
.
ApplicationMapping
>
applicationMappings
=
applicationMappingUIDAO
.
load
(
step
,
startTimeBucket
,
endTimeBucket
);
Map
<
Integer
,
Integer
>
mappings
=
new
HashMap
<>();
applicationMappings
.
forEach
(
applicationMapping
->
mappings
.
put
(
applicationMapping
.
getMappingApplicationId
(),
applicationMapping
.
getApplicationId
()));
alarm
.
getItems
().
forEach
(
item
->
{
ServiceName
serviceName
=
serviceNameCacheService
.
get
(
item
.
getId
());
String
applicationCode
=
applicationCacheService
.
getApplicationById
(
serviceName
.
getApplicationId
(
)).
getApplicationCode
();
String
applicationCode
=
applicationCacheService
.
getApplicationById
(
mappings
.
getOrDefault
(
serviceName
.
getApplicationId
(),
serviceName
.
getApplicationId
()
)).
getApplicationCode
();
switch
(
item
.
getCauseType
())
{
case
SLOW_RESPONSE:
item
.
setTitle
(
"Service "
+
serviceName
.
getServiceName
()
+
" of Application "
+
applicationCode
+
RESPONSE_TIME_ALARM
);
...
...
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ApplicationTopologyService.java
浏览文件 @
ca20d088
...
...
@@ -82,6 +82,6 @@ public class ApplicationTopologyService {
TopologyBuilder
builder
=
new
TopologyBuilder
(
moduleManager
);
return
builder
.
build
(
applicationComponents
,
applicationMappings
,
applicationMetrics
,
callerReferenceMetric
,
calleeReferenceMetric
,
startTimeBucket
,
endTimeBucket
,
startSecondTimeBucket
,
endSecondTimeBucket
);
return
builder
.
build
(
applicationComponents
,
applicationMappings
,
applicationMetrics
,
callerReferenceMetric
,
calleeReferenceMetric
,
st
ep
,
st
artTimeBucket
,
endTimeBucket
,
startSecondTimeBucket
,
endSecondTimeBucket
);
}
}
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ClusterTopologyService.java
浏览文件 @
ca20d088
...
...
@@ -72,6 +72,6 @@ public class ClusterTopologyService {
TopologyBuilder
builder
=
new
TopologyBuilder
(
moduleManager
);
return
builder
.
build
(
applicationComponents
,
applicationMappings
,
applicationMetrics
,
callerReferenceMetric
,
calleeReferenceMetric
,
startTimeBucket
,
endTimeBucket
,
startSecondTimeBucket
,
endSecondTimeBucket
);
return
builder
.
build
(
applicationComponents
,
applicationMappings
,
applicationMetrics
,
callerReferenceMetric
,
calleeReferenceMetric
,
st
ep
,
st
artTimeBucket
,
endTimeBucket
,
startSecondTimeBucket
,
endSecondTimeBucket
);
}
}
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/TopologyBuilder.java
浏览文件 @
ca20d088
...
...
@@ -40,6 +40,7 @@ import org.apache.skywalking.apm.collector.storage.ui.application.ApplicationNod
import
org.apache.skywalking.apm.collector.storage.ui.application.ConjecturalNode
;
import
org.apache.skywalking.apm.collector.storage.ui.common.Call
;
import
org.apache.skywalking.apm.collector.storage.ui.common.Node
;
import
org.apache.skywalking.apm.collector.storage.ui.common.Step
;
import
org.apache.skywalking.apm.collector.storage.ui.common.Topology
;
import
org.apache.skywalking.apm.collector.storage.ui.common.VisualUserNode
;
import
org.apache.skywalking.apm.collector.ui.utils.ApdexCalculator
;
...
...
@@ -72,7 +73,7 @@ class TopologyBuilder {
List
<
IApplicationMetricUIDAO
.
ApplicationMetric
>
applicationMetrics
,
List
<
IApplicationReferenceMetricUIDAO
.
ApplicationReferenceMetric
>
callerReferenceMetric
,
List
<
IApplicationReferenceMetricUIDAO
.
ApplicationReferenceMetric
>
calleeReferenceMetric
,
long
startTimeBucket
,
long
endTimeBucket
,
long
startSecondTimeBucket
,
long
endSecondTimeBucket
)
{
Step
step
,
long
startTimeBucket
,
long
endTimeBucket
,
long
startSecondTimeBucket
,
long
endSecondTimeBucket
)
{
Map
<
Integer
,
String
>
components
=
changeNodeComp2Map
(
applicationComponents
);
Map
<
Integer
,
Integer
>
mappings
=
changeMapping2Map
(
applicationMappings
);
...
...
@@ -97,7 +98,7 @@ class TopologyBuilder {
applicationNode
.
setApdex
(
ApdexCalculator
.
INSTANCE
.
calculate
(
applicationMetric
.
getSatisfiedCount
(),
applicationMetric
.
getToleratingCount
(),
applicationMetric
.
getFrustratedCount
()));
applicationNode
.
setAlarm
(
false
);
try
{
Alarm
alarm
=
alarmService
.
loadApplicationAlarmList
(
Const
.
EMPTY_STRING
,
startTimeBucket
,
endTimeBucket
,
1
,
0
);
Alarm
alarm
=
alarmService
.
loadApplicationAlarmList
(
Const
.
EMPTY_STRING
,
st
ep
,
st
artTimeBucket
,
endTimeBucket
,
1
,
0
);
if
(
alarm
.
getItems
().
size
()
>
0
)
{
applicationNode
.
setAlarm
(
true
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录