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

Annotations: Fix issue with annotation queries editors (#21712)

Browse Source
This commit is contained in:
Dominik Prokop 2020-01-24 10:55:54 +01:00 committed by GitHub
parent 5e87af8b2a
commit d9e1cb44c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
public/app/features/plugins/plugin_component.ts
View File

@ -126,10 +126,13 @@ function pluginDirectiveLoader(
} }
// Annotations // Annotations
case 'annotations-query-ctrl': { case 'annotations-query-ctrl': {
const baseUrl = scope.ctrl.currentDatasource.meta.baseUrl;
const pluginId = scope.ctrl.currentDatasource.meta.id;
return importDataSourcePlugin(scope.ctrl.currentDatasource.meta).then(dsPlugin => { return importDataSourcePlugin(scope.ctrl.currentDatasource.meta).then(dsPlugin => {
return { return {
baseUrl: scope.ctrl.currentDatasource.meta.baseUrl, baseUrl,
name: 'annotations-query-ctrl-' + scope.ctrl.currentDatasource.meta.id, name: 'annotations-query-ctrl-' + pluginId,
bindings: { annotation: '=', datasource: '=' }, bindings: { annotation: '=', datasource: '=' },
attrs: { attrs: {
annotation: 'ctrl.currentAnnotation', annotation: 'ctrl.currentAnnotation',