From 5215514bf38fc5f54a3718b4aaaccd87171347ff Mon Sep 17 00:00:00 2001 From: Sven Grossmann Date: Tue, 14 Jun 2022 10:23:08 +0200 Subject: [PATCH] added opensearch annotations to not use default ui (#50655) (#50751) (cherry picked from commit d8d3a9c561aacd7ada0842a90ff8dd12dbf8b1de) --- public/app/features/annotations/standardAnnotationSupport.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/app/features/annotations/standardAnnotationSupport.ts b/public/app/features/annotations/standardAnnotationSupport.ts index 710ded708ed..4d4c5cbb5a4 100644 --- a/public/app/features/annotations/standardAnnotationSupport.ts +++ b/public/app/features/annotations/standardAnnotationSupport.ts @@ -235,12 +235,12 @@ export function getAnnotationsFromData( * Opt out of using the default mapping functionality on frontend. */ export function shouldUseMappingUI(datasource: DataSourceApi): boolean { - return datasource.type !== 'prometheus'; + return datasource.type !== 'prometheus' && datasource.type !== 'grafana-opensearch-datasource'; } /** * Use legacy runner. Used only as an escape hatch for easier transition to React based annotation editor. */ export function shouldUseLegacyRunner(datasource: DataSourceApi): boolean { - return datasource.type === 'prometheus'; + return datasource.type === 'prometheus' || datasource.type === 'grafana-opensearch-datasource'; }