From d8d3a9c561aacd7ada0842a90ff8dd12dbf8b1de Mon Sep 17 00:00:00 2001 From: Sven Grossmann Date: Mon, 13 Jun 2022 17:07:38 +0200 Subject: [PATCH] added opensearch annotations to not use default ui (#50655) --- .../app/features/annotations/standardAnnotationSupport.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/public/app/features/annotations/standardAnnotationSupport.ts b/public/app/features/annotations/standardAnnotationSupport.ts index 743cb79be39..9f1114677bf 100644 --- a/public/app/features/annotations/standardAnnotationSupport.ts +++ b/public/app/features/annotations/standardAnnotationSupport.ts @@ -236,7 +236,9 @@ export function getAnnotationsFromData( */ export function shouldUseMappingUI(datasource: DataSourceApi): boolean { const { type } = datasource; - return type !== 'prometheus' && type !== 'elasticsearch' && type !== 'loki'; + return ( + type !== 'prometheus' && type !== 'elasticsearch' && type !== 'loki' && type !== 'grafana-opensearch-datasource' + ); } /** @@ -244,5 +246,7 @@ export function shouldUseMappingUI(datasource: DataSourceApi): boolean { */ export function shouldUseLegacyRunner(datasource: DataSourceApi): boolean { const { type } = datasource; - return type === 'prometheus' || type === 'elasticsearch' || type === 'loki'; + return ( + type === 'prometheus' || type === 'elasticsearch' || type === 'loki' || type === 'grafana-opensearch-datasource' + ); }