Browse Source

ux: create annotations

Torkel Ödegaard 8 years ago
parent
commit
fa2a7db657

+ 2 - 2
public/app/features/annotations/event_manager.ts

@@ -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,

+ 2 - 2
public/app/plugins/panel/graph/graph.ts

@@ -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; });

+ 1 - 1
public/app/plugins/panel/graph/specs/threshold_manager_specs.ts

@@ -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);

+ 1 - 1
public/app/plugins/panel/graph/threshold_manager.ts

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