@perses-dev/prometheus-plugin 0.57.0 → 0.58.0-beta.0

package/lib/cjs/plugins/prometheus-datasource.js

@@ -22,6 +22,14 @@ Object.defineProperty(exports, "PrometheusDatasource", {
 });
 const _model = require("../model");
 const _PrometheusDatasourceEditor = require("./PrometheusDatasourceEditor");
+function wrapClientMethod(fn, datasourceUrl, specHeaders, specQueryParams) {
+    return (params, options)=>fn(params, {
+            datasourceUrl,
+            headers: options?.headers ?? specHeaders,
+            signal: options?.signal,
+            queryParams: (0, _model.mergeQueryParams)(specQueryParams, options?.queryParams)
+        });
+}
 /**
  * Creates a PrometheusClient for a specific datasource spec.
  */ const createClient = (spec, options)=>{
@@ -43,48 +51,13 @@ const _PrometheusDatasourceEditor = require("./PrometheusDatasourceEditor");
             headers: specHeaders,
             queryParams
         }),
-        instantQuery: (params, headers, abortSignal)=>(0, _model.instantQuery)(params, {
-                datasourceUrl,
-                headers: headers ?? specHeaders,
-                abortSignal,
-                queryParams
-            }),
-        rangeQuery: (params, headers, abortSignal)=>(0, _model.rangeQuery)(params, {
-                datasourceUrl,
-                headers: headers ?? specHeaders,
-                abortSignal,
-                queryParams
-            }),
-        labelNames: (params, headers, abortSignal)=>(0, _model.labelNames)(params, {
-                datasourceUrl,
-                headers: headers ?? specHeaders,
-                abortSignal,
-                queryParams
-            }),
-        labelValues: (params, headers, abortSignal)=>(0, _model.labelValues)(params, {
-                datasourceUrl,
-                headers: headers ?? specHeaders,
-                abortSignal,
-                queryParams
-            }),
-        metricMetadata: (params, headers, abortSignal)=>(0, _model.metricMetadata)(params, {
-                datasourceUrl,
-                headers: headers ?? specHeaders,
-                abortSignal,
-                queryParams
-            }),
-        series: (params, headers, abortSignal)=>(0, _model.series)(params, {
-                datasourceUrl,
-                headers: headers ?? specHeaders,
-                abortSignal,
-                queryParams
-            }),
-        parseQuery: (params, headers, abortSignal)=>(0, _model.parseQuery)(params, {
-                datasourceUrl,
-                headers: headers ?? specHeaders,
-                abortSignal,
-                queryParams
-            })
+        instantQuery: wrapClientMethod(_model.instantQuery, datasourceUrl, specHeaders, queryParams),
+        rangeQuery: wrapClientMethod(_model.rangeQuery, datasourceUrl, specHeaders, queryParams),
+        labelNames: wrapClientMethod(_model.labelNames, datasourceUrl, specHeaders, queryParams),
+        labelValues: wrapClientMethod(_model.labelValues, datasourceUrl, specHeaders, queryParams),
+        metricMetadata: wrapClientMethod(_model.metricMetadata, datasourceUrl, specHeaders, queryParams),
+        series: wrapClientMethod(_model.series, datasourceUrl, specHeaders, queryParams),
+        parseQuery: wrapClientMethod(_model.parseQuery, datasourceUrl, specHeaders, queryParams)
     };
 };
 const getBuiltinVariableDefinitions = ()=>{

package/lib/cjs/plugins/prometheus-time-series-query/get-time-series-data.js

@@ -25,6 +25,7 @@ const _pluginsystem = require("@perses-dev/plugin-system");
 const _datefns = require("date-fns");
 const _model = require("../../model");
 const _utils = require("../../utils");
+const _interpolation = require("../interpolation");
 const _types = require("../types");
 const _replaceprombuiltinvariables = require("./replace-prom-builtin-variables");
 const getTimeSeriesData = async (spec, context, abortSignal)=>{
@@ -37,6 +38,7 @@ const getTimeSeriesData = async (spec, context, abortSignal)=>{
     const listDatasourceSelectItems = await context.datasourceStore.listDatasourceSelectItems(_model.PROM_DATASOURCE_KIND);
     const selectedDatasource = (0, _pluginsystem.datasourceSelectValueToSelector)(spec.datasource ?? _model.DEFAULT_PROM, context.variableState, listDatasourceSelectItems) ?? _model.DEFAULT_PROM;
     const datasource = await context.datasourceStore.getDatasource(selectedDatasource);
+    const interpolatedOptions = (0, _interpolation.interpolateDatasourceProxyParams)(datasource, context.variableState);
     const datasourceScrapeInterval = Math.trunc((0, _datefns.milliseconds)((0, _core.parseDurationString)(datasource.plugin.spec.scrapeInterval ?? _types.DEFAULT_SCRAPE_INTERVAL)) / 1000);
     // Min step is the lower bound of the interval between data points
     // If no value is provided for it, it should default to the scrape interval of the datasource
@@ -79,7 +81,10 @@ const getTimeSeriesData = async (spec, context, abortSignal)=>{
             response = await client.instantQuery({
                 query,
                 time: end
-            }, undefined, abortSignal);
+            }, {
+                ...interpolatedOptions,
+                signal: abortSignal
+            });
             break;
         case 'range':
         default:
@@ -88,7 +93,10 @@ const getTimeSeriesData = async (spec, context, abortSignal)=>{
                 start,
                 end,
                 step
-            }, undefined, abortSignal);
+            }, {
+                ...interpolatedOptions,
+                signal: abortSignal
+            });
             break;
     }
     // TODO: What about error responses from Prom that have a response body?

package/lib/model/api-types.d.ts

@@ -4,8 +4,8 @@ export type { DurationString };
 export interface SuccessResponse<T> {
     status: 'success';
     data: T;
-    rawResponse?: Response;
     warnings?: string[];
+    infos?: string[];
 }
 export interface ErrorResponse<T> {
     status: 'error';

package/lib/model/api-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api-types.d.ts","sourceRoot":"","sources":["../../../src/model/api-types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"api-types.d.ts","sourceRoot":"","sources":["../../../src/model/api-types.ts"],"names":[],"mappings":"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"}

package/lib/model/api-types.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/model/api-types.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 { DurationString } from '@perses-dev/core';\nimport ASTNode from '../components/promql/ast';\n\n// Just reuse dashboard model's type and re-export\nexport type { DurationString };\n\nexport interface SuccessResponse<T> {\n  status: 'success';\n  data: T;\n  rawResponse?: Response;\n  warnings?: string[];\n}\n\nexport interface ErrorResponse<T> {\n  status: 'error';\n  data?: T;\n  errorType: string;\n  error: string;\n}\n\nexport type ApiResponse<T> = SuccessResponse<T> | ErrorResponse<T>;\n\nexport type DurationSeconds = number;\n\nexport type UnixTimestampSeconds = number;\n\nexport type ValueTuple = [unixTimeSeconds: UnixTimestampSeconds, sampleValue: string];\n\nexport type BucketTuple = [bucket: number, upperBound: string, lowerBound: string, count: string];\n\nexport type HistogramValue = { count: number; sum: string; buckets?: BucketTuple[] };\n\nexport type HistogramTuple = [unixTimeSeconds: UnixTimestampSeconds, value: HistogramValue];\n\nexport type Metric = Record<string, string>;\n\nexport interface VectorData {\n  resultType: 'vector';\n  result: Array<{\n    metric: Metric;\n    value: ValueTuple;\n    histogram?: HistogramTuple;\n  }>;\n}\n\nexport interface MatrixData {\n  resultType: 'matrix';\n  result: Array<{\n    metric: Metric;\n    values: ValueTuple[];\n    histograms?: HistogramTuple[];\n  }>;\n}\n\nexport interface ScalarData {\n  resultType: 'scalar';\n  result: ValueTuple;\n}\n\nexport interface StringData {\n  resultType: 'string';\n  result: ValueTuple;\n}\n\nexport interface InstantQueryRequestParameters {\n  query: string;\n  time?: UnixTimestampSeconds;\n  timeout?: DurationString;\n}\n\nexport type InstantQueryResultType = MatrixData | VectorData | ScalarData | StringData;\n\n// Ref https://prometheus.io/docs/prometheus/latest/querying/api/#instant-queries\nexport type InstantQueryResponse = ApiResponse<InstantQueryResultType>;\n\nexport type MonitoredInstantQueryResponse = InstantQueryResponse & {\n  responseTime: number;\n};\n\nexport interface RangeQueryRequestParameters {\n  query: string;\n  start: UnixTimestampSeconds;\n  end: UnixTimestampSeconds;\n  step: DurationSeconds;\n  timeout?: DurationString;\n}\n\nexport type RangeQueryResponse = ApiResponse<MatrixData>;\n\nexport interface SeriesRequestParameters {\n  'match[]': string[];\n  start?: UnixTimestampSeconds;\n  end?: UnixTimestampSeconds;\n  limit?: number;\n}\n\nexport type SeriesResponse = ApiResponse<Metric[]>;\n\nexport interface LabelNamesRequestParameters {\n  start?: UnixTimestampSeconds;\n  end?: UnixTimestampSeconds;\n  'match[]'?: string[];\n  limit?: number;\n}\n\nexport type LabelNamesResponse = ApiResponse<string[]>;\n\nexport interface LabelValuesRequestParameters {\n  labelName: string;\n  start?: UnixTimestampSeconds;\n  end?: UnixTimestampSeconds;\n  'match[]'?: string[];\n  limit?: number;\n}\n\nexport type LabelValuesResponse = ApiResponse<string[]>;\n\nexport interface MetricMetadata {\n  type: string;\n  help: string;\n  unit?: string;\n}\n\nexport interface MetricMetadataRequestParameters {\n  limit?: number;\n  metric?: string;\n}\n\nexport type MetricMetadataResponse = ApiResponse<Record<string, MetricMetadata[]>>;\n\n// ref: https://prometheus.io/docs/prometheus/3.0/querying/api/#parsing-a-promql-expressions-into-a-abstract-syntax-tree-ast\nexport interface ParseQueryRequestParameters {\n  query: string;\n}\n\nexport type ParseQueryResponse = ApiResponse<ASTNode>;\n"],"names":[],"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;AAyIjC,WAAsD"}
+{"version":3,"sources":["../../../src/model/api-types.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 { DurationString } from '@perses-dev/core';\nimport ASTNode from '../components/promql/ast';\n\n// Just reuse dashboard model's type and re-export\nexport type { DurationString };\n\nexport interface SuccessResponse<T> {\n  status: 'success';\n  data: T;\n  warnings?: string[];\n  infos?: string[];\n}\n\nexport interface ErrorResponse<T> {\n  status: 'error';\n  data?: T;\n  errorType: string;\n  error: string;\n}\n\nexport type ApiResponse<T> = SuccessResponse<T> | ErrorResponse<T>;\n\nexport type DurationSeconds = number;\n\nexport type UnixTimestampSeconds = number;\n\nexport type ValueTuple = [unixTimeSeconds: UnixTimestampSeconds, sampleValue: string];\n\nexport type BucketTuple = [bucket: number, upperBound: string, lowerBound: string, count: string];\n\nexport type HistogramValue = { count: number; sum: string; buckets?: BucketTuple[] };\n\nexport type HistogramTuple = [unixTimeSeconds: UnixTimestampSeconds, value: HistogramValue];\n\nexport type Metric = Record<string, string>;\n\nexport interface VectorData {\n  resultType: 'vector';\n  result: Array<{\n    metric: Metric;\n    value: ValueTuple;\n    histogram?: HistogramTuple;\n  }>;\n}\n\nexport interface MatrixData {\n  resultType: 'matrix';\n  result: Array<{\n    metric: Metric;\n    values: ValueTuple[];\n    histograms?: HistogramTuple[];\n  }>;\n}\n\nexport interface ScalarData {\n  resultType: 'scalar';\n  result: ValueTuple;\n}\n\nexport interface StringData {\n  resultType: 'string';\n  result: ValueTuple;\n}\n\nexport interface InstantQueryRequestParameters {\n  query: string;\n  time?: UnixTimestampSeconds;\n  timeout?: DurationString;\n}\n\nexport type InstantQueryResultType = MatrixData | VectorData | ScalarData | StringData;\n\n// Ref https://prometheus.io/docs/prometheus/latest/querying/api/#instant-queries\nexport type InstantQueryResponse = ApiResponse<InstantQueryResultType>;\n\nexport type MonitoredInstantQueryResponse = InstantQueryResponse & {\n  responseTime: number;\n};\n\nexport interface RangeQueryRequestParameters {\n  query: string;\n  start: UnixTimestampSeconds;\n  end: UnixTimestampSeconds;\n  step: DurationSeconds;\n  timeout?: DurationString;\n}\n\nexport type RangeQueryResponse = ApiResponse<MatrixData>;\n\nexport interface SeriesRequestParameters {\n  'match[]': string[];\n  start?: UnixTimestampSeconds;\n  end?: UnixTimestampSeconds;\n  limit?: number;\n}\n\nexport type SeriesResponse = ApiResponse<Metric[]>;\n\nexport interface LabelNamesRequestParameters {\n  start?: UnixTimestampSeconds;\n  end?: UnixTimestampSeconds;\n  'match[]'?: string[];\n  limit?: number;\n}\n\nexport type LabelNamesResponse = ApiResponse<string[]>;\n\nexport interface LabelValuesRequestParameters {\n  labelName: string;\n  start?: UnixTimestampSeconds;\n  end?: UnixTimestampSeconds;\n  'match[]'?: string[];\n  limit?: number;\n}\n\nexport type LabelValuesResponse = ApiResponse<string[]>;\n\nexport interface MetricMetadata {\n  type: string;\n  help: string;\n  unit?: string;\n}\n\nexport interface MetricMetadataRequestParameters {\n  limit?: number;\n  metric?: string;\n}\n\nexport type MetricMetadataResponse = ApiResponse<Record<string, MetricMetadata[]>>;\n\n// ref: https://prometheus.io/docs/prometheus/3.0/querying/api/#parsing-a-promql-expressions-into-a-abstract-syntax-tree-ast\nexport interface ParseQueryRequestParameters {\n  query: string;\n}\n\nexport type ParseQueryResponse = ApiResponse<ASTNode>;\n"],"names":[],"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;AAyIjC,WAAsD"}

