Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
润土的好友猹
SkyWalking
提交
eff39b0f
S
SkyWalking
项目概览
润土的好友猹
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / SkyWalking
通知
9
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,发现更多精彩内容 >>
提交
eff39b0f
编写于
3月 30, 2018
作者:
彭
彭勇升 pengys
提交者:
wu-sheng
3月 30, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rename field name to osName in type AppServerInfo. (#1006)
#998
上级
bade4fd6
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
9 addition
and
14 deletion
+9
-14
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/server/AppServerInfo.java
...alking/apm/collector/storage/ui/server/AppServerInfo.java
+6
-5
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ServerService.java
...he/skywalking/apm/collector/ui/service/ServerService.java
+2
-8
apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/server-layer.graphqls
...tocol/src/main/resources/ui-graphql/server-layer.graphqls
+1
-1
未找到文件。
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/server/AppServerInfo.java
浏览文件 @
eff39b0f
...
...
@@ -24,11 +24,12 @@ import java.util.List;
* @author peng-yongsheng
*/
public
class
AppServerInfo
{
private
int
id
;
private
int
applicationId
;
private
String
applicationCode
;
private
String
osInfo
;
private
String
n
ame
;
private
String
osN
ame
;
private
int
callsPerSec
;
private
String
host
;
private
int
pid
;
...
...
@@ -66,12 +67,12 @@ public class AppServerInfo {
this
.
osInfo
=
osInfo
;
}
public
String
getName
()
{
return
n
ame
;
public
String
get
Os
Name
()
{
return
osN
ame
;
}
public
void
set
Name
(
String
n
ame
)
{
this
.
name
=
n
ame
;
public
void
set
OsName
(
String
osN
ame
)
{
this
.
osName
=
osN
ame
;
}
public
int
getCallsPerSec
()
{
...
...
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ServerService.java
浏览文件 @
eff39b0f
...
...
@@ -166,12 +166,10 @@ public class ServerService {
private
void
buildAppServerInfo
(
List
<
AppServerInfo
>
serverInfos
)
{
serverInfos
.
forEach
(
serverInfo
->
{
serverInfo
.
setApplicationCode
(
applicationCacheService
.
getApplicationById
(
serverInfo
.
getApplicationId
()).
getApplicationCode
());
StringBuilder
nameBuilder
=
new
StringBuilder
();
nameBuilder
.
append
(
serverInfo
.
getApplicationCode
());
if
(
StringUtils
.
isNotEmpty
(
serverInfo
.
getOsInfo
()))
{
JsonObject
osInfoJson
=
gson
.
fromJson
(
serverInfo
.
getOsInfo
(),
JsonObject
.
class
);
if
(
osInfoJson
.
has
(
"osName"
))
{
serverInfo
.
setName
(
osInfoJson
.
get
(
"osName"
).
getAsString
());
serverInfo
.
set
Os
Name
(
osInfoJson
.
get
(
"osName"
).
getAsString
());
}
if
(
osInfoJson
.
has
(
"hostName"
))
{
serverInfo
.
setHost
(
osInfoJson
.
get
(
"hostName"
).
getAsString
());
...
...
@@ -184,14 +182,10 @@ public class ServerService {
JsonArray
ipv4Array
=
osInfoJson
.
get
(
"ipv4s"
).
getAsJsonArray
();
List
<
String
>
ipv4s
=
new
LinkedList
<>();
ipv4Array
.
forEach
(
ipv4
->
{
ipv4s
.
add
(
ipv4
.
getAsString
());
nameBuilder
.
append
(
Const
.
ID_SPLIT
).
append
(
ipv4
.
getAsString
());
});
ipv4Array
.
forEach
(
ipv4
->
ipv4s
.
add
(
ipv4
.
getAsString
()));
serverInfo
.
setIpv4
(
ipv4s
);
}
}
serverInfo
.
setName
(
nameBuilder
.
toString
());
});
}
}
apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/server-layer.graphqls
浏览文件 @
eff39b0f
...
...
@@ -21,7 +21,7 @@
# 2. A Tomcat server instance
type AppServerInfo {
id: ID!
n
ame: String!
osN
ame: String!
applicationId: Int!
applicationCode: String
callsPerSec: Int!
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录