This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch feature/5.0.0
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-ui.git
The following commit(s) were added to refs/heads/feature/5.0.0 by this push:
new cf57fe6 Overhaul dashboard and service pages for integration test
cf57fe6 is described below
commit cf57fe6809c65fca3bd937421094a308fca4c197
Author: hanahmily <[email protected]>
AuthorDate: Tue Feb 13 10:14:09 2018 +0800
Overhaul dashboard and service pages for integration test
---
src/main/frontend/mock/dashboard.js | 2 +-
src/main/frontend/mock/service.js | 7 +------
src/main/frontend/src/models/dashboard.js | 3 +++
src/main/frontend/src/routes/Dashboard/Dashboard.js | 9 +++++----
src/main/frontend/src/routes/Service/Service.js | 4 ++--
5 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/src/main/frontend/mock/dashboard.js
b/src/main/frontend/mock/dashboard.js
index af2bef8..479e595 100644
--- a/src/main/frontend/mock/dashboard.js
+++ b/src/main/frontend/mock/dashboard.js
@@ -13,7 +13,7 @@ export default {
'numOfMQ|1-100': 1,
},
getAlarmTrend: {
- 'numOfAlarmRate|60': ['@natural(0, 99)'],
+ 'numOfAlarmRate|60': ['@natural(0, 9999)'],
},
getConjecturalApps: {
'apps|3-5': [{ 'name|1': ['Oracle', 'MySQL', 'ActiveMQ', 'Redis',
'Memcache', 'SQLServer'], num: '@natural(1, 20)' }],
diff --git a/src/main/frontend/mock/service.js
b/src/main/frontend/mock/service.js
index 9f8ac95..83f5420 100644
--- a/src/main/frontend/mock/service.js
+++ b/src/main/frontend/mock/service.js
@@ -9,11 +9,6 @@ export default {
{
'key|+1': 3,
label: function() { return `service-${this.key}`; },
- 'type|1': ['DUBBO', 'USER', 'SPRINGMVC'],
- 'calls|1000-2000': 1,
- 'sla|1-100.1-2': 1,
- 'apdex|0.2': 1,
- 'numOfServiceAlarm|1-100': 1,
},
],
},
@@ -32,7 +27,7 @@ export default {
'trendList|60': ['@natural(500, 10000)'],
},
getServiceSLATrend: {
- 'trendList|60': ['@natural(80, 100)'],
+ 'trendList|60': ['@natural(8000, 10000)'],
},
getServiceTopology: () => {
const upNodes = mockjs.mock({
diff --git a/src/main/frontend/src/models/dashboard.js
b/src/main/frontend/src/models/dashboard.js
index ca33a0d..59188f2 100644
--- a/src/main/frontend/src/models/dashboard.js
+++ b/src/main/frontend/src/models/dashboard.js
@@ -28,6 +28,9 @@ export default generateModal({
numOfCache
numOfMQ
}
+ getAlarmTrend(duration: $duration) {
+ numOfAlarmRate
+ }
getConjecturalApps(duration: $duration) {
apps {
name
diff --git a/src/main/frontend/src/routes/Dashboard/Dashboard.js
b/src/main/frontend/src/routes/Dashboard/Dashboard.js
index c624257..cd4aae9 100644
--- a/src/main/frontend/src/routes/Dashboard/Dashboard.js
+++ b/src/main/frontend/src/routes/Dashboard/Dashboard.js
@@ -45,16 +45,17 @@ export default class Dashboard extends PureComponent {
const { data } = this.props.dashboard;
const visitData = [];
const { numOfAlarmRate } = data.getAlarmTrend;
+ const accuracy = 100;
let avg = 0;
let max = 0;
let min = 0;
if (numOfAlarmRate && numOfAlarmRate.length > 0) {
timeRange(this.props.duration).forEach((v, i) => {
- visitData.push({ x: v, y: numOfAlarmRate[i] });
+ visitData.push({ x: v, y: numOfAlarmRate[i] / accuracy });
});
- avg = numOfAlarmRate.reduce((acc, curr) => acc + curr) /
numOfAlarmRate.length;
- max = numOfAlarmRate.reduce((acc, curr) => { return acc < curr ? curr :
acc; });
- min = numOfAlarmRate.reduce((acc, curr) => { return acc > curr ? curr :
acc; });
+ avg = numOfAlarmRate.reduce((acc, curr) => acc + curr) /
numOfAlarmRate.length / accuracy;
+ max = numOfAlarmRate.reduce((acc, curr) => { return acc < curr ? curr :
acc; }) / accuracy;
+ min = numOfAlarmRate.reduce((acc, curr) => { return acc > curr ? curr :
acc; }) / accuracy;
}
return (
<Panel globalVariables={this.props.globalVariables}
onChange={this.handleDurationChange}>
diff --git a/src/main/frontend/src/routes/Service/Service.js
b/src/main/frontend/src/routes/Service/Service.js
index a1d3b22..4abb882 100644
--- a/src/main/frontend/src/routes/Service/Service.js
+++ b/src/main/frontend/src/routes/Service/Service.js
@@ -111,13 +111,13 @@ export default class Service extends PureComponent {
<Col xs={24} sm={24} md={24} lg={8} xl={8} style={{ marginTop: 24
}}>
<ChartCard
title="Avg SLA"
- total={`${this.avg(getServiceSLATrend.trendList)} %`}
+ total={`${this.avg(getServiceSLATrend.trendList) / 100} %`}
>
<MiniBar
animate={false}
height={46}
data={getServiceSLATrend.trendList
- .map((v, i) => { return { x: timeRangeArray[i], y: v }; })}
+ .map((v, i) => { return { x: timeRangeArray[i], y: v / 100
}; })}
/>
</ChartCard>
</Col>
--
To stop receiving notification emails like this one, please contact
[email protected].
