{
this.successQps = successQps;
}
- public Long getException() {
- return exception;
+ public Long getExceptionQps() {
+ return exceptionQps;
}
- public void setException(Long exception) {
- this.exception = exception;
+ public void setExceptionQps(Long exceptionQps) {
+ this.exceptionQps = exceptionQps;
}
public Double getRt() {
diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/vo/ResourceVo.java b/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/vo/ResourceVo.java
index a84096a3..bbba8b47 100755
--- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/vo/ResourceVo.java
+++ b/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/vo/ResourceVo.java
@@ -32,13 +32,13 @@ public class ResourceVo {
private Integer threadNum;
private Long passQps;
- private Long blockedQps;
+ private Long blockQps;
private Long totalQps;
private Long averageRt;
private Long passRequestQps;
private Long exceptionQps;
- private Long oneMinutePassed;
- private Long oneMinuteBlocked;
+ private Long oneMinutePass;
+ private Long oneMinuteBlock;
private Long oneMinuteException;
private Long oneMinuteTotal;
@@ -64,12 +64,12 @@ public class ResourceVo {
vo.resource = nodeVo.getResource();
vo.threadNum = nodeVo.getThreadNum();
vo.passQps = nodeVo.getPassQps();
- vo.blockedQps = nodeVo.getBlockedQps();
+ vo.blockQps = nodeVo.getBlockQps();
vo.totalQps = nodeVo.getTotalQps();
vo.averageRt = nodeVo.getAverageRt();
vo.exceptionQps = nodeVo.getExceptionQps();
- vo.oneMinutePassed = nodeVo.getOneMinutePassed();
- vo.oneMinuteBlocked = nodeVo.getOneMinuteBlocked();
+ vo.oneMinutePass = nodeVo.getOneMinutePass();
+ vo.oneMinuteBlock = nodeVo.getOneMinuteBlock();
vo.oneMinuteException = nodeVo.getOneMinuteException();
vo.oneMinuteTotal = nodeVo.getOneMinuteTotal();
list.add(vo);
@@ -103,12 +103,12 @@ public class ResourceVo {
vo.resource = node.getResource();
vo.threadNum = node.getThreadNum();
vo.passQps = node.getPassQps();
- vo.blockedQps = node.getBlockedQps();
+ vo.blockQps = node.getBlockQps();
vo.totalQps = node.getTotalQps();
vo.averageRt = node.getAverageRt();
vo.exceptionQps = node.getExceptionQps();
- vo.oneMinutePassed = node.getOneMinutePassed();
- vo.oneMinuteBlocked = node.getOneMinuteBlocked();
+ vo.oneMinutePass = node.getOneMinutePass();
+ vo.oneMinuteBlock = node.getOneMinuteBlock();
vo.oneMinuteException = node.getOneMinuteException();
vo.oneMinuteTotal = node.getOneMinuteTotal();
vo.visible = node.isVisible();
@@ -159,12 +159,12 @@ public class ResourceVo {
this.passQps = passQps;
}
- public Long getBlockedQps() {
- return blockedQps;
+ public Long getBlockQps() {
+ return blockQps;
}
- public void setBlockedQps(Long blockedQps) {
- this.blockedQps = blockedQps;
+ public void setBlockQps(Long blockQps) {
+ this.blockQps = blockQps;
}
public Long getTotalQps() {
@@ -207,20 +207,20 @@ public class ResourceVo {
this.oneMinuteException = oneMinuteException;
}
- public Long getOneMinutePassed() {
- return oneMinutePassed;
+ public Long getOneMinutePass() {
+ return oneMinutePass;
}
- public void setOneMinutePassed(Long oneMinutePassed) {
- this.oneMinutePassed = oneMinutePassed;
+ public void setOneMinutePass(Long oneMinutePass) {
+ this.oneMinutePass = oneMinutePass;
}
- public Long getOneMinuteBlocked() {
- return oneMinuteBlocked;
+ public Long getOneMinuteBlock() {
+ return oneMinuteBlock;
}
- public void setOneMinuteBlocked(Long oneMinuteBlocked) {
- this.oneMinuteBlocked = oneMinuteBlocked;
+ public void setOneMinuteBlock(Long oneMinuteBlock) {
+ this.oneMinuteBlock = oneMinuteBlock;
}
public Long getOneMinuteTotal() {
diff --git a/sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/metric.js b/sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/metric.js
index 8f853007..558495a5 100755
--- a/sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/metric.js
+++ b/sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/metric.js
@@ -75,13 +75,13 @@ app.controller('MetricCtl', ['$scope', '$stateParams', 'MetricService', '$interv
type: 'time',
mask: 'YYYY-MM-DD HH:mm:ss'
});
- chart.scale('passedQps', {
+ chart.scale('passQps', {
min: 0,
fine: true,
alias: 'p_qps'
// max: 10
});
- chart.scale('blockedQps', {
+ chart.scale('blockQps', {
min: 0,
fine: true,
alias: 'b_qps',
@@ -94,7 +94,7 @@ app.controller('MetricCtl', ['$scope', '$stateParams', 'MetricService', '$interv
grid: null,
label: null
});
- chart.axis('blockedQps', {
+ chart.axis('blockQps', {
grid: null,
label: null
});
@@ -118,17 +118,17 @@ app.controller('MetricCtl', ['$scope', '$stateParams', 'MetricService', '$interv
allowAllCanceled: true,
itemFormatter: function (val) {
// console.log('val=', val);
- if ('passedQps' === val) {
+ if ('passQps' === val) {
return 'p_qps';
}
- if ('blockedQps' === val) {
+ if ('blockQps' === val) {
return 'b_qps';
}
return val;
},
items: [
- { value: 'passedQps', marker: { symbol: 'hyphen', stroke: 'green', radius: 5, lineWidth: 2 } },
- { value: 'blockedQps', marker: { symbol: 'hyphen', stroke: 'blue', radius: 5, lineWidth: 2 } },
+ { value: 'passQps', marker: { symbol: 'hyphen', stroke: 'green', radius: 5, lineWidth: 2 } },
+ { value: 'blockQps', marker: { symbol: 'hyphen', stroke: 'blue', radius: 5, lineWidth: 2 } },
// { value: 'rt', marker: {symbol: 'hyphen', stroke: 'gray', radius: 5, lineWidth: 2} },
],
onClick: function (ev) {
@@ -148,8 +148,8 @@ app.controller('MetricCtl', ['$scope', '$stateParams', 'MetricService', '$interv
}
}
});
- chart.line().position('timestamp*passedQps').size(1).color('green').shape('smooth');
- chart.line().position('timestamp*blockedQps').size(1).color('blue').shape('smooth');
+ chart.line().position('timestamp*passQps').size(1).color('green').shape('smooth');
+ chart.line().position('timestamp*blockQps').size(1).color('blue').shape('smooth');
// chart.line().position('timestamp*rt').size(1).color('gray');
G2.track(false);
chart.render();
@@ -214,8 +214,8 @@ app.controller('MetricCtl', ['$scope', '$stateParams', 'MetricService', '$interv
for (var j = lastTime + 1; j < curTime; j++) {
filledData.push({
"timestamp": j * 1000,
- "passedQps": 0,
- "blockedQps": 0,
+ "passQps": 0,
+ "blockQps": 0,
"successQps": 0,
"exception": 0,
"rt": 0,
diff --git a/sentinel-dashboard/src/main/webapp/resources/app/views/identity.html b/sentinel-dashboard/src/main/webapp/resources/app/views/identity.html
index 682f71bb..03eba209 100755
--- a/sentinel-dashboard/src/main/webapp/resources/app/views/identity.html
+++ b/sentinel-dashboard/src/main/webapp/resources/app/views/identity.html
@@ -61,13 +61,13 @@
{{resource.passQps}} |
- {{resource.blockedQps}} |
+ {{resource.blockQps}} |
{{resource.threadNum}} |
{{resource.averageRt}} |
- {{resource.oneMinutePassed}} |
+ {{resource.oneMinutePass}} |
- {{resource.oneMinuteBlocked}} |
- {{resource.oneMinuteBlocked}} |
+ {{resource.oneMinuteBlock}}
+ {{resource.oneMinuteBlock}} |
|