IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

new design for no alerts in alert-list, fixes #9721

Browse Source
This commit is contained in:
Patrick O'Carroll 2017-11-01 09:44:51 +01:00
parent fec37f22b8
commit 5a26fc252e
3 changed files with 72 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
public/app/plugins/panel/alertlist/module.html
View File

@ -1,17 +1,11 @@
<div class="panel-alert-list" style="{{ctrl.contentHeight}}">
<section class="card-section card-list-layout-list" ng-if="ctrl.panel.show === 'current'">
<ol class="card-list">
<li class="card-item-wrapper" ng-show="!ctrl.currentAlerts.length">
<div class="alert-list card-item card-item--alert">
<div class="alert-list-body">
<div class="alert-list-main">
<div class="no-alert" ng-style="{'height': + ctrl.panelHeight + 'px'}" ng-show="!ctrl.currentAlerts.length">
<p class="alert-list-title">
No alerts in selected interval
</p>
</div>
</div>
</div>
</li>
<li class="card-item-wrapper" ng-repeat="alert in ctrl.currentAlerts">
<div class="alert-list card-item card-item--alert">
<div class="alert-list-body">
@ -36,7 +30,7 @@
</section>
<section class="card-section card-list-layout-list" ng-if="ctrl.panel.show === 'changes'">
<ol class ="card-list">
<ol class="card-list">
<li class="card-item-wrapper" ng-repeat="al in ctrl.alertHistory">
<div class="alert-list card-item card-item--alert">
<div class="alert-list-body">
@ -53,7 +47,9 @@
</div>
<div class="alert-list-footer">
<span class="alert-list-text">{{al.time}}</span>
<span class="alert-list-text"><!--Img Link--></span>
<span class="alert-list-text">
<!--Img Link-->
</span>
</div>
</div>
</li>

16
public/app/plugins/panel/alertlist/module.ts
View File

@ -3,7 +3,7 @@
import _ from 'lodash';
import moment from 'moment';
import alertDef from '../../../features/alerting/alert_def';
import {PanelCtrl} from 'app/plugins/sdk';
import { PanelCtrl } from 'app/plugins/sdk';
import * as dateMath from 'app/core/utils/datemath';
@ -11,16 +11,17 @@ class AlertListPanel extends PanelCtrl {
static templateUrl = 'module.html';
showOptions = [
{text: 'Current state', value: 'current'},
{text: 'Recent state changes', value: 'changes'}
{ text: 'Current state', value: 'current' },
{ text: 'Recent state changes', value: 'changes' }
];
sortOrderOptions = [
{text: 'Alphabetical (asc)', value: 1},
{text: 'Alphabetical (desc)', value: 2},
{text: 'Importance', value: 3},
{ text: 'Alphabetical (asc)', value: 1 },
{ text: 'Alphabetical (desc)', value: 2 },
{ text: 'Importance', value: 3 },
];
panelHeight: any;
contentHeight: string;
stateFilter: any = {};
currentAlerts: any = [];
@ -53,7 +54,7 @@ class AlertListPanel extends PanelCtrl {
return _.sortBy(alerts, a => { return alertDef.alertStateSortScore[a.state]; });
}
var result = _.sortBy(alerts, a => { return a.name.toLowerCase();});
var result = _.sortBy(alerts, a => { return a.name.toLowerCase(); });
if (this.panel.sortOrder === 2) {
result.reverse();
}
@ -75,6 +76,7 @@ class AlertListPanel extends PanelCtrl {
}
onRender() {
this.panelHeight = this.height - 30;
this.contentHeight = "max-height: " + this.height + "px;";
if (this.panel.show === 'current') {
this.getCurrentAlertState();

7
public/sass/pages/_alerting.scss
View File

@ -132,6 +132,13 @@
}
}
.no-alert {
display: flex;
align-items: center;
justify-content: center;
width: 100%;
}
@keyframes alerting-panel {
100% {
opacity: 1;