From 964c7a332dd48a71fc381fbb61e04127903775db Mon Sep 17 00:00:00 2001
From: "grafana-delivery-bot[bot]"
 <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
Date: Wed, 18 Jun 2025 18:30:14 +0100
Subject: [PATCH] [release-11.6.4] Graphite: Fix annotation queries (#106940)

Graphite: Fix annotation queries (#106553)

* Add refid to annotation queries

* Fix errors

(cherry picked from commit 6e45069cdd5c2087504c075daa2465bc8c91fa86)

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
---
 public/app/plugins/datasource/graphite/datasource.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/public/app/plugins/datasource/graphite/datasource.ts b/public/app/plugins/datasource/graphite/datasource.ts
index 14460f23b66..0601bedeb9f 100644
--- a/public/app/plugins/datasource/graphite/datasource.ts
+++ b/public/app/plugins/datasource/graphite/datasource.ts
@@ -410,7 +410,7 @@ export class GraphiteDatasource
       const targetAnnotation = this.templateSrv.replace(target.target, {}, 'glob');
       const graphiteQuery = {
         range: range,
-        targets: [{ target: targetAnnotation }],
+        targets: [{ target: targetAnnotation, refId: target.refId }],
         format: 'json',
         maxDataPoints: 100,
       } as unknown as DataQueryRequest<GraphiteQuery>;
@@ -979,7 +979,10 @@ export class GraphiteDatasource
       .fetch(options)
       .pipe(
         catchError((err) => {
-          return throwError(reduceError(err));
+          return throwError(() => {
+            const reduced = reduceError(err);
+            return new Error(`${reduced.data.message}`);
+          });
         })
       );
   }