package/lib/model/prometheus-client.d.ts

@@ -1,3 +1,4 @@
+import { QueryParamValues } from '@perses-dev/components';
 import { RequestHeaders } from '@perses-dev/core';
 import { DatasourceClient } from '@perses-dev/plugin-system';
 import { InstantQueryRequestParameters, InstantQueryResponse, LabelNamesRequestParameters, LabelNamesResponse, LabelValuesRequestParameters, LabelValuesResponse, MetricMetadataRequestParameters, MetricMetadataResponse, ParseQueryRequestParameters, ParseQueryResponse, RangeQueryRequestParameters, RangeQueryResponse, SeriesRequestParameters, SeriesResponse } from './api-types';
@@ -5,22 +6,28 @@ interface PrometheusClientOptions {
     datasourceUrl: string;
     headers?: RequestHeaders;
 }
+export interface ClientRequestOptions {
+    headers?: RequestHeaders;
+    signal?: AbortSignal;
+    queryParams?: QueryParamValues;
+}
 export interface PrometheusClient extends DatasourceClient {
     options: PrometheusClientOptions;
-    instantQuery(params: InstantQueryRequestParameters, headers?: RequestHeaders, signal?: AbortSignal): Promise<InstantQueryResponse>;
-    rangeQuery(params: RangeQueryRequestParameters, headers?: RequestHeaders, signal?: AbortSignal): Promise<RangeQueryResponse>;
-    labelNames(params: LabelNamesRequestParameters, headers?: RequestHeaders, signal?: AbortSignal): Promise<LabelNamesResponse>;
-    labelValues(params: LabelValuesRequestParameters, headers?: RequestHeaders, signal?: AbortSignal): Promise<LabelValuesResponse>;
-    metricMetadata(params: MetricMetadataRequestParameters, headers?: RequestHeaders, signal?: AbortSignal): Promise<MetricMetadataResponse>;
-    series(params: SeriesRequestParameters, headers?: RequestHeaders, signal?: AbortSignal): Promise<SeriesResponse>;
-    parseQuery(params: ParseQueryRequestParameters, headers?: RequestHeaders, signal?: AbortSignal): Promise<ParseQueryResponse>;
+    instantQuery(params: InstantQueryRequestParameters, options?: ClientRequestOptions): Promise<InstantQueryResponse>;
+    rangeQuery(params: RangeQueryRequestParameters, options?: ClientRequestOptions): Promise<RangeQueryResponse>;
+    labelNames(params: LabelNamesRequestParameters, options?: ClientRequestOptions): Promise<LabelNamesResponse>;
+    labelValues(params: LabelValuesRequestParameters, options?: ClientRequestOptions): Promise<LabelValuesResponse>;
+    metricMetadata(params: MetricMetadataRequestParameters, options?: ClientRequestOptions): Promise<MetricMetadataResponse>;
+    series(params: SeriesRequestParameters, options?: ClientRequestOptions): Promise<SeriesResponse>;
+    parseQuery(params: ParseQueryRequestParameters, options?: ClientRequestOptions): Promise<ParseQueryResponse>;
 }
 export interface QueryOptions {
     datasourceUrl: string;
     headers?: RequestHeaders;
-    abortSignal?: AbortSignal;
-    queryParams?: Record<string, string>;
+    signal?: AbortSignal;
+    queryParams?: QueryParamValues;
 }
+export declare function mergeQueryParams(defaults?: QueryParamValues, overrides?: QueryParamValues): QueryParamValues | undefined;
 /**
  * Calls the `/-/healthy` endpoint to check if the datasource is healthy.
  */
@@ -53,9 +60,5 @@ export declare function series(params: SeriesRequestParameters, queryOptions: Qu
  * Calls the `/api/v1/parse_query` to parse the given promQL expresion into an abstract syntax tree (AST).
  */
 export declare function parseQuery(params: ParseQueryRequestParameters, queryOptions: QueryOptions): Promise<ParseQueryResponse>;
-/**
- * Fetch JSON and parse warnings for query inspector
- */
-export declare function fetchResults<T>(...args: Parameters<typeof global.fetch>): Promise<T>;
 export {};
 //# sourceMappingURL=prometheus-client.d.ts.map

package/lib/model/prometheus-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prometheus-client.d.ts","sourceRoot":"","sources":["../../../src/model/prometheus-client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"prometheus-client.d.ts","sourceRoot":"","sources":["../../../src/model/prometheus-client.ts"],"names":[],"mappings":"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"}

package/lib/model/prometheus-client.js

@@ -19,12 +19,24 @@ import { fetch, fetchJson } from '@perses-dev/core';
     const urlParams = initialParams || new URLSearchParams();
     if (queryParams) {
         Object.entries(queryParams).forEach(([key, value])=>{
-            urlParams.set(key, value);
+            if (initialParams?.has(key)) return;
+            if (Array.isArray(value)) {
+                value.forEach((v)=>urlParams.append(key, v));
+            } else {
+                urlParams.set(key, value);
+            }
         });
     }
     const queryString = urlParams.toString();
     return queryString !== '' ? `?${queryString}` : '';
 }
