From e62f2a7b743974d72fe9a3792a8a43a4a5e3e021 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Fri, 8 Jul 2022 18:22:35 +0200 Subject: [PATCH] Prometheus datasource: query builder freezes when metrics metadata is undefined (#51929) (#51988) * add error handling for prom query builder returning undefined metrics metadata * remove reference to escalation (cherry picked from commit e51187a47420c91cde38f1aa3fed445776f82fae) Co-authored-by: Brendan O'Handley --- .../prometheus/querybuilder/components/PromQueryBuilder.tsx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.tsx index 3fba042d304..d088e79fe70 100644 --- a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.tsx +++ b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.tsx @@ -134,6 +134,11 @@ async function getMetrics( await datasource.languageProvider.loadMetricsMetadata(); } + // Error handling for when metrics metadata returns as undefined + if (!datasource.languageProvider.metricsMetadata) { + datasource.languageProvider.metricsMetadata = {}; + } + let metrics; if (query.labels.length > 0) { const expr = promQueryModeller.renderLabels(query.labels);