From 42f0612e5a443363c956cae8cab09514dae73527 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 28 Oct 2021 08:48:15 -0600
Subject: [PATCH] Loki/Prometheus: Improve facetting message in label browser
 (#40998) (#41047)

* Chore: Improve Loki/Prometheus facetting message in label browser

* Chore: Remove uneeded console log and comment

(cherry picked from commit 8869df2ffe541fb671225b54c6e8d171ce2d2eb5)

Co-authored-by: Devin Smith <me@devinsmith.co.za>
---
 .../plugins/datasource/loki/components/LokiLabelBrowser.tsx   | 4 +---
 .../prometheus/components/PrometheusMetricsBrowser.tsx        | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/public/app/plugins/datasource/loki/components/LokiLabelBrowser.tsx b/public/app/plugins/datasource/loki/components/LokiLabelBrowser.tsx
index 95c949b423a..6d3fc47f134 100644
--- a/public/app/plugins/datasource/loki/components/LokiLabelBrowser.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiLabelBrowser.tsx
@@ -361,9 +361,7 @@ export class UnthemedLokiLabelBrowser extends React.Component<BrowserProps, Brow
         return;
       }
       if (Object.keys(possibleLabels).length === 0) {
-        // Sometimes the backend does not return a valid set
-        console.error('No results for label combination, but should not occur.');
-        this.setState({ error: `Facetting failed for ${selector}` });
+        this.setState({ error: `Empty results, no matching label for ${selector}` });
         return;
       }
       const labels: SelectableLabel[] = facetLabels(this.state.labels, possibleLabels, lastFacetted);
diff --git a/public/app/plugins/datasource/prometheus/components/PrometheusMetricsBrowser.tsx b/public/app/plugins/datasource/prometheus/components/PrometheusMetricsBrowser.tsx
index 76a9ba17889..7c5c717d8cf 100644
--- a/public/app/plugins/datasource/prometheus/components/PrometheusMetricsBrowser.tsx
+++ b/public/app/plugins/datasource/prometheus/components/PrometheusMetricsBrowser.tsx
@@ -433,9 +433,7 @@ export class UnthemedPrometheusMetricsBrowser extends React.Component<BrowserPro
         return;
       }
       if (Object.keys(possibleLabels).length === 0) {
-        // Sometimes the backend does not return a valid set
-        console.error('No results for label combination, but should not occur.');
-        this.setState({ error: `Facetting failed for ${selector}` });
+        this.setState({ error: `Empty results, no matching label for ${selector}` });
         return;
       }
       const labels: SelectableLabel[] = facetLabels(this.state.labels, possibleLabels, lastFacetted);