Repository: eagle Updated Branches: refs/heads/master 3fb7ff27d -> 812002740
[MINOR] Fix regionserver,datanode dashboard datetime picker exception Author: chitin <[email protected]> Closes #890 from chitin/datetimepicker. Project: http://git-wip-us.apache.org/repos/asf/eagle/repo Commit: http://git-wip-us.apache.org/repos/asf/eagle/commit/81200274 Tree: http://git-wip-us.apache.org/repos/asf/eagle/tree/81200274 Diff: http://git-wip-us.apache.org/repos/asf/eagle/diff/81200274 Branch: refs/heads/master Commit: 812002740cd6acea8c5e4b2f0e2267e47668aa10 Parents: 3fb7ff2 Author: chitin <[email protected]> Authored: Thu Mar 23 06:55:24 2017 +0000 Committer: r7raul1984 <[email protected]> Committed: Thu Mar 23 06:55:24 2017 +0000 ---------------------------------------------------------------------- .../main/webapp/app/apps/hbase/ctrls/regionDetailCtrl.js | 11 +++++++++++ .../webapp/app/apps/hbase/widgets/availabilityChart.js | 4 ++-- .../main/webapp/app/apps/hdfs/ctrl/datanodeDetailCtrl.js | 11 +++++++++++ .../webapp/app/apps/hdfs/widget/availabilityChart.js | 4 ++-- 4 files changed, 26 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/eagle/blob/81200274/eagle-metric/eagle-hbase-web/src/main/webapp/app/apps/hbase/ctrls/regionDetailCtrl.js ---------------------------------------------------------------------- diff --git a/eagle-metric/eagle-hbase-web/src/main/webapp/app/apps/hbase/ctrls/regionDetailCtrl.js b/eagle-metric/eagle-hbase-web/src/main/webapp/app/apps/hbase/ctrls/regionDetailCtrl.js index 838b3a2..68f2824 100644 --- a/eagle-metric/eagle-hbase-web/src/main/webapp/app/apps/hbase/ctrls/regionDetailCtrl.js +++ b/eagle-metric/eagle-hbase-web/src/main/webapp/app/apps/hbase/ctrls/regionDetailCtrl.js @@ -259,6 +259,17 @@ }; Time.onReload(function () { cache = {}; + $.each($scope.chartList, function (i) { + var chart = $scope.chartList[i]; + var chartname = chart.name; + $scope.metricList[chartname] = { + title: chartname, + series: {}, + option: {}, + loading: true, + promises: [] + }; + }); $scope.refresh(); }, $scope); $scope.refresh(); http://git-wip-us.apache.org/repos/asf/eagle/blob/81200274/eagle-metric/eagle-hbase-web/src/main/webapp/app/apps/hbase/widgets/availabilityChart.js ---------------------------------------------------------------------- diff --git a/eagle-metric/eagle-hbase-web/src/main/webapp/app/apps/hbase/widgets/availabilityChart.js b/eagle-metric/eagle-hbase-web/src/main/webapp/app/apps/hbase/widgets/availabilityChart.js index 08cafaf..b2dec3d 100644 --- a/eagle-metric/eagle-hbase-web/src/main/webapp/app/apps/hbase/widgets/availabilityChart.js +++ b/eagle-metric/eagle-hbase-web/src/main/webapp/app/apps/hbase/widgets/availabilityChart.js @@ -129,8 +129,8 @@ '</a>' + '<div ng-show="!regionserverhealtynum && !regionserverunhealtynum">' + '<span>0</span> Masters (' + - '<span>0</span> Active / ' + - '<span>0</span> Standby)' + + '<span>0</span> Healthy / ' + + '<span>0</span> Unhealthy)' + '</div>' + '</div>' + '<div ng-show="regionserverhealtynum===-1 || regionserverunhealtynum===-1" class="hadoopMetric-widget-detail">' + http://git-wip-us.apache.org/repos/asf/eagle/blob/81200274/eagle-metric/eagle-hdfs-web/src/main/webapp/app/apps/hdfs/ctrl/datanodeDetailCtrl.js ---------------------------------------------------------------------- diff --git a/eagle-metric/eagle-hdfs-web/src/main/webapp/app/apps/hdfs/ctrl/datanodeDetailCtrl.js b/eagle-metric/eagle-hdfs-web/src/main/webapp/app/apps/hdfs/ctrl/datanodeDetailCtrl.js index e96c488..bddaa42 100644 --- a/eagle-metric/eagle-hdfs-web/src/main/webapp/app/apps/hdfs/ctrl/datanodeDetailCtrl.js +++ b/eagle-metric/eagle-hdfs-web/src/main/webapp/app/apps/hdfs/ctrl/datanodeDetailCtrl.js @@ -174,6 +174,17 @@ }; Time.onReload(function () { cache = {}; + $.each($scope.chartList, function (i) { + var chart = $scope.chartList[i]; + var chartname = chart.name; + $scope.metricList[chartname] = { + title: chartname, + series: {}, + option: {}, + loading: true, + promises: [] + }; + }); $scope.refresh(); }, $scope); $scope.refresh(); http://git-wip-us.apache.org/repos/asf/eagle/blob/81200274/eagle-metric/eagle-hdfs-web/src/main/webapp/app/apps/hdfs/widget/availabilityChart.js ---------------------------------------------------------------------- diff --git a/eagle-metric/eagle-hdfs-web/src/main/webapp/app/apps/hdfs/widget/availabilityChart.js b/eagle-metric/eagle-hdfs-web/src/main/webapp/app/apps/hdfs/widget/availabilityChart.js index 1053621..17867ba 100644 --- a/eagle-metric/eagle-hdfs-web/src/main/webapp/app/apps/hdfs/widget/availabilityChart.js +++ b/eagle-metric/eagle-hdfs-web/src/main/webapp/app/apps/hdfs/widget/availabilityChart.js @@ -118,8 +118,8 @@ '</a>' + '<div ng-show="!datanodehealtynum && !datanodehealtynum">' + '<span>0</span> Datanodes (' + - '<span>0</span> Active / ' + - '<span>0</span> Standby)' + + '<span>0</span> Healthy / ' + + '<span>0</span> Unhealthy)' + '</div>' + '</div>' + '<div ng-show="datanodehealtynum===-1 || datanodeunhealtynum===-1" class="hadoopMetric-widget-detail">' +
