You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by ha...@apache.org on 2018/03/05 01:33:41 UTC
[incubator-skywalking-ui] branch fix/e2e updated (4d5557e ->
b6c4b25)
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a change to branch fix/e2e
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-ui.git.
from 4d5557e Merge from master
new 66ae02d Refactor server search result
new b6c4b25 Add chart unit
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
mock/server.js | 3 ++-
src/routes/Server/Server.js | 10 +++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
--
To stop receiving notification emails like this one, please contact
hanahmily@apache.org.
[incubator-skywalking-ui] 02/02: Add chart unit
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch fix/e2e
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-ui.git
commit b6c4b25e1cef78c45b1298fa331d497569ac4eb5
Author: hanahmily <ha...@gmail.com>
AuthorDate: Mon Mar 5 09:26:48 2018 +0800
Add chart unit
---
src/routes/Server/Server.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/routes/Server/Server.js b/src/routes/Server/Server.js
index 2ed2063..c915679 100644
--- a/src/routes/Server/Server.js
+++ b/src/routes/Server/Server.js
@@ -128,7 +128,7 @@ export default class Server extends PureComponent {
<Row gutter={24}>
<Col xs={24} sm={24} md={24} lg={24} xl={24} style={{ marginTop: 24 }}>
<ChartCard
- title="CPU"
+ title="CPU %"
contentHeight={150}
>
<Line
@@ -140,7 +140,7 @@ export default class Server extends PureComponent {
<Row gutter={24}>
<Col xs={24} sm={24} md={12} lg={12} xl={12} style={{ marginTop: 24 }}>
<ChartCard
- title="Heap"
+ title="Heap MB"
contentHeight={150}
>
<Area
@@ -151,7 +151,7 @@ export default class Server extends PureComponent {
</Col>
<Col xs={24} sm={24} md={12} lg={12} xl={12} style={{ marginTop: 24 }}>
<ChartCard
- title="Non-Heap"
+ title="Non-Heap MB"
contentHeight={150}
>
<Area
@@ -164,7 +164,7 @@ export default class Server extends PureComponent {
<Row gutter={24}>
<Col xs={24} sm={24} md={24} lg={24} xl={24} style={{ marginTop: 24 }}>
<ChartCard
- title="GC"
+ title="GC ms"
contentHeight={150}
>
<StackBar
--
To stop receiving notification emails like this one, please contact
hanahmily@apache.org.
[incubator-skywalking-ui] 01/02: Refactor server search result
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch fix/e2e
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-ui.git
commit 66ae02dc5ad23f64d1c2c0bf08107f05d26936ab
Author: hanahmily <ha...@gmail.com>
AuthorDate: Mon Mar 5 09:19:48 2018 +0800
Refactor server search result
---
mock/server.js | 3 ++-
src/routes/Server/Server.js | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/mock/server.js b/mock/server.js
index cbc8020..7a70310 100644
--- a/mock/server.js
+++ b/mock/server.js
@@ -11,8 +11,9 @@ export default {
name: function() { return `server-${this.key}`; }, // eslint-disable-line
os: 'Mac-@name',
host: 'WORKSAPCE-@name',
- pid: '@natural',
+ pid: '@natural(4, 20)',
'ipv4|1-3': ['@ip'],
+ applicationCode: 'Frontend',
},
],
},
diff --git a/src/routes/Server/Server.js b/src/routes/Server/Server.js
index 7ff19cd..2ed2063 100644
--- a/src/routes/Server/Server.js
+++ b/src/routes/Server/Server.js
@@ -78,7 +78,7 @@ export default class Server extends PureComponent {
}
}
`}
- transform={r => ({ ...r, label: `${r.pid}@${r.applicationCode}` })}
+ transform={r => ({ ...r, label: `${r.pid}@${r.host}:${r.applicationCode}` })}
/>
)}
</FormItem>
--
To stop receiving notification emails like this one, please contact
hanahmily@apache.org.