From be3db07bd4bdb93be7787ee01519460f6cc357f2 Mon Sep 17 00:00:00 2001 From: Brendan O'Handley Date: Tue, 12 Jul 2022 10:26:51 -0400 Subject: [PATCH] Prometheus datasource: query builder freezes when metrics metadata is undefined (#51929) (#52058) * add error handling for prom query builder returning undefined metrics metadata * remove reference to escalation (cherry picked from commit e51187a47420c91cde38f1aa3fed445776f82fae) --- .../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);