@perses-dev/prometheus-plugin 0.58.0-beta.1 → 0.58.0-beta.3

package/lib/cjs/components/query.js

@@ -30,8 +30,11 @@ _export(exports, {
 });
 const _pluginsystem = require("@perses-dev/plugin-system");
 const _reactquery = require("@tanstack/react-query");
+const _interpolation = require("../plugins/interpolation");
 function useParseQuery(content, datasource, enabled) {
     const { data: client } = (0, _pluginsystem.useDatasourceClient)(datasource);
+    const datasourceStore = (0, _pluginsystem.useDatasourceStore)();
+    const variableState = (0, _pluginsystem.useVariableValues)();
     return (0, _reactquery.useQuery)({
         enabled: !!client && enabled,
         queryKey: [
@@ -44,12 +47,15 @@ function useParseQuery(content, datasource, enabled) {
             const params = {
                 query: content
             };
-            return await client.parseQuery(params);
+            const interpolatedOptions = await (0, _interpolation.getInterpolatedRequestOptions)(datasourceStore, datasource, variableState);
+            return await client.parseQuery(params, interpolatedOptions);
         }
     });
 }
 function useInstantQuery(content, datasource, enabled) {
     const { data: client } = (0, _pluginsystem.useDatasourceClient)(datasource);
+    const datasourceStore = (0, _pluginsystem.useDatasourceStore)();
+    const variableState = (0, _pluginsystem.useVariableValues)();
     return (0, _reactquery.useQuery)({
         enabled: !!client && enabled,
         // TODO: for some reason the caching is not working: identical nodes still fire their requests after each change made to the promQL
@@ -63,8 +69,9 @@ function useInstantQuery(content, datasource, enabled) {
             const params = {
                 query: content
             };
+            const interpolatedOptions = await (0, _interpolation.getInterpolatedRequestOptions)(datasourceStore, datasource, variableState);
             const startTime = performance.now();
-            const response = await client.instantQuery(params);
+            const response = await client.instantQuery(params, interpolatedOptions);
             const responseTime = performance.now() - startTime;
             return {
                 ...response,

package/lib/cjs/explore/PrometheusMetricsFinder/utils.js

@@ -37,9 +37,12 @@ _export(exports, {
 const _pluginsystem = require("@perses-dev/plugin-system");
 const _reactquery = require("@tanstack/react-query");
 const _react = require("react");
+const _interpolation = require("../../plugins/interpolation");
 const _types = require("./types");
 function useMetricMetadata(metricName, datasource, enabled) {
     const { data: client } = (0, _pluginsystem.useDatasourceClient)(datasource);
+    const datasourceStore = (0, _pluginsystem.useDatasourceStore)();
+    const variableState = (0, _pluginsystem.useVariableValues)();
     // histograms and summaries timeseries desc are not always added to prefixed timeseries
     const name = metricName.replace(/(_count|_sum|_bucket)$/, '');
     const { data, isLoading, error } = (0, _reactquery.useQuery)({
@@ -52,7 +55,8 @@ function useMetricMetadata(metricName, datasource, enabled) {
             const params = {
                 metric: name
             };
-            return await client.metricMetadata(params);
+            const interpolatedOptions = await (0, _interpolation.getInterpolatedRequestOptions)(datasourceStore, datasource, variableState);
+            return await client.metricMetadata(params, interpolatedOptions);
         }
     });
     // Find the first result with help text
@@ -76,6 +80,8 @@ function useMetricMetadata(metricName, datasource, enabled) {
 function useLabels(filters, datasource) {
     const { absoluteTimeRange: { start, end } } = (0, _pluginsystem.useTimeRange)();
     const { data: client } = (0, _pluginsystem.useDatasourceClient)(datasource);
+    const datasourceStore = (0, _pluginsystem.useDatasourceStore)();
+    const variableState = (0, _pluginsystem.useVariableValues)();
     return (0, _reactquery.useQuery)({
         enabled: !!client,
         queryKey: [
@@ -99,13 +105,16 @@ function useLabels(filters, datasource) {
                     `{${(0, _types.computeFilterExpr)(filters)}}`
                 ];
             }
-            return await client.labelNames(params);
+            const interpolatedOptions = await (0, _interpolation.getInterpolatedRequestOptions)(datasourceStore, datasource, variableState);
+            return await client.labelNames(params, interpolatedOptions);
         }
     });
 }
 function useLabelValues(labelName, filters, datasource) {
     const { absoluteTimeRange: { start, end } } = (0, _pluginsystem.useTimeRange)();
     const { data: client } = (0, _pluginsystem.useDatasourceClient)(datasource);
+    const datasourceStore = (0, _pluginsystem.useDatasourceStore)();
+    const variableState = (0, _pluginsystem.useVariableValues)();
     return (0, _reactquery.useQuery)({
         enabled: !!client,
         queryKey: [
@@ -130,13 +139,16 @@ function useLabelValues(labelName, filters, datasource) {
                     `{${(0, _types.computeFilterExpr)(filters)}}`
                 ];
             }
-            return await client.labelValues(params);
+            const interpolatedOptions = await (0, _interpolation.getInterpolatedRequestOptions)(datasourceStore, datasource, variableState);
+            return await client.labelValues(params, interpolatedOptions);
         }
     });
 }
 function useSeriesStates(metricName, filters, datasource) {
     const { absoluteTimeRange: { start, end } } = (0, _pluginsystem.useTimeRange)();
     const { data: client } = (0, _pluginsystem.useDatasourceClient)(datasource);
+    const datasourceStore = (0, _pluginsystem.useDatasourceStore)();
+    const variableState = (0, _pluginsystem.useVariableValues)();
     const { data: seriesData, isLoading, isError, error } = (0, _reactquery.useQuery)({
         enabled: !!client,
         queryKey: [
@@ -158,7 +170,8 @@ function useSeriesStates(metricName, filters, datasource) {
                 start: start.valueOf() / 1000,
                 end: end.valueOf() / 1000
             };
-            return await client.series(params);
+            const interpolatedOptions = await (0, _interpolation.getInterpolatedRequestOptions)(datasourceStore, datasource, variableState);
+            return await client.series(params, interpolatedOptions);
         }
     });
     const labelValueCounters = (0, _react.useMemo)(()=>{

package/lib/cjs/plugins/PrometheusLabelValuesVariable.js

@@ -24,6 +24,60 @@ const _pluginsystem = require("@perses-dev/plugin-system");
 const _model = require("../model");
 const _prometheusvariables = require("./prometheus-variables");
 const _interpolation = require("./interpolation");
+function extractDatasourceVariables(datasourceSpec) {
+    try {
+        const spec = datasourceSpec.plugin.spec;
+        // Pure function to extract variables from string or array values
+        const extractFromValue = (value)=>{
+            if (typeof value === 'string') {
+                return (0, _pluginsystem.parseVariables)(value);
+            } else if (Array.isArray(value)) {
+                return value.flatMap((item)=>{
+                    return typeof item === 'string' ? (0, _pluginsystem.parseVariables)(item) : [];
+                });
+            }
+            return [];
+        };
+        const allVariables = [];
+        // Extract variables from queryParams
+        if (spec.queryParams) {
+            Object.values(spec.queryParams).forEach((value)=>{
+                allVariables.push(...extractFromValue(value));
+            });
+        }
+        // Extract variables from directUrl
+        if (spec.directUrl) {
+            allVariables.push(...extractFromValue(spec.directUrl));
+        }
+        // Extract variables from proxy configuration
+        if (spec.proxy?.spec) {
+            // Extract from proxy URL
+            if (spec.proxy.spec.url) {
+                allVariables.push(...extractFromValue(spec.proxy.spec.url));
+            }
+            // Extract from proxy headers
+            if (spec.proxy.spec.headers) {
+                Object.values(spec.proxy.spec.headers).forEach((value)=>{
+                    if (typeof value === 'string') {
+                        allVariables.push(...extractFromValue(value));
+                    }
+                });
+            }
+        }
+        return Array.from(new Set(allVariables)); // Remove duplicates
+    } catch  {
+        return [];
+    }
+}
+function getDatasourceVariablesFromCache(datasourceSelector, datasourceStore) {
+    try {
+        if (!datasourceStore.getDatasourceSpecSync) return [];
+        const datasourceSpec = datasourceStore.getDatasourceSpecSync(datasourceSelector);
+        return datasourceSpec ? extractDatasourceVariables(datasourceSpec) : [];
+    } catch  {
+        return [];
+    }
+}
 const PrometheusLabelValuesVariable = {
     getVariableOptions: async (spec, ctx)=>{
         const pluginDef = spec;
@@ -40,16 +94,28 @@ const PrometheusLabelValuesVariable = {
             data: (0, _prometheusvariables.stringArrayToVariableOptions)(options)
         };
     },
-    dependsOn: (spec)=>{
+    dependsOn: (spec, ctx)=>{
         const matcherVariables = spec.matchers?.map((m)=>(0, _pluginsystem.parseVariables)(m)).flat() || [];
         const labelVariables = (0, _pluginsystem.parseVariables)(spec.labelName);
         const datasourceVariables = spec.datasource && (0, _pluginsystem.isVariableDatasource)(spec.datasource) ? (0, _pluginsystem.parseVariables)(spec.datasource) : [];
+        let datasourceVariablesFromCache = [];
+        if (ctx?.datasourceStore && ctx?.variables) {
+            const datasourceValue = spec.datasource ?? _model.DEFAULT_PROM;
+            const datasourceSelector = typeof datasourceValue === 'string' ? {
+                kind: _model.PROM_DATASOURCE_KIND,
+                name: datasourceValue
+            } : datasourceValue;
+            datasourceVariablesFromCache = getDatasourceVariablesFromCache(datasourceSelector, ctx.datasourceStore);
+        }
+        const allDependencies = [
+            ...matcherVariables,
+            ...labelVariables,
+            ...datasourceVariables,
+            ...datasourceVariablesFromCache
+        ];
+        const uniqueDependencies = Array.from(new Set(allDependencies));
         return {
-            variables: [
-                ...matcherVariables,
-                ...labelVariables,
-                ...datasourceVariables
-            ]
+            variables: uniqueDependencies
         };
     },
     OptionsEditorComponent: _prometheusvariables.PrometheusLabelValuesVariableEditor,

package/lib/cjs/plugins/interpolation.js

@@ -21,6 +21,9 @@ function _export(target, all) {
     });
 }
 _export(exports, {
+    get getInterpolatedRequestOptions () {
+        return getInterpolatedRequestOptions;
+    },
     get interpolateDatasourceProxyParams () {
         return interpolateDatasourceProxyParams;
     },
@@ -52,3 +55,7 @@ function interpolateDatasourceProxyParams(datasource, variableState) {
         queryParams: rawQueryParams ? (0, _components.interpolateQueryParams)(rawQueryParams, variableState) : undefined
     };
 }
+async function getInterpolatedRequestOptions(datasourceStore, datasource, variableState) {
+    const datasourceSpec = await datasourceStore.getDatasource(datasource);
+    return interpolateDatasourceProxyParams(datasourceSpec, variableState);
+}

package/lib/components/query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../src/components/query.ts"],"names":[],"mappings":"AAcA,OAAO,EAAY,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAEL,6BAA6B,EAE7B,kBAAkB,EAEnB,MAAM,UAAU,CAAC;AAElB,wBAAgB,aAAa,CAC3B,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,kBAAkB,EAC9B,OAAO,CAAC,EAAE,OAAO,GAChB,cAAc,CAAC,kBAAkB,EAAE,WAAW,CAAC,CAYjD;AAED,wBAAgB,eAAe,CAC7B,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,kBAAkB,EAC9B,OAAO,CAAC,EAAE,OAAO,GAChB,cAAc,CAAC,6BAA6B,EAAE,WAAW,CAAC,CAgB5D"}
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../src/components/query.ts"],"names":[],"mappings":"AAcA,OAAO,EAAY,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAEL,6BAA6B,EAE7B,kBAAkB,EAEnB,MAAM,UAAU,CAAC;AAGlB,wBAAgB,aAAa,CAC3B,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,kBAAkB,EAC9B,OAAO,CAAC,EAAE,OAAO,GAChB,cAAc,CAAC,kBAAkB,EAAE,WAAW,CAAC,CAgBjD;AAED,wBAAgB,eAAe,CAC7B,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,kBAAkB,EAC9B,OAAO,CAAC,EAAE,OAAO,GAChB,cAAc,CAAC,6BAA6B,EAAE,WAAW,CAAC,CAqB5D"}

package/lib/components/query.js

@@ -10,10 +10,13 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-import { useDatasourceClient } from '@perses-dev/plugin-system';
+import { useDatasourceClient, useDatasourceStore, useVariableValues } from '@perses-dev/plugin-system';
 import { useQuery } from '@tanstack/react-query';
+import { getInterpolatedRequestOptions } from '../plugins/interpolation';
 export function useParseQuery(content, datasource, enabled) {
     const { data: client } = useDatasourceClient(datasource);
+    const datasourceStore = useDatasourceStore();
+    const variableState = useVariableValues();
     return useQuery({
         enabled: !!client && enabled,
         queryKey: [
@@ -26,12 +29,15 @@ export function useParseQuery(content, datasource, enabled) {
             const params = {
                 query: content
             };
-            return await client.parseQuery(params);
+            const interpolatedOptions = await getInterpolatedRequestOptions(datasourceStore, datasource, variableState);
+            return await client.parseQuery(params, interpolatedOptions);
         }
     });
 }
 export function useInstantQuery(content, datasource, enabled) {
     const { data: client } = useDatasourceClient(datasource);
+    const datasourceStore = useDatasourceStore();
+    const variableState = useVariableValues();
     return useQuery({
         enabled: !!client && enabled,
         // TODO: for some reason the caching is not working: identical nodes still fire their requests after each change made to the promQL
@@ -45,8 +51,9 @@ export function useInstantQuery(content, datasource, enabled) {
             const params = {
                 query: content
             };
+            const interpolatedOptions = await getInterpolatedRequestOptions(datasourceStore, datasource, variableState);
             const startTime = performance.now();
-            const response = await client.instantQuery(params);
+            const response = await client.instantQuery(params, interpolatedOptions);
             const responseTime = performance.now() - startTime;
             return {
                 ...response,

package/lib/components/query.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/components/query.ts"],"sourcesContent":["// Copyright The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { useDatasourceClient } from '@perses-dev/plugin-system';\nimport { useQuery, UseQueryResult } from '@tanstack/react-query';\nimport { DatasourceSelector } from '@perses-dev/spec';\nimport { StatusError } from '@perses-dev/client';\nimport {\n  InstantQueryRequestParameters,\n  MonitoredInstantQueryResponse,\n  ParseQueryRequestParameters,\n  ParseQueryResponse,\n  PrometheusClient,\n} from '../model';\n\nexport function useParseQuery(\n  content: string,\n  datasource: DatasourceSelector,\n  enabled?: boolean\n): UseQueryResult<ParseQueryResponse, StatusError> {\n  const { data: client } = useDatasourceClient<PrometheusClient>(datasource);\n\n  return useQuery<ParseQueryResponse, StatusError>({\n    enabled: !!client && enabled,\n    queryKey: ['parseQuery', content, 'datasource', datasource],\n    queryFn: async () => {\n      const params: ParseQueryRequestParameters = { query: content };\n\n      return await client!.parseQuery(params);\n    },\n  });\n}\n\nexport function useInstantQuery(\n  content: string,\n  datasource: DatasourceSelector,\n  enabled?: boolean\n): UseQueryResult<MonitoredInstantQueryResponse, StatusError> {\n  const { data: client } = useDatasourceClient<PrometheusClient>(datasource);\n\n  return useQuery<MonitoredInstantQueryResponse, StatusError>({\n    enabled: !!client && enabled,\n    // TODO: for some reason the caching is not working: identical nodes still fire their requests after each change made to the promQL\n    queryKey: ['instantQuery', content, 'datasource', datasource.kind],\n    queryFn: async () => {\n      const params: InstantQueryRequestParameters = { query: content };\n      const startTime = performance.now();\n      const response = await client!.instantQuery(params);\n      const responseTime = performance.now() - startTime;\n\n      return { ...response, responseTime };\n    },\n  });\n}\n"],"names":["useDatasourceClient","useQuery","useParseQuery","content","datasource","enabled","data","client","queryKey","queryFn","params","query","parseQuery","useInstantQuery","kind","startTime","performance","now","response","instantQuery","responseTime"],"mappings":"AAAA,+BAA+B;AAC/B,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAEjC,SAASA,mBAAmB,QAAQ,4BAA4B;AAChE,SAASC,QAAQ,QAAwB,wBAAwB;AAWjE,OAAO,SAASC,cACdC,OAAe,EACfC,UAA8B,EAC9BC,OAAiB;IAEjB,MAAM,EAAEC,MAAMC,MAAM,EAAE,GAAGP,oBAAsCI;IAE/D,OAAOH,SAA0C;QAC/CI,SAAS,CAAC,CAACE,UAAUF;QACrBG,UAAU;YAAC;YAAcL;YAAS;YAAcC;SAAW;QAC3DK,SAAS;YACP,MAAMC,SAAsC;gBAAEC,OAAOR;YAAQ;YAE7D,OAAO,MAAMI,OAAQK,UAAU,CAACF;QAClC;IACF;AACF;AAEA,OAAO,SAASG,gBACdV,OAAe,EACfC,UAA8B,EAC9BC,OAAiB;IAEjB,MAAM,EAAEC,MAAMC,MAAM,EAAE,GAAGP,oBAAsCI;IAE/D,OAAOH,SAAqD;QAC1DI,SAAS,CAAC,CAACE,UAAUF;QACrB,mIAAmI;QACnIG,UAAU;YAAC;YAAgBL;YAAS;YAAcC,WAAWU,IAAI;SAAC;QAClEL,SAAS;YACP,MAAMC,SAAwC;gBAAEC,OAAOR;YAAQ;YAC/D,MAAMY,YAAYC,YAAYC,GAAG;YACjC,MAAMC,WAAW,MAAMX,OAAQY,YAAY,CAACT;YAC5C,MAAMU,eAAeJ,YAAYC,GAAG,KAAKF;YAEzC,OAAO;gBAAE,GAAGG,QAAQ;gBAAEE;YAAa;QACrC;IACF;AACF"}
+{"version":3,"sources":["../../../src/components/query.ts"],"sourcesContent":["// Copyright The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { useDatasourceClient, useDatasourceStore, useVariableValues } from '@perses-dev/plugin-system';\nimport { useQuery, UseQueryResult } from '@tanstack/react-query';\nimport { DatasourceSelector } from '@perses-dev/spec';\nimport { StatusError } from '@perses-dev/client';\nimport {\n  InstantQueryRequestParameters,\n  MonitoredInstantQueryResponse,\n  ParseQueryRequestParameters,\n  ParseQueryResponse,\n  PrometheusClient,\n} from '../model';\nimport { getInterpolatedRequestOptions } from '../plugins/interpolation';\n\nexport function useParseQuery(\n  content: string,\n  datasource: DatasourceSelector,\n  enabled?: boolean\n): UseQueryResult<ParseQueryResponse, StatusError> {\n  const { data: client } = useDatasourceClient<PrometheusClient>(datasource);\n  const datasourceStore = useDatasourceStore();\n  const variableState = useVariableValues();\n\n  return useQuery<ParseQueryResponse, StatusError>({\n    enabled: !!client && enabled,\n    queryKey: ['parseQuery', content, 'datasource', datasource],\n    queryFn: async () => {\n      const params: ParseQueryRequestParameters = { query: content };\n\n      const interpolatedOptions = await getInterpolatedRequestOptions(datasourceStore, datasource, variableState);\n\n      return await client!.parseQuery(params, interpolatedOptions);\n    },\n  });\n}\n\nexport function useInstantQuery(\n  content: string,\n  datasource: DatasourceSelector,\n  enabled?: boolean\n): UseQueryResult<MonitoredInstantQueryResponse, StatusError> {\n  const { data: client } = useDatasourceClient<PrometheusClient>(datasource);\n  const datasourceStore = useDatasourceStore();\n  const variableState = useVariableValues();\n\n  return useQuery<MonitoredInstantQueryResponse, StatusError>({\n    enabled: !!client && enabled,\n    // TODO: for some reason the caching is not working: identical nodes still fire their requests after each change made to the promQL\n    queryKey: ['instantQuery', content, 'datasource', datasource.kind],\n    queryFn: async () => {\n      const params: InstantQueryRequestParameters = { query: content };\n\n      const interpolatedOptions = await getInterpolatedRequestOptions(datasourceStore, datasource, variableState);\n\n      const startTime = performance.now();\n      const response = await client!.instantQuery(params, interpolatedOptions);\n      const responseTime = performance.now() - startTime;\n\n      return { ...response, responseTime };\n    },\n  });\n}\n"],"names":["useDatasourceClient","useDatasourceStore","useVariableValues","useQuery","getInterpolatedRequestOptions","useParseQuery","content","datasource","enabled","data","client","datasourceStore","variableState","queryKey","queryFn","params","query","interpolatedOptions","parseQuery","useInstantQuery","kind","startTime","performance","now","response","instantQuery","responseTime"],"mappings":"AAAA,+BAA+B;AAC/B,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAEjC,SAASA,mBAAmB,EAAEC,kBAAkB,EAAEC,iBAAiB,QAAQ,4BAA4B;AACvG,SAASC,QAAQ,QAAwB,wBAAwB;AAUjE,SAASC,6BAA6B,QAAQ,2BAA2B;AAEzE,OAAO,SAASC,cACdC,OAAe,EACfC,UAA8B,EAC9BC,OAAiB;IAEjB,MAAM,EAAEC,MAAMC,MAAM,EAAE,GAAGV,oBAAsCO;IAC/D,MAAMI,kBAAkBV;IACxB,MAAMW,gBAAgBV;IAEtB,OAAOC,SAA0C;QAC/CK,SAAS,CAAC,CAACE,UAAUF;QACrBK,UAAU;YAAC;YAAcP;YAAS;YAAcC;SAAW;QAC3DO,SAAS;YACP,MAAMC,SAAsC;gBAAEC,OAAOV;YAAQ;YAE7D,MAAMW,sBAAsB,MAAMb,8BAA8BO,iBAAiBJ,YAAYK;YAE7F,OAAO,MAAMF,OAAQQ,UAAU,CAACH,QAAQE;QAC1C;IACF;AACF;AAEA,OAAO,SAASE,gBACdb,OAAe,EACfC,UAA8B,EAC9BC,OAAiB;IAEjB,MAAM,EAAEC,MAAMC,MAAM,EAAE,GAAGV,oBAAsCO;IAC/D,MAAMI,kBAAkBV;IACxB,MAAMW,gBAAgBV;IAEtB,OAAOC,SAAqD;QAC1DK,SAAS,CAAC,CAACE,UAAUF;QACrB,mIAAmI;QACnIK,UAAU;YAAC;YAAgBP;YAAS;YAAcC,WAAWa,IAAI;SAAC;QAClEN,SAAS;YACP,MAAMC,SAAwC;gBAAEC,OAAOV;YAAQ;YAE/D,MAAMW,sBAAsB,MAAMb,8BAA8BO,iBAAiBJ,YAAYK;YAE7F,MAAMS,YAAYC,YAAYC,GAAG;YACjC,MAAMC,WAAW,MAAMd,OAAQe,YAAY,CAACV,QAAQE;YACpD,MAAMS,eAAeJ,YAAYC,GAAG,KAAKF;YAEzC,OAAO;gBAAE,GAAGG,QAAQ;gBAAEE;YAAa;QACrC;IACF;AACF"}

package/lib/explore/PrometheusMetricsFinder/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/explore/PrometheusMetricsFinder/utils.ts"],"names":[],"mappings":"AAcA,OAAO,EAAY,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAGL,mBAAmB,EACnB,MAAM,EACN,cAAc,EAMf,MAAM,aAAa,CAAC;AACrB,OAAO,EAAqB,WAAW,EAAqB,MAAM,SAAS,CAAC;AAG5E,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,kBAAkB,EAC9B,OAAO,CAAC,EAAE,OAAO,GAChB;IACD,SAAS,EAAE,KAAK,GAAG,IAAI,CAAC;IACxB,QAAQ,EAAE,cAAc,GAAG,SAAS,CAAC;IACrC,KAAK,EAAE,WAAW,GAAG,IAAI,CAAC;CAC3B,CA2BA;AAED,wBAAgB,SAAS,CACvB,OAAO,EAAE,WAAW,EAAE,EACtB,UAAU,EAAE,kBAAkB,GAC7B,cAAc,CAAC,mBAAmB,EAAE,WAAW,CAAC,CAqBlD;AAGD,wBAAgB,cAAc,CAC5B,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,WAAW,EAAE,EACtB,UAAU,EAAE,kBAAkB,GAC7B,cAAc,CAAC,mBAAmB,EAAE,WAAW,CAAC,CAsBlD;AAID,wBAAgB,eAAe,CAC7B,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,WAAW,EAAE,EACtB,UAAU,EAAE,kBAAkB,GAC7B;IACD,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAC7B,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC,CAAC;IAChF,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,WAAW,GAAG,IAAI,CAAC;CAC3B,CAoDA"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/explore/PrometheusMetricsFinder/utils.ts"],"names":[],"mappings":"AAcA,OAAO,EAAY,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAGL,mBAAmB,EACnB,MAAM,EACN,cAAc,EAMf,MAAM,aAAa,CAAC;AAErB,OAAO,EAAqB,WAAW,EAAqB,MAAM,SAAS,CAAC;AAG5E,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,kBAAkB,EAC9B,OAAO,CAAC,EAAE,OAAO,GAChB;IACD,SAAS,EAAE,KAAK,GAAG,IAAI,CAAC;IACxB,QAAQ,EAAE,cAAc,GAAG,SAAS,CAAC;IACrC,KAAK,EAAE,WAAW,GAAG,IAAI,CAAC;CAC3B,CA+BA;AAED,wBAAgB,SAAS,CACvB,OAAO,EAAE,WAAW,EAAE,EACtB,UAAU,EAAE,kBAAkB,GAC7B,cAAc,CAAC,mBAAmB,EAAE,WAAW,CAAC,CAyBlD;AAGD,wBAAgB,cAAc,CAC5B,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,WAAW,EAAE,EACtB,UAAU,EAAE,kBAAkB,GAC7B,cAAc,CAAC,mBAAmB,EAAE,WAAW,CAAC,CA0BlD;AAID,wBAAgB,eAAe,CAC7B,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,WAAW,EAAE,EACtB,UAAU,EAAE,kBAAkB,GAC7B;IACD,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAC7B,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC,CAAC;IAChF,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,WAAW,GAAG,IAAI,CAAC;CAC3B,CAwDA"}

package/lib/explore/PrometheusMetricsFinder/utils.js

@@ -10,13 +10,16 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-import { useDatasourceClient, useTimeRange } from '@perses-dev/plugin-system';
+import { useDatasourceClient, useTimeRange, useVariableValues, useDatasourceStore } from '@perses-dev/plugin-system';
 import { useQuery } from '@tanstack/react-query';
 import { useMemo } from 'react';
+import { getInterpolatedRequestOptions } from '../../plugins/interpolation';
 import { computeFilterExpr } from './types';
 // Retrieve metric metadata from the Prometheus API
 export function useMetricMetadata(metricName, datasource, enabled) {
     const { data: client } = useDatasourceClient(datasource);
+    const datasourceStore = useDatasourceStore();
+    const variableState = useVariableValues();
     // histograms and summaries timeseries desc are not always added to prefixed timeseries
     const name = metricName.replace(/(_count|_sum|_bucket)$/, '');
     const { data, isLoading, error } = useQuery({
@@ -29,7 +32,8 @@ export function useMetricMetadata(metricName, datasource, enabled) {
             const params = {
                 metric: name
             };
-            return await client.metricMetadata(params);
+            const interpolatedOptions = await getInterpolatedRequestOptions(datasourceStore, datasource, variableState);
+            return await client.metricMetadata(params, interpolatedOptions);
         }
     });
     // Find the first result with help text
@@ -53,6 +57,8 @@ export function useMetricMetadata(metricName, datasource, enabled) {
 export function useLabels(filters, datasource) {
     const { absoluteTimeRange: { start, end } } = useTimeRange();
     const { data: client } = useDatasourceClient(datasource);
+    const datasourceStore = useDatasourceStore();
+    const variableState = useVariableValues();
     return useQuery({
         enabled: !!client,
         queryKey: [
@@ -76,7 +82,8 @@ export function useLabels(filters, datasource) {
                     `{${computeFilterExpr(filters)}}`
                 ];
             }
-            return await client.labelNames(params);
+            const interpolatedOptions = await getInterpolatedRequestOptions(datasourceStore, datasource, variableState);
+            return await client.labelNames(params, interpolatedOptions);
         }
     });
 }
@@ -84,6 +91,8 @@ export function useLabels(filters, datasource) {
 export function useLabelValues(labelName, filters, datasource) {
     const { absoluteTimeRange: { start, end } } = useTimeRange();
     const { data: client } = useDatasourceClient(datasource);
+    const datasourceStore = useDatasourceStore();
+    const variableState = useVariableValues();
     return useQuery({
         enabled: !!client,
         queryKey: [
@@ -108,7 +117,8 @@ export function useLabelValues(labelName, filters, datasource) {
                     `{${computeFilterExpr(filters)}}`
                 ];
             }
-            return await client.labelValues(params);
+            const interpolatedOptions = await getInterpolatedRequestOptions(datasourceStore, datasource, variableState);
+            return await client.labelValues(params, interpolatedOptions);
         }
     });
 }
@@ -117,6 +127,8 @@ export function useLabelValues(labelName, filters, datasource) {
 export function useSeriesStates(metricName, filters, datasource) {
     const { absoluteTimeRange: { start, end } } = useTimeRange();
     const { data: client } = useDatasourceClient(datasource);
+    const datasourceStore = useDatasourceStore();
+    const variableState = useVariableValues();
     const { data: seriesData, isLoading, isError, error } = useQuery({
         enabled: !!client,
         queryKey: [
@@ -138,7 +150,8 @@ export function useSeriesStates(metricName, filters, datasource) {
                 start: start.valueOf() / 1000,
                 end: end.valueOf() / 1000
             };
-            return await client.series(params);
+            const interpolatedOptions = await getInterpolatedRequestOptions(datasourceStore, datasource, variableState);
+            return await client.series(params, interpolatedOptions);
         }
     });
     const labelValueCounters = useMemo(()=>{

package/lib/explore/PrometheusMetricsFinder/utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/explore/PrometheusMetricsFinder/utils.ts"],"sourcesContent":["// Copyright The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { useDatasourceClient, useTimeRange } from '@perses-dev/plugin-system';\nimport { useQuery, UseQueryResult } from '@tanstack/react-query';\nimport { useMemo } from 'react';\nimport { DatasourceSelector } from '@perses-dev/spec';\nimport { StatusError } from '@perses-dev/client';\nimport {\n  LabelNamesRequestParameters,\n  LabelValuesRequestParameters,\n  LabelValuesResponse,\n  Metric,\n  MetricMetadata,\n  MetricMetadataRequestParameters,\n  MetricMetadataResponse,\n  PrometheusClient,\n  SeriesRequestParameters,\n  SeriesResponse,\n} from '../../model';\nimport { computeFilterExpr, LabelFilter, LabelValueCounter } from './types';\n\n// Retrieve metric metadata from the Prometheus API\nexport function useMetricMetadata(\n  metricName: string,\n  datasource: DatasourceSelector,\n  enabled?: boolean\n): {\n  isLoading: false | true;\n  metadata: MetricMetadata | undefined;\n  error: StatusError | null;\n} {\n  const { data: client } = useDatasourceClient<PrometheusClient>(datasource);\n\n  // histograms and summaries timeseries desc are not always added to prefixed timeseries\n  const name = metricName.replace(/(_count|_sum|_bucket)$/, '');\n\n  const { data, isLoading, error } = useQuery<MetricMetadataResponse, StatusError>({\n    enabled: !!client && enabled,\n    queryKey: ['metricMetadata', name], // Not indexed on datasource, assuming a metric metadata should be similar across datasources\n    queryFn: async () => {\n      const params: MetricMetadataRequestParameters = { metric: name };\n\n      return await client!.metricMetadata(params);\n    },\n  });\n\n  // Find the first result with help text\n  const metadata: MetricMetadata | undefined = useMemo(() => {\n    for (const metric of data?.data?.[name] ?? []) {\n      if (metric.help.length > 0) {\n        return metric;\n      }\n    }\n    return undefined;\n  }, [data, name]);\n\n  return { metadata, isLoading, error };\n}\n\nexport function useLabels(\n  filters: LabelFilter[],\n  datasource: DatasourceSelector\n): UseQueryResult<LabelValuesResponse, StatusError> {\n  const {\n    absoluteTimeRange: { start, end },\n  } = useTimeRange();\n  const { data: client } = useDatasourceClient<PrometheusClient>(datasource);\n\n  return useQuery<LabelValuesResponse, StatusError>({\n    enabled: !!client,\n    queryKey: ['labels', 'datasource', datasource.name, 'start', start, 'end', end, 'filters', ...filters],\n    queryFn: async () => {\n      const params: LabelNamesRequestParameters = {\n        start: start.valueOf() / 1000,\n        end: end.valueOf() / 1000,\n      };\n      if (filters.length) {\n        params['match[]'] = [`{${computeFilterExpr(filters)}}`];\n      }\n\n      return await client!.labelNames(params);\n    },\n  });\n}\n\n// Retrieve label values from the Prometheus API for a given label name and filters\nexport function useLabelValues(\n  labelName: string,\n  filters: LabelFilter[],\n  datasource: DatasourceSelector\n): UseQueryResult<LabelValuesResponse, StatusError> {\n  const {\n    absoluteTimeRange: { start, end },\n  } = useTimeRange();\n  const { data: client } = useDatasourceClient<PrometheusClient>(datasource);\n\n  return useQuery<LabelValuesResponse, StatusError>({\n    enabled: !!client,\n    queryKey: ['labelValues', labelName, 'datasource', datasource.name, 'start', start, 'end', 'filters', ...filters],\n    queryFn: async () => {\n      const params: LabelValuesRequestParameters = {\n        labelName: labelName,\n        start: start.valueOf() / 1000,\n        end: end.valueOf() / 1000,\n      };\n      if (filters.length) {\n        params['match[]'] = [`{${computeFilterExpr(filters)}}`];\n      }\n\n      return await client!.labelValues(params);\n    },\n  });\n}\n\n// Retrieve series from the Prometheus API for a given metric name and filters\n// Also computes the number of times a label value appears for the given metric name and filters\nexport function useSeriesStates(\n  metricName: string,\n  filters: LabelFilter[],\n  datasource: DatasourceSelector\n): {\n  series: Metric[] | undefined;\n  labelValueCounters: Map<string, Array<{ labelValue: string; counter: number }>>;\n  isLoading: boolean;\n  isError: boolean;\n  error: StatusError | null;\n} {\n  const {\n    absoluteTimeRange: { start, end },\n  } = useTimeRange();\n  const { data: client } = useDatasourceClient<PrometheusClient>(datasource);\n\n  const {\n    data: seriesData,\n    isLoading,\n    isError,\n    error,\n  } = useQuery<SeriesResponse, StatusError>({\n    enabled: !!client,\n    queryKey: ['series', metricName, 'datasource', datasource, 'start', start, 'end', 'filters', ...filters],\n    queryFn: async () => {\n      const params: SeriesRequestParameters = {\n        'match[]': [`{${computeFilterExpr(filters)}}`],\n        start: start.valueOf() / 1000,\n        end: end.valueOf() / 1000,\n      };\n\n      return await client!.series(params);\n    },\n  });\n\n  const labelValueCounters: Map<string, Array<{ labelValue: string; counter: number }>> = useMemo(() => {\n    const result = new Map<string, LabelValueCounter[]>();\n    if (seriesData?.data === undefined) {\n      return result;\n    }\n\n    for (const series of seriesData.data) {\n      for (const [label, value] of Object.entries(series)) {\n        const labelCounters = result.get(label);\n        if (labelCounters === undefined) {\n          result.set(label, [{ labelValue: value, counter: 1 }]);\n          continue;\n        }\n\n        const labelValueCounter = labelCounters.find((counter) => counter.labelValue === value);\n        if (labelValueCounter === undefined) {\n          labelCounters.push({ labelValue: value, counter: 1 });\n        } else {\n          labelValueCounter.counter += 1;\n        }\n      }\n    }\n\n    return result;\n  }, [seriesData]);\n\n  return { series: seriesData?.data, labelValueCounters, isLoading, isError, error };\n}\n"],"names":["useDatasourceClient","useTimeRange","useQuery","useMemo","computeFilterExpr","useMetricMetadata","metricName","datasource","enabled","data","client","name","replace","isLoading","error","queryKey","queryFn","params","metric","metricMetadata","metadata","help","length","undefined","useLabels","filters","absoluteTimeRange","start","end","valueOf","labelNames","useLabelValues","labelName","labelValues","useSeriesStates","seriesData","isError","series","labelValueCounters","result","Map","label","value","Object","entries","labelCounters","get","set","labelValue","counter","labelValueCounter","find","push"],"mappings":"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"}
+{"version":3,"sources":["../../../../src/explore/PrometheusMetricsFinder/utils.ts"],"sourcesContent":["// Copyright The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { useDatasourceClient, useTimeRange, useVariableValues, useDatasourceStore } from '@perses-dev/plugin-system';\nimport { useQuery, UseQueryResult } from '@tanstack/react-query';\nimport { useMemo } from 'react';\nimport { DatasourceSelector } from '@perses-dev/spec';\nimport { StatusError } from '@perses-dev/client';\nimport {\n  LabelNamesRequestParameters,\n  LabelValuesRequestParameters,\n  LabelValuesResponse,\n  Metric,\n  MetricMetadata,\n  MetricMetadataRequestParameters,\n  MetricMetadataResponse,\n  PrometheusClient,\n  SeriesRequestParameters,\n  SeriesResponse,\n} from '../../model';\nimport { getInterpolatedRequestOptions } from '../../plugins/interpolation';\nimport { computeFilterExpr, LabelFilter, LabelValueCounter } from './types';\n\n// Retrieve metric metadata from the Prometheus API\nexport function useMetricMetadata(\n  metricName: string,\n  datasource: DatasourceSelector,\n  enabled?: boolean\n): {\n  isLoading: false | true;\n  metadata: MetricMetadata | undefined;\n  error: StatusError | null;\n} {\n  const { data: client } = useDatasourceClient<PrometheusClient>(datasource);\n  const datasourceStore = useDatasourceStore();\n  const variableState = useVariableValues();\n\n  // histograms and summaries timeseries desc are not always added to prefixed timeseries\n  const name = metricName.replace(/(_count|_sum|_bucket)$/, '');\n\n  const { data, isLoading, error } = useQuery<MetricMetadataResponse, StatusError>({\n    enabled: !!client && enabled,\n    queryKey: ['metricMetadata', name], // Not indexed on datasource, assuming a metric metadata should be similar across datasources\n    queryFn: async () => {\n      const params: MetricMetadataRequestParameters = { metric: name };\n\n      const interpolatedOptions = await getInterpolatedRequestOptions(datasourceStore, datasource, variableState);\n\n      return await client!.metricMetadata(params, interpolatedOptions);\n    },\n  });\n\n  // Find the first result with help text\n  const metadata: MetricMetadata | undefined = useMemo(() => {\n    for (const metric of data?.data?.[name] ?? []) {\n      if (metric.help.length > 0) {\n        return metric;\n      }\n    }\n    return undefined;\n  }, [data, name]);\n\n  return { metadata, isLoading, error };\n}\n\nexport function useLabels(\n  filters: LabelFilter[],\n  datasource: DatasourceSelector\n): UseQueryResult<LabelValuesResponse, StatusError> {\n  const {\n    absoluteTimeRange: { start, end },\n  } = useTimeRange();\n  const { data: client } = useDatasourceClient<PrometheusClient>(datasource);\n  const datasourceStore = useDatasourceStore();\n  const variableState = useVariableValues();\n\n  return useQuery<LabelValuesResponse, StatusError>({\n    enabled: !!client,\n    queryKey: ['labels', 'datasource', datasource.name, 'start', start, 'end', end, 'filters', ...filters],\n    queryFn: async () => {\n      const params: LabelNamesRequestParameters = {\n        start: start.valueOf() / 1000,\n        end: end.valueOf() / 1000,\n      };\n      if (filters.length) {\n        params['match[]'] = [`{${computeFilterExpr(filters)}}`];\n      }\n\n      const interpolatedOptions = await getInterpolatedRequestOptions(datasourceStore, datasource, variableState);\n\n      return await client!.labelNames(params, interpolatedOptions);\n    },\n  });\n}\n\n// Retrieve label values from the Prometheus API for a given label name and filters\nexport function useLabelValues(\n  labelName: string,\n  filters: LabelFilter[],\n  datasource: DatasourceSelector\n): UseQueryResult<LabelValuesResponse, StatusError> {\n  const {\n    absoluteTimeRange: { start, end },\n  } = useTimeRange();\n  const { data: client } = useDatasourceClient<PrometheusClient>(datasource);\n  const datasourceStore = useDatasourceStore();\n  const variableState = useVariableValues();\n\n  return useQuery<LabelValuesResponse, StatusError>({\n    enabled: !!client,\n    queryKey: ['labelValues', labelName, 'datasource', datasource.name, 'start', start, 'end', 'filters', ...filters],\n    queryFn: async () => {\n      const params: LabelValuesRequestParameters = {\n        labelName: labelName,\n        start: start.valueOf() / 1000,\n        end: end.valueOf() / 1000,\n      };\n      if (filters.length) {\n        params['match[]'] = [`{${computeFilterExpr(filters)}}`];\n      }\n\n      const interpolatedOptions = await getInterpolatedRequestOptions(datasourceStore, datasource, variableState);\n\n      return await client!.labelValues(params, interpolatedOptions);\n    },\n  });\n}\n\n// Retrieve series from the Prometheus API for a given metric name and filters\n// Also computes the number of times a label value appears for the given metric name and filters\nexport function useSeriesStates(\n  metricName: string,\n  filters: LabelFilter[],\n  datasource: DatasourceSelector\n): {\n  series: Metric[] | undefined;\n  labelValueCounters: Map<string, Array<{ labelValue: string; counter: number }>>;\n  isLoading: boolean;\n  isError: boolean;\n  error: StatusError | null;\n} {\n  const {\n    absoluteTimeRange: { start, end },\n  } = useTimeRange();\n  const { data: client } = useDatasourceClient<PrometheusClient>(datasource);\n  const datasourceStore = useDatasourceStore();\n  const variableState = useVariableValues();\n\n  const {\n    data: seriesData,\n    isLoading,\n    isError,\n    error,\n  } = useQuery<SeriesResponse, StatusError>({\n    enabled: !!client,\n    queryKey: ['series', metricName, 'datasource', datasource, 'start', start, 'end', 'filters', ...filters],\n    queryFn: async () => {\n      const params: SeriesRequestParameters = {\n        'match[]': [`{${computeFilterExpr(filters)}}`],\n        start: start.valueOf() / 1000,\n        end: end.valueOf() / 1000,\n      };\n\n      const interpolatedOptions = await getInterpolatedRequestOptions(datasourceStore, datasource, variableState);\n\n      return await client!.series(params, interpolatedOptions);\n    },\n  });\n\n  const labelValueCounters: Map<string, Array<{ labelValue: string; counter: number }>> = useMemo(() => {\n    const result = new Map<string, LabelValueCounter[]>();\n    if (seriesData?.data === undefined) {\n      return result;\n    }\n\n    for (const series of seriesData.data) {\n      for (const [label, value] of Object.entries(series)) {\n        const labelCounters = result.get(label);\n        if (labelCounters === undefined) {\n          result.set(label, [{ labelValue: value, counter: 1 }]);\n          continue;\n        }\n\n        const labelValueCounter = labelCounters.find((counter) => counter.labelValue === value);\n        if (labelValueCounter === undefined) {\n          labelCounters.push({ labelValue: value, counter: 1 });\n        } else {\n          labelValueCounter.counter += 1;\n        }\n      }\n    }\n\n    return result;\n  }, [seriesData]);\n\n  return { series: seriesData?.data, labelValueCounters, isLoading, isError, error };\n}\n"],"names":["useDatasourceClient","useTimeRange","useVariableValues","useDatasourceStore","useQuery","useMemo","getInterpolatedRequestOptions","computeFilterExpr","useMetricMetadata","metricName","datasource","enabled","data","client","datasourceStore","variableState","name","replace","isLoading","error","queryKey","queryFn","params","metric","interpolatedOptions","metricMetadata","metadata","help","length","undefined","useLabels","filters","absoluteTimeRange","start","end","valueOf","labelNames","useLabelValues","labelName","labelValues","useSeriesStates","seriesData","isError","series","labelValueCounters","result","Map","label","value","Object","entries","labelCounters","get","set","labelValue","counter","labelValueCounter","find","push"],"mappings":"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"}

package/lib/plugins/PrometheusLabelValuesVariable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PrometheusLabelValuesVariable.d.ts","sourceRoot":"","sources":["../../../src/plugins/PrometheusLabelValuesVariable.tsx"],"names":[],"mappings":"AAaA,OAAO,EACL,cAAc,EAMf,MAAM,2BAA2B,CAAC;AAInC,OAAO,EAAE,oCAAoC,EAAE,MAAM,SAAS,CAAC;AAE/D,eAAO,MAAM,6BAA6B,EAAE,cAAc,CAAC,oCAAoC,CAyC9F,CAAC"}
+{"version":3,"file":"PrometheusLabelValuesVariable.d.ts","sourceRoot":"","sources":["../../../src/plugins/PrometheusLabelValuesVariable.tsx"],"names":[],"mappings":"AAaA,OAAO,EACL,cAAc,EAOf,MAAM,2BAA2B,CAAC;AAKnC,OAAO,EAAE,oCAAoC,EAA4B,MAAM,SAAS,CAAC;AAuEzF,eAAO,MAAM,6BAA6B,EAAE,cAAc,CAAC,oCAAoC,CA2D9F,CAAC"}

package/lib/plugins/PrometheusLabelValuesVariable.js

@@ -14,6 +14,60 @@ import { replaceVariables, parseVariables, datasourceSelectValueToSelector, isVa
 import { DEFAULT_PROM, getPrometheusTimeRange, PROM_DATASOURCE_KIND } from '../model';
 import { stringArrayToVariableOptions, PrometheusLabelValuesVariableEditor } from './prometheus-variables';
 import { resolvePrometheusDatasource } from './interpolation';
+function extractDatasourceVariables(datasourceSpec) {
+    try {
+        const spec = datasourceSpec.plugin.spec;
+        // Pure function to extract variables from string or array values
+        const extractFromValue = (value)=>{
+            if (typeof value === 'string') {
+                return parseVariables(value);
+            } else if (Array.isArray(value)) {
+                return value.flatMap((item)=>{
+                    return typeof item === 'string' ? parseVariables(item) : [];
+                });
+            }
+            return [];
+        };
+        const allVariables = [];
+        // Extract variables from queryParams
+        if (spec.queryParams) {
+            Object.values(spec.queryParams).forEach((value)=>{
+                allVariables.push(...extractFromValue(value));
+            });
+        }
+        // Extract variables from directUrl
+        if (spec.directUrl) {
+            allVariables.push(...extractFromValue(spec.directUrl));
+        }
+        // Extract variables from proxy configuration
+        if (spec.proxy?.spec) {
+            // Extract from proxy URL
+            if (spec.proxy.spec.url) {
+                allVariables.push(...extractFromValue(spec.proxy.spec.url));
+            }
+            // Extract from proxy headers
+            if (spec.proxy.spec.headers) {
+                Object.values(spec.proxy.spec.headers).forEach((value)=>{
+                    if (typeof value === 'string') {
+                        allVariables.push(...extractFromValue(value));
+                    }
+                });
+            }
+        }
+        return Array.from(new Set(allVariables)); // Remove duplicates
+    } catch  {
+        return [];
+    }
+}
+function getDatasourceVariablesFromCache(datasourceSelector, datasourceStore) {
+    try {
+        if (!datasourceStore.getDatasourceSpecSync) return [];
+        const datasourceSpec = datasourceStore.getDatasourceSpecSync(datasourceSelector);
+        return datasourceSpec ? extractDatasourceVariables(datasourceSpec) : [];
+    } catch  {
+        return [];
+    }
+}
 export const PrometheusLabelValuesVariable = {
     getVariableOptions: async (spec, ctx)=>{
         const pluginDef = spec;
@@ -30,16 +84,28 @@ export const PrometheusLabelValuesVariable = {
             data: stringArrayToVariableOptions(options)
         };
     },
-    dependsOn: (spec)=>{
+    dependsOn: (spec, ctx)=>{
         const matcherVariables = spec.matchers?.map((m)=>parseVariables(m)).flat() || [];
         const labelVariables = parseVariables(spec.labelName);
         const datasourceVariables = spec.datasource && isVariableDatasource(spec.datasource) ? parseVariables(spec.datasource) : [];
+        let datasourceVariablesFromCache = [];
+        if (ctx?.datasourceStore && ctx?.variables) {
+            const datasourceValue = spec.datasource ?? DEFAULT_PROM;
+            const datasourceSelector = typeof datasourceValue === 'string' ? {
+                kind: PROM_DATASOURCE_KIND,
+                name: datasourceValue
+            } : datasourceValue;
+            datasourceVariablesFromCache = getDatasourceVariablesFromCache(datasourceSelector, ctx.datasourceStore);
+        }
+        const allDependencies = [
+            ...matcherVariables,
+            ...labelVariables,
+            ...datasourceVariables,
+            ...datasourceVariablesFromCache
+        ];
+        const uniqueDependencies = Array.from(new Set(allDependencies));
         return {
-            variables: [
-                ...matcherVariables,
-                ...labelVariables,
-                ...datasourceVariables
-            ]
+            variables: uniqueDependencies
         };
     },
     OptionsEditorComponent: PrometheusLabelValuesVariableEditor,

package/lib/plugins/PrometheusLabelValuesVariable.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/plugins/PrometheusLabelValuesVariable.tsx"],"sourcesContent":["// Copyright The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \\\"License\\\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \\\"AS IS\\\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport {\n  VariablePlugin,\n  GetVariableOptionsContext,\n  replaceVariables,\n  parseVariables,\n  datasourceSelectValueToSelector,\n  isVariableDatasource,\n} from '@perses-dev/plugin-system';\nimport { DEFAULT_PROM, getPrometheusTimeRange, PROM_DATASOURCE_KIND } from '../model';\nimport { stringArrayToVariableOptions, PrometheusLabelValuesVariableEditor } from './prometheus-variables';\nimport { resolvePrometheusDatasource } from './interpolation';\nimport { PrometheusLabelValuesVariableOptions } from './types';\n\nexport const PrometheusLabelValuesVariable: VariablePlugin<PrometheusLabelValuesVariableOptions> = {\n  getVariableOptions: async (spec: PrometheusLabelValuesVariableOptions, ctx: GetVariableOptionsContext) => {\n    const pluginDef = spec;\n    const datasourceSelector =\n      datasourceSelectValueToSelector(\n        spec.datasource ?? DEFAULT_PROM,\n        ctx.variables,\n        await ctx.datasourceStore.listDatasourceSelectItems(PROM_DATASOURCE_KIND)\n      ) ?? DEFAULT_PROM;\n    const { client, requestOptions } = await resolvePrometheusDatasource(\n      ctx.datasourceStore,\n      datasourceSelector,\n      ctx.variables\n    );\n    const match = pluginDef.matchers ? pluginDef.matchers.map((m) => replaceVariables(m, ctx.variables)) : undefined;\n\n    const timeRange = getPrometheusTimeRange(ctx.timeRange);\n\n    const { data: options } = await client.labelValues(\n      {\n        labelName: replaceVariables(pluginDef.labelName, ctx.variables),\n        'match[]': match,\n        ...timeRange,\n      },\n      requestOptions\n    );\n    return {\n      data: stringArrayToVariableOptions(options),\n    };\n  },\n  dependsOn: (spec: PrometheusLabelValuesVariableOptions) => {\n    const matcherVariables = spec.matchers?.map((m) => parseVariables(m)).flat() || [];\n    const labelVariables = parseVariables(spec.labelName);\n    const datasourceVariables =\n      spec.datasource && isVariableDatasource(spec.datasource) ? parseVariables(spec.datasource) : [];\n    return {\n      variables: [...matcherVariables, ...labelVariables, ...datasourceVariables],\n    };\n  },\n  OptionsEditorComponent: PrometheusLabelValuesVariableEditor,\n  createInitialOptions: () => ({ labelName: '' }),\n};\n"],"names":["replaceVariables","parseVariables","datasourceSelectValueToSelector","isVariableDatasource","DEFAULT_PROM","getPrometheusTimeRange","PROM_DATASOURCE_KIND","stringArrayToVariableOptions","PrometheusLabelValuesVariableEditor","resolvePrometheusDatasource","PrometheusLabelValuesVariable","getVariableOptions","spec","ctx","pluginDef","datasourceSelector","datasource","variables","datasourceStore","listDatasourceSelectItems","client","requestOptions","match","matchers","map","m","undefined","timeRange","data","options","labelValues","labelName","dependsOn","matcherVariables","flat","labelVariables","datasourceVariables","OptionsEditorComponent","createInitialOptions"],"mappings":"AAAA,+BAA+B;AAC/B,oEAAoE;AACpE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,sEAAsE;AACtE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAEjC,SAGEA,gBAAgB,EAChBC,cAAc,EACdC,+BAA+B,EAC/BC,oBAAoB,QACf,4BAA4B;AACnC,SAASC,YAAY,EAAEC,sBAAsB,EAAEC,oBAAoB,QAAQ,WAAW;AACtF,SAASC,4BAA4B,EAAEC,mCAAmC,QAAQ,yBAAyB;AAC3G,SAASC,2BAA2B,QAAQ,kBAAkB;AAG9D,OAAO,MAAMC,gCAAsF;IACjGC,oBAAoB,OAAOC,MAA4CC;QACrE,MAAMC,YAAYF;QAClB,MAAMG,qBACJb,gCACEU,KAAKI,UAAU,IAAIZ,cACnBS,IAAII,SAAS,EACb,MAAMJ,IAAIK,eAAe,CAACC,yBAAyB,CAACb,0BACjDF;QACP,MAAM,EAAEgB,MAAM,EAAEC,cAAc,EAAE,GAAG,MAAMZ,4BACvCI,IAAIK,eAAe,EACnBH,oBACAF,IAAII,SAAS;QAEf,MAAMK,QAAQR,UAAUS,QAAQ,GAAGT,UAAUS,QAAQ,CAACC,GAAG,CAAC,CAACC,IAAMzB,iBAAiByB,GAAGZ,IAAII,SAAS,KAAKS;QAEvG,MAAMC,YAAYtB,uBAAuBQ,IAAIc,SAAS;QAEtD,MAAM,EAAEC,MAAMC,OAAO,EAAE,GAAG,MAAMT,OAAOU,WAAW,CAChD;YACEC,WAAW/B,iBAAiBc,UAAUiB,SAAS,EAAElB,IAAII,SAAS;YAC9D,WAAWK;YACX,GAAGK,SAAS;QACd,GACAN;QAEF,OAAO;YACLO,MAAMrB,6BAA6BsB;QACrC;IACF;IACAG,WAAW,CAACpB;QACV,MAAMqB,mBAAmBrB,KAAKW,QAAQ,EAAEC,IAAI,CAACC,IAAMxB,eAAewB,IAAIS,UAAU,EAAE;QAClF,MAAMC,iBAAiBlC,eAAeW,KAAKmB,SAAS;QACpD,MAAMK,sBACJxB,KAAKI,UAAU,IAAIb,qBAAqBS,KAAKI,UAAU,IAAIf,eAAeW,KAAKI,UAAU,IAAI,EAAE;QACjG,OAAO;YACLC,WAAW;mBAAIgB;mBAAqBE;mBAAmBC;aAAoB;QAC7E;IACF;IACAC,wBAAwB7B;IACxB8B,sBAAsB,IAAO,CAAA;YAAEP,WAAW;QAAG,CAAA;AAC/C,EAAE"}
+{"version":3,"sources":["../../../src/plugins/PrometheusLabelValuesVariable.tsx"],"sourcesContent":["// Copyright The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \\\"License\\\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \\\"AS IS\\\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport {\n  VariablePlugin,\n  GetVariableOptionsContext,\n  replaceVariables,\n  parseVariables,\n  datasourceSelectValueToSelector,\n  isVariableDatasource,\n  DatasourceStore,\n} from '@perses-dev/plugin-system';\nimport { DatasourceSelector, DatasourceSpec } from '@perses-dev/spec';\nimport { DEFAULT_PROM, getPrometheusTimeRange, PROM_DATASOURCE_KIND } from '../model';\nimport { stringArrayToVariableOptions, PrometheusLabelValuesVariableEditor } from './prometheus-variables';\nimport { resolvePrometheusDatasource } from './interpolation';\nimport { PrometheusLabelValuesVariableOptions, PrometheusDatasourceSpec } from './types';\n\nfunction extractDatasourceVariables(datasourceSpec: DatasourceSpec<PrometheusDatasourceSpec>): string[] {\n  try {\n    const spec = datasourceSpec.plugin.spec;\n\n    // Pure function to extract variables from string or array values\n    const extractFromValue = (value: string | string[]): string[] => {\n      if (typeof value === 'string') {\n        return parseVariables(value);\n      } else if (Array.isArray(value)) {\n        return value.flatMap((item) => {\n          return typeof item === 'string' ? parseVariables(item) : [];\n        });\n      }\n      return [];\n    };\n\n    const allVariables: string[] = [];\n\n    // Extract variables from queryParams\n    if (spec.queryParams) {\n      Object.values(spec.queryParams).forEach((value) => {\n        allVariables.push(...extractFromValue(value));\n      });\n    }\n\n    // Extract variables from directUrl\n    if (spec.directUrl) {\n      allVariables.push(...extractFromValue(spec.directUrl));\n    }\n\n    // Extract variables from proxy configuration\n    if (spec.proxy?.spec) {\n      // Extract from proxy URL\n      if (spec.proxy.spec.url) {\n        allVariables.push(...extractFromValue(spec.proxy.spec.url));\n      }\n\n      // Extract from proxy headers\n      if (spec.proxy.spec.headers) {\n        Object.values(spec.proxy.spec.headers).forEach((value) => {\n          if (typeof value === 'string') {\n            allVariables.push(...extractFromValue(value));\n          }\n        });\n      }\n    }\n\n    return Array.from(new Set(allVariables)); // Remove duplicates\n  } catch {\n    return [];\n  }\n}\n\nfunction getDatasourceVariablesFromCache(\n  datasourceSelector: DatasourceSelector,\n  datasourceStore: DatasourceStore\n): string[] {\n  try {\n    if (!datasourceStore.getDatasourceSpecSync) return [];\n\n    const datasourceSpec = datasourceStore.getDatasourceSpecSync(datasourceSelector) as\n      | DatasourceSpec<PrometheusDatasourceSpec>\n      | undefined;\n    return datasourceSpec ? extractDatasourceVariables(datasourceSpec) : [];\n  } catch {\n    return [];\n  }\n}\n\nexport const PrometheusLabelValuesVariable: VariablePlugin<PrometheusLabelValuesVariableOptions> = {\n  getVariableOptions: async (spec: PrometheusLabelValuesVariableOptions, ctx: GetVariableOptionsContext) => {\n    const pluginDef = spec;\n    const datasourceSelector =\n      datasourceSelectValueToSelector(\n        spec.datasource ?? DEFAULT_PROM,\n        ctx.variables,\n        await ctx.datasourceStore.listDatasourceSelectItems(PROM_DATASOURCE_KIND)\n      ) ?? DEFAULT_PROM;\n\n    const { client, requestOptions } = await resolvePrometheusDatasource(\n      ctx.datasourceStore,\n      datasourceSelector,\n      ctx.variables\n    );\n    const match = pluginDef.matchers ? pluginDef.matchers.map((m) => replaceVariables(m, ctx.variables)) : undefined;\n\n    const timeRange = getPrometheusTimeRange(ctx.timeRange);\n\n    const { data: options } = await client.labelValues(\n      {\n        labelName: replaceVariables(pluginDef.labelName, ctx.variables),\n        'match[]': match,\n        ...timeRange,\n      },\n      requestOptions\n    );\n    return {\n      data: stringArrayToVariableOptions(options),\n    };\n  },\n  dependsOn: (spec: PrometheusLabelValuesVariableOptions, ctx?: GetVariableOptionsContext) => {\n    const matcherVariables = spec.matchers?.map((m) => parseVariables(m)).flat() || [];\n    const labelVariables = parseVariables(spec.labelName);\n    const datasourceVariables =\n      spec.datasource && isVariableDatasource(spec.datasource) ? parseVariables(spec.datasource) : [];\n\n    let datasourceVariablesFromCache: string[] = [];\n    if (ctx?.datasourceStore && ctx?.variables) {\n      const datasourceValue = spec.datasource ?? DEFAULT_PROM;\n      const datasourceSelector: DatasourceSelector =\n        typeof datasourceValue === 'string' ? { kind: PROM_DATASOURCE_KIND, name: datasourceValue } : datasourceValue;\n      datasourceVariablesFromCache = getDatasourceVariablesFromCache(datasourceSelector, ctx.datasourceStore);\n    }\n\n    const allDependencies = [\n      ...matcherVariables,\n      ...labelVariables,\n      ...datasourceVariables,\n      ...datasourceVariablesFromCache,\n    ];\n    const uniqueDependencies = Array.from(new Set(allDependencies));\n\n    return {\n      variables: uniqueDependencies,\n    };\n  },\n  OptionsEditorComponent: PrometheusLabelValuesVariableEditor,\n  createInitialOptions: () => ({ labelName: '' }),\n};\n"],"names":["replaceVariables","parseVariables","datasourceSelectValueToSelector","isVariableDatasource","DEFAULT_PROM","getPrometheusTimeRange","PROM_DATASOURCE_KIND","stringArrayToVariableOptions","PrometheusLabelValuesVariableEditor","resolvePrometheusDatasource","extractDatasourceVariables","datasourceSpec","spec","plugin","extractFromValue","value","Array","isArray","flatMap","item","allVariables","queryParams","Object","values","forEach","push","directUrl","proxy","url","headers","from","Set","getDatasourceVariablesFromCache","datasourceSelector","datasourceStore","getDatasourceSpecSync","PrometheusLabelValuesVariable","getVariableOptions","ctx","pluginDef","datasource","variables","listDatasourceSelectItems","client","requestOptions","match","matchers","map","m","undefined","timeRange","data","options","labelValues","labelName","dependsOn","matcherVariables","flat","labelVariables","datasourceVariables","datasourceVariablesFromCache","datasourceValue","kind","name","allDependencies","uniqueDependencies","OptionsEditorComponent","createInitialOptions"],"mappings":"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"}

package/lib/plugins/interpolation.d.ts

@@ -9,4 +9,5 @@ export interface ResolvedPrometheusDatasource {
 }
 export declare function resolvePrometheusDatasource(datasourceStore: DatasourceStore, selector: DatasourceSelector, variableState: VariableStateMap): Promise<ResolvedPrometheusDatasource>;
 export declare function interpolateDatasourceProxyParams(datasource: DatasourceSpec<PrometheusDatasourceSpec>, variableState: VariableStateMap): ClientRequestOptions;
+export declare function getInterpolatedRequestOptions(datasourceStore: DatasourceStore, datasource: DatasourceSelector, variableState: VariableStateMap): Promise<ClientRequestOptions>;
 //# sourceMappingURL=interpolation.d.ts.map

package/lib/plugins/interpolation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interpolation.d.ts","sourceRoot":"","sources":["../../../src/plugins/interpolation.ts"],"names":[],"mappings":"AAaA,OAAO,EAA8C,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AACtG,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAClE,OAAO,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AAEnD,MAAM,WAAW,4BAA4B;IAC3C,MAAM,EAAE,gBAAgB,CAAC;IACzB,cAAc,EAAE,oBAAoB,CAAC;CACtC;AAED,wBAAsB,2BAA2B,CAC/C,eAAe,EAAE,eAAe,EAChC,QAAQ,EAAE,kBAAkB,EAC5B,aAAa,EAAE,gBAAgB,GAC9B,OAAO,CAAC,4BAA4B,CAAC,CAOvC;AAED,wBAAgB,gCAAgC,CAC9C,UAAU,EAAE,cAAc,CAAC,wBAAwB,CAAC,EACpD,aAAa,EAAE,gBAAgB,GAC9B,oBAAoB,CAStB"}
+{"version":3,"file":"interpolation.d.ts","sourceRoot":"","sources":["../../../src/plugins/interpolation.ts"],"names":[],"mappings":"AAaA,OAAO,EAA8C,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AACtG,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAClE,OAAO,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AAEnD,MAAM,WAAW,4BAA4B;IAC3C,MAAM,EAAE,gBAAgB,CAAC;IACzB,cAAc,EAAE,oBAAoB,CAAC;CACtC;AAED,wBAAsB,2BAA2B,CAC/C,eAAe,EAAE,eAAe,EAChC,QAAQ,EAAE,kBAAkB,EAC5B,aAAa,EAAE,gBAAgB,GAC9B,OAAO,CAAC,4BAA4B,CAAC,CAOvC;AAED,wBAAgB,gCAAgC,CAC9C,UAAU,EAAE,cAAc,CAAC,wBAAwB,CAAC,EACpD,aAAa,EAAE,gBAAgB,GAC9B,oBAAoB,CAStB;AAED,wBAAsB,6BAA6B,CACjD,eAAe,EAAE,eAAe,EAChC,UAAU,EAAE,kBAAkB,EAC9B,aAAa,EAAE,gBAAgB,GAC9B,OAAO,CAAC,oBAAoB,CAAC,CAG/B"}

package/lib/plugins/interpolation.js

@@ -34,5 +34,9 @@ export function interpolateDatasourceProxyParams(datasource, variableState) {
         queryParams: rawQueryParams ? interpolateQueryParams(rawQueryParams, variableState) : undefined
     };
 }
+export async function getInterpolatedRequestOptions(datasourceStore, datasource, variableState) {
+    const datasourceSpec = await datasourceStore.getDatasource(datasource);
+    return interpolateDatasourceProxyParams(datasourceSpec, variableState);
+}
 
 //# sourceMappingURL=interpolation.js.map