From 3b1abd4bd3d264599c21c64b09652c85435402a5 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Fri, 17 Sep 2021 09:28:35 -0400 Subject: [PATCH] prometheus: monaco-query-field: fix metrics-list (#39347) (#39349) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 73873f99cd1f09d139f465fb25aae7d02021e6bc) Co-authored-by: Gábor Farkas --- .../monaco-query-field/MonacoQueryField.tsx | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/public/app/plugins/datasource/prometheus/components/monaco-query-field/MonacoQueryField.tsx b/public/app/plugins/datasource/prometheus/components/monaco-query-field/MonacoQueryField.tsx index 03db833c858..b8dda1a1c9a 100644 --- a/public/app/plugins/datasource/prometheus/components/monaco-query-field/MonacoQueryField.tsx +++ b/public/app/plugins/datasource/prometheus/components/monaco-query-field/MonacoQueryField.tsx @@ -84,15 +84,16 @@ const MonacoQueryField = (props: Props) => { Promise.resolve(historyRef.current.map((h) => h.query.expr).filter((expr) => expr !== undefined)); const getAllMetricNames = () => { - const { metricsMetadata } = lpRef.current; - const result = - metricsMetadata == null - ? [] - : Object.entries(metricsMetadata).map(([k, v]) => ({ - name: k, - help: v[0].help, - type: v[0].type, - })); + const { metrics, metricsMetadata } = lpRef.current; + const result = metrics.map((m) => { + const metaItem = metricsMetadata?.[m]?.[0]; + return { + name: m, + help: metaItem?.help ?? '', + type: metaItem?.type ?? '', + }; + }); + return Promise.resolve(result); };