From 2dc4a76e90311ce784159a461244c3c44ec50c4c Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 6 Jul 2023 14:37:46 -0400
Subject: [PATCH] [v9.5.x] Prometheus: Heatmap Format with No Data (#69096)

Prometheus: Heatmap Format with No Data (#68938)

* Prometheus: Heatmap Format with No Data

* Simplify conditional logic

(cherry picked from commit 0fa991a4b95ba7daf56be2ffa45bd975b15189ac)

Co-authored-by: Drew Slobodnjak <60050885+drew08t@users.noreply.github.com>
---
 public/app/plugins/datasource/prometheus/result_transformer.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/prometheus/result_transformer.ts b/public/app/plugins/datasource/prometheus/result_transformer.ts
index b33a2b0322f..1cc3003b48a 100644
--- a/public/app/plugins/datasource/prometheus/result_transformer.ts
+++ b/public/app/plugins/datasource/prometheus/result_transformer.ts
@@ -604,7 +604,7 @@ export function getOriginalMetricName(labelData: { [key: string]: string }) {
 }
 
 function mergeHeatmapFrames(frames: DataFrame[]): DataFrame[] {
-  if (frames.length === 0) {
+  if (frames.length === 0 || (frames.length === 1 && frames[0].length === 0)) {
     return [];
   }