+export function mergeQueryParams(defaults, overrides) {
+    if (!defaults && !overrides) return undefined;
+    return {
+        ...defaults,
+        ...overrides
+    };
+}
 /**
  * Calls the `/-/healthy` endpoint to check if the datasource is healthy.
  */ export function healthCheck(queryOptions) {
@@ -33,7 +45,7 @@ import { fetch, fetchJson } from '@perses-dev/core';
         try {
             const resp = await fetch(url, {
                 headers: queryOptions.headers,
-                signal: queryOptions.abortSignal
+                signal: queryOptions.signal
             });
             return resp.status === 200;
         } catch  {
@@ -91,15 +103,16 @@ import { fetch, fetchJson } from '@perses-dev/core';
     return fetchWithPost(apiURI, params, queryOptions);
 }
 function fetchWithGet(apiURI, params, queryOptions) {
-    const { datasourceUrl, headers, queryParams } = queryOptions;
+    const { datasourceUrl, headers, queryParams, signal } = queryOptions;
     const url = `${datasourceUrl}${apiURI}${buildQueryString(queryParams, createSearchParams(params))}`;
     return fetchJson(url, {
         method: 'GET',
-        headers
+        headers,
+        signal
     });
 }
 function fetchWithPost(apiURI, params, queryOptions) {
-    const { datasourceUrl, headers, abortSignal: signal, queryParams } = queryOptions;
+    const { datasourceUrl, headers, signal, queryParams } = queryOptions;
     const url = `${datasourceUrl}${apiURI}${buildQueryString(queryParams)}`;
     const init = {
         method: 'POST',
@@ -110,7 +123,7 @@ function fetchWithPost(apiURI, params, queryOptions) {
         signal,
         body: createSearchParams(params)
     };
-    return fetchResults(url, init);
+    return fetchJson(url, init);
 }
 /**
  * Creates URLSearchParams from a request params object.
@@ -133,15 +146,5 @@ function fetchWithPost(apiURI, params, queryOptions) {
     }
     return searchParams;
 }
-/**
- * Fetch JSON and parse warnings for query inspector
- */ export async function fetchResults(...args) {
-    const response = await fetch(...args);
-    const json = await response.json();
-    return {
-        ...json,
-        rawResponse: response
-    };
-}
 
 //# sourceMappingURL=prometheus-client.js.map

package/lib/model/prometheus-client.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/model/prometheus-client.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 { fetch, fetchJson, RequestHeaders } from '@perses-dev/core';\nimport { DatasourceClient } from '@perses-dev/plugin-system';\nimport {\n  InstantQueryRequestParameters,\n  InstantQueryResponse,\n  LabelNamesRequestParameters,\n  LabelNamesResponse,\n  LabelValuesRequestParameters,\n  LabelValuesResponse,\n  MetricMetadataRequestParameters,\n  MetricMetadataResponse,\n  ParseQueryRequestParameters,\n  ParseQueryResponse,\n  RangeQueryRequestParameters,\n  RangeQueryResponse,\n  SeriesRequestParameters,\n  SeriesResponse,\n  SuccessResponse,\n} from './api-types';\n\ninterface PrometheusClientOptions {\n  datasourceUrl: string;\n  headers?: RequestHeaders;\n}\n\nexport interface PrometheusClient extends DatasourceClient {\n  options: PrometheusClientOptions;\n  instantQuery(\n    params: InstantQueryRequestParameters,\n    headers?: RequestHeaders,\n    signal?: AbortSignal\n  ): Promise<InstantQueryResponse>;\n  rangeQuery(\n    params: RangeQueryRequestParameters,\n    headers?: RequestHeaders,\n    signal?: AbortSignal\n  ): Promise<RangeQueryResponse>;\n  labelNames(\n    params: LabelNamesRequestParameters,\n    headers?: RequestHeaders,\n    signal?: AbortSignal\n  ): Promise<LabelNamesResponse>;\n  labelValues(\n    params: LabelValuesRequestParameters,\n    headers?: RequestHeaders,\n    signal?: AbortSignal\n  ): Promise<LabelValuesResponse>;\n  metricMetadata(\n    params: MetricMetadataRequestParameters,\n    headers?: RequestHeaders,\n    signal?: AbortSignal\n  ): Promise<MetricMetadataResponse>;\n  series(params: SeriesRequestParameters, headers?: RequestHeaders, signal?: AbortSignal): Promise<SeriesResponse>;\n  parseQuery(\n    params: ParseQueryRequestParameters,\n    headers?: RequestHeaders,\n    signal?: AbortSignal\n  ): Promise<ParseQueryResponse>;\n}\n\nexport interface QueryOptions {\n  datasourceUrl: string;\n  headers?: RequestHeaders;\n  abortSignal?: AbortSignal;\n  queryParams?: Record<string, string>;\n}\n\n/**\n * Builds a query string from datasource-level query parameters.\n * Optionally merges with existing URLSearchParams.\n * Returns empty string if no parameters, otherwise returns query string with leading '?'.\n */\nfunction buildQueryString(queryParams?: Record<string, string>, initialParams?: URLSearchParams): string {\n  const urlParams = initialParams || new URLSearchParams();\n\n  if (queryParams) {\n    Object.entries(queryParams).forEach(([key, value]) => {\n      urlParams.set(key, value);\n    });\n  }\n\n  const queryString = urlParams.toString();\n  return queryString !== '' ? `?${queryString}` : '';\n}\n\n/**\n * Calls the `/-/healthy` endpoint to check if the datasource is healthy.\n */\nexport function healthCheck(queryOptions: QueryOptions) {\n  return async (): Promise<boolean> => {\n    const url = `${queryOptions.datasourceUrl}/-/healthy${buildQueryString(queryOptions.queryParams)}`;\n\n    try {\n      const resp = await fetch(url, { headers: queryOptions.headers, signal: queryOptions.abortSignal });\n      return resp.status === 200;\n    } catch {\n      return false;\n    }\n  };\n}\n\n/**\n * Calls the `/api/v1/query` endpoint to get metrics data.\n */\nexport function instantQuery(\n  params: InstantQueryRequestParameters,\n  queryOptions: QueryOptions\n): Promise<InstantQueryResponse> {\n  return fetchWithPost<InstantQueryRequestParameters, InstantQueryResponse>('/api/v1/query', params, queryOptions);\n}\n\n/**\n * Calls the `/api/v1/query_range` endpoint to get metrics data.\n */\nexport function rangeQuery(\n  params: RangeQueryRequestParameters,\n  queryOptions: QueryOptions\n): Promise<RangeQueryResponse> {\n  return fetchWithPost<RangeQueryRequestParameters, RangeQueryResponse>('/api/v1/query_range', params, queryOptions);\n}\n\n/**\n * Calls the `/api/v1/labels` endpoint to get a list of label names.\n */\nexport function labelNames(\n  params: LabelNamesRequestParameters,\n  queryOptions: QueryOptions\n): Promise<LabelNamesResponse> {\n  return fetchWithPost<LabelNamesRequestParameters, LabelNamesResponse>('/api/v1/labels', params, queryOptions);\n}\n\n/**\n * Calls the `/api/v1/label/{labelName}/values` endpoint to get a list of values for a label.\n */\nexport function labelValues(\n  params: LabelValuesRequestParameters,\n  queryOptions: QueryOptions\n): Promise<LabelValuesResponse> {\n  const { labelName, ...searchParams } = params;\n\n  // In case label name is empty, we'll receive a 404, so we can replace it by an empty list, which is less confusing.\n  // Note that an empty list is the prometheus result if the label does not exist.\n  if (labelName.length === 0) {\n    return new Promise((resolve) => {\n      resolve({ data: [] as string[] } as SuccessResponse<string[]>);\n    });\n  }\n\n  const apiURI = `/api/v1/label/${encodeURIComponent(labelName)}/values`;\n  return fetchWithGet<typeof searchParams, LabelValuesResponse>(apiURI, searchParams, queryOptions);\n}\n\n/**\n * Calls the `/api/v1/label/{labelName}/values` endpoint to get a list of values for a label.\n */\nexport function metricMetadata(\n  params: MetricMetadataRequestParameters,\n  queryOptions: QueryOptions\n): Promise<MetricMetadataResponse> {\n  const apiURI = `/api/v1/metadata`;\n  return fetchWithGet<MetricMetadataRequestParameters, MetricMetadataResponse>(apiURI, params, queryOptions);\n}\n\n/**\n * Calls the `/api/v1/series` endpoint to finding series by label matchers.\n */\nexport function series(params: SeriesRequestParameters, queryOptions: QueryOptions): Promise<SeriesResponse> {\n  const apiURI = `/api/v1/series`;\n  return fetchWithPost<SeriesRequestParameters, SeriesResponse>(apiURI, params, queryOptions);\n}\n\n/**\n * Calls the `/api/v1/parse_query` to parse the given promQL expresion into an abstract syntax tree (AST).\n */\nexport function parseQuery(\n  params: ParseQueryRequestParameters,\n  queryOptions: QueryOptions\n): Promise<ParseQueryResponse> {\n  const apiURI = `/api/v1/parse_query`;\n  return fetchWithPost<ParseQueryRequestParameters, ParseQueryResponse>(apiURI, params, queryOptions);\n}\n\nfunction fetchWithGet<T extends RequestParams<T>, TResponse>(\n  apiURI: string,\n  params: T,\n  queryOptions: QueryOptions\n): Promise<TResponse> {\n  const { datasourceUrl, headers, queryParams } = queryOptions;\n  const url = `${datasourceUrl}${apiURI}${buildQueryString(queryParams, createSearchParams(params))}`;\n  return fetchJson<TResponse>(url, { method: 'GET', headers });\n}\n\nfunction fetchWithPost<T extends RequestParams<T>, TResponse>(\n  apiURI: string,\n  params: T,\n  queryOptions: QueryOptions\n): Promise<TResponse> {\n  const { datasourceUrl, headers, abortSignal: signal, queryParams } = queryOptions;\n  const url = `${datasourceUrl}${apiURI}${buildQueryString(queryParams)}`;\n\n  const init = {\n    method: 'POST',\n    headers: {\n      'Content-Type': 'application/x-www-form-urlencoded',\n      ...headers,\n    },\n    signal,\n    body: createSearchParams(params),\n  };\n  return fetchResults<TResponse>(url, init);\n}\n\n// Request parameter values we know how to serialize\ntype ParamValue = string | string[] | number | undefined;\n\n// Used to constrain the types that can be passed to createSearchParams to\n// just the ones we know how to serialize\ntype RequestParams<T> = {\n  [K in keyof T]: ParamValue;\n};\n\n/**\n * Creates URLSearchParams from a request params object.\n */\nfunction createSearchParams<T extends RequestParams<T>>(params: T): URLSearchParams {\n  const searchParams = new URLSearchParams();\n  for (const key in params) {\n    const value: ParamValue = params[key];\n    if (value === undefined) continue;\n\n    if (typeof value === 'string') {\n      searchParams.append(key, value);\n      continue;\n    }\n\n    if (typeof value === 'number') {\n      searchParams.append(key, value.toString());\n      continue;\n    }\n\n    for (const val of value) {\n      searchParams.append(key, val);\n    }\n  }\n  return searchParams;\n}\n\n/**\n * Fetch JSON and parse warnings for query inspector\n */\nexport async function fetchResults<T>(...args: Parameters<typeof global.fetch>): Promise<T> {\n  const response = await fetch(...args);\n  const json: T = await response.json();\n  return { ...json, rawResponse: response };\n}\n"],"names":["fetch","fetchJson","buildQueryString","queryParams","initialParams","urlParams","URLSearchParams","Object","entries","forEach","key","value","set","queryString","toString","healthCheck","queryOptions","url","datasourceUrl","resp","headers","signal","abortSignal","status","instantQuery","params","fetchWithPost","rangeQuery","labelNames","labelValues","labelName","searchParams","length","Promise","resolve","data","apiURI","encodeURIComponent","fetchWithGet","metricMetadata","series","parseQuery","createSearchParams","method","init","body","fetchResults","undefined","append","val","args","response","json","rawResponse"],"mappings":"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"}
+{"version":3,"sources":["../../../src/model/prometheus-client.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 { QueryParamValues } from '@perses-dev/components';\nimport { fetch, fetchJson, RequestHeaders } from '@perses-dev/core';\nimport { DatasourceClient } from '@perses-dev/plugin-system';\nimport {\n  InstantQueryRequestParameters,\n  InstantQueryResponse,\n  LabelNamesRequestParameters,\n  LabelNamesResponse,\n  LabelValuesRequestParameters,\n  LabelValuesResponse,\n  MetricMetadataRequestParameters,\n  MetricMetadataResponse,\n  ParseQueryRequestParameters,\n  ParseQueryResponse,\n  RangeQueryRequestParameters,\n  RangeQueryResponse,\n  SeriesRequestParameters,\n  SeriesResponse,\n  SuccessResponse,\n} from './api-types';\n\ninterface PrometheusClientOptions {\n  datasourceUrl: string;\n  headers?: RequestHeaders;\n}\n\nexport interface ClientRequestOptions {\n  headers?: RequestHeaders;\n  signal?: AbortSignal;\n  queryParams?: QueryParamValues;\n}\n\nexport interface PrometheusClient extends DatasourceClient {\n  options: PrometheusClientOptions;\n  instantQuery(params: InstantQueryRequestParameters, options?: ClientRequestOptions): Promise<InstantQueryResponse>;\n  rangeQuery(params: RangeQueryRequestParameters, options?: ClientRequestOptions): Promise<RangeQueryResponse>;\n  labelNames(params: LabelNamesRequestParameters, options?: ClientRequestOptions): Promise<LabelNamesResponse>;\n  labelValues(params: LabelValuesRequestParameters, options?: ClientRequestOptions): Promise<LabelValuesResponse>;\n  metricMetadata(\n    params: MetricMetadataRequestParameters,\n    options?: ClientRequestOptions\n  ): Promise<MetricMetadataResponse>;\n  series(params: SeriesRequestParameters, options?: ClientRequestOptions): Promise<SeriesResponse>;\n  parseQuery(params: ParseQueryRequestParameters, options?: ClientRequestOptions): Promise<ParseQueryResponse>;\n}\n\nexport interface QueryOptions {\n  datasourceUrl: string;\n  headers?: RequestHeaders;\n  signal?: AbortSignal;\n  queryParams?: QueryParamValues;\n}\n\n/**\n * Builds a query string from datasource-level query parameters.\n * Optionally merges with existing URLSearchParams.\n * Returns empty string if no parameters, otherwise returns query string with leading '?'.\n */\nfunction buildQueryString(queryParams?: QueryParamValues, initialParams?: URLSearchParams): string {\n  const urlParams = initialParams || new URLSearchParams();\n\n  if (queryParams) {\n    Object.entries(queryParams).forEach(([key, value]) => {\n      if (initialParams?.has(key)) return;\n\n      if (Array.isArray(value)) {\n        value.forEach((v) => urlParams.append(key, v));\n      } else {\n        urlParams.set(key, value);\n      }\n    });\n  }\n\n  const queryString = urlParams.toString();\n  return queryString !== '' ? `?${queryString}` : '';\n}\n\nexport function mergeQueryParams(\n  defaults?: QueryParamValues,\n  overrides?: QueryParamValues\n): QueryParamValues | undefined {\n  if (!defaults && !overrides) return undefined;\n  return { ...defaults, ...overrides };\n}\n\n/**\n * Calls the `/-/healthy` endpoint to check if the datasource is healthy.\n */\nexport function healthCheck(queryOptions: QueryOptions) {\n  return async (): Promise<boolean> => {\n    const url = `${queryOptions.datasourceUrl}/-/healthy${buildQueryString(queryOptions.queryParams)}`;\n\n    try {\n      const resp = await fetch(url, { headers: queryOptions.headers, signal: queryOptions.signal });\n      return resp.status === 200;\n    } catch {\n      return false;\n    }\n  };\n}\n\n/**\n * Calls the `/api/v1/query` endpoint to get metrics data.\n */\nexport function instantQuery(\n  params: InstantQueryRequestParameters,\n  queryOptions: QueryOptions\n): Promise<InstantQueryResponse> {\n  return fetchWithPost<InstantQueryRequestParameters, InstantQueryResponse>('/api/v1/query', params, queryOptions);\n}\n\n/**\n * Calls the `/api/v1/query_range` endpoint to get metrics data.\n */\nexport function rangeQuery(\n  params: RangeQueryRequestParameters,\n  queryOptions: QueryOptions\n): Promise<RangeQueryResponse> {\n  return fetchWithPost<RangeQueryRequestParameters, RangeQueryResponse>('/api/v1/query_range', params, queryOptions);\n}\n\n/**\n * Calls the `/api/v1/labels` endpoint to get a list of label names.\n */\nexport function labelNames(\n  params: LabelNamesRequestParameters,\n  queryOptions: QueryOptions\n): Promise<LabelNamesResponse> {\n  return fetchWithPost<LabelNamesRequestParameters, LabelNamesResponse>('/api/v1/labels', params, queryOptions);\n}\n\n/**\n * Calls the `/api/v1/label/{labelName}/values` endpoint to get a list of values for a label.\n */\nexport function labelValues(\n  params: LabelValuesRequestParameters,\n  queryOptions: QueryOptions\n): Promise<LabelValuesResponse> {\n  const { labelName, ...searchParams } = params;\n\n  // In case label name is empty, we'll receive a 404, so we can replace it by an empty list, which is less confusing.\n  // Note that an empty list is the prometheus result if the label does not exist.\n  if (labelName.length === 0) {\n    return new Promise((resolve) => {\n      resolve({ data: [] as string[] } as SuccessResponse<string[]>);\n    });\n  }\n\n  const apiURI = `/api/v1/label/${encodeURIComponent(labelName)}/values`;\n  return fetchWithGet<typeof searchParams, LabelValuesResponse>(apiURI, searchParams, queryOptions);\n}\n\n/**\n * Calls the `/api/v1/label/{labelName}/values` endpoint to get a list of values for a label.\n */\nexport function metricMetadata(\n  params: MetricMetadataRequestParameters,\n  queryOptions: QueryOptions\n): Promise<MetricMetadataResponse> {\n  const apiURI = `/api/v1/metadata`;\n  return fetchWithGet<MetricMetadataRequestParameters, MetricMetadataResponse>(apiURI, params, queryOptions);\n}\n\n/**\n * Calls the `/api/v1/series` endpoint to finding series by label matchers.\n */\nexport function series(params: SeriesRequestParameters, queryOptions: QueryOptions): Promise<SeriesResponse> {\n  const apiURI = `/api/v1/series`;\n  return fetchWithPost<SeriesRequestParameters, SeriesResponse>(apiURI, params, queryOptions);\n}\n\n/**\n * Calls the `/api/v1/parse_query` to parse the given promQL expresion into an abstract syntax tree (AST).\n */\nexport function parseQuery(\n  params: ParseQueryRequestParameters,\n  queryOptions: QueryOptions\n): Promise<ParseQueryResponse> {\n  const apiURI = `/api/v1/parse_query`;\n  return fetchWithPost<ParseQueryRequestParameters, ParseQueryResponse>(apiURI, params, queryOptions);\n}\n\nfunction fetchWithGet<T extends RequestParams<T>, TResponse>(\n  apiURI: string,\n  params: T,\n  queryOptions: QueryOptions\n): Promise<TResponse> {\n  const { datasourceUrl, headers, queryParams, signal } = queryOptions;\n  const url = `${datasourceUrl}${apiURI}${buildQueryString(queryParams, createSearchParams(params))}`;\n  return fetchJson<TResponse>(url, { method: 'GET', headers, signal });\n}\n\nfunction fetchWithPost<T extends RequestParams<T>, TResponse>(\n  apiURI: string,\n  params: T,\n  queryOptions: QueryOptions\n): Promise<TResponse> {\n  const { datasourceUrl, headers, signal, queryParams } = queryOptions;\n  const url = `${datasourceUrl}${apiURI}${buildQueryString(queryParams)}`;\n\n  const init = {\n    method: 'POST',\n    headers: {\n      'Content-Type': 'application/x-www-form-urlencoded',\n      ...headers,\n    },\n    signal,\n    body: createSearchParams(params),\n  };\n  return fetchJson<TResponse>(url, init);\n}\n\n// Request parameter values we know how to serialize\ntype ParamValue = string | string[] | number | undefined;\n\n// Used to constrain the types that can be passed to createSearchParams to\n// just the ones we know how to serialize\ntype RequestParams<T> = {\n  [K in keyof T]: ParamValue;\n};\n\n/**\n * Creates URLSearchParams from a request params object.\n */\nfunction createSearchParams<T extends RequestParams<T>>(params: T): URLSearchParams {\n  const searchParams = new URLSearchParams();\n  for (const key in params) {\n    const value: ParamValue = params[key];\n    if (value === undefined) continue;\n\n    if (typeof value === 'string') {\n      searchParams.append(key, value);\n      continue;\n    }\n\n    if (typeof value === 'number') {\n      searchParams.append(key, value.toString());\n      continue;\n    }\n\n    for (const val of value) {\n      searchParams.append(key, val);\n    }\n  }\n  return searchParams;\n}\n"],"names":["fetch","fetchJson","buildQueryString","queryParams","initialParams","urlParams","URLSearchParams","Object","entries","forEach","key","value","has","Array","isArray","v","append","set","queryString","toString","mergeQueryParams","defaults","overrides","undefined","healthCheck","queryOptions","url","datasourceUrl","resp","headers","signal","status","instantQuery","params","fetchWithPost","rangeQuery","labelNames","labelValues","labelName","searchParams","length","Promise","resolve","data","apiURI","encodeURIComponent","fetchWithGet","metricMetadata","series","parseQuery","createSearchParams","method","init","body","val"],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"PrometheusDatasourceEditor.d.ts","sourceRoot":"","sources":["../../../src/plugins/PrometheusDatasourceEditor.tsx"],"names":[],"mappings":"AAkBA,OAAc,EAAE,YAAY,EAAoB,MAAM,OAAO,CAAC;AAC9D,OAAO,EAA2B,wBAAwB,EAAE,MAAM,SAAS,CAAC;AAS5E,MAAM,WAAW,+BAA+B;IAC9C,KAAK,EAAE,wBAAwB,CAAC;IAChC,QAAQ,EAAE,CAAC,IAAI,EAAE,wBAAwB,KAAK,IAAI,CAAC;IACnD,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,+BAA+B,GAAG,YAAY,CA6L/F"}
+{"version":3,"file":"PrometheusDatasourceEditor.d.ts","sourceRoot":"","sources":["../../../src/plugins/PrometheusDatasourceEditor.tsx"],"names":[],"mappings":"AAmBA,OAAO,EAAE,YAAY,EAAoB,MAAM,OAAO,CAAC;AACvD,OAAO,EAA2B,wBAAwB,EAAE,MAAM,SAAS,CAAC;AAS5E,MAAM,WAAW,+BAA+B;IAC9C,KAAK,EAAE,wBAAwB,CAAC;IAChC,QAAQ,EAAE,CAAC,IAAI,EAAE,wBAAwB,KAAK,IAAI,CAAC;IACnD,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,+BAA+B,GAAG,YAAY,CAgM/F"}

package/lib/plugins/PrometheusDatasourceEditor.js

@@ -1,3 +1,4 @@
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 // Copyright The Perses Authors
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -10,12 +11,11 @@
 // 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 { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { Box, IconButton, TextField, Typography } from '@mui/material';
 import { HTTPSettingsEditor } from '@perses-dev/plugin-system';
-import { Box, TextField, Typography, IconButton } from '@mui/material';
-import PlusIcon from 'mdi-material-ui/Plus';
 import MinusIcon from 'mdi-material-ui/Minus';
-import React, { useState, useRef } from 'react';
+import PlusIcon from 'mdi-material-ui/Plus';
+import { useRef, useState } from 'react';
 import { DEFAULT_SCRAPE_INTERVAL } from './types';
 export function PrometheusDatasourceEditor(props) {
     const { value, onChange, isReadonly } = props;
@@ -25,10 +25,10 @@ export function PrometheusDatasourceEditor(props) {
     // manipulating a map directly which causes weird UX.
     const [entries, setEntries] = useState(()=>{
         const queryParams = value.queryParams ?? {};
-        return Object.entries(queryParams).map(([key, value])=>({
+        return Object.entries(queryParams).map(([key, val])=>({
                 id: String(nextIdRef.current++),
                 key,
-                value
+                value: Array.isArray(val) ? val.join(',') : val
             }));
     });
     // Check for duplicate keys
@@ -44,12 +44,15 @@ export function PrometheusDatasourceEditor(props) {
         }
     });
     const hasDuplicates = duplicateKeys.size > 0;
-    // Convert entries array to object and trigger onChange
+    // Convert entries array to object and trigger onChange.
+    // Values containing commas are stored as arrays to preserve the round-trip
+    // with the load-time join(',') in useState above.
     const syncToParent = (newEntries)=>{
         const newParams = {};
         newEntries.forEach(({ key, value })=>{
             if (key !== '') {
-                newParams[key] = value;
+                const parts = value.split(',');
+                newParams[key] = parts.length > 1 ? parts : value;
             }
         });
         onChange({

package/lib/plugins/PrometheusDatasourceEditor.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/plugins/PrometheusDatasourceEditor.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 { DurationString } from '@perses-dev/core';\nimport { HTTPSettingsEditor } from '@perses-dev/plugin-system';\nimport { Box, TextField, Typography, IconButton } from '@mui/material';\nimport PlusIcon from 'mdi-material-ui/Plus';\nimport MinusIcon from 'mdi-material-ui/Minus';\nimport React, { ReactElement, useState, useRef } from 'react';\nimport { DEFAULT_SCRAPE_INTERVAL, PrometheusDatasourceSpec } from './types';\n\ninterface QueryParamEntry {\n  // Unique identifier for the entry, added to avoid using array index as key\n  id: string;\n  key: string;\n  value: string;\n}\n\nexport interface PrometheusDatasourceEditorProps {\n  value: PrometheusDatasourceSpec;\n  onChange: (next: PrometheusDatasourceSpec) => void;\n  isReadonly?: boolean;\n}\n\nexport function PrometheusDatasourceEditor(props: PrometheusDatasourceEditorProps): ReactElement {\n  const { value, onChange, isReadonly } = props;\n\n  // Counter for generating unique IDs\n  const nextIdRef = useRef(0);\n\n  // Use local state to maintain an array of entries during editing, instead of\n  // manipulating a map directly which causes weird UX.\n  const [entries, setEntries] = useState<QueryParamEntry[]>(() => {\n    const queryParams = value.queryParams ?? {};\n    return Object.entries(queryParams).map(([key, value]) => ({\n      id: String(nextIdRef.current++),\n      key,\n      value,\n    }));\n  });\n\n  // Check for duplicate keys\n  const keyMap = new Map<string, number>();\n  const duplicateKeys = new Set<string>();\n  entries.forEach(({ key }) => {\n    if (key !== '') {\n      const count = (keyMap.get(key) || 0) + 1;\n      keyMap.set(key, count);\n      if (count > 1) {\n        duplicateKeys.add(key);\n      }\n    }\n  });\n  const hasDuplicates = duplicateKeys.size > 0;\n\n  // Convert entries array to object and trigger onChange\n  const syncToParent = (newEntries: QueryParamEntry[]) => {\n    const newParams: Record<string, string> = {};\n    newEntries.forEach(({ key, value }) => {\n      if (key !== '') {\n        newParams[key] = value;\n      }\n    });\n\n    onChange({\n      ...value,\n      queryParams: Object.keys(newParams).length > 0 ? newParams : undefined,\n    });\n  };\n\n  const handleQueryParamChange = (id: string, field: 'key' | 'value', newValue: string) => {\n    const newEntries = entries.map((entry) => {\n      if (entry.id !== id) return entry;\n      return field === 'key' ? { ...entry, key: newValue } : { ...entry, value: newValue };\n    });\n    setEntries(newEntries);\n    syncToParent(newEntries);\n  };\n\n  const addQueryParam = () => {\n    const newEntries = [...entries, { id: String(nextIdRef.current++), key: '', value: '' }];\n    setEntries(newEntries);\n    syncToParent(newEntries);\n  };\n\n  const removeQueryParam = (id: string) => {\n    const newEntries = entries.filter((entry) => entry.id !== id);\n    setEntries(newEntries);\n    syncToParent(newEntries);\n  };\n\n  const initialSpecDirect: PrometheusDatasourceSpec = {\n    directUrl: '',\n  };\n\n  const initialSpecProxy: PrometheusDatasourceSpec = {\n    proxy: {\n      kind: 'HTTPProxy',\n      spec: {\n        allowedEndpoints: [\n          // list of standard endpoints suggested by default\n          {\n            endpointPattern: '/api/v1/labels',\n            method: 'POST',\n          },\n          {\n            endpointPattern: '/api/v1/series',\n            method: 'POST',\n          },\n          {\n            endpointPattern: '/api/v1/metadata',\n            method: 'GET',\n          },\n          {\n            endpointPattern: '/api/v1/query',\n            method: 'POST',\n          },\n          {\n            endpointPattern: '/api/v1/query_range',\n            method: 'POST',\n          },\n          {\n            endpointPattern: '/api/v1/label/([a-zA-Z0-9_-]+)/values',\n            method: 'GET',\n          },\n          {\n            endpointPattern: '/api/v1/parse_query',\n            method: 'POST',\n          },\n        ],\n        url: '',\n      },\n    },\n  };\n\n  return (\n    <>\n      <Typography variant=\"h4\" mb={2}>\n        General Settings\n      </Typography>\n      <TextField\n        size=\"small\"\n        fullWidth\n        label=\"Scrape Interval\"\n        value={value.scrapeInterval || ''}\n        placeholder={`Default: ${DEFAULT_SCRAPE_INTERVAL}`}\n        InputProps={{\n          readOnly: isReadonly,\n        }}\n        InputLabelProps={{ shrink: isReadonly ? true : undefined }}\n        onChange={(e) => onChange({ ...value, scrapeInterval: e.target.value as DurationString })}\n        helperText=\"Set it to match the typical scrape interval used in your Prometheus instance.\"\n      />\n      <HTTPSettingsEditor\n        value={value}\n        onChange={onChange}\n        isReadonly={isReadonly}\n        initialSpecDirect={initialSpecDirect}\n        initialSpecProxy={initialSpecProxy}\n      />\n      <Typography variant=\"h5\" mt={2} mb={1}>\n        Query Parameters\n      </Typography>\n      {entries.length > 0 && (\n        <>\n          {entries.map((entry) => (\n            <Box key={entry.id} display=\"flex\" alignItems=\"center\" gap={2} mb={1}>\n              <TextField\n                size=\"small\"\n                label=\"Key\"\n                value={entry.key}\n                placeholder=\"Parameter name\"\n                disabled={isReadonly}\n                onChange={(e) => handleQueryParamChange(entry.id, 'key', e.target.value)}\n                error={duplicateKeys.has(entry.key)}\n                sx={{ minWidth: 150 }}\n              />\n              <TextField\n                size=\"small\"\n                label=\"Value\"\n                value={entry.value}\n                placeholder=\"Parameter value\"\n                disabled={isReadonly}\n                onChange={(e) => handleQueryParamChange(entry.id, 'value', e.target.value)}\n                sx={{ minWidth: 150, flexGrow: 1 }}\n              />\n              {!isReadonly && (\n                <IconButton onClick={() => removeQueryParam(entry.id)}>\n                  <MinusIcon />\n                </IconButton>\n              )}\n            </Box>\n          ))}\n        </>\n      )}\n      {hasDuplicates && (\n        <Typography variant=\"body2\" color=\"error\" mb={1}>\n          Duplicate parameter keys detected. Each key must be unique.\n        </Typography>\n      )}\n      {entries.length === 0 && (\n        <Typography variant=\"body2\" color=\"textSecondary\">\n          No query parameters configured. Use query parameters to pass additional options to Prometheus (e.g.,\n          dedup=false for Thanos).\n        </Typography>\n      )}\n      {!isReadonly && (\n        <IconButton onClick={addQueryParam}>\n          <PlusIcon />\n        </IconButton>\n      )}\n    </>\n  );\n}\n"],"names":["HTTPSettingsEditor","Box","TextField","Typography","IconButton","PlusIcon","MinusIcon","React","useState","useRef","DEFAULT_SCRAPE_INTERVAL","PrometheusDatasourceEditor","props","value","onChange","isReadonly","nextIdRef","entries","setEntries","queryParams","Object","map","key","id","String","current","keyMap","Map","duplicateKeys","Set","forEach","count","get","set","add","hasDuplicates","size","syncToParent","newEntries","newParams","keys","length","undefined","handleQueryParamChange","field","newValue","entry","addQueryParam","removeQueryParam","filter","initialSpecDirect","directUrl","initialSpecProxy","proxy","kind","spec","allowedEndpoints","endpointPattern","method","url","variant","mb","fullWidth","label","scrapeInterval","placeholder","InputProps","readOnly","InputLabelProps","shrink","e","target","helperText","mt","display","alignItems","gap","disabled","error","has","sx","minWidth","flexGrow","onClick","color"],"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;;AAGjC,SAASA,kBAAkB,QAAQ,4BAA4B;AAC/D,SAASC,GAAG,EAAEC,SAAS,EAAEC,UAAU,EAAEC,UAAU,QAAQ,gBAAgB;AACvE,OAAOC,cAAc,uBAAuB;AAC5C,OAAOC,eAAe,wBAAwB;AAC9C,OAAOC,SAAuBC,QAAQ,EAAEC,MAAM,QAAQ,QAAQ;AAC9D,SAASC,uBAAuB,QAAkC,UAAU;AAe5E,OAAO,SAASC,2BAA2BC,KAAsC;IAC/E,MAAM,EAAEC,KAAK,EAAEC,QAAQ,EAAEC,UAAU,EAAE,GAAGH;IAExC,oCAAoC;IACpC,MAAMI,YAAYP,OAAO;IAEzB,6EAA6E;IAC7E,qDAAqD;IACrD,MAAM,CAACQ,SAASC,WAAW,GAAGV,SAA4B;QACxD,MAAMW,cAAcN,MAAMM,WAAW,IAAI,CAAC;QAC1C,OAAOC,OAAOH,OAAO,CAACE,aAAaE,GAAG,CAAC,CAAC,CAACC,KAAKT,MAAM,GAAM,CAAA;gBACxDU,IAAIC,OAAOR,UAAUS,OAAO;gBAC5BH;gBACAT;YACF,CAAA;IACF;IAEA,2BAA2B;IAC3B,MAAMa,SAAS,IAAIC;IACnB,MAAMC,gBAAgB,IAAIC;IAC1BZ,QAAQa,OAAO,CAAC,CAAC,EAAER,GAAG,EAAE;QACtB,IAAIA,QAAQ,IAAI;YACd,MAAMS,QAAQ,AAACL,CAAAA,OAAOM,GAAG,CAACV,QAAQ,CAAA,IAAK;YACvCI,OAAOO,GAAG,CAACX,KAAKS;YAChB,IAAIA,QAAQ,GAAG;gBACbH,cAAcM,GAAG,CAACZ;YACpB;QACF;IACF;IACA,MAAMa,gBAAgBP,cAAcQ,IAAI,GAAG;IAE3C,uDAAuD;IACvD,MAAMC,eAAe,CAACC;QACpB,MAAMC,YAAoC,CAAC;QAC3CD,WAAWR,OAAO,CAAC,CAAC,EAAER,GAAG,EAAET,KAAK,EAAE;YAChC,IAAIS,QAAQ,IAAI;gBACdiB,SAAS,CAACjB,IAAI,GAAGT;YACnB;QACF;QAEAC,SAAS;YACP,GAAGD,KAAK;YACRM,aAAaC,OAAOoB,IAAI,CAACD,WAAWE,MAAM,GAAG,IAAIF,YAAYG;QAC/D;IACF;IAEA,MAAMC,yBAAyB,CAACpB,IAAYqB,OAAwBC;QAClE,MAAMP,aAAarB,QAAQI,GAAG,CAAC,CAACyB;YAC9B,IAAIA,MAAMvB,EAAE,KAAKA,IAAI,OAAOuB;YAC5B,OAAOF,UAAU,QAAQ;gBAAE,GAAGE,KAAK;gBAAExB,KAAKuB;YAAS,IAAI;gBAAE,GAAGC,KAAK;gBAAEjC,OAAOgC;YAAS;QACrF;QACA3B,WAAWoB;QACXD,aAAaC;IACf;IAEA,MAAMS,gBAAgB;QACpB,MAAMT,aAAa;eAAIrB;YAAS;gBAAEM,IAAIC,OAAOR,UAAUS,OAAO;gBAAKH,KAAK;gBAAIT,OAAO;YAAG;SAAE;QACxFK,WAAWoB;QACXD,aAAaC;IACf;IAEA,MAAMU,mBAAmB,CAACzB;QACxB,MAAMe,aAAarB,QAAQgC,MAAM,CAAC,CAACH,QAAUA,MAAMvB,EAAE,KAAKA;QAC1DL,WAAWoB;QACXD,aAAaC;IACf;IAEA,MAAMY,oBAA8C;QAClDC,WAAW;IACb;IAEA,MAAMC,mBAA6C;QACjDC,OAAO;YACLC,MAAM;YACNC,MAAM;gBACJC,kBAAkB;oBAChB,kDAAkD;oBAClD;wBACEC,iBAAiB;wBACjBC,QAAQ;oBACV;oBACA;wBACED,iBAAiB;wBACjBC,QAAQ;oBACV;oBACA;wBACED,iBAAiB;wBACjBC,QAAQ;oBACV;oBACA;wBACED,iBAAiB;wBACjBC,QAAQ;oBACV;oBACA;wBACED,iBAAiB;wBACjBC,QAAQ;oBACV;oBACA;wBACED,iBAAiB;wBACjBC,QAAQ;oBACV;oBACA;wBACED,iBAAiB;wBACjBC,QAAQ;oBACV;iBACD;gBACDC,KAAK;YACP;QACF;IACF;IAEA,qBACE;;0BACE,KAACxD;gBAAWyD,SAAQ;gBAAKC,IAAI;0BAAG;;0BAGhC,KAAC3D;gBACCkC,MAAK;gBACL0B,SAAS;gBACTC,OAAM;gBACNlD,OAAOA,MAAMmD,cAAc,IAAI;gBAC/BC,aAAa,CAAC,SAAS,EAAEvD,yBAAyB;gBAClDwD,YAAY;oBACVC,UAAUpD;gBACZ;gBACAqD,iBAAiB;oBAAEC,QAAQtD,aAAa,OAAO2B;gBAAU;gBACzD5B,UAAU,CAACwD,IAAMxD,SAAS;wBAAE,GAAGD,KAAK;wBAAEmD,gBAAgBM,EAAEC,MAAM,CAAC1D,KAAK;oBAAmB;gBACvF2D,YAAW;;0BAEb,KAACxE;gBACCa,OAAOA;gBACPC,UAAUA;gBACVC,YAAYA;gBACZmC,mBAAmBA;gBACnBE,kBAAkBA;;0BAEpB,KAACjD;gBAAWyD,SAAQ;gBAAKa,IAAI;gBAAGZ,IAAI;0BAAG;;YAGtC5C,QAAQwB,MAAM,GAAG,mBAChB;0BACGxB,QAAQI,GAAG,CAAC,CAACyB,sBACZ,MAAC7C;wBAAmByE,SAAQ;wBAAOC,YAAW;wBAASC,KAAK;wBAAGf,IAAI;;0CACjE,KAAC3D;gCACCkC,MAAK;gCACL2B,OAAM;gCACNlD,OAAOiC,MAAMxB,GAAG;gCAChB2C,aAAY;gCACZY,UAAU9D;gCACVD,UAAU,CAACwD,IAAM3B,uBAAuBG,MAAMvB,EAAE,EAAE,OAAO+C,EAAEC,MAAM,CAAC1D,KAAK;gCACvEiE,OAAOlD,cAAcmD,GAAG,CAACjC,MAAMxB,GAAG;gCAClC0D,IAAI;oCAAEC,UAAU;gCAAI;;0CAEtB,KAAC/E;gCACCkC,MAAK;gCACL2B,OAAM;gCACNlD,OAAOiC,MAAMjC,KAAK;gCAClBoD,aAAY;gCACZY,UAAU9D;gCACVD,UAAU,CAACwD,IAAM3B,uBAAuBG,MAAMvB,EAAE,EAAE,SAAS+C,EAAEC,MAAM,CAAC1D,KAAK;gCACzEmE,IAAI;oCAAEC,UAAU;oCAAKC,UAAU;gCAAE;;4BAElC,CAACnE,4BACA,KAACX;gCAAW+E,SAAS,IAAMnC,iBAAiBF,MAAMvB,EAAE;0CAClD,cAAA,KAACjB;;;uBAtBGwC,MAAMvB,EAAE;;YA6BvBY,+BACC,KAAChC;gBAAWyD,SAAQ;gBAAQwB,OAAM;gBAAQvB,IAAI;0BAAG;;YAIlD5C,QAAQwB,MAAM,KAAK,mBAClB,KAACtC;gBAAWyD,SAAQ;gBAAQwB,OAAM;0BAAgB;;YAKnD,CAACrE,4BACA,KAACX;gBAAW+E,SAASpC;0BACnB,cAAA,KAAC1C;;;;AAKX"}
+{"version":3,"sources":["../../../src/plugins/PrometheusDatasourceEditor.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 { Box, IconButton, TextField, Typography } from '@mui/material';\nimport { QueryParamValues } from '@perses-dev/components';\nimport { DurationString } from '@perses-dev/core';\nimport { HTTPSettingsEditor } from '@perses-dev/plugin-system';\nimport MinusIcon from 'mdi-material-ui/Minus';\nimport PlusIcon from 'mdi-material-ui/Plus';\nimport { ReactElement, useRef, useState } from 'react';\nimport { DEFAULT_SCRAPE_INTERVAL, PrometheusDatasourceSpec } from './types';\n\ninterface QueryParamEntry {\n  // Unique identifier for the entry, added to avoid using array index as key\n  id: string;\n  key: string;\n  value: string;\n}\n\nexport interface PrometheusDatasourceEditorProps {\n  value: PrometheusDatasourceSpec;\n  onChange: (next: PrometheusDatasourceSpec) => void;\n  isReadonly?: boolean;\n}\n\nexport function PrometheusDatasourceEditor(props: PrometheusDatasourceEditorProps): ReactElement {\n  const { value, onChange, isReadonly } = props;\n\n  // Counter for generating unique IDs\n  const nextIdRef = useRef(0);\n\n  // Use local state to maintain an array of entries during editing, instead of\n  // manipulating a map directly which causes weird UX.\n  const [entries, setEntries] = useState<QueryParamEntry[]>(() => {\n    const queryParams: QueryParamValues = value.queryParams ?? {};\n    return Object.entries(queryParams).map(([key, val]) => ({\n      id: String(nextIdRef.current++),\n      key,\n      value: Array.isArray(val) ? val.join(',') : val,\n    }));\n  });\n\n  // Check for duplicate keys\n  const keyMap = new Map<string, number>();\n  const duplicateKeys = new Set<string>();\n  entries.forEach(({ key }) => {\n    if (key !== '') {\n      const count = (keyMap.get(key) || 0) + 1;\n      keyMap.set(key, count);\n      if (count > 1) {\n        duplicateKeys.add(key);\n      }\n    }\n  });\n  const hasDuplicates = duplicateKeys.size > 0;\n\n  // Convert entries array to object and trigger onChange.\n  // Values containing commas are stored as arrays to preserve the round-trip\n  // with the load-time join(',') in useState above.\n  const syncToParent = (newEntries: QueryParamEntry[]): void => {\n    const newParams: Record<string, string | string[]> = {};\n    newEntries.forEach(({ key, value }) => {\n      if (key !== '') {\n        const parts = value.split(',');\n        newParams[key] = parts.length > 1 ? parts : value;\n      }\n    });\n\n    onChange({\n      ...value,\n      queryParams: Object.keys(newParams).length > 0 ? newParams : undefined,\n    });\n  };\n\n  const handleQueryParamChange = (id: string, field: 'key' | 'value', newValue: string): void => {\n    const newEntries = entries.map((entry) => {\n      if (entry.id !== id) return entry;\n      return field === 'key' ? { ...entry, key: newValue } : { ...entry, value: newValue };\n    });\n    setEntries(newEntries);\n    syncToParent(newEntries);\n  };\n\n  const addQueryParam = (): void => {\n    const newEntries = [...entries, { id: String(nextIdRef.current++), key: '', value: '' }];\n    setEntries(newEntries);\n    syncToParent(newEntries);\n  };\n\n  const removeQueryParam = (id: string): void => {\n    const newEntries = entries.filter((entry) => entry.id !== id);\n    setEntries(newEntries);\n    syncToParent(newEntries);\n  };\n\n  const initialSpecDirect: PrometheusDatasourceSpec = {\n    directUrl: '',\n  };\n\n  const initialSpecProxy: PrometheusDatasourceSpec = {\n    proxy: {\n      kind: 'HTTPProxy',\n      spec: {\n        allowedEndpoints: [\n          // list of standard endpoints suggested by default\n          {\n            endpointPattern: '/api/v1/labels',\n            method: 'POST',\n          },\n          {\n            endpointPattern: '/api/v1/series',\n            method: 'POST',\n          },\n          {\n            endpointPattern: '/api/v1/metadata',\n            method: 'GET',\n          },\n          {\n            endpointPattern: '/api/v1/query',\n            method: 'POST',\n          },\n          {\n            endpointPattern: '/api/v1/query_range',\n            method: 'POST',\n          },\n          {\n            endpointPattern: '/api/v1/label/([a-zA-Z0-9_-]+)/values',\n            method: 'GET',\n          },\n          {\n            endpointPattern: '/api/v1/parse_query',\n            method: 'POST',\n          },\n        ],\n        url: '',\n      },\n    },\n  };\n\n  return (\n    <>\n      <Typography variant=\"h4\" mb={2}>\n        General Settings\n      </Typography>\n      <TextField\n        size=\"small\"\n        fullWidth\n        label=\"Scrape Interval\"\n        value={value.scrapeInterval || ''}\n        placeholder={`Default: ${DEFAULT_SCRAPE_INTERVAL}`}\n        InputProps={{\n          readOnly: isReadonly,\n        }}\n        InputLabelProps={{ shrink: isReadonly ? true : undefined }}\n        onChange={(e) => onChange({ ...value, scrapeInterval: e.target.value as DurationString })}\n        helperText=\"Set it to match the typical scrape interval used in your Prometheus instance.\"\n      />\n      <HTTPSettingsEditor\n        value={value}\n        onChange={onChange}\n        isReadonly={isReadonly}\n        initialSpecDirect={initialSpecDirect}\n        initialSpecProxy={initialSpecProxy}\n      />\n      <Typography variant=\"h5\" mt={2} mb={1}>\n        Query Parameters\n      </Typography>\n      {entries.length > 0 && (\n        <>\n          {entries.map((entry) => (\n            <Box key={entry.id} display=\"flex\" alignItems=\"center\" gap={2} mb={1}>\n              <TextField\n                size=\"small\"\n                label=\"Key\"\n                value={entry.key}\n                placeholder=\"Parameter name\"\n                disabled={isReadonly}\n                onChange={(e) => handleQueryParamChange(entry.id, 'key', e.target.value)}\n                error={duplicateKeys.has(entry.key)}\n                sx={{ minWidth: 150 }}\n              />\n              <TextField\n                size=\"small\"\n                label=\"Value\"\n                value={entry.value}\n                placeholder=\"Parameter value\"\n                disabled={isReadonly}\n                onChange={(e) => handleQueryParamChange(entry.id, 'value', e.target.value)}\n                sx={{ minWidth: 150, flexGrow: 1 }}\n              />\n              {!isReadonly && (\n                <IconButton onClick={() => removeQueryParam(entry.id)}>\n                  <MinusIcon />\n                </IconButton>\n              )}\n            </Box>\n          ))}\n        </>\n      )}\n      {hasDuplicates && (\n        <Typography variant=\"body2\" color=\"error\" mb={1}>\n          Duplicate parameter keys detected. Each key must be unique.\n        </Typography>\n      )}\n      {entries.length === 0 && (\n        <Typography variant=\"body2\" color=\"textSecondary\">\n          No query parameters configured. Use query parameters to pass additional options to Prometheus (e.g.,\n          dedup=false for Thanos).\n        </Typography>\n      )}\n      {!isReadonly && (\n        <IconButton onClick={addQueryParam}>\n          <PlusIcon />\n        </IconButton>\n      )}\n    </>\n  );\n}\n"],"names":["Box","IconButton","TextField","Typography","HTTPSettingsEditor","MinusIcon","PlusIcon","useRef","useState","DEFAULT_SCRAPE_INTERVAL","PrometheusDatasourceEditor","props","value","onChange","isReadonly","nextIdRef","entries","setEntries","queryParams","Object","map","key","val","id","String","current","Array","isArray","join","keyMap","Map","duplicateKeys","Set","forEach","count","get","set","add","hasDuplicates","size","syncToParent","newEntries","newParams","parts","split","length","keys","undefined","handleQueryParamChange","field","newValue","entry","addQueryParam","removeQueryParam","filter","initialSpecDirect","directUrl","initialSpecProxy","proxy","kind","spec","allowedEndpoints","endpointPattern","method","url","variant","mb","fullWidth","label","scrapeInterval","placeholder","InputProps","readOnly","InputLabelProps","shrink","e","target","helperText","mt","display","alignItems","gap","disabled","error","has","sx","minWidth","flexGrow","onClick","color"],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"PrometheusLabelNamesVariable.d.ts","sourceRoot":"","sources":["../../../src/plugins/PrometheusLabelNamesVariable.tsx"],"names":[],"mappings":"AAaA,OAAO,EACL,cAAc,EAMf,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EAAE,mCAAmC,EAAE,MAAM,SAAS,CAAC;AAE9D,eAAO,MAAM,4BAA4B,EAAE,cAAc,CAAC,mCAAmC,CAyB5F,CAAC"}
+{"version":3,"file":"PrometheusLabelNamesVariable.d.ts","sourceRoot":"","sources":["../../../src/plugins/PrometheusLabelNamesVariable.tsx"],"names":[],"mappings":"AAaA,OAAO,EACL,cAAc,EAMf,MAAM,2BAA2B,CAAC;AAInC,OAAO,EAAE,mCAAmC,EAAE,MAAM,SAAS,CAAC;AAE9D,eAAO,MAAM,4BAA4B,EAAE,cAAc,CAAC,mCAAmC,CA6B5F,CAAC"}

package/lib/plugins/PrometheusLabelNamesVariable.js

@@ -13,16 +13,17 @@
 import { replaceVariables, parseVariables, datasourceSelectValueToSelector, isVariableDatasource } from '@perses-dev/plugin-system';
 import { DEFAULT_PROM, getPrometheusTimeRange, PROM_DATASOURCE_KIND } from '../model';
 import { stringArrayToVariableOptions, PrometheusLabelNamesVariableEditor } from './prometheus-variables';
+import { resolvePrometheusDatasource } from './interpolation';
 export const PrometheusLabelNamesVariable = {
     getVariableOptions: async (spec, ctx)=>{
         const datasourceSelector = datasourceSelectValueToSelector(spec.datasource ?? DEFAULT_PROM, ctx.variables, await ctx.datasourceStore.listDatasourceSelectItems(PROM_DATASOURCE_KIND)) ?? DEFAULT_PROM;
-        const client = await ctx.datasourceStore.getDatasourceClient(datasourceSelector);
+        const { client, requestOptions } = await resolvePrometheusDatasource(ctx.datasourceStore, datasourceSelector, ctx.variables);
         const match = spec.matchers ? spec.matchers.map((m)=>replaceVariables(m, ctx.variables)) : undefined;
         const timeRange = getPrometheusTimeRange(ctx.timeRange);
         const { data: options } = await client.labelNames({
             'match[]': match,
             ...timeRange
-        });
+        }, requestOptions);
         return {
             data: stringArrayToVariableOptions(options)
         };

package/lib/plugins/PrometheusLabelNamesVariable.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/plugins/PrometheusLabelNamesVariable.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 { PrometheusClient, DEFAULT_PROM, getPrometheusTimeRange, PROM_DATASOURCE_KIND } from '../model';\nimport { stringArrayToVariableOptions, PrometheusLabelNamesVariableEditor } from './prometheus-variables';\nimport { PrometheusLabelNamesVariableOptions } from './types';\n\nexport const PrometheusLabelNamesVariable: VariablePlugin<PrometheusLabelNamesVariableOptions> = {\n  getVariableOptions: async (spec: PrometheusLabelNamesVariableOptions, ctx: GetVariableOptionsContext) => {\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: PrometheusClient = await ctx.datasourceStore.getDatasourceClient(datasourceSelector);\n    const match = spec.matchers ? spec.matchers.map((m) => replaceVariables(m, ctx.variables)) : undefined;\n    const timeRange = getPrometheusTimeRange(ctx.timeRange);\n\n    const { data: options } = await client.labelNames({ 'match[]': match, ...timeRange });\n    return {\n      data: stringArrayToVariableOptions(options),\n    };\n  },\n  dependsOn: (spec: PrometheusLabelNamesVariableOptions) => {\n    const matcherVariables = spec.matchers?.map((m) => parseVariables(m)).flat() || [];\n    const datasourceVariables =\n      spec.datasource && isVariableDatasource(spec.datasource) ? parseVariables(spec.datasource) : [];\n    return { variables: [...matcherVariables, ...datasourceVariables] };\n  },\n  OptionsEditorComponent: PrometheusLabelNamesVariableEditor,\n  createInitialOptions: () => ({}),\n};\n"],"names":["replaceVariables","parseVariables","datasourceSelectValueToSelector","isVariableDatasource","DEFAULT_PROM","getPrometheusTimeRange","PROM_DATASOURCE_KIND","stringArrayToVariableOptions","PrometheusLabelNamesVariableEditor","PrometheusLabelNamesVariable","getVariableOptions","spec","ctx","datasourceSelector","datasource","variables","datasourceStore","listDatasourceSelectItems","client","getDatasourceClient","match","matchers","map","m","undefined","timeRange","data","options","labelNames","dependsOn","matcherVariables","flat","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,SAA2BC,YAAY,EAAEC,sBAAsB,EAAEC,oBAAoB,QAAQ,WAAW;AACxG,SAASC,4BAA4B,EAAEC,kCAAkC,QAAQ,yBAAyB;AAG1G,OAAO,MAAMC,+BAAoF;IAC/FC,oBAAoB,OAAOC,MAA2CC;QACpE,MAAMC,qBACJX,gCACES,KAAKG,UAAU,IAAIV,cACnBQ,IAAIG,SAAS,EACb,MAAMH,IAAII,eAAe,CAACC,yBAAyB,CAACX,0BACjDF;QACP,MAAMc,SAA2B,MAAMN,IAAII,eAAe,CAACG,mBAAmB,CAACN;QAC/E,MAAMO,QAAQT,KAAKU,QAAQ,GAAGV,KAAKU,QAAQ,CAACC,GAAG,CAAC,CAACC,IAAMvB,iBAAiBuB,GAAGX,IAAIG,SAAS,KAAKS;QAC7F,MAAMC,YAAYpB,uBAAuBO,IAAIa,SAAS;QAEtD,MAAM,EAAEC,MAAMC,OAAO,EAAE,GAAG,MAAMT,OAAOU,UAAU,CAAC;YAAE,WAAWR;YAAO,GAAGK,SAAS;QAAC;QACnF,OAAO;YACLC,MAAMnB,6BAA6BoB;QACrC;IACF;IACAE,WAAW,CAAClB;QACV,MAAMmB,mBAAmBnB,KAAKU,QAAQ,EAAEC,IAAI,CAACC,IAAMtB,eAAesB,IAAIQ,UAAU,EAAE;QAClF,MAAMC,sBACJrB,KAAKG,UAAU,IAAIX,qBAAqBQ,KAAKG,UAAU,IAAIb,eAAeU,KAAKG,UAAU,IAAI,EAAE;QACjG,OAAO;YAAEC,WAAW;mBAAIe;mBAAqBE;aAAoB;QAAC;IACpE;IACAC,wBAAwBzB;IACxB0B,sBAAsB,IAAO,CAAA,CAAC,CAAA;AAChC,EAAE"}
+{"version":3,"sources":["../../../src/plugins/PrometheusLabelNamesVariable.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, PrometheusLabelNamesVariableEditor } from './prometheus-variables';\nimport { resolvePrometheusDatasource } from './interpolation';\nimport { PrometheusLabelNamesVariableOptions } from './types';\n\nexport const PrometheusLabelNamesVariable: VariablePlugin<PrometheusLabelNamesVariableOptions> = {\n  getVariableOptions: async (spec: PrometheusLabelNamesVariableOptions, ctx: GetVariableOptionsContext) => {\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 = spec.matchers ? spec.matchers.map((m) => replaceVariables(m, ctx.variables)) : undefined;\n    const timeRange = getPrometheusTimeRange(ctx.timeRange);\n\n    const { data: options } = await client.labelNames({ 'match[]': match, ...timeRange }, requestOptions);\n    return {\n      data: stringArrayToVariableOptions(options),\n    };\n  },\n  dependsOn: (spec: PrometheusLabelNamesVariableOptions) => {\n    const matcherVariables = spec.matchers?.map((m) => parseVariables(m)).flat() || [];\n    const datasourceVariables =\n      spec.datasource && isVariableDatasource(spec.datasource) ? parseVariables(spec.datasource) : [];\n    return { variables: [...matcherVariables, ...datasourceVariables] };\n  },\n  OptionsEditorComponent: PrometheusLabelNamesVariableEditor,\n  createInitialOptions: () => ({}),\n};\n"],"names":["replaceVariables","parseVariables","datasourceSelectValueToSelector","isVariableDatasource","DEFAULT_PROM","getPrometheusTimeRange","PROM_DATASOURCE_KIND","stringArrayToVariableOptions","PrometheusLabelNamesVariableEditor","resolvePrometheusDatasource","PrometheusLabelNamesVariable","getVariableOptions","spec","ctx","datasourceSelector","datasource","variables","datasourceStore","listDatasourceSelectItems","client","requestOptions","match","matchers","map","m","undefined","timeRange","data","options","labelNames","dependsOn","matcherVariables","flat","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,kCAAkC,QAAQ,yBAAyB;AAC1G,SAASC,2BAA2B,QAAQ,kBAAkB;AAG9D,OAAO,MAAMC,+BAAoF;IAC/FC,oBAAoB,OAAOC,MAA2CC;QACpE,MAAMC,qBACJZ,gCACEU,KAAKG,UAAU,IAAIX,cACnBS,IAAIG,SAAS,EACb,MAAMH,IAAII,eAAe,CAACC,yBAAyB,CAACZ,0BACjDF;QACP,MAAM,EAAEe,MAAM,EAAEC,cAAc,EAAE,GAAG,MAAMX,4BACvCI,IAAII,eAAe,EACnBH,oBACAD,IAAIG,SAAS;QAEf,MAAMK,QAAQT,KAAKU,QAAQ,GAAGV,KAAKU,QAAQ,CAACC,GAAG,CAAC,CAACC,IAAMxB,iBAAiBwB,GAAGX,IAAIG,SAAS,KAAKS;QAC7F,MAAMC,YAAYrB,uBAAuBQ,IAAIa,SAAS;QAEtD,MAAM,EAAEC,MAAMC,OAAO,EAAE,GAAG,MAAMT,OAAOU,UAAU,CAAC;YAAE,WAAWR;YAAO,GAAGK,SAAS;QAAC,GAAGN;QACtF,OAAO;YACLO,MAAMpB,6BAA6BqB;QACrC;IACF;IACAE,WAAW,CAAClB;QACV,MAAMmB,mBAAmBnB,KAAKU,QAAQ,EAAEC,IAAI,CAACC,IAAMvB,eAAeuB,IAAIQ,UAAU,EAAE;QAClF,MAAMC,sBACJrB,KAAKG,UAAU,IAAIZ,qBAAqBS,KAAKG,UAAU,IAAId,eAAeW,KAAKG,UAAU,IAAI,EAAE;QACjG,OAAO;YAAEC,WAAW;mBAAIe;mBAAqBE;aAAoB;QAAC;IACpE;IACAC,wBAAwB1B;IACxB2B,sBAAsB,IAAO,CAAA,CAAC,CAAA;AAChC,EAAE"}

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;AAGnC,OAAO,EAAE,oCAAoC,EAAE,MAAM,SAAS,CAAC;AAE/D,eAAO,MAAM,6BAA6B,EAAE,cAAc,CAAC,oCAAoC,CAkC9F,CAAC"}
+{"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"}

package/lib/plugins/PrometheusLabelValuesVariable.js

@@ -13,18 +13,19 @@
 import { replaceVariables, parseVariables, datasourceSelectValueToSelector, isVariableDatasource } from '@perses-dev/plugin-system';
 import { DEFAULT_PROM, getPrometheusTimeRange, PROM_DATASOURCE_KIND } from '../model';
 import { stringArrayToVariableOptions, PrometheusLabelValuesVariableEditor } from './prometheus-variables';
+import { resolvePrometheusDatasource } from './interpolation';
 export const PrometheusLabelValuesVariable = {
     getVariableOptions: async (spec, ctx)=>{
         const pluginDef = spec;
         const datasourceSelector = datasourceSelectValueToSelector(spec.datasource ?? DEFAULT_PROM, ctx.variables, await ctx.datasourceStore.listDatasourceSelectItems(PROM_DATASOURCE_KIND)) ?? DEFAULT_PROM;
-        const client = await ctx.datasourceStore.getDatasourceClient(datasourceSelector);
+        const { client, requestOptions } = await resolvePrometheusDatasource(ctx.datasourceStore, datasourceSelector, ctx.variables);
         const match = pluginDef.matchers ? pluginDef.matchers.map((m)=>replaceVariables(m, ctx.variables)) : undefined;
         const timeRange = getPrometheusTimeRange(ctx.timeRange);
         const { data: options } = await client.labelValues({
             labelName: replaceVariables(pluginDef.labelName, ctx.variables),
             'match[]': match,
             ...timeRange
-        });
+        }, requestOptions);
         return {
             data: stringArrayToVariableOptions(options)
         };