[incubator-skywalking-ui] 03/03: Update endpoint

[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,
           },
         },
       });