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

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/plugins/prometheus-time-series-query/get-time-series-data.ts"],"sourcesContent":["// Copyright 2025 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  DatasourceSpec,\n  DurationString,\n  Notice,\n  parseDurationString,\n  TimeSeries,\n  TimeSeriesData,\n} from '@perses-dev/core';\nimport { TimeSeriesQueryPlugin, datasourceSelectValueToSelector, replaceVariables } from '@perses-dev/plugin-system';\nimport { fromUnixTime, milliseconds } from 'date-fns';\nimport {\n  parseValueTuple,\n  PrometheusClient,\n  getDurationStringSeconds,\n  getPrometheusTimeRange,\n  getRangeStep,\n  DEFAULT_PROM,\n  MatrixData,\n  VectorData,\n  ScalarData,\n  InstantQueryResultType,\n  PROM_DATASOURCE_KIND,\n} from '../../model';\nimport { getFormattedPrometheusSeriesName } from '../../utils';\nimport { DEFAULT_SCRAPE_INTERVAL, PrometheusDatasourceSpec } from '../types';\nimport { PrometheusTimeSeriesQuerySpec } from './time-series-query-model';\nimport { replacePromBuiltinVariables } from './replace-prom-builtin-variables';\n\nexport const getTimeSeriesData: TimeSeriesQueryPlugin<PrometheusTimeSeriesQuerySpec>['getTimeSeriesData'] = async (\n  spec,\n  context,\n  abortSignal\n) => {\n  if (spec.query === undefined || spec.query === null || spec.query === '') {\n    // Do not make a request to the backend, instead return an empty TimeSeriesData\n    return { series: [] };\n  }\n\n  const listDatasourceSelectItems = await context.datasourceStore.listDatasourceSelectItems(PROM_DATASOURCE_KIND);\n\n  const selectedDatasource =\n    datasourceSelectValueToSelector(\n      spec.datasource ?? DEFAULT_PROM,\n      context.variableState,\n      listDatasourceSelectItems\n    ) ?? DEFAULT_PROM;\n\n  const datasource = (await context.datasourceStore.getDatasource(\n    selectedDatasource\n  )) as DatasourceSpec<PrometheusDatasourceSpec>;\n  const datasourceScrapeInterval = Math.trunc(\n    milliseconds(parseDurationString(datasource.plugin.spec.scrapeInterval ?? DEFAULT_SCRAPE_INTERVAL)) / 1000\n  );\n\n  // Min step is the lower bound of the interval between data points\n  // If no value is provided for it, it should default to the scrape interval of the datasource\n  const minStep =\n    getDurationStringSeconds(\n      // resolve any variable that may have been provided\n      // TODO add a validation check to make sure the variable is a DurationString, to avoid the back & forth cast here\n      replaceVariables(spec.minStep as string, context.variableState) as DurationString\n    ) ?? datasourceScrapeInterval;\n  const timeRange = getPrometheusTimeRange(context.timeRange);\n  const step = getRangeStep(timeRange, minStep, undefined, context.suggestedStepMs); // TODO: resolution\n\n  // Align the time range so that it's a multiple of the step\n  let { start, end } = timeRange;\n\n  const utcOffsetSec = new Date().getTimezoneOffset() * 60;\n\n  const alignedEnd = Math.floor((end + utcOffsetSec) / step) * step - utcOffsetSec;\n  const alignedStart = Math.floor((start + utcOffsetSec) / step) * step - utcOffsetSec;\n  start = alignedStart;\n  end = alignedEnd;\n\n  /* Ensure end is always greater than start:\n     If the step is greater than equal to the diff of end and start,\n     both start, and end will eventually be rounded to the same value,\n     Consequently, the time range will be zero, which does not return any valid value\n  */\n  if (end === start) {\n    end = start + step;\n    console.warn(`Step (${step}) was larger than the time range! end of time range was set accordingly.`);\n  }\n\n  // Replace variable placeholders in PromQL query\n  const intervalMs = step * 1000;\n  const minStepMs = minStep * 1000;\n  let query = replacePromBuiltinVariables(spec.query, minStepMs, intervalMs);\n  query = replaceVariables(query, context.variableState);\n\n  let seriesNameFormat = spec.seriesNameFormat;\n  // if series name format is defined, replace variable placeholders in series name format\n  if (seriesNameFormat) {\n    seriesNameFormat = replaceVariables(seriesNameFormat, context.variableState);\n  }\n\n  // Get the datasource, using the default Prom Datasource if one isn't specified in the query\n  const client: PrometheusClient = await context.datasourceStore.getDatasourceClient(selectedDatasource);\n\n  // Make the request to Prom\n\n  let response;\n  switch (context.mode) {\n    case 'instant':\n      response = await client.instantQuery(\n        {\n          query,\n          time: end,\n        },\n        undefined,\n        abortSignal\n      );\n      break;\n    case 'range':\n    default:\n      response = await client.rangeQuery(\n        {\n          query,\n          start,\n          end,\n          step,\n        },\n        undefined,\n        abortSignal\n      );\n      break;\n  }\n\n  // TODO: What about error responses from Prom that have a response body?\n  const result = response.data;\n\n  // Custom display for response header warnings, configurable error responses display coming next\n  const notices: Notice[] = [];\n  if (response.status === 'success') {\n    const warnings = response.warnings ?? [];\n    const warningMessage = warnings[0] ?? '';\n    if (warningMessage !== '') {\n      notices.push({\n        type: 'warning',\n        message: warningMessage,\n      });\n    }\n  }\n\n  // Transform response\n  const chartData: TimeSeriesData = {\n    // Return the time range and step we actually used for the query\n    timeRange: { start: fromUnixTime(start), end: fromUnixTime(end) },\n    stepMs: step * 1000,\n\n    series: buildTimeSeries(query, result, seriesNameFormat),\n    metadata: {\n      notices,\n      executedQueryString: query,\n    },\n  };\n\n  return chartData;\n};\n\nfunction buildVectorData(query: string, data: VectorData, seriesNameFormat: string | undefined): TimeSeries[] {\n  return data.result.map((res) => {\n    const { metric, value, histogram } = res;\n\n    // Account for seriesNameFormat from query editor when determining name to show in legend, tooltip, etc.\n    const { name, formattedName } = getFormattedPrometheusSeriesName(query, metric, seriesNameFormat);\n\n    if (histogram) {\n      return {\n        name,\n        formattedName,\n        labels: metric,\n        values: [parseValueTuple([histogram[0], histogram[1].sum])],\n        histograms: [histogram],\n      };\n    }\n\n    return {\n      name,\n      formattedName,\n      labels: metric,\n      values: [parseValueTuple(value)],\n    };\n  });\n}\n\nfunction buildMatrixData(query: string, data: MatrixData, seriesNameFormat: string | undefined): TimeSeries[] {\n  return data.result.map((res) => {\n    const { metric, values, histograms } = res;\n\n    // Account for seriesNameFormat from query editor when determining name to show in legend, tooltip, etc.\n    const { name, formattedName } = getFormattedPrometheusSeriesName(query, metric, seriesNameFormat);\n\n    if (histograms) {\n      return {\n        name,\n        formattedName,\n        labels: metric,\n        values: histograms.map((histogram) => parseValueTuple([histogram[0], histogram[1].sum])),\n        histograms: histograms.map((histogram) => histogram),\n      };\n    }\n\n    return {\n      name,\n      formattedName,\n      labels: metric,\n      values: values.map(parseValueTuple),\n    };\n  });\n}\n\nfunction buildScalarData(query: string, data: ScalarData, seriesNameFormat: string | undefined): TimeSeries[] {\n  const { name, formattedName } = getFormattedPrometheusSeriesName(query, {}, seriesNameFormat);\n  return [\n    {\n      name,\n      values: [parseValueTuple(data.result)],\n      formattedName,\n    },\n  ];\n}\n\nfunction buildTimeSeries(query: string, data?: InstantQueryResultType, seriesNameFormat?: string): TimeSeries[] {\n  if (!data) {\n    return [];\n  }\n\n  const resultType = data.resultType;\n  switch (resultType) {\n    case 'vector':\n      return buildVectorData(query, data, seriesNameFormat);\n    case 'matrix':\n      return buildMatrixData(query, data, seriesNameFormat);\n    case 'scalar':\n      return buildScalarData(query, data, seriesNameFormat);\n    default:\n      console.warn('Unknown result type', resultType, data);\n      return [];\n  }\n}\n"],"names":["parseDurationString","datasourceSelectValueToSelector","replaceVariables","fromUnixTime","milliseconds","parseValueTuple","getDurationStringSeconds","getPrometheusTimeRange","getRangeStep","DEFAULT_PROM","PROM_DATASOURCE_KIND","getFormattedPrometheusSeriesName","DEFAULT_SCRAPE_INTERVAL","replacePromBuiltinVariables","getTimeSeriesData","spec","context","abortSignal","query","undefined","series","listDatasourceSelectItems","datasourceStore","selectedDatasource","datasource","variableState","getDatasource","datasourceScrapeInterval","Math","trunc","plugin","scrapeInterval","minStep","timeRange","step","suggestedStepMs","start","end","utcOffsetSec","Date","getTimezoneOffset","alignedEnd","floor","alignedStart","console","warn","intervalMs","minStepMs","seriesNameFormat","client","getDatasourceClient","response","mode","instantQuery","time","rangeQuery","result","data","notices","status","warnings","warningMessage","push","type","message","chartData","stepMs","buildTimeSeries","metadata","executedQueryString","buildVectorData","map","res","metric","value","histogram","name","formattedName","labels","values","sum","histograms","buildMatrixData","buildScalarData","resultType"],"mappings":"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"}
+{"version":3,"sources":["../../../../src/plugins/prometheus-time-series-query/get-time-series-data.ts"],"sourcesContent":["// Copyright 2025 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  DatasourceSpec,\n  DurationString,\n  Notice,\n  parseDurationString,\n  TimeSeries,\n  TimeSeriesData,\n} from '@perses-dev/core';\nimport { TimeSeriesQueryPlugin, datasourceSelectValueToSelector, replaceVariables } from '@perses-dev/plugin-system';\nimport { fromUnixTime, milliseconds } from 'date-fns';\nimport {\n  parseValueTuple,\n  PrometheusClient,\n  getDurationStringSeconds,\n  getPrometheusTimeRange,\n  getRangeStep,\n  DEFAULT_PROM,\n  MatrixData,\n  VectorData,\n  ScalarData,\n  InstantQueryResultType,\n  PROM_DATASOURCE_KIND,\n} from '../../model';\nimport { getFormattedPrometheusSeriesName } from '../../utils';\nimport { DEFAULT_SCRAPE_INTERVAL, PrometheusDatasourceSpec } from '../types';\nimport { PrometheusTimeSeriesQuerySpec } from './time-series-query-model';\nimport { replacePromBuiltinVariables } from './replace-prom-builtin-variables';\n\nexport const getTimeSeriesData: TimeSeriesQueryPlugin<PrometheusTimeSeriesQuerySpec>['getTimeSeriesData'] = async (\n  spec,\n  context,\n  abortSignal\n) => {\n  if (spec.query === undefined || spec.query === null || spec.query === '') {\n    // Do not make a request to the backend, instead return an empty TimeSeriesData\n    return { series: [] };\n  }\n\n  const listDatasourceSelectItems = await context.datasourceStore.listDatasourceSelectItems(PROM_DATASOURCE_KIND);\n\n  const selectedDatasource =\n    datasourceSelectValueToSelector(\n      spec.datasource ?? DEFAULT_PROM,\n      context.variableState,\n      listDatasourceSelectItems\n    ) ?? DEFAULT_PROM;\n\n  const datasource = (await context.datasourceStore.getDatasource(\n    selectedDatasource\n  )) as DatasourceSpec<PrometheusDatasourceSpec>;\n  const datasourceScrapeInterval = Math.trunc(\n    milliseconds(parseDurationString(datasource.plugin.spec.scrapeInterval ?? DEFAULT_SCRAPE_INTERVAL)) / 1000\n  );\n\n  // Min step is the lower bound of the interval between data points\n  // If no value is provided for it, it should default to the scrape interval of the datasource\n  const minStep =\n    getDurationStringSeconds(\n      // resolve any variable that may have been provided\n      // TODO add a validation check to make sure the variable is a DurationString, to avoid the back & forth cast here\n      replaceVariables(spec.minStep as string, context.variableState) as DurationString\n    ) ?? datasourceScrapeInterval;\n\n  const timeRange = getPrometheusTimeRange(context.timeRange);\n  const step = getRangeStep(timeRange, minStep, undefined, context.suggestedStepMs); // TODO: resolution\n\n  // Align the time range so that it's a multiple of the step\n  let { start, end } = timeRange;\n\n  const utcOffsetSec = new Date().getTimezoneOffset() * 60;\n\n  const alignedEnd = Math.floor((end + utcOffsetSec) / step) * step - utcOffsetSec;\n  const alignedStart = Math.floor((start + utcOffsetSec) / step) * step - utcOffsetSec;\n  start = alignedStart;\n  end = alignedEnd;\n\n  /* Ensure end is always greater than start:\n     If the step is greater than equal to the diff of end and start,\n     both start, and end will eventually be rounded to the same value,\n     Consequently, the time range will be zero, which does not return any valid value\n  */\n  if (end === start) {\n    end = start + step;\n    console.warn(`Step (${step}) was larger than the time range! end of time range was set accordingly.`);\n  }\n\n  // Replace variable placeholders in PromQL query\n  const intervalMs = step * 1000;\n  const minStepMs = minStep * 1000;\n\n  let query = replacePromBuiltinVariables(spec.query, minStepMs, intervalMs);\n  query = replaceVariables(query, context.variableState);\n\n  let seriesNameFormat = spec.seriesNameFormat;\n  // if series name format is defined, replace variable placeholders in series name format\n  if (seriesNameFormat) {\n    seriesNameFormat = replaceVariables(seriesNameFormat, context.variableState);\n  }\n\n  // Get the datasource, using the default Prom Datasource if one isn't specified in the query\n  const client: PrometheusClient = await context.datasourceStore.getDatasourceClient(selectedDatasource);\n\n  // Make the request to Prom\n\n  let response;\n  switch (context.mode) {\n    case 'instant':\n      response = await client.instantQuery(\n        {\n          query,\n          time: end,\n        },\n        undefined,\n        abortSignal\n      );\n      break;\n    case 'range':\n    default:\n      response = await client.rangeQuery(\n        {\n          query,\n          start,\n          end,\n          step,\n        },\n        undefined,\n        abortSignal\n      );\n      break;\n  }\n\n  // TODO: What about error responses from Prom that have a response body?\n  const result = response.data;\n\n  // Custom display for response header warnings, configurable error responses display coming next\n  const notices: Notice[] = [];\n  if (response.status === 'success') {\n    const warnings = response.warnings ?? [];\n    const warningMessage = warnings[0] ?? '';\n    if (warningMessage !== '') {\n      notices.push({\n        type: 'warning',\n        message: warningMessage,\n      });\n    }\n  }\n\n  // Transform response\n  const chartData: TimeSeriesData = {\n    // Return the time range and step we actually used for the query\n    timeRange: { start: fromUnixTime(start), end: fromUnixTime(end) },\n    stepMs: step * 1000,\n\n    series: buildTimeSeries(query, result, seriesNameFormat),\n    metadata: {\n      notices,\n      executedQueryString: query,\n    },\n  };\n\n  return chartData;\n};\n\nfunction buildVectorData(query: string, data: VectorData, seriesNameFormat: string | undefined): TimeSeries[] {\n  return data.result.map((res) => {\n    const { metric, value, histogram } = res;\n\n    // Account for seriesNameFormat from query editor when determining name to show in legend, tooltip, etc.\n    const { name, formattedName } = getFormattedPrometheusSeriesName(query, metric, seriesNameFormat);\n\n    if (histogram) {\n      return {\n        name,\n        formattedName,\n        labels: metric,\n        values: [parseValueTuple([histogram[0], histogram[1].sum])],\n        histograms: [histogram],\n      };\n    }\n\n    return {\n      name,\n      formattedName,\n      labels: metric,\n      values: [parseValueTuple(value)],\n    };\n  });\n}\n\nfunction buildMatrixData(query: string, data: MatrixData, seriesNameFormat: string | undefined): TimeSeries[] {\n  return data.result.map((res) => {\n    const { metric, values, histograms } = res;\n\n    // Account for seriesNameFormat from query editor when determining name to show in legend, tooltip, etc.\n    const { name, formattedName } = getFormattedPrometheusSeriesName(query, metric, seriesNameFormat);\n\n    if (histograms) {\n      return {\n        name,\n        formattedName,\n        labels: metric,\n        values: histograms.map((histogram) => parseValueTuple([histogram[0], histogram[1].sum])),\n        histograms: histograms.map((histogram) => histogram),\n      };\n    }\n\n    return {\n      name,\n      formattedName,\n      labels: metric,\n      values: values.map(parseValueTuple),\n    };\n  });\n}\n\nfunction buildScalarData(query: string, data: ScalarData, seriesNameFormat: string | undefined): TimeSeries[] {\n  const { name, formattedName } = getFormattedPrometheusSeriesName(query, {}, seriesNameFormat);\n  return [\n    {\n      name,\n      values: [parseValueTuple(data.result)],\n      formattedName,\n    },\n  ];\n}\n\nfunction buildTimeSeries(query: string, data?: InstantQueryResultType, seriesNameFormat?: string): TimeSeries[] {\n  if (!data) {\n    return [];\n  }\n\n  const resultType = data.resultType;\n  switch (resultType) {\n    case 'vector':\n      return buildVectorData(query, data, seriesNameFormat);\n    case 'matrix':\n      return buildMatrixData(query, data, seriesNameFormat);\n    case 'scalar':\n      return buildScalarData(query, data, seriesNameFormat);\n    default:\n      console.warn('Unknown result type', resultType, data);\n      return [];\n  }\n}\n"],"names":["parseDurationString","datasourceSelectValueToSelector","replaceVariables","fromUnixTime","milliseconds","parseValueTuple","getDurationStringSeconds","getPrometheusTimeRange","getRangeStep","DEFAULT_PROM","PROM_DATASOURCE_KIND","getFormattedPrometheusSeriesName","DEFAULT_SCRAPE_INTERVAL","replacePromBuiltinVariables","getTimeSeriesData","spec","context","abortSignal","query","undefined","series","listDatasourceSelectItems","datasourceStore","selectedDatasource","datasource","variableState","getDatasource","datasourceScrapeInterval","Math","trunc","plugin","scrapeInterval","minStep","timeRange","step","suggestedStepMs","start","end","utcOffsetSec","Date","getTimezoneOffset","alignedEnd","floor","alignedStart","console","warn","intervalMs","minStepMs","seriesNameFormat","client","getDatasourceClient","response","mode","instantQuery","time","rangeQuery","result","data","notices","status","warnings","warningMessage","push","type","message","chartData","stepMs","buildTimeSeries","metadata","executedQueryString","buildVectorData","map","res","metric","value","histogram","name","formattedName","labels","values","sum","histograms","buildMatrixData","buildScalarData","resultType"],"mappings":"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"}

