From 360956186193a983f0a0269204cd714440f185ff Mon Sep 17 00:00:00 2001 From: Alexey Velikiy Date: Thu, 6 Dec 2018 03:07:19 +0300 Subject: [PATCH] Remove built in alerting #100 (#103) --- src/colors.ts | 1 - src/controllers/analytic_controller.ts | 16 -- src/graph_renderer.ts | 10 +- src/models/analytic_unit.ts | 5 - src/module.ts | 21 +-- src/partials/tab_analytics.html | 18 -- src/services/analytic_service.ts | 18 -- src/threshold_manager.ts | 237 ------------------------- src/thresholds_form.ts | 142 --------------- 9 files changed, 6 insertions(+), 462 deletions(-) delete mode 100644 src/threshold_manager.ts delete mode 100644 src/thresholds_form.ts diff --git a/src/colors.ts b/src/colors.ts index e0d4a75..33b9f9f 100644 --- a/src/colors.ts +++ b/src/colors.ts @@ -4,7 +4,6 @@ export const PALETTE_ROWS = 4; export const PALETTE_COLUMNS = 14; export const DEFAULT_ANNOTATION_COLOR = 'rgba(0, 211, 255, 1)'; export const OK_COLOR = 'rgba(11, 237, 50, 1)'; -export const ALERTING_COLOR = 'rgba(237, 46, 24, 1)'; export const NO_DATA_COLOR = 'rgba(150, 150, 150, 1)'; export const REGION_FILL_ALPHA = 0.09; diff --git a/src/controllers/analytic_controller.ts b/src/controllers/analytic_controller.ts index 3aed7ab..f369760 100644 --- a/src/controllers/analytic_controller.ts +++ b/src/controllers/analytic_controller.ts @@ -367,22 +367,6 @@ export class AnalyticController { this._statusRunners.delete(analyticUnit.id); } - // async runEnabledWaiter(analyticUnit: AnalyticUnit) { - // var enabled = await this._analyticService.getAlertEnabled(analyticUnit.id); - // if(analyticUnit.alertEnabled !== enabled) { - // analyticUnit.alertEnabled = enabled; - // this._emitter.emit('anomaly-type-alert-change', analyticUnit); - // } - // } - - async toggleAlertEnabled(analyticUnit: AnalyticUnit) { - var enabled = analyticUnit.alertEnabled; - analyticUnit.alertEnabled = undefined; - await this._analyticService.setAlertEnabled(analyticUnit.id, enabled); - analyticUnit.alertEnabled = enabled; - this._emitter.emit('anomaly-type-alert-change', analyticUnit); - } - public getNewTempSegmentId(): SegmentId { this._tempIdCounted--; return this._tempIdCounted.toString(); diff --git a/src/graph_renderer.ts b/src/graph_renderer.ts index fde84e8..16ed8b5 100644 --- a/src/graph_renderer.ts +++ b/src/graph_renderer.ts @@ -1,6 +1,6 @@ import { Segment } from './models/segment'; import { GraphTooltip } from './graph_tooltip'; -import { ThresholdManager } from './threshold_manager'; + import { convertValuesToHistogram, getSeriesValues } from './histogram'; import { AnalyticController, @@ -41,7 +41,6 @@ export class GraphRenderer { private _analyticController: AnalyticController; private data: any; private tooltip: GraphTooltip; - private thresholdManager: ThresholdManager; private panelWidth: number; private plot: any; private sortedSeries: any; @@ -82,7 +81,7 @@ export class GraphRenderer { // this.eventManager = new EventManager(this.ctrl); this.flotOptions = {} - this.thresholdManager = new ThresholdManager(this.ctrl); + this.tooltip = new GraphTooltip( $elem, this.dashboard, scope, () => this.sortedSeries, this._analyticController.getSegmentsSearcher() @@ -90,7 +89,6 @@ export class GraphRenderer { // panel events this.ctrl.events.on('panel-teardown', () => { - this.thresholdManager = null; if (this.plot) { this.plot.destroy(); @@ -265,7 +263,6 @@ export class GraphRenderer { $(`
${this.ctrl.dataWarning.title}
`).appendTo(this.$elem); } - this.thresholdManager.draw(plot); } private _processOffsetHook(plot, gridMargin) { @@ -324,8 +321,6 @@ export class GraphRenderer { return; } - // give space to alert editing - this.thresholdManager.prepare(this.$elem, this.data); // un-check dashes if lines are unchecked this.panel.dashes = this.panel.lines ? this.panel.dashes : false; @@ -334,7 +329,6 @@ export class GraphRenderer { this._buildFlotOptions(this.panel); this._prepareXAxis(this.panel); this._configureYAxisOptions(this.data); - this.thresholdManager.addFlotOptions(this.flotOptions, this.panel); // this.eventManager.addFlotEvents(this.annotations, this.flotOptions); this._analyticController.updateFlotEvents(this.contextSrv.isEditor, this.flotOptions); diff --git a/src/models/analytic_unit.ts b/src/models/analytic_unit.ts index 7c72eea..d120b9d 100644 --- a/src/models/analytic_unit.ts +++ b/src/models/analytic_unit.ts @@ -32,8 +32,6 @@ export class AnalyticUnit { private _error: string; private _metric: Metric; - private _alertEnabled?: boolean; - constructor(private _panelObject?: any) { if(_panelObject === undefined) { this._panelObject = {}; @@ -126,9 +124,6 @@ export class AnalyticUnit { get panelObject() { return this._panelObject; } - get alertEnabled(): boolean { return this._alertEnabled; } - set alertEnabled(value) { this._alertEnabled = value;} - } export class AnalyticUnitsSet { diff --git a/src/module.ts b/src/module.ts index 632c617..6060880 100644 --- a/src/module.ts +++ b/src/module.ts @@ -1,5 +1,4 @@ import './series_overrides_ctrl'; -import './thresholds_form'; import template from './template'; @@ -15,10 +14,10 @@ import { PanelInfo } from './models/info'; import { axesEditorComponent } from './axes_editor'; -import { MetricsPanelCtrl, alertTab } from 'grafana/app/plugins/sdk'; +import { MetricsPanelCtrl } from 'grafana/app/plugins/sdk'; import { appEvents } from 'grafana/app/core/core' import { BackendSrv } from 'grafana/app/core/services/backend_srv'; -import { AlertSrv } from 'grafana/app/core/services/alert_srv'; +import { AlertSrv } from 'grafana/app/core/services/alert_srv' import config from 'grafana/app/core/config'; @@ -48,7 +47,6 @@ class GraphCtrl extends MetricsPanelCtrl { datasourceRequest: DatasourceRequest; - anomalyTypes = []; // TODO: remove it later. Only for alert tab analyticsController: AnalyticController; _graphRenderer: GraphRenderer; @@ -155,7 +153,7 @@ class GraphCtrl extends MetricsPanelCtrl { private annotationsSrv, private keybindingSrv, private backendSrv: BackendSrv, - private popoverSrv, + private popoverSrv, private contextSrv, private alertSrv: AlertSrv ) { @@ -173,7 +171,6 @@ class GraphCtrl extends MetricsPanelCtrl { this.runBackendConnectivityCheck(); this.analyticsController = new AnalyticController(this.panel, this.analyticService, this.events); - this.anomalyTypes = this.panel.anomalyTypes; keybindingSrv.bind('d', this.onDKey.bind(this)); this.events.on('render', this.onRender.bind(this)); @@ -182,9 +179,7 @@ class GraphCtrl extends MetricsPanelCtrl { this.events.on('data-snapshot-load', this.onDataSnapshotLoad.bind(this)); this.events.on('init-edit-mode', this.onInitEditMode.bind(this)); this.events.on('init-panel-actions', this.onInitPanelActions.bind(this)); - this.events.on('anomaly-type-alert-change', () => { - this.$scope.$digest() - }); + this.events.on('analytic-unit-status-change', async (analyticUnit: AnalyticUnit) => { if(analyticUnit === undefined) { throw new Error('analyticUnit is undefined'); @@ -264,10 +259,6 @@ class GraphCtrl extends MetricsPanelCtrl { this.addEditorTab('Display', `${partialPath}/tab_display.html`, 5); this.addEditorTab('Plugin info', `${partialPath}/tab_info.html`, 6); - if(config.alertingEnabled) { - this.addEditorTab('Alert', alertTab, 6); - } - this.subTabIndex = 0; } @@ -607,10 +598,6 @@ class GraphCtrl extends MetricsPanelCtrl { this.refresh(); } - onAnomalyAlertChange(anomalyType: AnalyticUnit) { - this.analyticsController.toggleAlertEnabled(anomalyType); - } - onToggleVisibility(id: AnalyticUnitId) { this.analyticsController.toggleVisibility(id); this.render(); diff --git a/src/partials/tab_analytics.html b/src/partials/tab_analytics.html index 96a90de..7c6f3c0 100644 --- a/src/partials/tab_analytics.html +++ b/src/partials/tab_analytics.html @@ -57,24 +57,6 @@ - - - - -