Browse Source

dashboard: frontend refinement of monitoring page and flow rule dialog description

Signed-off-by: Eric Zhao <sczyh16@gmail.com>
master
Eric Zhao 6 years ago
parent
commit
e42551a877
3 changed files with 9 additions and 9 deletions
  1. +5
    -5
      sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/metric.js
  2. +1
    -1
      sentinel-dashboard/src/main/webapp/resources/app/views/dialog/flow-rule-dialog.html
  3. +3
    -3
      sentinel-dashboard/src/main/webapp/resources/app/views/metric.html

+ 5
- 5
sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/metric.js View File

@@ -89,14 +89,14 @@ app.controller('MetricCtl', ['$scope', '$stateParams', 'MetricService', '$interv
min: 0,
max: maxQps,
fine: true,
alias: 'p_qps'
alias: '通过 QPS'
// max: 10
});
chart.scale('blockQps', {
min: 0,
max: maxQps,
fine: true,
alias: 'b_qps',
alias: '拒绝 QPS',
});
chart.scale('rt', {
min: 0,
@@ -131,10 +131,10 @@ app.controller('MetricCtl', ['$scope', '$stateParams', 'MetricService', '$interv
allowAllCanceled: true,
itemFormatter: function (val) {
if ('passQps' === val) {
return 'p_qps(通过 QPS)';
return '通过 QPS';
}
if ('blockQps' === val) {
return 'b_qps(拒绝 QPS)';
return '拒绝 QPS';
}
return val;
},
@@ -181,7 +181,7 @@ app.controller('MetricCtl', ['$scope', '$stateParams', 'MetricService', '$interv
MetricService.queryAppSortedIdentities(params).success(function (data) {
$scope.metrics = [];
$scope.emptyObjs = [];
if (data.code == 0 && data.data) {
if (data.code === 0 && data.data) {
var metricsObj = data.data.metric;
var identityNames = Object.keys(metricsObj);
if (identityNames.length < 1) {


+ 1
- 1
sentinel-dashboard/src/main/webapp/resources/app/views/dialog/flow-rule-dialog.html View File

@@ -73,8 +73,8 @@
<div class="col-sm-8">
<label class="checkbox-inline">
<input type="checkbox" name="clusterMode" ng-model="currentRule.clusterConfig.fallbackToLocalWhenFail">
<i class="glyphicon glyphicon-info-sign"></i>如果集群限流失败是否退化到单机限流
</label>
<i class="glyphicon glyphicon-info-sign"></i>&nbsp;如果 Token Server 不可用是否退化到单机限流
</div>
</div>



+ 3
- 3
sentinel-dashboard/src/main/webapp/resources/app/views/metric.html View File

@@ -51,9 +51,9 @@
<thead>
<tr style="font-size: 13px;text-align:center;font-weight: bold;">
<td style="word-wrap:break-word;word-break:break-all;">时间</td>
<td style="word-wrap:break-word;word-break:break-all;" title="passQps: 通过的qps">通过QPS</td>
<td style="word-wrap:break-word;word-break:break-all;" title="blockQps: 拦截的qps">拒绝QPS</td>
<td style="word-wrap:break-word;word-break:break-all;" title="responseTime: 响应时间(毫秒)">响应时间(ms)</td>
<td style="word-wrap:break-word;word-break:break-all;" title="通过 QPS (pass qps)">通过 QPS</td>
<td style="word-wrap:break-word;word-break:break-all;" title="拒绝 QPS (blocked qps)">拒绝QPS</td>
<td style="word-wrap:break-word;word-break:break-all;" title="RT: 平均响应时间(毫秒)">响应时间(ms)</td>
</tr>
</thead>
<!-- thead -->


Loading…
Cancel
Save