You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ha...@apache.org on 2018/10/30 02:19:50 UTC
[incubator-skywalking-ui] branch master updated (b32532d -> c4abbde)
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-ui.git.
from b32532d Merge pull request #197 from apache/wu-sheng-patch-1
new 2f5564a Change service instance select name
new c4abbde Convert the SLA metric display to percentage
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/metadata.js | 12 ++++++++----
mock/metric.js | 2 +-
src/components/ApplicationLitePanel/index.js | 2 +-
src/utils/utils.js | 11 +----------
4 files changed, 11 insertions(+), 16 deletions(-)
[incubator-skywalking-ui] 02/02: Convert the SLA metric display to
percentage
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-ui.git
commit c4abbde39d52b31c9e5b94fe2a8013cda3f6ced7
Author: gaohongtao <ha...@gmail.com>
AuthorDate: Tue Oct 30 10:15:51 2018 +0800
Convert the SLA metric display to percentage
---
mock/metric.js | 2 +-
src/components/ApplicationLitePanel/index.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mock/metric.js b/mock/metric.js
index 203d525..ada83b2 100644
--- a/mock/metric.js
+++ b/mock/metric.js
@@ -34,7 +34,7 @@ export default {
{
'values|60': [{
'id|+1': 1,
- value: '@natural(0, 100)',
+ value: '@natural(100, 10000)',
}],
}
)),
diff --git a/src/components/ApplicationLitePanel/index.js b/src/components/ApplicationLitePanel/index.js
index a834c1b..c237670 100644
--- a/src/components/ApplicationLitePanel/index.js
+++ b/src/components/ApplicationLitePanel/index.js
@@ -28,7 +28,7 @@ export default class ApplicationLitePanel extends PureComponent {
<div>
{appInfo.isAlarm ? <Avatar style={{ backgroundColor: '#F04864', marginBottom: 10 }} icon="bell" /> : null}
<DescriptionList col={1} layout="vertical">
- <Description term="SLA">{appInfo.sla}%</Description>
+ <Description term="SLA">{appInfo.sla / 100}%</Description>
<Description term="Calls Per Minute">{appInfo.cpm}</Description>
<Description term="Avg Response Time">{appInfo.avgResponseTime} ms</Description>
</DescriptionList>
[incubator-skywalking-ui] 01/02: Change service instance select name
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-ui.git
commit 2f5564abd39a61a1414cceac36422377c3cf8811
Author: gaohongtao <ha...@gmail.com>
AuthorDate: Tue Oct 30 09:52:44 2018 +0800
Change service instance select name
The last combination of service instance select name is a process
number with host name or ip. The backend supplied a new name attribute
for ui to display, which is a more convenient way to accomplish
it.
---
mock/metadata.js | 12 ++++++++----
src/utils/utils.js | 11 +----------
2 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/mock/metadata.js b/mock/metadata.js
index 999a76d..15a130f 100644
--- a/mock/metadata.js
+++ b/mock/metadata.js
@@ -32,19 +32,23 @@ export default {
name: '@natural(4, 20)',
attributes: [
{
- name: 'os',
+ name: 'os_name',
value: 'LINUX',
},
{
- name: 'host',
+ name: 'host_name',
value: 'WORKSAPCE-@name',
},
{
- name: 'pid',
+ name: 'process_no',
value: '@natural(4, 20)',
},
{
- name: 'ipv4',
+ name: 'ipv4s',
+ value: '@ip',
+ },
+ {
+ name: 'ipv4s',
value: '@ip',
},
],
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 537832d..f8060f6 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -115,16 +115,7 @@ export function isUrl(path) {
}
export function getServiceInstanceId(serviceInstanceInfo) {
- const { attributes } = serviceInstanceInfo;
- if (!attributes || attributes.length < 1) {
- return '';
- }
- let host = getAttributes(attributes, 'host_name');
- const ipv4 = getAttributes(attributes, 'ipv4s');
- if (ipv4 && ipv4.length > 0) {
- host = ipv4;
- }
- return `${getAttributes(attributes, 'process_no')}@${host}`;
+ return serviceInstanceInfo.name;
}
export function getAttributes(attributes, name) {