commit ad2dcf268fb17974924ec051cd2979df8ff5f1eb
author Gao Hongtao <hanahmily@gmail.com> Thu Sep 27 20:16:03 2018 +0800
committer Gao Hongtao <hanahmily@gmail.com> Thu Sep 27 20:16:03 2018 +0800
tree 2fac7e0c153987bc70c11cf101b9e6c7c9e18268
parent db7c4473a7c43179d280c3933c0f36639f10e0c4

Fix metric name with oal

.roadhogrc.mock.js

diff --git a/.roadhogrc.mock.js b/.roadhogrc.mock.js
index 38ff59e..1d4608c 100644
--- a/.roadhogrc.mock.js
+++ b/.roadhogrc.mock.js
@@ -7,7 +7,7 @@
 import { graphql } from 'graphql';
 import { ClusterBrief, getServiceInstances, getAllServices, searchEndpoint } from './mock/metadata';
 import { IntValues, Thermodynamic } from './mock/metric';
-import {  } from './mock/aggregation';
+import { getServiceTopN, getAllEndpointTopN } from './mock/aggregation';
 
 const noMock = process.env.NO_MOCK === 'true';
 
@@ -15,6 +15,8 @@
   Query: {
     getAllServices,
     getServiceInstances,
+    getServiceTopN,
+    getAllEndpointTopN,
     getGlobalTopology,
     getServiceTopology,
     searchEndpoint,

mock/aggregation.js

diff --git a/mock/aggregation.js b/mock/aggregation.js
index b45c112..c76fa65 100644
--- a/mock/aggregation.js
+++ b/mock/aggregation.js
@@ -18,7 +18,16 @@
 import mockjs from 'mockjs';
 
 export default {
-  getServiceTopN: () => mockjs.mock({ 'array|10': [{ 'id|+1': 1, name: '@name', 'value|100-10000': 1 }]}),
-  getAllServiceInstanceTopN: () => mockjs.mock({ 'array|10': [{ 'id|+1': 1, name: '@name', 'value|100-10000': 1 }]}),
-  getAllEndpointTopN: () => mockjs.mock({ 'array|10': [{ 'id|+1': 1, name: '@url', 'value|200-1000': 1 }]}),
+  getServiceTopN: () => {
+    const data =  mockjs.mock({ 'array|10': [{ 'id|+1': 1, name: '@name', 'value|100-10000': 1 }]});
+    return data.array;
+  },
+  getAllServiceInstanceTopN: () => {
+    const data =  mockjs.mock({ 'array|10': [{ 'id|+1': 1, name: '@name', 'value|100-10000': 1 }]});
+    return data.array;
+  },
+  getAllEndpointTopN: () => {
+    const data =  mockjs.mock({ 'array|10': [{ 'id|+1': 1, name: '@name', 'value|200-1000': 1 }]});
+    return data.array;
+  },
 };

src/models/dashboard.js

diff --git a/src/models/dashboard.js b/src/models/dashboard.js
index 01f2771..de75220 100644
--- a/src/models/dashboard.js
+++ b/src/models/dashboard.js
@@ -51,27 +51,27 @@
         numOfAlarm
       }
       getThermodynamic(duration: $duration, metric: {
-        name: "Endpoint_avg"
+        name: "all_heatmap"
       }) {
         nodes
         responseTimeStep: axisYStep
       }
-      getTopNSlowEndpoint: getTopN(duration: $duration, condition: {
-        name: "slowEndpoint",
+      getTopNSlowEndpoint: getAllEndpointTopN(
+        duration: $duration,
+        name: "endpoint_avg",
         topN: 10,
-        order: DES,
-        filterScope: ENDPOINT
-      }) {
+        order: DES
+      ) {
         key: id
         label: name
         value
       }
-      getTopNServiceThroughput: getTopN(duration: $duration, condition: {
-        name: "serviceThroughput",
+      getTopNServiceThroughput: getServiceTopN(
+        duration: $duration,
+        name: "service_cpm",
         topN: 10,
-        order: DES,
-        filterScope: SERVICE
-      }) {
+        order: DES
+      ) {
         key: id
         label: name
         value