Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Merge pull request #593 from jshaughn/hawkular-654
Browse files Browse the repository at this point in the history
Hawkular 654
  • Loading branch information
mtho11 committed Oct 20, 2015
2 parents ceefba0 + 6797b8a commit a5df1ce
Show file tree
Hide file tree
Showing 10 changed files with 434 additions and 22 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<hawkular-subtab ng-controller="Subtab.SubtabController">
<div class="hk-nav-tabs-container">
<ul class="nav nav-tabs nav-tabs-pf">
<li class="active"><a href="/hawkular-ui/alerts-center" class="hk-alerts">All Alerts</a></li>
<li><a href="#" class="hk-availability">Definitions</a></li>
<li class="active"><a href="/hawkular-ui/alerts-center" class="hk-alerts">Alerts</a></li>
<li><a href="/hawkular-ui/alerts-center-triggers" class="hk-availability">Definitions</a></li>
</ul>
</div>
</hawkular-subtab>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
<div class="hk-screen-content">
<hawkular-subtab ng-controller="Subtab.SubtabController">
<div class="hk-nav-tabs-container">
<ul class="nav nav-tabs nav-tabs-pf">
<li><a href="/hawkular-ui/alerts-center" class="hk-alerts">Alerts</a></li>
<li class="active"><a href="/hawkular-ui/alerts-center-triggers" class="hk-alerts">Definitions</a></li>
</ul>
</div>
</hawkular-subtab>

<div class="hk-alert-center">

<!-- No Triggers -->
<div ng-show="act.triggersList.length === 0">
<div class="hk-info-top clearfix">
<h3>Triggers ({{act.triggersList.length}})</h3>
</div>
<div class="blank-slate-pf">
<div class="blank-slate-pf-icon">
<i class="fa fa-flag"></i>
</div>
<h1>No Triggers.</h1>
</div>
</div>

<div ng-show="act.triggersList.length > 0">

<div class="hk-info-top clearfix">
<h3 class="pull-left">Triggers ({{act.headerLinks.total}})</h3>
<span class="hk-update pull-right" data-toggle="tooltip" data-placement="top" title="Last update">
<i class="fa fa-clock-o" ng-click="act.getTriggers()"></i>{{act.lastUpdateDate | date:'HH:mm'}}</span>
</div>

<div class="hk-table-container">
<div class="hk-actions-table">
<div class="dropdown">
<a href="#" class="btn btn-default" dropdown-toggle>
Change State <b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li><a href="#" ng-click="act.enableSelected()" ng-disabled="!act.hasDisabledSelectedItems || act.isWorking">Enable</a></li>
<li><a href="#" ng-click="act.disableSelected()" ng-disabled="!act.hasEnabledSelectedItems || act.isWorking">Disable</a></li>
</ul>
</div>
</div>
<div class="dataTables_header">
<div id="DataTables_Table_0_filter" class="dataTables_filter">
<label><input type="search" ng-model="act.search" aria-controls="DataTables_Table_0"></label>
</div>
<div class="dataTables_info" id="DataTables_Table_0_info" role="status" aria-live="polite">Showing <b>1</b> to <b>{{(act.triggersList | filter:act.search).length}}</b> of <b>{{act.triggersList.length}}</b> Items</div>
</div>
<table class="datatable table table-bordered hk-table-alerts hk-table-detailed hk-table-select">
<thead>
<tr>
<th ng-click="act.selectAll()"><input type="checkbox"/></th>
<th ng-class="{'sorting_asc': act.sortField == 'name' && act.sortAsc, 'sorting_desc': act.sortField == 'name' && !act.sortAsc, 'sorting': act.sortField != 'name'}" ng-click="act.sortBy('name')">Name</th>
<th ng-class="{'sorting_asc': act.sortField == 'description' && act.sortAsc, 'sorting_desc': act.sortField == 'description' && !act.sortAsc, 'sorting': act.sortField != 'description'}" ng-click="act.sortBy('description')">Description</th>
<th ng-class="{'sorting_asc': act.sortField == 'context.resourceName' && act.sortAsc, 'sorting_desc': act.sortField == 'context.resourceName' && !act.sortAsc, 'sorting': act.sortField != 'context.resourceName'}" ng-click="act.sortBy('context.resourceName')">Resource</th>
<th ng-class="{'sorting_asc': act.sortField == 'severity' && act.sortAsc, 'sorting_desc': act.sortField == 'severity' && !act.sortAsc, 'sorting': act.sortField != 'severity'}" ng-click="act.sortBy('severity')" ng-click="act.sortBy('severity')">Severity</th>
<th ng-class="{'sorting_asc': act.sortField == 'enabled' && act.sortAsc, 'sorting_desc': act.sortField == 'enabled' && !act.sortAsc, 'sorting': act.sortField != 'enabled'}" ng-click="act.sortBy('enabled')" ng-click="act.sortBy('enabled')">Enabled</th>
<th ng-class="{'sorting_asc': act.sortField == 'notifications' && act.sortAsc, 'sorting_desc': act.sortField == 'notifications' && !act.sortAsc, 'sorting': act.sortField != 'notifications'}" ng-click="act.sortBy('notifications')" ng-click="act.sortBy('notifications')">Notifications</th>
<th></th>
</tr>
</thead>
<tbody>
<tr ng-repeat="trigger in act.triggersList | filter:act.search" ng-class="{'hk-selected': act.selected}"
ng-click="act.selectItem(trigger)">
<td><input type="checkbox" ng-checked="trigger.selected"/></td>
<td>{{trigger.name}}</td>
<td>{{trigger.description}}</td>
<td>{{trigger.context.resourceName|truncate: 30}}</td>
<td>{{trigger.severity|firstUpper}}</td>
<td>{{trigger.enabled ? "True" : "False"}}</td>
<td>{{trigger.actions.email.length}} <i class="fa fa-envelope"></i></td>
<td><a class="btn btn-link"><i class="fa fa-chevron-circle-right fa-lg"
tooltip="View Details" tooltip-trigger tooltip-placement="top"
ng-click="act.showDetailPage(trigger.id)">
</i></a>
</td>
</tr>
</tbody>
</table>
<div class="dataTables_footer">
<hk-data-pagination resource-list="act.triggersList" current-page="act.triggersCurPage"
page-setter="act.setPage(pageNumber)"
per-page="act.triggersPerPage" headers="act.headerLinks"></hk-data-pagination>
</div>
</div>

