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/09/27 12:16:40 UTC
[incubator-skywalking-ui] branch 6.0.0/dev updated (35510a4 ->
ad2dcf2)
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 35510a4 Add the style of latency and cpm to the lines of Topology page.
new db7c447 Fix start:no-proxy script
new ad2dcf2 Fix metric name with oal
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:
.roadhogrc.mock.js | 4 +++-
mock/aggregation.js | 15 ++++++++++++---
package.json | 2 +-
src/models/dashboard.js | 22 +++++++++++-----------
4 files changed, 27 insertions(+), 16 deletions(-)
[incubator-skywalking-ui] 02/02: Fix metric name with oal
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 ad2dcf268fb17974924ec051cd2979df8ff5f1eb
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Thu Sep 27 20:16:03 2018 +0800
Fix metric name with oal
---
.roadhogrc.mock.js | 4 +++-
mock/aggregation.js | 15 ++++++++++++---
src/models/dashboard.js | 22 +++++++++++-----------
3 files changed, 26 insertions(+), 15 deletions(-)
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 { makeExecutableSchema, addMockFunctionsToSchema } from 'graphql-tools';
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 @@ const resolvers = {
Query: {
getAllServices,
getServiceInstances,
+ getServiceTopN,
+ getAllEndpointTopN,
getGlobalTopology,
getServiceTopology,
searchEndpoint,
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;
+ },
};
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 @@ export default base({
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
[incubator-skywalking-ui] 01/02: Fix start:no-proxy script
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 db7c4473a7c43179d280c3933c0f36639f10e0c4
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Thu Sep 27 17:09:35 2018 +0800
Fix start:no-proxy script
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 0353afe..5b219d5 100755
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
"scripts": {
"precommit": "npm run lint:style",
"start": "cross-env ESLINT=none roadhog dev",
- "start:no-proxy": "cross-env NO_PROXY=true ESLINT=none roadhog dev",
+ "start:no-proxy": "cross-env NO_MOCK=true ESLINT=none roadhog dev",
"build": "cross-env ESLINT=none roadhog build",
"site": "roadhog-api-doc static && gh-pages -d dist",
"analyze": "cross-env ANALYZE=true roadhog build",