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

add suggestions for reminder frequency and change copy

Browse Source
This commit is contained in:
Marcus Efraimsson
2018-08-20 18:23:48 +02:00
parent dfa5d17670
commit 470e7cc6db
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/app/features/alerting/notification_edit_ctrl.ts
View File

@@ -20,12 +20,17 @@ export class AlertNotificationEditCtrl {
}, },
isDefault: false, isDefault: false,
}; };
getFrequencySuggestion: any;
/** @ngInject */ /** @ngInject */
constructor(private $routeParams, private backendSrv, private $location, private $templateCache, navModelSrv) { constructor(private $routeParams, private backendSrv, private $location, private $templateCache, navModelSrv) {
this.navModel = navModelSrv.getNav('alerting', 'channels', 0); this.navModel = navModelSrv.getNav('alerting', 'channels', 0);
this.isNew = !this.$routeParams.id; this.isNew = !this.$routeParams.id;
this.getFrequencySuggestion = () => {
return ['1m', '5m', '10m', '15m', '30m', '1h'];
};
this.backendSrv this.backendSrv
.get(`/api/alert-notifiers`) .get(`/api/alert-notifiers`)
.then(notifiers => { .then(notifiers => {

25
public/app/features/alerting/partials/notification_edit.html
View File

@@ -37,28 +37,21 @@
label="Send reminder" label="Send reminder"
label-class="width-12" label-class="width-12"
checked="ctrl.model.sendReminder" checked="ctrl.model.sendReminder"
tooltip="Choose to either notify on state change or at every interval"> tooltip="Choose to either notify on state change (default) or at every interval">
</gf-form-switch> </gf-form-switch>
<div class="gf-form"> <div class="gf-form">
<span class="alert alert-info width-30" ng-if="ctrl.model.sendReminder"> <span class="alert alert-info width-30" ng-if="ctrl.model.sendReminder">
Alert reminders are sent after rules are evaluated. Therefore the alert rule interval has to be lower than the reminder frequency Alert reminders are sent after rules are evaluated. Therefore the highest alert rule interval (of alert rules using this notification channel) must be lower than the reminder frequency.
</span> </span>
</div> </div>
<div class="gf-form-inline"> <div class="gf-form-inline">
<div class="gf-form"> <div class="gf-form" ng-if="ctrl.model.sendReminder">
<span class="gf-form-label width-12" ng-if="ctrl.model.sendReminder">Send reminder every</span> <span class="gf-form-label width-12">Reminder frequency</span>
<input <input type="text" placeholder="Select or specify custom" class="gf-form-input width-15" ng-model="ctrl.model.frequency"
class="gf-form-input max-width-15" bs-typeahead="ctrl.getFrequencySuggestion" data-min-length=0 ng-required="ctrl.model.sendReminder">
type="text" <info-popover mode="right-absolute">
ng-model="ctrl.model.frequency" Select at what interval you want reminder's to be sent after alerts being triggered, e.g. 30s, 1m, 10m, 30m or 1h etc.
ng-required="ctrl.model.sendReminder" </info-popover>
ng-if="ctrl.model.sendReminder"
spellcheck='false'
placeholder='15m'></input>
<info-popover mode="right-absolute" ng-if="ctrl.model.sendReminder">
Specify at what interval you want reminder's about this alerting being triggered.
Ex. 60s, 10m, 30m, 1h
</info-popover>
</div> </div>
</div> </div>
</div> </div>