</div>
</div>

</div>
27 changes: 14 additions & 13 deletions console/src/main/scripts/plugins/metrics/ts/alertsCenterList.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,25 +104,26 @@ module HawkularMetrics {
ordering = 'desc';
}

this.HawkularAlertsManager.queryAlerts({statuses: this.alertsStatuses,
this.HawkularAlertsManager.queryAlerts({
statuses: this.alertsStatuses,
startTime: this.alertsTimeStart,
endTime: this.alertsTimeEnd,
currentPage: this.alertsCurPage,
perPage: this.alertsPerPage,
sort: this.sortField,
order: ordering
})
})
.then((queriedAlerts) => {
this.headerLinks = this.HkHeaderParser.parse(queriedAlerts.headers);
this.alertsList = queriedAlerts.alertList;
this.lastUpdateDate = new Date();
}, (error) => {
this.$log.warn(error);
}).catch((error) => {
this.$log.error('Error:' + error);
}).finally(() => {
this.lastUpdateDate = new Date();
});
}, (error) => {
this.$log.warn(error);
}).catch((error) => {
this.$log.error('Error:' + error);
}).finally(() => {
this.lastUpdateDate = new Date();
});
}

public showDetailPage(alertId:AlertId):void {
Expand Down Expand Up @@ -191,13 +192,13 @@ module HawkularMetrics {

public selectItem(item:IAlert):void {
item.selected = !item.selected;
this.selectedItems = _.filter(this.alertsList, 'selected');
this.selectedItems = _.filter(this.alertsList, 'selected');
this.selectCount = this.selectedItems.length;
this.hasOpenSelectedItems = _.some(this.selectedItems,{'status': 'OPEN'});
this.hasOpenSelectedItems = _.some(this.selectedItems, {'status': 'OPEN'});
}

public hasResolvedItems(): boolean {
return _.some(this.selectedItems,{'status': 'RESOLVED'});
public hasResolvedItems():boolean {
return _.some(this.selectedItems, {'status': 'RESOLVED'});
}

private resetAllUnselected() {
Expand Down
223 changes: 223 additions & 0 deletions console/src/main/scripts/plugins/metrics/ts/alertsCenterTriggerList.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,223 @@
///
/// Copyright 2015 Red Hat, Inc. and/or its affiliates
/// and other contributors as indicated by the @author tags.
///
/// Licensed under the Apache License, Version 2.0 (the "License");
/// you may not use this file except in compliance with the License.
/// You may obtain a copy of the License at
///
/// http://www.apache.org/licenses/LICENSE-2.0
///
/// Unless required by applicable law or agreed to in writing, software
/// distributed under the License is distributed on an "AS IS" BASIS,
/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
/// See the License for the specific language governing permissions and
/// limitations under the License.
///

/// <reference path="metricsPlugin.ts"/>
/// <reference path="../../includes.ts"/>
/// <reference path="services/alertsManager.ts"/>
/// <reference path="services/errorsManager.ts"/>

module HawkularMetrics {

export class AlertsCenterTriggerController {

public static $inject = ['$scope', 'HawkularAlertsManager',
'ErrorsManager', '$log', '$q', '$rootScope', '$interval', '$routeParams',
'HkHeaderParser', '$location'];

public isWorking = false;
public lastUpdateDate:Date = new Date();

public triggersList:IAlertTrigger[];
public selectedItems:IAlertTrigger[];
public triggersPerPage = 10;
public triggersCurPage = 0;
public headerLinks:any = {};
public selectCount = 0;
public hasEnabledSelectedItems:boolean = false;
public hasDisabledSelectedItems:boolean = false;
public sortField:string = 'name';
public sortAsc:boolean = false;


public loadingMoreItems:boolean = false;
public addProgress:boolean = false;

constructor(private $scope:any,
private HawkularAlertsManager:IHawkularAlertsManager,
private ErrorsManager:IErrorsManager,
private $log:ng.ILogService,
private $q:ng.IQService,
private $rootScope:IHawkularRootScope,
private $interval:ng.IIntervalService,
private $routeParams:any,
private HkHeaderParser:any,
private $location:ng.ILocationService) {
$scope.ac = this;

this.autoRefresh(120);
if ($rootScope.currentPersona) {
this.getTriggers();
} else {
// currentPersona hasn't been injected to the rootScope yet, wait for it..
$rootScope.$watch('currentPersona', (currentPersona) =>
currentPersona && this.getTriggers());
}

}

private autoRefresh(intervalInSeconds:number):void {
let autoRefreshPromise = this.$interval(() => {
this.$log.debug('autoRefresh .... ' + new Date());
this.getTriggers();
}, intervalInSeconds * 1000);

this.$scope.$on('$destroy', () => {
this.$interval.cancel(autoRefreshPromise);
});
}

public getTriggers():void {

let ordering = 'asc';
if (!this.sortAsc) {
ordering = 'desc';
}

this.HawkularAlertsManager.queryTriggers({currentPage: this.triggersCurPage,
perPage: this.triggersPerPage,
sort: this.sortField,
order: ordering
})
.then((queriedTriggers) => {
this.headerLinks = this.HkHeaderParser.parse(queriedTriggers.headers);
this.triggersList = queriedTriggers.triggerList;
this.lastUpdateDate = new Date();
console.dir(this.headerLinks);
}, (error) => {
this.$log.warn(error);
}).catch((error) => {
this.$log.error('Error:' + error);
}).finally(() => {
this.lastUpdateDate = new Date();
});
}

public enableSelected():void {
this.$log.debug('Enable Selected Triggers');

// Error notification done with callback function on error
let errorCallback = (error:any, msg:string) => {
this.$log.error('Error:' + error);
};

this.isWorking = true;
let isError = false;
// Check if email action exists

let updateTriggersPromises = this.updateSelected(true, errorCallback);

this.$q.all(updateTriggersPromises).finally(()=> {
this.isWorking = false;
this.resetAllUnselected();
this.getTriggers();

if (!isError) {
// notify success ?
}
});
}

public disableSelected():void {
this.$log.debug('Disable Selected Triggers');

// Error notification done with callback function on error
let errorCallback = (error:any, msg:string) => {
this.$log.error('Error:' + error);
};

this.isWorking = true;
let isError = false;
// Check if email action exists

let updateTriggersPromises = this.updateSelected(false, errorCallback);

this.$q.all(updateTriggersPromises).finally(()=> {
this.isWorking = false;
this.resetAllUnselected();
this.getTriggers();

if (!isError) {
// notify success ?
}
});
}

updateSelected(enabled, errorCallback):Array<ng.IPromise<any>> {

let promises = [];
let triggerDefinition = {};
let triggerBackup = {};

this.triggersList.forEach((triggerItem:IAlertTrigger) => {
if (triggerItem.selected && (triggerItem.enabled !== enabled)) {
triggerDefinition['trigger'] = angular.copy(triggerItem);
delete triggerDefinition['trigger'].selected;
triggerBackup['trigger'] = angular.copy(triggerDefinition['trigger']);
triggerDefinition['trigger'].enabled = enabled;
promises.push(this.HawkularAlertsManager.updateTrigger(triggerDefinition, errorCallback, triggerBackup));
}
});

return promises;
}

public showDetailPage(triggerId:TriggerId):void {
this.$location.url(`/hawkular-ui/alerts-center-trigger-detail/${triggerId}`);
}

public setPage(page:number):void {
this.triggersCurPage = page;
this.getTriggers();
}

public selectItem(item:IAlertTrigger):void {
item.selected = !item.selected;
this.selectedItems = _.filter(this.triggersList, 'selected');
this.selectCount = this.selectedItems.length;
this.hasEnabledSelectedItems = _.some(this.selectedItems,{'enabled': true});
this.hasDisabledSelectedItems = _.some(this.selectedItems,{'enabled': false});
}

private resetAllUnselected() {
this.selectCount = 0;
this.hasEnabledSelectedItems = false;
this.hasDisabledSelectedItems = false;
this.triggersList.forEach((item:IAlertTrigger) => {
item.selected = false;
});
}

public selectAll():void {
let toggleTo = this.selectCount !== this.triggersList.length;
_.forEach(this.triggersList, (item:IAlertTrigger) => {
item.selected = toggleTo;
});
this.selectCount = toggleTo ? this.triggersList.length : 0;
}

public sortBy(field:string):void {
this.sortField = field;
this.sortAsc = !this.sortAsc;
this.getTriggers();
this.$log.debug('Sorting by ' + field + ' ascending ' + this.sortAsc + ' ' + new Date());
}

}

_module.controller('AlertsCenterTriggerController', AlertsCenterTriggerController);
}

0 comments on commit a5df1ce

Please sign in to comment.