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/18 03:21:04 UTC
[incubator-skywalking-ui] branch 6.0.0/dev updated (8ad74f8 ->
7b353f7)
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a change to branch 6.0.0/dev
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-ui.git.
from 8ad74f8 Remove alarm tread chart from Dashboard
new 741fd26 Add endpoint dependencies map
new 9474e04 Update change
new 7b353f7 Update endpoint
The 3 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/topology.js | 2 +-
query-protocol | 2 +-
src/components/ApplicationLitePanel/index.js | 1 -
src/components/Charts/EndpointDeps/index.js | 4 ++++
src/components/Topology/Base.js | 4 ++--
src/models/endpoint.js | 21 +++++--------------
src/models/service.js | 4 ++--
src/models/topology.js | 30 +++++++++++++++++++++++++---
src/routes/Topology/Topology.js | 16 +++++++++++++--
9 files changed, 56 insertions(+), 28 deletions(-)
[incubator-skywalking-ui] 01/03: Add endpoint dependencies map
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch 6.0.0/dev
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-ui.git
commit 741fd263ea1e74571a3a3dbeb553f2535a50e008
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Tue Oct 16 20:55:52 2018 +0800
Add endpoint dependencies map
---
src/components/Charts/EndpointDeps/index.js | 4 ++++
src/components/Topology/Base.js | 4 ++--
src/models/topology.js | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/components/Charts/EndpointDeps/index.js b/src/components/Charts/EndpointDeps/index.js
index 8cc478a..39d7f25 100644
--- a/src/components/Charts/EndpointDeps/index.js
+++ b/src/components/Charts/EndpointDeps/index.js
@@ -25,6 +25,10 @@ class EndpointDeps extends PureComponent {
if (deps === preDeps) {
return;
}
+ const { calls } = deps;
+ if (calls.length < 1) {
+ return;
+ }
const { onLoadMetrics } = this.props;
onLoadMetrics(deps);
}
diff --git a/src/components/Topology/Base.js b/src/components/Topology/Base.js
index e6631fa..a860017 100644
--- a/src/components/Topology/Base.js
+++ b/src/components/Topology/Base.js
@@ -94,8 +94,8 @@ export default class Base extends Component {
if (onLoadMetircs) {
onLoadMetircs(
elementes.nodes.filter(_ => _.data.id.indexOf('USER') < 0).map(_ => _.data.id),
- elementes.edges.filter(_ => _.data.detectPoint === 'SERVER').map(_ => _.data.id),
- elementes.edges.filter(_ => _.data.detectPoint === 'CLIENT').map(_ => _.data.id),
+ elementes.edges.filter(_ => _.data.detectPoint === 'SERVER').map(_ => _.data.dataId),
+ elementes.edges.filter(_ => _.data.detectPoint === 'CLIENT').map(_ => _.data.dataId),
);
}
}
diff --git a/src/models/topology.js b/src/models/topology.js
index 1b34e44..4ff3e68 100644
--- a/src/models/topology.js
+++ b/src/models/topology.js
@@ -22,7 +22,7 @@ import { exec } from '../services/graphql';
const metricQuery = `
query TopologyMetric($duration: Duration!, $ids: [ID!]!, $idsS: [ID!]!, $idsC: [ID!]!) {
sla: getValues(metric: {
- name: "service_relation_server_call_sla"
+ name: "service_sla"
ids: $ids
}, duration: $duration) {
values {
[incubator-skywalking-ui] 02/03: Update change
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch 6.0.0/dev
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-ui.git
commit 9474e04df0d1cd98b1f92ea7ef5e170949a9d12c
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Wed Oct 17 22:04:23 2018 +0800
Update change
---
mock/topology.js | 2 +-
src/components/ApplicationLitePanel/index.js | 1 -
src/models/service.js | 4 ++--
src/models/topology.js | 28 ++++++++++++++++++++++++++--
src/routes/Topology/Topology.js | 16 ++++++++++++++--
5 files changed, 43 insertions(+), 8 deletions(-)
diff --git a/mock/topology.js b/mock/topology.js
index 5861e93..c6a8639 100644
--- a/mock/topology.js
+++ b/mock/topology.js
@@ -125,7 +125,7 @@ export default {
{
'id|+1': 2,
name: '@name',
- 'type|1': ['DUBBO', 'tomcat', 'SPRINGMVC'],
+ 'type|1': ['DUBBO', 'tomcat', 'SPRINGMVC', 'foo'],
isReal: true,
},
],
diff --git a/src/components/ApplicationLitePanel/index.js b/src/components/ApplicationLitePanel/index.js
index 8ac6f81..a834c1b 100644
--- a/src/components/ApplicationLitePanel/index.js
+++ b/src/components/ApplicationLitePanel/index.js
@@ -31,7 +31,6 @@ export default class ApplicationLitePanel extends PureComponent {
<Description term="SLA">{appInfo.sla}%</Description>
<Description term="Calls Per Minute">{appInfo.cpm}</Description>
<Description term="Avg Response Time">{appInfo.avgResponseTime} ms</Description>
- <Description term="Total Server">{appInfo.numOfServer}</Description>
</DescriptionList>
</div>
);
diff --git a/src/models/service.js b/src/models/service.js
index c0aa4c7..3ae3763 100644
--- a/src/models/service.js
+++ b/src/models/service.js
@@ -186,7 +186,7 @@ query ServiceInstance($serviceInstanceId: ID!, $duration: Duration!) {
}
}
maxHeap: getLinearIntValues(metric: {
- name: "instance_jvm_memory_max_heap"
+ name: "instance_jvm_memory_heap_max"
id: $serviceInstanceId
}, duration: $duration) {
values {
@@ -202,7 +202,7 @@ query ServiceInstance($serviceInstanceId: ID!, $duration: Duration!) {
}
}
maxNoheap: getLinearIntValues(metric: {
- name: "instance_jvm_memory_max_noheap"
+ name: "instance_jvm_memory_noheap_max"
id: $serviceInstanceId
}, duration: $duration) {
values {
diff --git a/src/models/topology.js b/src/models/topology.js
index 4ff3e68..c869157 100644
--- a/src/models/topology.js
+++ b/src/models/topology.js
@@ -30,6 +30,24 @@ const metricQuery = `
value
}
}
+ nodeCpm: getValues(metric: {
+ name: "service_cpm"
+ ids: $ids
+ }, duration: $duration) {
+ values {
+ id
+ value
+ }
+ }
+ nodeLatency: getValues(metric: {
+ name: "service_resp_time"
+ ids: $ids
+ }, duration: $duration) {
+ values {
+ id
+ value
+ }
+ }
cpmS: getValues(metric: {
name: "service_relation_server_cpm"
ids: $idsS
@@ -80,6 +98,12 @@ export default base({
sla: {
values: [],
},
+ nodeCpm: {
+ values: [],
+ },
+ nodeLatency: {
+ values: [],
+ },
cpm: {
values: [],
},
@@ -116,12 +140,12 @@ export default base({
if (!response.data) {
return;
}
- const { sla, cpmS, cpmC, latencyS, latencyC } = response.data;
+ const { cpmS, cpmC, latencyS, latencyC } = response.data;
yield put({
type: 'saveData',
payload: {
metrics: {
- sla,
+ ...response.data,
cpm: {
values: cpmS.values.concat(cpmC.values),
},
diff --git a/src/routes/Topology/Topology.js b/src/routes/Topology/Topology.js
index 4dbe867..17c7b5c 100644
--- a/src/routes/Topology/Topology.js
+++ b/src/routes/Topology/Topology.js
@@ -73,6 +73,14 @@ export default class Topology extends PureComponent {
graphHeight: 600,
};
+ findValue = (id, values) => {
+ const v = values.find(_ => _.id === id);
+ if (v) {
+ return v.value;
+ }
+ return null;
+ }
+
handleChange = (variables) => {
const { dispatch } = this.props;
dispatch({
@@ -103,11 +111,15 @@ export default class Topology extends PureComponent {
}
handleSelectedApplication = (appInfo) => {
- const { dispatch } = this.props;
+ const { dispatch, topology: { data: { metrics: { sla, nodeCpm, nodeLatency } } } } = this.props;
if (appInfo) {
dispatch({
type: 'topology/saveData',
- payload: { appInfo },
+ payload: { appInfo: { ...appInfo,
+ sla: this.findValue(appInfo.id, sla.values),
+ cpm: this.findValue(appInfo.id, nodeCpm.values),
+ avgResponseTime: this.findValue(appInfo.id, nodeLatency.values),
+ } },
});
} else {
dispatch({
[incubator-skywalking-ui] 03/03: Update endpoint
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch 6.0.0/dev
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-ui.git
commit 7b353f7a8fa4a24071ee6d7bf67f043cb3a1d3c9
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Thu Oct 18 11:20:40 2018 +0800
Update endpoint
---
query-protocol | 2 +-
src/models/endpoint.js | 21 +++++----------------
2 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/query-protocol b/query-protocol
index 3a83be7..1122e97 160000
--- a/query-protocol
+++ b/query-protocol
@@ -1 +1 @@
-Subproject commit 3a83be79a9c23aad6576ed2a4a04b82de6d7a829
+Subproject commit 1122e97b5604ae96447bd58ecdb248d7e02952aa
diff --git a/src/models/endpoint.js b/src/models/endpoint.js
index c4b0dda..d4a7f20 100644
--- a/src/models/endpoint.js
+++ b/src/models/endpoint.js
@@ -162,9 +162,9 @@ const spanQuery = `query Spans($traceId: ID!) {
}`;
const metricQuery = `
- query TopologyMetric($duration: Duration!, $idsS: [ID!]!, $idsC: [ID!]!) {
- cpmS: getValues(metric: {
- name: "endpoint_relation_server_cpm"
+ query TopologyMetric($duration: Duration!, $idsS: [ID!]!) {
+ cpm: getValues(metric: {
+ name: "endpoint_relation_cpm"
ids: $idsS
}, duration: $duration) {
values {
@@ -172,15 +172,6 @@ const metricQuery = `
value
}
}
- cpmC: getValues(metric: {
- name: "endpoint_relation_client_cpm"
- ids: $idsC
- }, duration: $duration) {
- values {
- id
- value
- }
- }
}
`;
@@ -241,14 +232,12 @@ export default base({
if (!response.data) {
return;
}
- const { cpmS, cpmC } = response.data;
+ const { cpm } = response.data;
yield put({
type: 'saveData',
payload: {
metrics: {
- cpm: {
- values: cpmS.values.concat(cpmC.values),
- },
+ cpm,
},
},
});