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

ux: create annotations

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-04-14 23:10:56 +02:00
parent 03ef1fd758
commit fa2a7db657
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/features/annotations/event_manager.ts
View File

@ -57,7 +57,7 @@ export class EventManager {
this.panelCtrl.render();
}
addPlotEvents(annotations) {
addFlotEvents(annotations, flotOptions) {
if (this.event || annotations.length === 0) {
return;
}
@ -108,7 +108,7 @@ export class EventManager {
}
}
options.events = {
flotOptions.events = {
levels: _.keys(types).length + 1,
data: annotations,
types: types,

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

@ -330,8 +330,8 @@ coreModule.directive('grafanaGraph', function($rootScope, timeSrv, popoverSrv) {
}
}
thresholdManager.addPlotOptions(options, panel);
eventManager.addPlotEvents(annotations, options);
thresholdManager.addFlotOptions(options, panel);
eventManager.addFlotEvents(annotations, options);
configureAxisOptions(data, options);
sortedSeries = _.sortBy(data, function(series) { return series.zindex; });

2
public/app/plugins/panel/graph/specs/threshold_manager_specs.ts
View File

@ -21,7 +21,7 @@ describe('ThresholdManager', function() {
ctx.setup = function(thresholds) {
ctx.panel.thresholds = thresholds;
var manager = new ThresholdManager(ctx.panelCtrl);
manager.addPlotOptions(ctx.options, ctx.panel);
manager.addFlotOptions(ctx.options, ctx.panel);
};
func(ctx);

2
public/app/plugins/panel/graph/threshold_manager.ts
View File

@ -158,7 +158,7 @@ export class ThresholdManager {
this.needsCleanup = true;
}
addPlotOptions(options, panel) {
addFlotOptions(options, panel) {
if (!panel.thresholds || panel.thresholds.length === 0) {
return;
}