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

feat(alerting): requests looks to be working again

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-06-06 17:11:46 +02:00
parent d1acfb4494
commit 34e17f7282
33 changed files with 471 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/plugins/panel/graph/alert_tab_ctrl.ts
View File

@@ -29,8 +29,8 @@ export class AlertTabCtrl {
_.defaults(this.panel.alerting, this.defaultValues);
var defaultTitle = (this.panelCtrl.dashboard.title + ' ' + this.panel.title + ' alert');
this.panel.alerting.title = this.panel.alerting.title || defaultTitle;
var defaultName = (this.panelCtrl.dashboard.title + ' ' + this.panel.title + ' alert');
this.panel.alerting.name = this.panel.alerting.name || defaultName;
this.panel.targets.map(target => {
this.metricTargets.push(target);

2
public/app/plugins/panel/graph/partials/tab_alerting.html
View File

@@ -60,7 +60,7 @@
<h5 class="section-heading">Alert info</h5>
<div class="gf-form">
<span class="gf-form-label width-10">Alert name</span>
<input type="text" class="gf-form-input width-22" ng-model="ctrl.panel.alerting.title">
<input type="text" class="gf-form-input width-22" ng-model="ctrl.panel.alerting.name">
</div>
<div class="gf-form-inline">
<div class="gf-form">