@perses-dev/prometheus-plugin 0.45.0 → 0.46.0-rc0

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

@@ -27,7 +27,6 @@ const _model = require("../../model");
 const _utils = require("../../utils");
 const _types = require("../types");
 const getTimeSeriesData = async (spec, context)=>{
-    var _response_data;
     if (spec.query === undefined || spec.query === null || spec.query === '') {
         // Do not make a request to the backend, instead return an empty TimeSeriesData
         return {
@@ -72,15 +71,26 @@ const getTimeSeriesData = async (spec, context)=>{
     // Get the datasource, using the default Prom Datasource if one isn't specified in the query
     const client = await context.datasourceStore.getDatasourceClient((_spec_datasource1 = spec.datasource) !== null && _spec_datasource1 !== void 0 ? _spec_datasource1 : _model.DEFAULT_PROM);
     // Make the request to Prom
-    const response = await client.rangeQuery({
-        query,
-        start,
-        end,
-        step
-    });
-    var _response_data_result;
+    let response;
+    switch(context.mode){
+        case 'instant':
+            response = await client.instantQuery({
+                query,
+                time: end
+            });
+            break;
+        case 'range':
+        default:
+            response = await client.rangeQuery({
+                query,
+                start,
+                end,
+                step
+            });
+            break;
+    }
     // TODO: What about error responses from Prom that have a response body?
-    const result = (_response_data_result = (_response_data = response.data) === null || _response_data === void 0 ? void 0 : _response_data.result) !== null && _response_data_result !== void 0 ? _response_data_result : [];
+    const result = response.data;
     // Custom display for response header warnings, configurable error responses display coming next
     const notices = [];
     if (response.status === 'success') {
@@ -103,17 +113,7 @@ const getTimeSeriesData = async (spec, context)=>{
             end: (0, _datefns.fromUnixTime)(end)
         },
         stepMs: step * 1000,
-        series: result.map((value)=>{
-            const { metric, values } = value;
-            // Account for seriesNameFormat from query editor when determining name to show in legend, tooltip, etc.
-            const { name, formattedName } = (0, _utils.getFormattedPrometheusSeriesName)(query, metric, seriesNameFormat);
-            return {
-                name,
-                values: values.map(_model.parseValueTuple),
-                formattedName,
-                labels: metric
-            };
-        }),
+        series: buildTimeSeries(result, query, seriesNameFormat),
         metadata: {
             notices,
             executedQueryString: query
@@ -121,3 +121,60 @@ const getTimeSeriesData = async (spec, context)=>{
     };
     return chartData;
 };
+function buildVectorData(data, query, seriesNameFormat) {
+    return data.result.map((res)=>{
+        const { metric, value } = res;
+        // Account for seriesNameFormat from query editor when determining name to show in legend, tooltip, etc.
+        const { name, formattedName } = (0, _utils.getFormattedPrometheusSeriesName)(query, metric, seriesNameFormat);
+        return {
+            name,
+            values: [
+                (0, _model.parseValueTuple)(value)
+            ],
+            formattedName,
+            labels: metric
+        };
+    });
+}
+function buildMatrixData(data, query, seriesNameFormat) {
+    return data.result.map((res)=>{
+        const { metric, values } = res;
+        // Account for seriesNameFormat from query editor when determining name to show in legend, tooltip, etc.
+        const { name, formattedName } = (0, _utils.getFormattedPrometheusSeriesName)(query, metric, seriesNameFormat);
+        return {
+            name,
+            values: values.map(_model.parseValueTuple),
+            formattedName,
+            labels: metric
+        };
+    });
+}
+function buildScalarData(data, query, seriesNameFormat) {
+    const { name, formattedName } = (0, _utils.getFormattedPrometheusSeriesName)(query, {}, seriesNameFormat);
+    return [
+        {
+            name,
+            values: [
+                (0, _model.parseValueTuple)(data.result)
+            ],
+            formattedName
+        }
+    ];
+}
+function buildTimeSeries(data, query, seriesNameFormat) {
+    if (!data) {
+        return [];
+    }
+    const resultType = data.resultType;
+    switch(resultType){
+        case 'vector':
+            return buildVectorData(data, query, seriesNameFormat);
+        case 'matrix':
+            return buildMatrixData(data, query, seriesNameFormat);
+        case 'scalar':
+            return buildScalarData(data, query, seriesNameFormat);
+        default:
+            console.warn('Unknown result type', resultType, data);
+            return [];
+    }
+}

package/dist/plugins/prometheus-time-series-query/get-time-series-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-time-series-data.d.ts","sourceRoot":"","sources":["../../../src/plugins/prometheus-time-series-query/get-time-series-data.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAE,qBAAqB,EAAqD,MAAM,2BAA2B,CAAC;AAYrH,OAAO,EAAE,6BAA6B,EAAE,MAAM,2BAA2B,CAAC;AAE1E,eAAO,MAAM,iBAAiB,EAAE,qBAAqB,CAAC,6BAA6B,CAAC,CAAC,mBAAmB,CA0GvG,CAAC"}
+{"version":3,"file":"get-time-series-data.d.ts","sourceRoot":"","sources":["../../../src/plugins/prometheus-time-series-query/get-time-series-data.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,qBAAqB,EAAqD,MAAM,2BAA2B,CAAC;AAerH,OAAO,EAAE,6BAA6B,EAAE,MAAM,2BAA2B,CAAC;AAE1E,eAAO,MAAM,iBAAiB,EAAE,qBAAqB,CAAC,6BAA6B,CAAC,CAAC,mBAAmB,CA0GvG,CAAC"}

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

@@ -17,7 +17,6 @@ import { parseValueTuple, getDurationStringSeconds, getPrometheusTimeRange, getR
 import { getFormattedPrometheusSeriesName } from '../../utils';
 import { DEFAULT_SCRAPE_INTERVAL } from '../types';
 export const getTimeSeriesData = async (spec, context)=>{
-    var _response_data;
     if (spec.query === undefined || spec.query === null || spec.query === '') {
         // Do not make a request to the backend, instead return an empty TimeSeriesData
         return {
@@ -62,15 +61,26 @@ export const getTimeSeriesData = async (spec, context)=>{
     // Get the datasource, using the default Prom Datasource if one isn't specified in the query
     const client = await context.datasourceStore.getDatasourceClient((_spec_datasource1 = spec.datasource) !== null && _spec_datasource1 !== void 0 ? _spec_datasource1 : DEFAULT_PROM);
     // Make the request to Prom
-    const response = await client.rangeQuery({
-        query,
-        start,
-        end,
-        step
-    });
-    var _response_data_result;
+    let response;
+    switch(context.mode){
+        case 'instant':
+            response = await client.instantQuery({
+                query,
+                time: end
+            });
+            break;
+        case 'range':
+        default:
+            response = await client.rangeQuery({
+                query,
+                start,
+                end,
+                step
+            });
+            break;
+    }
     // TODO: What about error responses from Prom that have a response body?
-    const result = (_response_data_result = (_response_data = response.data) === null || _response_data === void 0 ? void 0 : _response_data.result) !== null && _response_data_result !== void 0 ? _response_data_result : [];
+    const result = response.data;
     // Custom display for response header warnings, configurable error responses display coming next
     const notices = [];
     if (response.status === 'success') {
@@ -93,17 +103,7 @@ export const getTimeSeriesData = async (spec, context)=>{
             end: fromUnixTime(end)
         },
         stepMs: step * 1000,
-        series: result.map((value)=>{
-            const { metric, values } = value;
-            // Account for seriesNameFormat from query editor when determining name to show in legend, tooltip, etc.
-            const { name, formattedName } = getFormattedPrometheusSeriesName(query, metric, seriesNameFormat);
-            return {
-                name,
-                values: values.map(parseValueTuple),
-                formattedName,
-                labels: metric
-            };
-        }),
+        series: buildTimeSeries(result, query, seriesNameFormat),
         metadata: {
             notices,
             executedQueryString: query
@@ -111,5 +111,62 @@ export const getTimeSeriesData = async (spec, context)=>{
     };
     return chartData;
 };
+function buildVectorData(data, query, seriesNameFormat) {
+    return data.result.map((res)=>{
+        const { metric, value } = res;
+        // Account for seriesNameFormat from query editor when determining name to show in legend, tooltip, etc.
+        const { name, formattedName } = getFormattedPrometheusSeriesName(query, metric, seriesNameFormat);
+        return {
+            name,
+            values: [
+                parseValueTuple(value)
+            ],
+            formattedName,
+            labels: metric
+        };
+    });
+}
+function buildMatrixData(data, query, seriesNameFormat) {
+    return data.result.map((res)=>{
+        const { metric, values } = res;
+        // Account for seriesNameFormat from query editor when determining name to show in legend, tooltip, etc.
+        const { name, formattedName } = getFormattedPrometheusSeriesName(query, metric, seriesNameFormat);
+        return {
+            name,
+            values: values.map(parseValueTuple),
+            formattedName,
+            labels: metric
+        };
+    });
+}
+function buildScalarData(data, query, seriesNameFormat) {
+    const { name, formattedName } = getFormattedPrometheusSeriesName(query, {}, seriesNameFormat);
+    return [
+        {
+            name,
+            values: [
+                parseValueTuple(data.result)
+            ],
+            formattedName
+        }
+    ];
+}
+function buildTimeSeries(data, query, seriesNameFormat) {
+    if (!data) {
+        return [];
+    }
+    const resultType = data.resultType;
+    switch(resultType){
+        case 'vector':
+            return buildVectorData(data, query, seriesNameFormat);
+        case 'matrix':
+            return buildMatrixData(data, query, seriesNameFormat);
+        case 'scalar':
+            return buildScalarData(data, query, seriesNameFormat);
+        default:
+            console.warn('Unknown result type', resultType, data);
+            return [];
+    }
+}
 
 //# sourceMappingURL=get-time-series-data.js.map

package/dist/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 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 {\n  DatasourceSpec,\n  DurationString,\n  formatDuration,\n  msToPrometheusDuration,\n  Notice,\n  parseDurationString,\n  TimeSeriesData,\n} from '@perses-dev/core';\nimport { TimeSeriesQueryPlugin, replaceTemplateVariables, replaceTemplateVariable } 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} from '../../model';\nimport { getFormattedPrometheusSeriesName } from '../../utils';\nimport { DEFAULT_SCRAPE_INTERVAL, PrometheusDatasourceSpec } from '../types';\nimport { PrometheusTimeSeriesQuerySpec } from './time-series-query-model';\n\nexport const getTimeSeriesData: TimeSeriesQueryPlugin<PrometheusTimeSeriesQuerySpec>['getTimeSeriesData'] = async (\n  spec,\n  context\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 datasource = (await context.datasourceStore.getDatasource(\n    spec.datasource ?? DEFAULT_PROM\n  )) as DatasourceSpec<PrometheusDatasourceSpec>;\n  const datasourceScrapeInterval = Math.trunc(\n    milliseconds(parseDurationString(datasource.plugin.spec.scrapeInterval ?? DEFAULT_SCRAPE_INTERVAL)) / 1000\n  );\n\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      replaceTemplateVariables(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  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  // Replace template variable placeholders in PromQL query\n  const intervalMs = context.suggestedStepMs ?? step * 1000; // Step is in seconds\n  let query = replaceTemplateVariable(spec.query, '__interval_ms', intervalMs.toString());\n  query = replaceTemplateVariable(spec.query, '__interval', formatDuration(msToPrometheusDuration(intervalMs)));\n\n  const scrapeIntervalMs = minStep * 1000;\n  // The $__rate_interval variable is meant to be used in the rate function.\n  // It is defined as max($__interval + Scrape interval, 4 * Scrape interval), where Scrape interval is the Min step setting (a setting per PromQL query),\n  // if any is set, and otherwise the Scrape interval as set in the Prometheus datasource\n  const rateIntervalMs = Math.max(intervalMs + scrapeIntervalMs, 4 * scrapeIntervalMs);\n  query = replaceTemplateVariable(query, '__rate_interval', formatDuration(msToPrometheusDuration(rateIntervalMs)));\n  query = replaceTemplateVariables(query, context.variableState);\n\n  let seriesNameFormat = spec.seriesNameFormat;\n  // if series name format is defined, replace template variable placeholders in series name format\n  if (seriesNameFormat) {\n    seriesNameFormat = replaceTemplateVariables(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(spec.datasource ?? DEFAULT_PROM);\n\n  // Make the request to Prom\n  const response = await client.rangeQuery({\n    query,\n    start,\n    end,\n    step,\n  });\n\n  // TODO: What about error responses from Prom that have a response body?\n  const result = response.data?.result ?? [];\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: result.map((value) => {\n      const { metric, values } = value;\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      return {\n        name,\n        values: values.map(parseValueTuple),\n        formattedName,\n        labels: metric,\n      };\n    }),\n    metadata: {\n      notices,\n      executedQueryString: query,\n    },\n  };\n\n  return chartData;\n};\n"],"names":["formatDuration","msToPrometheusDuration","parseDurationString","replaceTemplateVariables","replaceTemplateVariable","fromUnixTime","milliseconds","parseValueTuple","getDurationStringSeconds","getPrometheusTimeRange","getRangeStep","DEFAULT_PROM","getFormattedPrometheusSeriesName","DEFAULT_SCRAPE_INTERVAL","getTimeSeriesData","spec","context","response","query","undefined","series","datasource","datasourceStore","getDatasource","datasourceScrapeInterval","Math","trunc","plugin","scrapeInterval","minStep","variableState","timeRange","step","suggestedStepMs","start","end","utcOffsetSec","Date","getTimezoneOffset","alignedEnd","floor","alignedStart","intervalMs","toString","scrapeIntervalMs","rateIntervalMs","max","seriesNameFormat","client","getDatasourceClient","rangeQuery","result","data","notices","status","warnings","warningMessage","push","type","message","chartData","stepMs","map","value","metric","values","name","formattedName","labels","metadata","executedQueryString"],"mappings":"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"}
+{"version":3,"sources":["../../../src/plugins/prometheus-time-series-query/get-time-series-data.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 {\n  DatasourceSpec,\n  DurationString,\n  formatDuration,\n  msToPrometheusDuration,\n  Notice,\n  parseDurationString,\n  TimeSeries,\n  TimeSeriesData,\n} from '@perses-dev/core';\nimport { TimeSeriesQueryPlugin, replaceTemplateVariables, replaceTemplateVariable } 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} from '../../model';\nimport { getFormattedPrometheusSeriesName } from '../../utils';\nimport { DEFAULT_SCRAPE_INTERVAL, PrometheusDatasourceSpec } from '../types';\nimport { PrometheusTimeSeriesQuerySpec } from './time-series-query-model';\n\nexport const getTimeSeriesData: TimeSeriesQueryPlugin<PrometheusTimeSeriesQuerySpec>['getTimeSeriesData'] = async (\n  spec,\n  context\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 datasource = (await context.datasourceStore.getDatasource(\n    spec.datasource ?? DEFAULT_PROM\n  )) as DatasourceSpec<PrometheusDatasourceSpec>;\n  const datasourceScrapeInterval = Math.trunc(\n    milliseconds(parseDurationString(datasource.plugin.spec.scrapeInterval ?? DEFAULT_SCRAPE_INTERVAL)) / 1000\n  );\n\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      replaceTemplateVariables(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  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  // Replace template variable placeholders in PromQL query\n  const intervalMs = context.suggestedStepMs ?? step * 1000; // Step is in seconds\n  let query = replaceTemplateVariable(spec.query, '__interval_ms', intervalMs.toString());\n  query = replaceTemplateVariable(spec.query, '__interval', formatDuration(msToPrometheusDuration(intervalMs)));\n\n  const scrapeIntervalMs = minStep * 1000;\n  // The $__rate_interval variable is meant to be used in the rate function.\n  // It is defined as max($__interval + Scrape interval, 4 * Scrape interval), where Scrape interval is the Min step setting (a setting per PromQL query),\n  // if any is set, and otherwise the Scrape interval as set in the Prometheus datasource\n  const rateIntervalMs = Math.max(intervalMs + scrapeIntervalMs, 4 * scrapeIntervalMs);\n  query = replaceTemplateVariable(query, '__rate_interval', formatDuration(msToPrometheusDuration(rateIntervalMs)));\n  query = replaceTemplateVariables(query, context.variableState);\n\n  let seriesNameFormat = spec.seriesNameFormat;\n  // if series name format is defined, replace template variable placeholders in series name format\n  if (seriesNameFormat) {\n    seriesNameFormat = replaceTemplateVariables(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(spec.datasource ?? DEFAULT_PROM);\n\n  // Make the request to Prom\n  let response;\n  switch (context.mode) {\n    case 'instant':\n      response = await client.instantQuery({\n        query,\n        time: end,\n      });\n      break;\n    case 'range':\n    default:\n      response = await client.rangeQuery({\n        query,\n        start,\n        end,\n        step,\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(result, query, seriesNameFormat),\n    metadata: {\n      notices,\n      executedQueryString: query,\n    },\n  };\n\n  return chartData;\n};\n\nfunction buildVectorData(data: VectorData, query: string, seriesNameFormat: string | undefined): TimeSeries[] {\n  return data.result.map((res) => {\n    const { metric, value } = 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    return {\n      name,\n      values: [parseValueTuple(value)],\n      formattedName,\n      labels: metric,\n    };\n  });\n}\n\nfunction buildMatrixData(data: MatrixData, query: string, seriesNameFormat: string | undefined): TimeSeries[] {\n  return data.result.map((res) => {\n    const { metric, values } = 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    return {\n      name,\n      values: values.map(parseValueTuple),\n      formattedName,\n      labels: metric,\n    };\n  });\n}\n\nfunction buildScalarData(data: ScalarData, query: string, 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(\n  data: MatrixData | VectorData | ScalarData | undefined,\n  query: string,\n  seriesNameFormat?: string\n): TimeSeries[] {\n  if (!data) {\n    return [];\n  }\n\n  const resultType = data.resultType;\n\n  switch (resultType) {\n    case 'vector':\n      return buildVectorData(data, query, seriesNameFormat);\n    case 'matrix':\n      return buildMatrixData(data, query, seriesNameFormat);\n    case 'scalar':\n      return buildScalarData(data, query, seriesNameFormat);\n    default:\n      console.warn('Unknown result type', resultType, data);\n      return [];\n  }\n}\n"],"names":["formatDuration","msToPrometheusDuration","parseDurationString","replaceTemplateVariables","replaceTemplateVariable","fromUnixTime","milliseconds","parseValueTuple","getDurationStringSeconds","getPrometheusTimeRange","getRangeStep","DEFAULT_PROM","getFormattedPrometheusSeriesName","DEFAULT_SCRAPE_INTERVAL","getTimeSeriesData","spec","context","query","undefined","series","datasource","datasourceStore","getDatasource","datasourceScrapeInterval","Math","trunc","plugin","scrapeInterval","minStep","variableState","timeRange","step","suggestedStepMs","start","end","utcOffsetSec","Date","getTimezoneOffset","alignedEnd","floor","alignedStart","intervalMs","toString","scrapeIntervalMs","rateIntervalMs","max","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","name","formattedName","values","labels","buildMatrixData","buildScalarData","resultType","console","warn"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@perses-dev/prometheus-plugin",
-  "version": "0.45.0",
+  "version": "0.46.0-rc0",
   "description": "Prometheus plugin for Perses",
   "license": "Apache-2.0",
   "homepage": "https://github.com/perses/perses/blob/main/README.md",
@@ -31,9 +31,9 @@
   "dependencies": {
     "@lezer/highlight": "^1.0.0",
     "@lezer/lr": "^1.2.0",
-    "@perses-dev/components": "0.45.0",
-    "@perses-dev/core": "0.45.0",
-    "@perses-dev/plugin-system": "0.45.0",
+    "@perses-dev/components": "0.46.0-rc0",
+    "@perses-dev/core": "0.46.0-rc0",
+    "@perses-dev/plugin-system": "0.46.0-rc0",
     "@prometheus-io/codemirror-promql": "^0.43.0",
     "@uiw/react-codemirror": "^4.19.1",
     "date-fns": "^2.28.0",

package/plugin.json

@@ -41,7 +41,7 @@
         "pluginType": "TimeSeriesQuery",
         "kind": "PrometheusTimeSeriesQuery",
         "display": {
-          "name": "Prometheus Range Query",
+          "name": "Prometheus Query",
           "description": ""
         }
       },