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_ui' of https://github.com/smalik03/grafana into smalik03-alerting_ui

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-01-25 13:16:48 +01:00
parent 4e30aa9da2 9862c9ff40
commit fee4846429
5 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -132,7 +132,9 @@ class GraphCtrl extends MetricsPanelCtrl {
this.addEditorTab('Axes', axesEditorComponent, 2);
this.addEditorTab('Legend', 'public/app/plugins/panel/graph/tab_legend.html', 3);
this.addEditorTab('Display', 'public/app/plugins/panel/graph/tab_display.html', 4);
this.addEditorTab('Alert', alertTab, 5);
if (config.showAlertingUI) {
this.addEditorTab('Alert', alertTab, 5);
}
this.subTabIndex = 0;
}