Added split brain message

This commit is contained in:
Rashid Khan 2014-02-06 14:04:36 -07:00
parent 7dfa660f3f
commit c247832a86
2 changed files with 4 additions and 9 deletions

View file

@ -38,7 +38,9 @@
</style>
<div class="pull-left marvel-header marvel-table" ng-show="rows.length > 0 || panel.rowFilter">
<input type="text" class="input-medium" placeholder="Filter {{panel.mode}}..." ng-model="panel.rowFilter" ng-change="onRowFilterChange()"> <span class="count">{{rows.length}} of {{_.size(data)}} {{panel.mode}}</span> / {{selectedData().length}} selected / Last 10m </span>
<input type="text" class="input-medium" placeholder="Filter {{panel.mode}}..." ng-model="panel.rowFilter" ng-change="onRowFilterChange()">
<span class="count">{{rows.length}} of {{_.size(data)}} {{panel.mode}}</span> / {{selectedData().length}} selected / Last 10m </span>
<span ng-show="meta.masterCount > 1"> / </span><span class="text-warning" ng-show="meta.masterCount > 1">Warning: Possible split brain. {{meta.masterCount}} nodes report master role</span></span>
<br>
<span class="small muted pull-right" ng-show="!viewSelect"> <i class="icon-warning"></i> Compact view. Filter {{panel.mode}} to 5 or less, or set the page refresh rate to 2m or greater for more options.</span>
</div>

View file

@ -507,13 +507,6 @@ define([
$scope._register_data_end();
$scope.select_display_data_and_enrich(newData);
});
/*
newData.marvelMeta = {
masterCount: _.filter(newData,'master').length
};
*/
}, $scope._register_data_end);
}, $scope._register_data_end);
@ -521,7 +514,7 @@ define([
function applyNewData(rows, data) {
$scope.meta = {
masterCount: _.filter(data,'master').length
masterCount: _.filter(data,{master:true,alive:true}).length
};
$scope.rows = rows;