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

Merge branch 'alerting' of github.com:grafana/grafana into alerting

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-06-28 14:04:38 -07:00
parent 9b4c0cca07 6bf42dde18
commit 5a65dc5d23
44 changed files with 1739 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/app/plugins/panel/graph/graph.js
View File

@@ -271,7 +271,6 @@ function (angular, $, moment, _, kbn, GraphTooltip, thresholds) {
function callPlot(incrementRenderCounter) {
try {
console.log('rendering');
$.plot(elem, sortedSeries, options);
} catch (e) {
console.log('flotcharts error', e);

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

@@ -109,8 +109,11 @@
<div class="gf-form-inline">
<div class="gf-form">
<span class="gf-form-label">Groups</span>
<input class="gf-form-input max-width-7" type="text" ng-model="ctrl.alert.notify"></input>
<!--
<bootstrap-tagsinput ng-model="ctrl.alert.notify" tagclass="label label-tag" placeholder="add tags">
</bootstrap-tagsinput>
-->
</div>
</div>
</div>