fix: loading with multiple queries (#224)

Co-authored-by: Dmytro Kozlov <d.kozlov@victoriametrics.com>
VictoriaMetrics · Nov 21, 2024 · 2993c7b · 2993c7b
1 parent 95bea81
commit 2993c7b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## tip
 
+* BUGFIX: fix query loading when using multiple visible queries in a panel. See [this issue](https://github.com/VictoriaMetrics/victoriametrics-datasource/issues/223).
 * BUGFIX: fix escaping when selecting metrics in the metrics browser. See [this issue](https://github.com/VictoriaMetrics/victoriametrics-datasource/issues/214).
 * BUGFIX: fix incorrect step calculation in annotation queries. See [this issue](https://github.com/VictoriaMetrics/victoriametrics-datasource/issues/217).
 

diff --git a/src/datasource.test.ts b/src/datasource.test.ts
@@ -1,9 +1,10 @@
 
 import { cloneDeep } from 'lodash';
 import { of } from 'rxjs';
-import { ScopedVar, ScopedVars } from '@grafana/data';
 
 import {
+  ScopedVar,
+  ScopedVars,
   CoreApp,
   DataQueryRequest,
   DataQueryResponse,
@@ -224,8 +225,8 @@ describe('PrometheusDatasource', () => {
         return str.replace('$topk', topk.value);
       });
       const caseTarget: PromQuery = { expr: 'topk_max($topk, vmalert_iteration_duration_seconds_sum)', refId: 'A' };
-      const result = ds.createQuery(caseTarget, { interval: '15s', scopedVars: { 'topk': { text: 'topk', value: '5' } } as ScopedVars} as DataQueryRequest<PromQuery>, 0, 0);
-      expect(result).toMatchObject({ expr: 'topk_max(5, vmalert_iteration_duration_seconds_sum{k1="v1"})'});
+      const result = ds.createQuery(caseTarget, { interval: '15s', scopedVars: { 'topk': { text: 'topk', value: '5' } } as ScopedVars } as DataQueryRequest<PromQuery>, 0, 0);
+      expect(result).toMatchObject({ expr: 'topk_max(5, vmalert_iteration_duration_seconds_sum{k1="v1"})' });
     });
   });
 
@@ -525,7 +526,7 @@ describe('PrometheusDatasource', () => {
         refId: 'A'
       };
       const result = ds.applyTemplateVariables(query, { 'topk': { text: 'topk', value: '5' } } as ScopedVars);
-      expect(result).toMatchObject({ expr: 'topk_max(5, vmalert_iteration_duration_seconds_sum{k1="v1"})'});
+      expect(result).toMatchObject({ expr: 'topk_max(5, vmalert_iteration_duration_seconds_sum{k1="v1"})' });
     });
   });
 
@@ -653,7 +654,6 @@ function getPrepareTargetsContext({
   const options = {
     targets,
     interval: '1s',
-    requestId: "request_id",
     panelId,
     app,
     ...queryOptions,
@@ -680,7 +680,7 @@ describe('prepareTargets', () => {
       const target: PromQuery = {
         refId: 'A',
         expr: 'up',
-        requestId: 'request_id',
+        requestId: '2A',
       };
 
       const { queries, activeTargets, panelId, end, start } = getPrepareTargetsContext({ targets: [target] });
@@ -698,7 +698,7 @@ describe('prepareTargets', () => {
         hinting: undefined,
         instant: undefined,
         refId: target.refId,
-        requestId: target.requestId,
+        requestId: panelId + target.refId,
         start,
         step: 1,
       });
@@ -782,7 +782,7 @@ describe('prepareTargets', () => {
           expr: 'up',
           range: true,
           instant: true,
-          requestId: 'request_id',
+          requestId: '2A',
         };
 
         const { queries, activeTargets, panelId, end, start } = getPrepareTargetsContext({
@@ -803,15 +803,15 @@ describe('prepareTargets', () => {
           hinting: undefined,
           instant: true,
           refId: target.refId,
-          requestId: target.requestId + "_instant",
+          requestId: panelId + target.refId + '_instant',
           start,
           step: 1,
         });
         expect(activeTargets[0]).toEqual({
           ...target,
           format: 'table',
           instant: true,
-          requestId: target.requestId + "_instant",
+          requestId: panelId + target.refId + '_instant',
           valueWithRefId: true,
         });
         expect(queries[1]).toEqual({
@@ -825,15 +825,15 @@ describe('prepareTargets', () => {
           hinting: undefined,
           instant: false,
           refId: target.refId,
-          requestId: target.requestId,
+          requestId: panelId + target.refId,
           start,
           step: 1,
         });
         expect(activeTargets[1]).toEqual({
           ...target,
           format: 'time_series',
           instant: false,
-          requestId: target.requestId,
+          requestId: panelId + target.refId,
         });
       });
     });
@@ -845,7 +845,7 @@ describe('prepareTargets', () => {
           expr: 'up',
           instant: true,
           range: false,
-          requestId: 'request_id',
+          requestId: '2A',
         };
 
         const { queries, activeTargets, panelId, end, start } = getPrepareTargetsContext({
@@ -866,7 +866,7 @@ describe('prepareTargets', () => {
           hinting: undefined,
           instant: true,
           refId: target.refId,
-          requestId: target.requestId,
+          requestId: panelId + target.refId,
           start,
           step: 1,
         });
@@ -882,7 +882,7 @@ describe('prepareTargets', () => {
         expr: 'up',
         range: true,
         instant: false,
-        requestId: 'request_id',
+        requestId: '2A',
       };
 
       const { queries, activeTargets, panelId, end, start } = getPrepareTargetsContext({
@@ -903,7 +903,7 @@ describe('prepareTargets', () => {
         hinting: undefined,
         instant: false,
         refId: target.refId,
-        requestId: target.requestId,
+        requestId: panelId + target.refId,
         start,
         step: 1,
         trace: undefined

diff --git a/src/datasource.tsx b/src/datasource.tsx
@@ -317,7 +317,7 @@ export class PrometheusDatasource
         continue;
       }
 
-      target.requestId = options.requestId
+      target.requestId = options.panelId + target.refId;
       // const metricName = this.languageProvider.histogramMetrics.find((m) => target.expr.includes(m));
 
       // In Explore, we run both (instant and range) queries if both are true (selected) or both are undefined (legacy Explore queries)
@@ -365,7 +365,7 @@ export class PrometheusDatasource
     return {
       ...target,
       queryType: PromQueryType.timeSeriesQuery,
-      requestId: request.requestId,
+      requestId: request.panelId + target.refId,
       // We need to pass utcOffsetSec to backend to calculate aligned range
       utcOffsetSec: this.timeSrv.timeRange().to.utcOffset() * 60,
     };
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ @@
     ## tip
+    * BUGFIX: fix query loading when using multiple visible queries in a panel. See [this issue](https://github.com/VictoriaMetrics/victoriametrics-datasource/issues/223).
     * BUGFIX: fix escaping when selecting metrics in the metrics browser. See [this issue](https://github.com/VictoriaMetrics/victoriametrics-datasource/issues/214).
     * BUGFIX: fix incorrect step calculation in annotation queries. See [this issue](https://github.com/VictoriaMetrics/victoriametrics-datasource/issues/217).
@@ Expand Down @@