From 039719619c7f10272e32ca0d0bc8b4537bd43e6c Mon Sep 17 00:00:00 2001 From: rozetko Date: Mon, 24 Sep 2018 18:52:28 +0300 Subject: [PATCH] Get datasource type from Grafana API (#71) --- src/module.ts | 6 ++++-- src/services/analytic_service.ts | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/module.ts b/src/module.ts index 26f3e1c..67d15d9 100644 --- a/src/module.ts +++ b/src/module.ts @@ -187,14 +187,16 @@ class GraphCtrl extends MetricsPanelCtrl { this.render(this.seriesList); this.$scope.$digest(); }); + appEvents.on('ds-request-response', data => { let requestConfig = data.config; + this.datasourceRequest = { url: requestConfig.url, - type: requestConfig.inspect.type, method: requestConfig.method, data: requestConfig.data, - params: requestConfig.params + params: requestConfig.params, + type: undefined }; }); diff --git a/src/services/analytic_service.ts b/src/services/analytic_service.ts index 3784821..1240e49 100644 --- a/src/services/analytic_service.ts +++ b/src/services/analytic_service.ts @@ -15,6 +15,9 @@ export class AnalyticService { metric: MetricExpanded, datasourceRequest: DatasourceRequest, newItem: AnalyticUnit, panelId: number ): Promise { + let datasource = await this._backendSrv.get(`/api/datasources/name/${metric.datasource}`); + datasourceRequest.type = datasource.type; + return this._backendSrv.post( this._backendURL + '/analyticUnits', {