package/lib/plugins/prometheus-variables.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prometheus-variables.d.ts","sourceRoot":"","sources":["../../../src/plugins/prometheus-variables.tsx"],"names":[],"mappings":"AAaA,OAAO,EAIL,kBAAkB,EAGlB,cAAc,EACf,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAE,YAAY,EAAyB,MAAM,OAAO,CAAC;AAE5D,OAAO,EAIL,UAAU,EAIV,UAAU,EACX,MAAM,UAAU,CAAC;AAElB,OAAO,EACL,mCAAmC,EACnC,oCAAoC,EACpC,+BAA+B,EAChC,MAAM,SAAS,CAAC;AAEjB,wBAAgB,mCAAmC,CACjD,KAAK,EAAE,kBAAkB,CAAC,oCAAoC,CAAC,GAC9D,YAAY,CA0Dd;AAED,wBAAgB,kCAAkC,CAChD,KAAK,EAAE,kBAAkB,CAAC,mCAAmC,CAAC,GAC7D,YAAY,CA6Cd;AAED,wBAAgB,8BAA8B,CAC5C,KAAK,EAAE,kBAAkB,CAAC,+BAA+B,CAAC,GACzD,YAAY,CA0Ed;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAS/E;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAS/E;AAED;;GAEG;AACH,eAAO,MAAM,4BAA4B,GAAI,SAAS,MAAM,EAAE,KAAG,cAAc,EAM9E,CAAC"}
+{"version":3,"file":"prometheus-variables.d.ts","sourceRoot":"","sources":["../../../src/plugins/prometheus-variables.tsx"],"names":[],"mappings":"AAaA,OAAO,EAIL,kBAAkB,EAGlB,cAAc,EACf,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAE,YAAY,EAAwC,MAAM,OAAO,CAAC;AAE3E,OAAO,EAIL,UAAU,EAIV,UAAU,EACX,MAAM,UAAU,CAAC;AAElB,OAAO,EACL,mCAAmC,EACnC,oCAAoC,EACpC,+BAA+B,EAChC,MAAM,SAAS,CAAC;AAEjB,wBAAgB,mCAAmC,CACjD,KAAK,EAAE,kBAAkB,CAAC,oCAAoC,CAAC,GAC9D,YAAY,CA6Ed;AAED,wBAAgB,kCAAkC,CAChD,KAAK,EAAE,kBAAkB,CAAC,mCAAmC,CAAC,GAC7D,YAAY,CAuDd;AAED,wBAAgB,8BAA8B,CAC5C,KAAK,EAAE,kBAAkB,CAAC,+BAA+B,CAAC,GACzD,YAAY,CAsFd;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAS/E;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAS/E;AAED;;GAEG;AACH,eAAO,MAAM,4BAA4B,GAAI,SAAS,MAAM,EAAE,KAAG,cAAc,EAM9E,CAAC"}

package/lib/plugins/prometheus-variables.js

@@ -1,3 +1,4 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 // Copyright 2024 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,19 +11,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 { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { FormControl, Stack, TextField } from '@mui/material';
 import { DatasourceSelect, isVariableDatasource, useDatasourceClient, useDatasourceSelectValueToSelector } from '@perses-dev/plugin-system';
 import { produce } from 'immer';
-import { useCallback, useState } from 'react';
+import { useCallback } from 'react';
 import { PromQLEditor } from '../components';
 import { DEFAULT_PROM, isDefaultPromSelector, isPrometheusDatasourceSelector, PROM_DATASOURCE_KIND } from '../model';
 import { MatcherEditor } from './MatcherEditor';
 export function PrometheusLabelValuesVariableEditor(props) {
     const { onChange, value, value: { datasource } } = props;
     const selectedDatasource = datasource ?? DEFAULT_PROM;
-    const [labelValue, setLabelValue] = useState(props.value.labelName);
-    const [matchersValues, setMatchersValues] = useState(props.value.matchers ?? []);
     const handleDatasourceChange = useCallback((next)=>{
         if (isVariableDatasource(next) || isPrometheusDatasourceSelector(next)) {
             onChange(produce(value, (draft)=>{
@@ -37,11 +35,21 @@ export function PrometheusLabelValuesVariableEditor(props) {
         value
     ]);
     const handleLabelChange = useCallback((e)=>{
-        setLabelValue(e.target.value);
-    }, []);
-    const handleMatchEditorsChange = useCallback((e)=>{
-        setMatchersValues(e);
-    }, []);
+        onChange(produce(value, (draft)=>{
+            draft.labelName = e.target.value;
+        }));
+    }, [
+        onChange,
+        value
+    ]);
+    const handleMatchEditorsChange = useCallback((matchers)=>{
+        onChange(produce(value, (draft)=>{
+            draft.matchers = matchers;
+        }));
+    }, [
+        onChange,
+        value
+    ]);
     return /*#__PURE__*/ _jsxs(Stack, {
         spacing: 2,
         children: [
@@ -59,14 +67,16 @@ export function PrometheusLabelValuesVariableEditor(props) {
             /*#__PURE__*/ _jsx(TextField, {
                 label: "Label Name",
                 required: true,
-                value: labelValue,
+                value: props.value.labelName,
                 onChange: handleLabelChange,
-                InputProps: {
-                    readOnly: props.isReadonly
+                slotProps: {
+                    input: {
+                        readOnly: props.isReadonly
+                    }
                 }
             }),
             /*#__PURE__*/ _jsx(MatcherEditor, {
-                matchers: matchersValues,
+                matchers: props.value.matchers ?? [],
                 onChange: handleMatchEditorsChange,
                 isReadonly: props.isReadonly
             })
@@ -76,7 +86,6 @@ export function PrometheusLabelValuesVariableEditor(props) {
 export function PrometheusLabelNamesVariableEditor(props) {
     const { onChange, value, value: { datasource } } = props;
     const selectedDatasource = datasource ?? DEFAULT_PROM;
-    const [matchersValues, setMatchersValues] = useState(props.value.matchers ?? []);
     const handleDatasourceChange = useCallback((next)=>{
         if (isVariableDatasource(next) || isPrometheusDatasourceSelector(next)) {
             onChange(produce(value, (draft)=>{
@@ -90,9 +99,14 @@ export function PrometheusLabelNamesVariableEditor(props) {
         onChange,
         value
     ]);
-    const handleMatchEditorChange = useCallback((e)=>{
-        setMatchersValues(e);
-    }, []);
+    const handleMatchEditorChange = useCallback((matchers)=>{
+        onChange(produce(value, (draft)=>{
+            draft.matchers = matchers;
+        }));
+    }, [
+        onChange,
+        value
+    ]);
     return /*#__PURE__*/ _jsxs(Stack, {
         spacing: 2,
         children: [
@@ -108,7 +122,7 @@ export function PrometheusLabelNamesVariableEditor(props) {
                 })
             }),
             /*#__PURE__*/ _jsx(MatcherEditor, {
-                matchers: matchersValues,
+                matchers: props.value.matchers ?? [],
                 isReadonly: props.isReadonly,
                 onChange: handleMatchEditorChange
             })
@@ -121,7 +135,6 @@ export function PrometheusPromQLVariableEditor(props) {
     const selectedDatasource = useDatasourceSelectValueToSelector(datasourceSelectValue, PROM_DATASOURCE_KIND);
     const { data: client } = useDatasourceClient(selectedDatasource);
     const promURL = client?.options.datasourceUrl;
-    const [labelValue, setLabelValue] = useState(props.value.labelName);
     const handleDatasourceChange = useCallback((next)=>{
         if (isVariableDatasource(next) || isPrometheusDatasourceSelector(next)) {
             onChange(produce(value, (draft)=>{
@@ -136,17 +149,21 @@ export function PrometheusPromQLVariableEditor(props) {
         onChange
     ]);
     const handleOnBlurPromQlChange = useCallback((e)=>{
-        onChange({
-            ...value,
-            expr: e.target.textContent ?? ''
-        });
+        onChange(produce(value, (draft)=>{
+            draft.expr = e.target.textContent ?? '';
+        }));
     }, [
         onChange,
         value
     ]);
     const handleLabelNameChange = useCallback((e)=>{
-        setLabelValue(e.target.value);
-    }, []);
+        onChange(produce(value, (draft)=>{
+            draft.labelName = e.target.value;
+        }));
+    }, [
+        onChange,
+        value
+    ]);
     return /*#__PURE__*/ _jsxs(Stack, {
         spacing: 2,
         children: [
@@ -176,9 +193,11 @@ export function PrometheusPromQLVariableEditor(props) {
             /*#__PURE__*/ _jsx(TextField, {
                 label: "Label Name",
                 required: true,
-                value: labelValue,
-                InputProps: {
-                    readOnly: props.isReadonly
+                value: props.value.labelName,
+                slotProps: {
+                    input: {
+                        readOnly: props.isReadonly
+                    }
                 },
                 onChange: handleLabelNameChange
             })

package/lib/plugins/prometheus-variables.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/plugins/prometheus-variables.tsx"],"sourcesContent":["// Copyright 2024 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.\nimport { FormControl, Stack, TextField } from '@mui/material';\nimport {\n  DatasourceSelect,\n  DatasourceSelectProps,\n  isVariableDatasource,\n  OptionsEditorProps,\n  useDatasourceClient,\n  useDatasourceSelectValueToSelector,\n  VariableOption,\n} from '@perses-dev/plugin-system';\nimport { produce } from 'immer';\nimport { ReactElement, useCallback, useState } from 'react';\nimport { PromQLEditor } from '../components';\nimport {\n  DEFAULT_PROM,\n  isDefaultPromSelector,\n  isPrometheusDatasourceSelector,\n  MatrixData,\n  PROM_DATASOURCE_KIND,\n  PrometheusClient,\n  PrometheusDatasourceSelector,\n  VectorData,\n} from '../model';\nimport { MatcherEditor } from './MatcherEditor';\nimport {\n  PrometheusLabelNamesVariableOptions,\n  PrometheusLabelValuesVariableOptions,\n  PrometheusPromQLVariableOptions,\n} from './types';\n\nexport function PrometheusLabelValuesVariableEditor(\n  props: OptionsEditorProps<PrometheusLabelValuesVariableOptions>\n): ReactElement {\n  const {\n    onChange,\n    value,\n    value: { datasource },\n  } = props;\n  const selectedDatasource = datasource ?? DEFAULT_PROM;\n  const [labelValue, setLabelValue] = useState(props.value.labelName);\n  const [matchersValues, setMatchersValues] = useState(props.value.matchers ?? []);\n  const handleDatasourceChange: DatasourceSelectProps['onChange'] = useCallback(\n    (next) => {\n      if (isVariableDatasource(next) || isPrometheusDatasourceSelector(next)) {\n        onChange(\n          produce(value, (draft) => {\n            // If they're using the default, just omit the datasource prop (i.e. set to undefined)\n            draft.datasource = !isVariableDatasource(next) && isDefaultPromSelector(next) ? undefined : next;\n          })\n        );\n        return;\n      }\n\n      throw new Error('Got unexpected non-Prometheus datasource selector');\n    },\n    [onChange, value]\n  );\n\n  const handleLabelChange = useCallback((e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => {\n    setLabelValue(e.target.value);\n  }, []);\n\n  const handleMatchEditorsChange = useCallback((e: string[]) => {\n    setMatchersValues(e);\n  }, []);\n\n  return (\n    <Stack spacing={2}>\n      <FormControl margin=\"dense\">\n        <DatasourceSelect\n          datasourcePluginKind=\"PrometheusDatasource\"\n          value={selectedDatasource}\n          onChange={handleDatasourceChange}\n          readOnly={props.isReadonly}\n          labelId=\"prom-datasource-label\"\n          label=\"Prometheus Datasource\"\n        />\n      </FormControl>\n      <TextField\n        label=\"Label Name\"\n        required\n        value={labelValue}\n        onChange={handleLabelChange}\n        InputProps={{\n          readOnly: props.isReadonly,\n        }}\n      />\n      <MatcherEditor matchers={matchersValues} onChange={handleMatchEditorsChange} isReadonly={props.isReadonly} />\n    </Stack>\n  );\n}\n\nexport function PrometheusLabelNamesVariableEditor(\n  props: OptionsEditorProps<PrometheusLabelNamesVariableOptions>\n): ReactElement {\n  const {\n    onChange,\n    value,\n    value: { datasource },\n  } = props;\n\n  const selectedDatasource = datasource ?? DEFAULT_PROM;\n  const [matchersValues, setMatchersValues] = useState(props.value.matchers ?? []);\n  const handleDatasourceChange: DatasourceSelectProps['onChange'] = useCallback(\n    (next) => {\n      if (isVariableDatasource(next) || isPrometheusDatasourceSelector(next)) {\n        onChange(\n          produce(value, (draft) => {\n            // If they're using the default, just omit the datasource prop (i.e. set to undefined)\n            draft.datasource = !isVariableDatasource(next) && isDefaultPromSelector(next) ? undefined : next;\n          })\n        );\n        return;\n      }\n\n      throw new Error('Got unexpected non-Prometheus datasource selector');\n    },\n    [onChange, value]\n  );\n\n  const handleMatchEditorChange = useCallback((e: string[]) => {\n    setMatchersValues(e);\n  }, []);\n\n  return (\n    <Stack spacing={2}>\n      <FormControl margin=\"dense\">\n        <DatasourceSelect\n          datasourcePluginKind=\"PrometheusDatasource\"\n          value={selectedDatasource}\n          onChange={handleDatasourceChange}\n          disabled={props.isReadonly}\n          labelId=\"prom-datasource-label\"\n          label=\"Prometheus Datasource\"\n        />\n      </FormControl>\n      <MatcherEditor matchers={matchersValues} isReadonly={props.isReadonly} onChange={handleMatchEditorChange} />\n    </Stack>\n  );\n}\n\nexport function PrometheusPromQLVariableEditor(\n  props: OptionsEditorProps<PrometheusPromQLVariableOptions>\n): ReactElement {\n  const {\n    onChange,\n    value,\n    value: { datasource },\n  } = props;\n  const datasourceSelectValue = datasource ?? DEFAULT_PROM;\n  const selectedDatasource = useDatasourceSelectValueToSelector(\n    datasourceSelectValue,\n    PROM_DATASOURCE_KIND\n  ) as PrometheusDatasourceSelector;\n\n  const { data: client } = useDatasourceClient<PrometheusClient>(selectedDatasource);\n  const promURL = client?.options.datasourceUrl;\n  const [labelValue, setLabelValue] = useState(props.value.labelName);\n  const handleDatasourceChange: DatasourceSelectProps['onChange'] = useCallback(\n    (next) => {\n      if (isVariableDatasource(next) || isPrometheusDatasourceSelector(next)) {\n        onChange(\n          produce(value, (draft) => {\n            // If they're using the default, just omit the datasource prop (i.e. set to undefined)\n            draft.datasource = !isVariableDatasource(next) && isDefaultPromSelector(next) ? undefined : next;\n          })\n        );\n        return;\n      }\n\n      throw new Error('Got unexpected non-Prometheus datasource selector');\n    },\n    [value, onChange]\n  );\n\n  const handleOnBlurPromQlChange = useCallback(\n    (e: React.FocusEvent<HTMLDivElement, Element>) => {\n      onChange({ ...value, expr: e.target.textContent ?? '' });\n    },\n    [onChange, value]\n  );\n\n  const handleLabelNameChange = useCallback((e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => {\n    setLabelValue(e.target.value);\n  }, []);\n\n  return (\n    <Stack spacing={2}>\n      <FormControl margin=\"dense\">\n        <DatasourceSelect\n          datasourcePluginKind={PROM_DATASOURCE_KIND}\n          value={datasourceSelectValue}\n          onChange={handleDatasourceChange}\n          labelId=\"prom-datasource-label\"\n          label=\"Prometheus Datasource\"\n          disabled={props.isReadonly}\n        />\n      </FormControl>\n      <PromQLEditor\n        completeConfig={{ remote: { url: promURL } }}\n        value={value.expr}\n        datasource={selectedDatasource}\n        onBlur={handleOnBlurPromQlChange}\n        readOnly={props.isReadonly}\n        width=\"100%\"\n      />\n      <TextField\n        label=\"Label Name\"\n        required\n        value={labelValue}\n        InputProps={{\n          readOnly: props.isReadonly,\n        }}\n        onChange={handleLabelNameChange}\n      />\n    </Stack>\n  );\n}\n\nexport function capturingMatrix(matrix: MatrixData, labelName: string): string[] {\n  const captured = new Set<string>();\n  for (const sample of matrix.result) {\n    const value = sample.metric[labelName];\n    if (value !== undefined) {\n      captured.add(value);\n    }\n  }\n  return Array.from(captured.values());\n}\n\nexport function capturingVector(vector: VectorData, labelName: string): string[] {\n  const captured = new Set<string>();\n  for (const sample of vector.result) {\n    const value = sample.metric[labelName];\n    if (value !== undefined) {\n      captured.add(value);\n    }\n  }\n  return Array.from(captured.values());\n}\n\n/**\n * Takes a list of strings and returns a list of VariableOptions\n */\nexport const stringArrayToVariableOptions = (values?: string[]): VariableOption[] => {\n  if (!values) return [];\n  return values.map((value) => ({\n    value,\n    label: value,\n  }));\n};\n"],"names":["FormControl","Stack","TextField","DatasourceSelect","isVariableDatasource","useDatasourceClient","useDatasourceSelectValueToSelector","produce","useCallback","useState","PromQLEditor","DEFAULT_PROM","isDefaultPromSelector","isPrometheusDatasourceSelector","PROM_DATASOURCE_KIND","MatcherEditor","PrometheusLabelValuesVariableEditor","props","onChange","value","datasource","selectedDatasource","labelValue","setLabelValue","labelName","matchersValues","setMatchersValues","matchers","handleDatasourceChange","next","draft","undefined","Error","handleLabelChange","e","target","handleMatchEditorsChange","spacing","margin","datasourcePluginKind","readOnly","isReadonly","labelId","label","required","InputProps","PrometheusLabelNamesVariableEditor","handleMatchEditorChange","disabled","PrometheusPromQLVariableEditor","datasourceSelectValue","data","client","promURL","options","datasourceUrl","handleOnBlurPromQlChange","expr","textContent","handleLabelNameChange","completeConfig","remote","url","onBlur","width","capturingMatrix","matrix","captured","Set","sample","result","metric","add","Array","from","values","capturingVector","vector","stringArrayToVariableOptions","map"],"mappings":"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"}
+{"version":3,"sources":["../../../src/plugins/prometheus-variables.tsx"],"sourcesContent":["// Copyright 2024 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.\nimport { FormControl, Stack, TextField } from '@mui/material';\nimport {\n  DatasourceSelect,\n  DatasourceSelectProps,\n  isVariableDatasource,\n  OptionsEditorProps,\n  useDatasourceClient,\n  useDatasourceSelectValueToSelector,\n  VariableOption,\n} from '@perses-dev/plugin-system';\nimport { produce } from 'immer';\nimport { ReactElement, useCallback, ChangeEvent, FocusEvent } from 'react';\nimport { PromQLEditor } from '../components';\nimport {\n  DEFAULT_PROM,\n  isDefaultPromSelector,\n  isPrometheusDatasourceSelector,\n  MatrixData,\n  PROM_DATASOURCE_KIND,\n  PrometheusClient,\n  PrometheusDatasourceSelector,\n  VectorData,\n} from '../model';\nimport { MatcherEditor } from './MatcherEditor';\nimport {\n  PrometheusLabelNamesVariableOptions,\n  PrometheusLabelValuesVariableOptions,\n  PrometheusPromQLVariableOptions,\n} from './types';\n\nexport function PrometheusLabelValuesVariableEditor(\n  props: OptionsEditorProps<PrometheusLabelValuesVariableOptions>\n): ReactElement {\n  const {\n    onChange,\n    value,\n    value: { datasource },\n  } = props;\n  const selectedDatasource = datasource ?? DEFAULT_PROM;\n\n  const handleDatasourceChange: DatasourceSelectProps['onChange'] = useCallback(\n    (next) => {\n      if (isVariableDatasource(next) || isPrometheusDatasourceSelector(next)) {\n        onChange(\n          produce(value, (draft) => {\n            // If they're using the default, just omit the datasource prop (i.e. set to undefined)\n            draft.datasource = !isVariableDatasource(next) && isDefaultPromSelector(next) ? undefined : next;\n          })\n        );\n        return;\n      }\n\n      throw new Error('Got unexpected non-Prometheus datasource selector');\n    },\n    [onChange, value]\n  );\n\n  const handleLabelChange = useCallback(\n    (e: ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => {\n      onChange(\n        produce(value, (draft) => {\n          draft.labelName = e.target.value;\n        })\n      );\n    },\n    [onChange, value]\n  );\n\n  const handleMatchEditorsChange = useCallback(\n    (matchers: string[]) => {\n      onChange(\n        produce(value, (draft) => {\n          draft.matchers = matchers;\n        })\n      );\n    },\n    [onChange, value]\n  );\n\n  return (\n    <Stack spacing={2}>\n      <FormControl margin=\"dense\">\n        <DatasourceSelect\n          datasourcePluginKind=\"PrometheusDatasource\"\n          value={selectedDatasource}\n          onChange={handleDatasourceChange}\n          readOnly={props.isReadonly}\n          labelId=\"prom-datasource-label\"\n          label=\"Prometheus Datasource\"\n        />\n      </FormControl>\n      <TextField\n        label=\"Label Name\"\n        required\n        value={props.value.labelName}\n        onChange={handleLabelChange}\n        slotProps={{\n          input: {\n            readOnly: props.isReadonly,\n          },\n        }}\n      />\n      <MatcherEditor\n        matchers={props.value.matchers ?? []}\n        onChange={handleMatchEditorsChange}\n        isReadonly={props.isReadonly}\n      />\n    </Stack>\n  );\n}\n\nexport function PrometheusLabelNamesVariableEditor(\n  props: OptionsEditorProps<PrometheusLabelNamesVariableOptions>\n): ReactElement {\n  const {\n    onChange,\n    value,\n    value: { datasource },\n  } = props;\n\n  const selectedDatasource = datasource ?? DEFAULT_PROM;\n  const handleDatasourceChange: DatasourceSelectProps['onChange'] = useCallback(\n    (next) => {\n      if (isVariableDatasource(next) || isPrometheusDatasourceSelector(next)) {\n        onChange(\n          produce(value, (draft) => {\n            // If they're using the default, just omit the datasource prop (i.e. set to undefined)\n            draft.datasource = !isVariableDatasource(next) && isDefaultPromSelector(next) ? undefined : next;\n          })\n        );\n        return;\n      }\n\n      throw new Error('Got unexpected non-Prometheus datasource selector');\n    },\n    [onChange, value]\n  );\n\n  const handleMatchEditorChange = useCallback(\n    (matchers: string[]) => {\n      onChange(\n        produce(value, (draft) => {\n          draft.matchers = matchers;\n        })\n      );\n    },\n    [onChange, value]\n  );\n\n  return (\n    <Stack spacing={2}>\n      <FormControl margin=\"dense\">\n        <DatasourceSelect\n          datasourcePluginKind=\"PrometheusDatasource\"\n          value={selectedDatasource}\n          onChange={handleDatasourceChange}\n          disabled={props.isReadonly}\n          labelId=\"prom-datasource-label\"\n          label=\"Prometheus Datasource\"\n        />\n      </FormControl>\n      <MatcherEditor\n        matchers={props.value.matchers ?? []}\n        isReadonly={props.isReadonly}\n        onChange={handleMatchEditorChange}\n      />\n    </Stack>\n  );\n}\n\nexport function PrometheusPromQLVariableEditor(\n  props: OptionsEditorProps<PrometheusPromQLVariableOptions>\n): ReactElement {\n  const {\n    onChange,\n    value,\n    value: { datasource },\n  } = props;\n  const datasourceSelectValue = datasource ?? DEFAULT_PROM;\n  const selectedDatasource = useDatasourceSelectValueToSelector(\n    datasourceSelectValue,\n    PROM_DATASOURCE_KIND\n  ) as PrometheusDatasourceSelector;\n\n  const { data: client } = useDatasourceClient<PrometheusClient>(selectedDatasource);\n  const promURL = client?.options.datasourceUrl;\n  const handleDatasourceChange: DatasourceSelectProps['onChange'] = useCallback(\n    (next) => {\n      if (isVariableDatasource(next) || isPrometheusDatasourceSelector(next)) {\n        onChange(\n          produce(value, (draft) => {\n            // If they're using the default, just omit the datasource prop (i.e. set to undefined)\n            draft.datasource = !isVariableDatasource(next) && isDefaultPromSelector(next) ? undefined : next;\n          })\n        );\n        return;\n      }\n\n      throw new Error('Got unexpected non-Prometheus datasource selector');\n    },\n    [value, onChange]\n  );\n\n  const handleOnBlurPromQlChange = useCallback(\n    (e: FocusEvent<HTMLDivElement>) => {\n      onChange(\n        produce(value, (draft) => {\n          draft.expr = e.target.textContent ?? '';\n        })\n      );\n    },\n    [onChange, value]\n  );\n\n  const handleLabelNameChange = useCallback(\n    (e: ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => {\n      onChange(\n        produce(value, (draft) => {\n          draft.labelName = e.target.value;\n        })\n      );\n    },\n    [onChange, value]\n  );\n\n  return (\n    <Stack spacing={2}>\n      <FormControl margin=\"dense\">\n        <DatasourceSelect\n          datasourcePluginKind={PROM_DATASOURCE_KIND}\n          value={datasourceSelectValue}\n          onChange={handleDatasourceChange}\n          labelId=\"prom-datasource-label\"\n          label=\"Prometheus Datasource\"\n          disabled={props.isReadonly}\n        />\n      </FormControl>\n      <PromQLEditor\n        completeConfig={{ remote: { url: promURL } }}\n        value={value.expr}\n        datasource={selectedDatasource}\n        onBlur={handleOnBlurPromQlChange}\n        readOnly={props.isReadonly}\n        width=\"100%\"\n      />\n      <TextField\n        label=\"Label Name\"\n        required\n        value={props.value.labelName}\n        slotProps={{\n          input: {\n            readOnly: props.isReadonly,\n          },\n        }}\n        onChange={handleLabelNameChange}\n      />\n    </Stack>\n  );\n}\n\nexport function capturingMatrix(matrix: MatrixData, labelName: string): string[] {\n  const captured = new Set<string>();\n  for (const sample of matrix.result) {\n    const value = sample.metric[labelName];\n    if (value !== undefined) {\n      captured.add(value);\n    }\n  }\n  return Array.from(captured.values());\n}\n\nexport function capturingVector(vector: VectorData, labelName: string): string[] {\n  const captured = new Set<string>();\n  for (const sample of vector.result) {\n    const value = sample.metric[labelName];\n    if (value !== undefined) {\n      captured.add(value);\n    }\n  }\n  return Array.from(captured.values());\n}\n\n/**\n * Takes a list of strings and returns a list of VariableOptions\n */\nexport const stringArrayToVariableOptions = (values?: string[]): VariableOption[] => {\n  if (!values) return [];\n  return values.map((value) => ({\n    value,\n    label: value,\n  }));\n};\n"],"names":["FormControl","Stack","TextField","DatasourceSelect","isVariableDatasource","useDatasourceClient","useDatasourceSelectValueToSelector","produce","useCallback","PromQLEditor","DEFAULT_PROM","isDefaultPromSelector","isPrometheusDatasourceSelector","PROM_DATASOURCE_KIND","MatcherEditor","PrometheusLabelValuesVariableEditor","props","onChange","value","datasource","selectedDatasource","handleDatasourceChange","next","draft","undefined","Error","handleLabelChange","e","labelName","target","handleMatchEditorsChange","matchers","spacing","margin","datasourcePluginKind","readOnly","isReadonly","labelId","label","required","slotProps","input","PrometheusLabelNamesVariableEditor","handleMatchEditorChange","disabled","PrometheusPromQLVariableEditor","datasourceSelectValue","data","client","promURL","options","datasourceUrl","handleOnBlurPromQlChange","expr","textContent","handleLabelNameChange","completeConfig","remote","url","onBlur","width","capturingMatrix","matrix","captured","Set","sample","result","metric","add","Array","from","values","capturingVector","vector","stringArrayToVariableOptions","map"],"mappings":"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"}

package/lib/plugins/types.d.ts

@@ -6,6 +6,7 @@ export interface PrometheusDatasourceSpec {
     directUrl?: string;
     proxy?: HTTPProxy;
     scrapeInterval?: DurationString;
+    queryParams?: Record<string, string>;
 }
 export interface PrometheusVariableOptionsBase {
     datasource?: DatasourceSelectValue<PrometheusDatasourceSelector>;

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/plugins/types.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAC;AAExD,eAAO,MAAM,uBAAuB,EAAE,cAAqB,CAAC;AAE5D,MAAM,WAAW,wBAAwB;IACvC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC;AAED,MAAM,WAAW,6BAA6B;IAC5C,UAAU,CAAC,EAAE,qBAAqB,CAAC,4BAA4B,CAAC,CAAC;CAClE;AAED,MAAM,MAAM,mCAAmC,GAAG,6BAA6B,GAAG;IAChF,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,oCAAoC,GAAG,6BAA6B,GAAG;IACjF,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,+BAA+B,GAAG,6BAA6B,GAAG;IAE5E,IAAI,EAAE,MAAM,CAAC;IAGb,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/plugins/types.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAC;AAExD,eAAO,MAAM,uBAAuB,EAAE,cAAqB,CAAC;AAE5D,MAAM,WAAW,wBAAwB;IACvC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACtC;AAED,MAAM,WAAW,6BAA6B;IAC5C,UAAU,CAAC,EAAE,qBAAqB,CAAC,4BAA4B,CAAC,CAAC;CAClE;AAED,MAAM,MAAM,mCAAmC,GAAG,6BAA6B,GAAG;IAChF,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,oCAAoC,GAAG,6BAA6B,GAAG;IACjF,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,+BAA+B,GAAG,6BAA6B,GAAG;IAE5E,IAAI,EAAE,MAAM,CAAC;IAGb,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC"}

package/lib/plugins/types.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/plugins/types.ts"],"sourcesContent":["// Copyright 2023 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, HTTPProxy } from '@perses-dev/core';\nimport { DatasourceSelectValue } from '@perses-dev/plugin-system';\nimport { PrometheusDatasourceSelector } from '../model';\n\nexport const DEFAULT_SCRAPE_INTERVAL: DurationString = '1m';\n\nexport interface PrometheusDatasourceSpec {\n  directUrl?: string;\n  proxy?: HTTPProxy;\n  scrapeInterval?: DurationString; // default to 1m\n}\n\nexport interface PrometheusVariableOptionsBase {\n  datasource?: DatasourceSelectValue<PrometheusDatasourceSelector>;\n}\n\nexport type PrometheusLabelNamesVariableOptions = PrometheusVariableOptionsBase & {\n  matchers?: string[];\n};\n\nexport type PrometheusLabelValuesVariableOptions = PrometheusVariableOptionsBase & {\n  labelName: string;\n  matchers?: string[];\n};\n\nexport type PrometheusPromQLVariableOptions = PrometheusVariableOptionsBase & {\n  // expr is the PromQL expression.\n  expr: string;\n  // labelName is the name of the label that will be used after the PromQL query is performed to select the label value.\n  // Note: This field is not part of the Prometheus API.\n  labelName: string;\n};\n"],"names":["DEFAULT_SCRAPE_INTERVAL"],"mappings":"AAAA,oCAAoC;AACpC,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAMjC,OAAO,MAAMA,0BAA0C,KAAK"}
+{"version":3,"sources":["../../../src/plugins/types.ts"],"sourcesContent":["// Copyright 2023 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, HTTPProxy } from '@perses-dev/core';\nimport { DatasourceSelectValue } from '@perses-dev/plugin-system';\nimport { PrometheusDatasourceSelector } from '../model';\n\nexport const DEFAULT_SCRAPE_INTERVAL: DurationString = '1m';\n\nexport interface PrometheusDatasourceSpec {\n  directUrl?: string;\n  proxy?: HTTPProxy;\n  scrapeInterval?: DurationString; // default to 1m\n  queryParams?: Record<string, string>;\n}\n\nexport interface PrometheusVariableOptionsBase {\n  datasource?: DatasourceSelectValue<PrometheusDatasourceSelector>;\n}\n\nexport type PrometheusLabelNamesVariableOptions = PrometheusVariableOptionsBase & {\n  matchers?: string[];\n};\n\nexport type PrometheusLabelValuesVariableOptions = PrometheusVariableOptionsBase & {\n  labelName: string;\n  matchers?: string[];\n};\n\nexport type PrometheusPromQLVariableOptions = PrometheusVariableOptionsBase & {\n  // expr is the PromQL expression.\n  expr: string;\n  // labelName is the name of the label that will be used after the PromQL query is performed to select the label value.\n  // Note: This field is not part of the Prometheus API.\n  labelName: string;\n};\n"],"names":["DEFAULT_SCRAPE_INTERVAL"],"mappings":"AAAA,oCAAoC;AACpC,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAMjC,OAAO,MAAMA,0BAA0C,KAAK"}