@perses-dev/prometheus-plugin 0.24.0 → 0.26.0

package/dist/cjs/index.js

@@ -32,3 +32,16 @@ const _prometheusTimeSeriesQuery = require("./plugins/prometheus-time-series-que
 const _variable = require("./plugins/variable");
 const _prometheusVariables = require("./plugins/prometheus-variables");
 const _prometheusDatasource = require("./plugins/prometheus-datasource");
+_exportStar(require("./model/prometheus-client"), exports);
+_exportStar(require("./model/api-types"), exports);
+function _exportStar(from, to) {
+    Object.keys(from).forEach(function(k) {
+        if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) Object.defineProperty(to, k, {
+            enumerable: true,
+            get: function() {
+                return from[k];
+            }
+        });
+    });
+    return from;
+}

package/dist/cjs/model/prometheus-client.js

@@ -24,7 +24,8 @@ _export(exports, {
     instantQuery: ()=>instantQuery,
     rangeQuery: ()=>rangeQuery,
     labelNames: ()=>labelNames,
-    labelValues: ()=>labelValues
+    labelValues: ()=>labelValues,
+    fetchResults: ()=>fetchResults
 });
 const _core = require("@perses-dev/core");
 function instantQuery(params, queryOptions) {
@@ -63,7 +64,7 @@ function fetchWithPost(apiURI, params, queryOptions) {
         },
         body: createSearchParams(params)
     };
-    return (0, _core.fetchJson)(url, init);
+    return fetchResults(url, init);
 }
 /**
  * Creates URLSearchParams from a request params object.
@@ -86,3 +87,11 @@ function fetchWithPost(apiURI, params, queryOptions) {
     }
     return searchParams;
 }
+async function fetchResults(...args) {
+    const response = await (0, _core.fetch)(...args);
+    const json = await response.json();
+    return {
+        ...json,
+        rawResponse: response
+    };
+}

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

@@ -22,7 +22,7 @@ const _model = require("../model");
 /**
  * Creates a PrometheusClient for a specific datasource spec.
  */ const createClient = (spec, options)=>{
-    const { direct_url , headers  } = spec;
+    const { direct_url , headers: specHeaders  } = spec;
     const { proxyUrl  } = options;
     // Use the direct URL if specified, but fallback to the proxyUrl by default if not specified
     const datasourceUrl = direct_url !== null && direct_url !== void 0 ? direct_url : proxyUrl;
@@ -34,21 +34,21 @@ const _model = require("../model");
         options: {
             datasourceUrl
         },
-        instantQuery: (params)=>(0, _model.instantQuery)(params, {
+        instantQuery: (params, headers)=>(0, _model.instantQuery)(params, {
                 datasourceUrl,
-                headers
+                headers: headers !== null && headers !== void 0 ? headers : specHeaders
             }),
-        rangeQuery: (params)=>(0, _model.rangeQuery)(params, {
+        rangeQuery: (params, headers)=>(0, _model.rangeQuery)(params, {
                 datasourceUrl,
-                headers
+                headers: headers !== null && headers !== void 0 ? headers : specHeaders
             }),
-        labelNames: (params)=>(0, _model.labelNames)(params, {
+        labelNames: (params, headers)=>(0, _model.labelNames)(params, {
                 datasourceUrl,
-                headers
+                headers: headers !== null && headers !== void 0 ? headers : specHeaders
             }),
-        labelValues: (params)=>(0, _model.labelValues)(params, {
+        labelValues: (params, headers)=>(0, _model.labelValues)(params, {
                 datasourceUrl,
-                headers
+                headers: headers !== null && headers !== void 0 ? headers : specHeaders
             })
     };
 };

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

@@ -55,6 +55,20 @@ const getTimeSeriesData = async (spec, context)=>{
     var ref1;
     // TODO: What about error responses from Prom that have a response body?
     const result = (ref1 = (ref = response.data) === null || ref === void 0 ? void 0 : ref.result) !== null && ref1 !== void 0 ? ref1 : [];
+    // Custom display for response header warnings, configurable error responses display coming next
+    const notices = [];
+    if (response.status === 'success') {
+        var _warnings;
+        const warnings = (_warnings = response.warnings) !== null && _warnings !== void 0 ? _warnings : [];
+        var ref2;
+        const warningMessage = (ref2 = warnings[0]) !== null && ref2 !== void 0 ? ref2 : '';
+        if (warningMessage !== '') {
+            notices.push({
+                type: 'warning',
+                message: warningMessage
+            });
+        }
+    }
     // Transform response
     const chartData = {
         // Return the time range and step we actually used for the query
@@ -65,20 +79,18 @@ const getTimeSeriesData = async (spec, context)=>{
         stepMs: step * 1000,
         series: result.map((value)=>{
             const { metric , values  } = value;
-            // Name the series after the metric labels or if no metric, use the query
-            let name = (0, _utils.getUniqueKeyForPrometheusResult)(metric);
-            if (name === '') {
-                name = query;
-            }
-            // query editor allows you to define an optional series_name_format
-            // property to customize legend and tooltip display
-            const formattedName = spec.series_name_format ? (0, _utils.formatSeriesName)(spec.series_name_format, metric) : name;
+            // Account for series_name_format from query editor when determining name to show in legend, tooltip, etc.
+            const { name , formattedName  } = (0, _utils.getFormattedPrometheusSeriesName)(query, metric, spec.series_name_format);
             return {
                 name,
                 values: values.map(_model.parseValueTuple),
-                formattedName
+                formattedName,
+                labels: metric
             };
-        })
+        }),
+        metadata: {
+            notices
+        }
     };
     return chartData;
 };

package/dist/cjs/utils/utils.js

@@ -25,8 +25,10 @@ _export(exports, {
     replaceTemplateVariable: ()=>replaceTemplateVariable,
     parseTemplateVariables: ()=>parseTemplateVariables,
     formatSeriesName: ()=>formatSeriesName,
-    getUniqueKeyForPrometheusResult: ()=>getUniqueKeyForPrometheusResult
+    getUniqueKeyForPrometheusResult: ()=>getUniqueKeyForPrometheusResult,
+    getFormattedPrometheusSeriesName: ()=>getFormattedPrometheusSeriesName
 });
+const _core = require("@perses-dev/core");
 function replaceTemplateVariables(text, variableState) {
     const variables = parseTemplateVariables(text);
     let finalText = text;
@@ -102,3 +104,22 @@ function getUniqueKeyForPrometheusResult(metricLabels, { removeExprWrap  } = {})
     }
     return '';
 }
+function getFormattedPrometheusSeriesName(query, metric, formatter) {
+    if ((0, _core.isEmptyObject)(metric)) {
+        return {
+            name: query
+        };
+    }
+    // Name the series after the metric labels or if no metric, use the query
+    let name = getUniqueKeyForPrometheusResult(metric);
+    if (name === '') {
+        name = query;
+    }
+    // Query editor allows you to define an optional series_name_format
+    // property to customize legend and tooltip display
+    const formattedName = formatter ? formatSeriesName(formatter, metric) : name;
+    return {
+        name,
+        formattedName
+    };
+}

package/dist/index.d.ts

@@ -3,4 +3,6 @@ import { StaticListVariable } from './plugins/variable';
 import { PrometheusLabelNamesVariable, PrometheusLabelValuesVariable, PrometheusPromQLVariable } from './plugins/prometheus-variables';
 import { PrometheusDatasource } from './plugins/prometheus-datasource';
 export { PrometheusTimeSeriesQuery, StaticListVariable, PrometheusLabelNamesVariable, PrometheusLabelValuesVariable, PrometheusPromQLVariable, PrometheusDatasource, };
+export * from './model/prometheus-client';
+export * from './model/api-types';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,yBAAyB,EAAE,MAAM,wCAAwC,CAAC;AAEnF,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EACL,4BAA4B,EAC5B,6BAA6B,EAC7B,wBAAwB,EACzB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAGvE,OAAO,EACL,yBAAyB,EACzB,kBAAkB,EAClB,4BAA4B,EAC5B,6BAA6B,EAC7B,wBAAwB,EACxB,oBAAoB,GACrB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,yBAAyB,EAAE,MAAM,wCAAwC,CAAC;AAEnF,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EACL,4BAA4B,EAC5B,6BAA6B,EAC7B,wBAAwB,EACzB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAGvE,OAAO,EACL,yBAAyB,EACzB,kBAAkB,EAClB,4BAA4B,EAC5B,6BAA6B,EAC7B,wBAAwB,EACxB,oBAAoB,GACrB,CAAC;AAGF,cAAc,2BAA2B,CAAC;AAC1C,cAAc,mBAAmB,CAAC"}

package/dist/index.js

@@ -17,5 +17,8 @@ import { PrometheusLabelNamesVariable, PrometheusLabelValuesVariable, Prometheus
 import { PrometheusDatasource } from './plugins/prometheus-datasource';
 // Export plugins under the same name as the kinds they handle from the plugin.json
 export { PrometheusTimeSeriesQuery, StaticListVariable, PrometheusLabelNamesVariable, PrometheusLabelValuesVariable, PrometheusPromQLVariable, PrometheusDatasource };
+// For consumers to leverage in DatasourceStoreProvider onCreate
+export * from './model/prometheus-client';
+export * from './model/api-types';
 
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.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 { PrometheusTimeSeriesQuery } from './plugins/prometheus-time-series-query';\n// @TODO: Move this to a more generic location;\nimport { StaticListVariable } from './plugins/variable';\nimport {\n  PrometheusLabelNamesVariable,\n  PrometheusLabelValuesVariable,\n  PrometheusPromQLVariable,\n} from './plugins/prometheus-variables';\nimport { PrometheusDatasource } from './plugins/prometheus-datasource';\n\n// Export plugins under the same name as the kinds they handle from the plugin.json\nexport {\n  PrometheusTimeSeriesQuery,\n  StaticListVariable,\n  PrometheusLabelNamesVariable,\n  PrometheusLabelValuesVariable,\n  PrometheusPromQLVariable,\n  PrometheusDatasource,\n};\n"],"names":["PrometheusTimeSeriesQuery","StaticListVariable","PrometheusLabelNamesVariable","PrometheusLabelValuesVariable","PrometheusPromQLVariable","PrometheusDatasource"],"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;AAEjC,SAASA,yBAAyB,QAAQ,wCAAwC,CAAC;AACnF,+CAA+C;AAC/C,SAASC,kBAAkB,QAAQ,oBAAoB,CAAC;AACxD,SACEC,4BAA4B,EAC5BC,6BAA6B,EAC7BC,wBAAwB,QACnB,gCAAgC,CAAC;AACxC,SAASC,oBAAoB,QAAQ,iCAAiC,CAAC;AAEvE,mFAAmF;AACnF,SACEL,yBAAyB,EACzBC,kBAAkB,EAClBC,4BAA4B,EAC5BC,6BAA6B,EAC7BC,wBAAwB,EACxBC,oBAAoB,GACpB"}
+{"version":3,"sources":["../src/index.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 { PrometheusTimeSeriesQuery } from './plugins/prometheus-time-series-query';\n// @TODO: Move this to a more generic location;\nimport { StaticListVariable } from './plugins/variable';\nimport {\n  PrometheusLabelNamesVariable,\n  PrometheusLabelValuesVariable,\n  PrometheusPromQLVariable,\n} from './plugins/prometheus-variables';\nimport { PrometheusDatasource } from './plugins/prometheus-datasource';\n\n// Export plugins under the same name as the kinds they handle from the plugin.json\nexport {\n  PrometheusTimeSeriesQuery,\n  StaticListVariable,\n  PrometheusLabelNamesVariable,\n  PrometheusLabelValuesVariable,\n  PrometheusPromQLVariable,\n  PrometheusDatasource,\n};\n\n// For consumers to leverage in DatasourceStoreProvider onCreate\nexport * from './model/prometheus-client';\nexport * from './model/api-types';\n"],"names":["PrometheusTimeSeriesQuery","StaticListVariable","PrometheusLabelNamesVariable","PrometheusLabelValuesVariable","PrometheusPromQLVariable","PrometheusDatasource"],"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;AAEjC,SAASA,yBAAyB,QAAQ,wCAAwC,CAAC;AACnF,+CAA+C;AAC/C,SAASC,kBAAkB,QAAQ,oBAAoB,CAAC;AACxD,SACEC,4BAA4B,EAC5BC,6BAA6B,EAC7BC,wBAAwB,QACnB,gCAAgC,CAAC;AACxC,SAASC,oBAAoB,QAAQ,iCAAiC,CAAC;AAEvE,mFAAmF;AACnF,SACEL,yBAAyB,EACzBC,kBAAkB,EAClBC,4BAA4B,EAC5BC,6BAA6B,EAC7BC,wBAAwB,EACxBC,oBAAoB,GACpB;AAEF,gEAAgE;AAChE,cAAc,2BAA2B,CAAC;AAC1C,cAAc,mBAAmB,CAAC"}

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

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

package/dist/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":"AAaA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,YAAY,EAAE,cAAc,EAAE,CAAC;AAE/B,MAAM,WAAW,eAAe,CAAC,CAAC;IAChC,MAAM,EAAE,SAAS,CAAC;IAClB,IAAI,EAAE,CAAC,CAAC;IACR,WAAW,CAAC,EAAE,QAAQ,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAED,MAAM,WAAW,aAAa,CAAC,CAAC;IAC9B,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,CAAC,EAAE,CAAC,CAAC;IACT,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,oBAAY,WAAW,CAAC,CAAC,IAAI,eAAe,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;AAEnE,oBAAY,eAAe,GAAG,MAAM,CAAC;AAErC,oBAAY,oBAAoB,GAAG,MAAM,CAAC;AAE1C,oBAAY,UAAU,GAAG,CAAC,eAAe,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;AAEtF,oBAAY,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAE5C,MAAM,WAAW,UAAU;IACzB,UAAU,EAAE,QAAQ,CAAC;IACrB,MAAM,EAAE,KAAK,CAAC;QACZ,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,UAAU,CAAC;KACnB,CAAC,CAAC;CACJ;AAED,MAAM,WAAW,UAAU;IACzB,UAAU,EAAE,QAAQ,CAAC;IACrB,MAAM,EAAE,KAAK,CAAC;QACZ,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,UAAU,EAAE,CAAC;KACtB,CAAC,CAAC;CACJ;AAED,MAAM,WAAW,UAAU;IACzB,UAAU,EAAE,QAAQ,CAAC;IACrB,MAAM,EAAE,UAAU,CAAC;CACpB;AAED,MAAM,WAAW,6BAA6B;IAC5C,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,oBAAoB,CAAC;IAC5B,OAAO,CAAC,EAAE,cAAc,CAAC;CAC1B;AAED,oBAAY,oBAAoB,GAAG,WAAW,CAAC,UAAU,GAAG,UAAU,GAAG,UAAU,CAAC,CAAC;AAErF,MAAM,WAAW,2BAA2B;IAC1C,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,oBAAoB,CAAC;IAC5B,GAAG,EAAE,oBAAoB,CAAC;IAC1B,IAAI,EAAE,eAAe,CAAC;IACtB,OAAO,CAAC,EAAE,cAAc,CAAC;CAC1B;AAED,oBAAY,kBAAkB,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;AAEzD,MAAM,WAAW,uBAAuB;IACtC,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,KAAK,EAAE,oBAAoB,CAAC;IAC5B,GAAG,EAAE,oBAAoB,CAAC;CAC3B;AAED,oBAAY,cAAc,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;AAEnD,MAAM,WAAW,2BAA2B;IAC1C,KAAK,CAAC,EAAE,oBAAoB,CAAC;IAC7B,GAAG,CAAC,EAAE,oBAAoB,CAAC;IAC3B,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB;AAED,oBAAY,kBAAkB,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;AAEvD,MAAM,WAAW,4BAA4B;IAC3C,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,oBAAoB,CAAC;IAC7B,GAAG,CAAC,EAAE,oBAAoB,CAAC;IAC3B,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB;AAED,oBAAY,mBAAmB,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;AAExD,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,+BAA+B;IAC9C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,oBAAY,sBAAsB,GAAG,WAAW,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/model/api-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 } from '@perses-dev/core';\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}\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 Metric = Record<string, string>;\n\nexport interface VectorData {\n  resultType: 'vector';\n  result: Array<{\n    metric: Metric;\n    value: ValueTuple;\n  }>;\n}\n\nexport interface MatrixData {\n  resultType: 'matrix';\n  result: Array<{\n    metric: Metric;\n    values: ValueTuple[];\n  }>;\n}\n\nexport interface ScalarData {\n  resultType: 'scalar';\n  result: ValueTuple;\n}\n\nexport interface InstantQueryRequestParameters {\n  query: string;\n  time?: UnixTimestampSeconds;\n  timeout?: DurationString;\n}\n\nexport type InstantQueryResponse = ApiResponse<MatrixData | VectorData | ScalarData>;\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}\n\nexport type SeriesResponse = ApiResponse<Metric[]>;\n\nexport interface LabelNamesRequestParameters {\n  start?: UnixTimestampSeconds;\n  end?: UnixTimestampSeconds;\n  'match[]'?: string[];\n}\n\nexport type LabelNamesResponse = ApiResponse<string[]>;\n\nexport interface LabelValuesRequestParameters {\n  labelName: string;\n  start?: UnixTimestampSeconds;\n  end?: UnixTimestampSeconds;\n  'match[]'?: string[];\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"],"names":[],"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;AAEjC,WAuGmF"}
+{"version":3,"sources":["../../src/model/api-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 } from '@perses-dev/core';\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 Metric = Record<string, string>;\n\nexport interface VectorData {\n  resultType: 'vector';\n  result: Array<{\n    metric: Metric;\n    value: ValueTuple;\n  }>;\n}\n\nexport interface MatrixData {\n  resultType: 'matrix';\n  result: Array<{\n    metric: Metric;\n    values: ValueTuple[];\n  }>;\n}\n\nexport interface ScalarData {\n  resultType: 'scalar';\n  result: ValueTuple;\n}\n\nexport interface InstantQueryRequestParameters {\n  query: string;\n  time?: UnixTimestampSeconds;\n  timeout?: DurationString;\n}\n\nexport type InstantQueryResponse = ApiResponse<MatrixData | VectorData | ScalarData>;\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}\n\nexport type SeriesResponse = ApiResponse<Metric[]>;\n\nexport interface LabelNamesRequestParameters {\n  start?: UnixTimestampSeconds;\n  end?: UnixTimestampSeconds;\n  'match[]'?: string[];\n}\n\nexport type LabelNamesResponse = ApiResponse<string[]>;\n\nexport interface LabelValuesRequestParameters {\n  labelName: string;\n  start?: UnixTimestampSeconds;\n  end?: UnixTimestampSeconds;\n  'match[]'?: string[];\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"],"names":[],"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;AAEjC,WAwGmF"}

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

@@ -1,15 +1,16 @@
 import { RequestHeaders } from '@perses-dev/core';
+import { DatasourceClient } from '@perses-dev/plugin-system';
 import { InstantQueryRequestParameters, InstantQueryResponse, LabelNamesRequestParameters, LabelNamesResponse, LabelValuesRequestParameters, LabelValuesResponse, RangeQueryRequestParameters, RangeQueryResponse } from './api-types';
 interface PrometheusClientOptions {
     datasourceUrl: string;
     headers?: RequestHeaders;
 }
-export interface PrometheusClient {
+export interface PrometheusClient extends DatasourceClient {
     options: PrometheusClientOptions;
-    instantQuery(params: InstantQueryRequestParameters): Promise<InstantQueryResponse>;
-    rangeQuery(params: RangeQueryRequestParameters): Promise<RangeQueryResponse>;
-    labelNames(params: LabelNamesRequestParameters): Promise<LabelNamesResponse>;
-    labelValues(params: LabelValuesRequestParameters): Promise<LabelValuesResponse>;
+    instantQuery(params: InstantQueryRequestParameters, headers?: RequestHeaders): Promise<InstantQueryResponse>;
+    rangeQuery(params: RangeQueryRequestParameters, headers?: RequestHeaders): Promise<RangeQueryResponse>;
+    labelNames(params: LabelNamesRequestParameters, headers?: RequestHeaders): Promise<LabelNamesResponse>;
+    labelValues(params: LabelValuesRequestParameters, headers?: RequestHeaders): Promise<LabelValuesResponse>;
 }
 export interface QueryOptions {
     datasourceUrl: string;
@@ -18,18 +19,30 @@ export interface QueryOptions {
 /**
  * Calls the `/api/v1/query` endpoint to get metrics data.
  */
-export declare function instantQuery(params: InstantQueryRequestParameters, queryOptions: QueryOptions): Promise<InstantQueryResponse>;
+export declare function instantQuery(params: InstantQueryRequestParameters, queryOptions: QueryOptions): Promise<InstantQueryResponse & {
+    rawResponse: Response;
+}>;
 /**
  * Calls the `/api/v1/query_range` endpoint to get metrics data.
  */
-export declare function rangeQuery(params: RangeQueryRequestParameters, queryOptions: QueryOptions): Promise<RangeQueryResponse>;
+export declare function rangeQuery(params: RangeQueryRequestParameters, queryOptions: QueryOptions): Promise<RangeQueryResponse & {
+    rawResponse: Response;
+}>;
 /**
  * Calls the `/api/v1/labels` endpoint to get a list of label names.
  */
-export declare function labelNames(params: LabelNamesRequestParameters, queryOptions: QueryOptions): Promise<LabelNamesResponse>;
+export declare function labelNames(params: LabelNamesRequestParameters, queryOptions: QueryOptions): Promise<LabelNamesResponse & {
+    rawResponse: Response;
+}>;
 /**
  * Calls the `/api/v1/label/{labelName}/values` endpoint to get a list of values for a label.
  */
 export declare function labelValues(params: LabelValuesRequestParameters, queryOptions: QueryOptions): Promise<LabelValuesResponse>;
+/**
+ * Fetch JSON and parse warnings for query inspector
+ */
+export declare function fetchResults<T>(...args: Parameters<typeof global.fetch>): Promise<T & {
+    rawResponse: Response;
+}>;
 export {};
 //# sourceMappingURL=prometheus-client.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"prometheus-client.d.ts","sourceRoot":"","sources":["../../src/model/prometheus-client.ts"],"names":[],"mappings":"AAaA,OAAO,EAAa,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EACL,6BAA6B,EAC7B,oBAAoB,EACpB,2BAA2B,EAC3B,kBAAkB,EAClB,4BAA4B,EAC5B,mBAAmB,EACnB,2BAA2B,EAC3B,kBAAkB,EACnB,MAAM,aAAa,CAAC;AAErB,UAAU,uBAAuB;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,cAAc,CAAC;CAC1B;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,uBAAuB,CAAC;IACjC,YAAY,CAAC,MAAM,EAAE,6BAA6B,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACnF,UAAU,CAAC,MAAM,EAAE,2BAA2B,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAC7E,UAAU,CAAC,MAAM,EAAE,2BAA2B,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAC7E,WAAW,CAAC,MAAM,EAAE,4BAA4B,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;CACjF;AAED,MAAM,WAAW,YAAY;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,cAAc,CAAC;CAC1B;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,6BAA6B,EAAE,YAAY,EAAE,YAAY,iCAE7F;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,2BAA2B,EAAE,YAAY,EAAE,YAAY,+BAEzF;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,2BAA2B,EAAE,YAAY,EAAE,YAAY,+BAEzF;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,4BAA4B,EAAE,YAAY,EAAE,YAAY,gCAI3F"}
+{"version":3,"file":"prometheus-client.d.ts","sourceRoot":"","sources":["../../src/model/prometheus-client.ts"],"names":[],"mappings":"AAaA,OAAO,EAAoB,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EACL,6BAA6B,EAC7B,oBAAoB,EACpB,2BAA2B,EAC3B,kBAAkB,EAClB,4BAA4B,EAC5B,mBAAmB,EACnB,2BAA2B,EAC3B,kBAAkB,EACnB,MAAM,aAAa,CAAC;AAErB,UAAU,uBAAuB;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,cAAc,CAAC;CAC1B;AAED,MAAM,WAAW,gBAAiB,SAAQ,gBAAgB;IACxD,OAAO,EAAE,uBAAuB,CAAC;IACjC,YAAY,CAAC,MAAM,EAAE,6BAA6B,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAC7G,UAAU,CAAC,MAAM,EAAE,2BAA2B,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACvG,UAAU,CAAC,MAAM,EAAE,2BAA2B,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACvG,WAAW,CAAC,MAAM,EAAE,4BAA4B,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;CAC3G;AAED,MAAM,WAAW,YAAY;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,cAAc,CAAC;CAC1B;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,6BAA6B,EAAE,YAAY,EAAE,YAAY;;GAE7F;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,2BAA2B,EAAE,YAAY,EAAE,YAAY;;GAEzF;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,2BAA2B,EAAE,YAAY,EAAE,YAAY;;GAEzF;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,4BAA4B,EAAE,YAAY,EAAE,YAAY,gCAI3F;AA+DD;;GAEG;AACH,wBAAsB,YAAY,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,UAAU,CAAC,OAAO,MAAM,CAAC,KAAK,CAAC;;GAI7E"}

package/dist/model/prometheus-client.js

@@ -10,7 +10,7 @@
 // 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 { fetchJson } from '@perses-dev/core';
+import { fetch, fetchJson } from '@perses-dev/core';
 /**
  * Calls the `/api/v1/query` endpoint to get metrics data.
  */ export function instantQuery(params, queryOptions) {
@@ -55,7 +55,7 @@ function fetchWithPost(apiURI, params, queryOptions) {
         },
         body: createSearchParams(params)
     };
-    return fetchJson(url, init);
+    return fetchResults(url, init);
 }
 /**
  * Creates URLSearchParams from a request params object.
@@ -78,5 +78,15 @@ 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/dist/model/prometheus-client.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/model/prometheus-client.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 { fetchJson, RequestHeaders } from '@perses-dev/core';\nimport {\n  InstantQueryRequestParameters,\n  InstantQueryResponse,\n  LabelNamesRequestParameters,\n  LabelNamesResponse,\n  LabelValuesRequestParameters,\n  LabelValuesResponse,\n  RangeQueryRequestParameters,\n  RangeQueryResponse,\n} from './api-types';\n\ninterface PrometheusClientOptions {\n  datasourceUrl: string;\n  headers?: RequestHeaders;\n}\n\nexport interface PrometheusClient {\n  options: PrometheusClientOptions;\n  instantQuery(params: InstantQueryRequestParameters): Promise<InstantQueryResponse>;\n  rangeQuery(params: RangeQueryRequestParameters): Promise<RangeQueryResponse>;\n  labelNames(params: LabelNamesRequestParameters): Promise<LabelNamesResponse>;\n  labelValues(params: LabelValuesRequestParameters): Promise<LabelValuesResponse>;\n}\n\nexport interface QueryOptions {\n  datasourceUrl: string;\n  headers?: RequestHeaders;\n}\n\n/**\n * Calls the `/api/v1/query` endpoint to get metrics data.\n */\nexport function instantQuery(params: InstantQueryRequestParameters, queryOptions: QueryOptions) {\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(params: RangeQueryRequestParameters, queryOptions: QueryOptions) {\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(params: LabelNamesRequestParameters, queryOptions: QueryOptions) {\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(params: LabelValuesRequestParameters, queryOptions: QueryOptions) {\n  const { labelName, ...searchParams } = params;\n  const apiURI = `/api/v1/label/${encodeURIComponent(labelName)}/values`;\n  return fetchWithGet<typeof searchParams, LabelValuesResponse>(apiURI, searchParams, queryOptions);\n}\n\nfunction fetchWithGet<T extends RequestParams<T>, TResponse>(apiURI: string, params: T, queryOptions: QueryOptions) {\n  const { datasourceUrl } = queryOptions;\n\n  let url = `${datasourceUrl}${apiURI}`;\n  const urlParams = createSearchParams(params).toString();\n  if (urlParams !== '') {\n    url += `?${urlParams}`;\n  }\n  return fetchJson<TResponse>(url, { method: 'GET' });\n}\n\nfunction fetchWithPost<T extends RequestParams<T>, TResponse>(apiURI: string, params: T, queryOptions: QueryOptions) {\n  const { datasourceUrl, headers } = queryOptions;\n\n  const url = `${datasourceUrl}${apiURI}`;\n  const init = {\n    method: 'POST',\n    headers: {\n      'Content-Type': 'application/x-www-form-urlencoded',\n      ...headers,\n    },\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) {\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":["fetchJson","instantQuery","params","queryOptions","fetchWithPost","rangeQuery","labelNames","labelValues","labelName","searchParams","apiURI","encodeURIComponent","fetchWithGet","datasourceUrl","url","urlParams","createSearchParams","toString","method","headers","init","body","URLSearchParams","key","value","undefined","append","val"],"mappings":"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"}
+{"version":3,"sources":["../../src/model/prometheus-client.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 { 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  RangeQueryRequestParameters,\n  RangeQueryResponse,\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(params: InstantQueryRequestParameters, headers?: RequestHeaders): Promise<InstantQueryResponse>;\n  rangeQuery(params: RangeQueryRequestParameters, headers?: RequestHeaders): Promise<RangeQueryResponse>;\n  labelNames(params: LabelNamesRequestParameters, headers?: RequestHeaders): Promise<LabelNamesResponse>;\n  labelValues(params: LabelValuesRequestParameters, headers?: RequestHeaders): Promise<LabelValuesResponse>;\n}\n\nexport interface QueryOptions {\n  datasourceUrl: string;\n  headers?: RequestHeaders;\n}\n\n/**\n * Calls the `/api/v1/query` endpoint to get metrics data.\n */\nexport function instantQuery(params: InstantQueryRequestParameters, queryOptions: QueryOptions) {\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(params: RangeQueryRequestParameters, queryOptions: QueryOptions) {\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(params: LabelNamesRequestParameters, queryOptions: QueryOptions) {\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(params: LabelValuesRequestParameters, queryOptions: QueryOptions) {\n  const { labelName, ...searchParams } = params;\n  const apiURI = `/api/v1/label/${encodeURIComponent(labelName)}/values`;\n  return fetchWithGet<typeof searchParams, LabelValuesResponse>(apiURI, searchParams, queryOptions);\n}\n\nfunction fetchWithGet<T extends RequestParams<T>, TResponse>(apiURI: string, params: T, queryOptions: QueryOptions) {\n  const { datasourceUrl } = queryOptions;\n\n  let url = `${datasourceUrl}${apiURI}`;\n  const urlParams = createSearchParams(params).toString();\n  if (urlParams !== '') {\n    url += `?${urlParams}`;\n  }\n  return fetchJson<TResponse>(url, { method: 'GET' });\n}\n\nfunction fetchWithPost<T extends RequestParams<T>, TResponse>(apiURI: string, params: T, queryOptions: QueryOptions) {\n  const { datasourceUrl, headers } = queryOptions;\n\n  const url = `${datasourceUrl}${apiURI}`;\n  const init = {\n    method: 'POST',\n    headers: {\n      'Content-Type': 'application/x-www-form-urlencoded',\n      ...headers,\n    },\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) {\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>) {\n  const response = await fetch(...args);\n  const json: T = await response.json();\n  return { ...json, rawResponse: response };\n}\n"],"names":["fetch","fetchJson","instantQuery","params","queryOptions","fetchWithPost","rangeQuery","labelNames","labelValues","labelName","searchParams","apiURI","encodeURIComponent","fetchWithGet","datasourceUrl","url","urlParams","createSearchParams","toString","method","headers","init","body","fetchResults","URLSearchParams","key","value","undefined","append","val","args","response","json","rawResponse"],"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;AAEjC,SAASA,KAAK,EAAEC,SAAS,QAAwB,kBAAkB,CAAC;AA+BpE;;CAEC,GACD,OAAO,SAASC,YAAY,CAACC,MAAqC,EAAEC,YAA0B,EAAE;IAC9F,OAAOC,aAAa,CAAsD,eAAe,EAAEF,MAAM,EAAEC,YAAY,CAAC,CAAC;AACnH,CAAC;AAED;;CAEC,GACD,OAAO,SAASE,UAAU,CAACH,MAAmC,EAAEC,YAA0B,EAAE;IAC1F,OAAOC,aAAa,CAAkD,qBAAqB,EAAEF,MAAM,EAAEC,YAAY,CAAC,CAAC;AACrH,CAAC;AAED;;CAEC,GACD,OAAO,SAASG,UAAU,CAACJ,MAAmC,EAAEC,YAA0B,EAAE;IAC1F,OAAOC,aAAa,CAAkD,gBAAgB,EAAEF,MAAM,EAAEC,YAAY,CAAC,CAAC;AAChH,CAAC;AAED;;CAEC,GACD,OAAO,SAASI,WAAW,CAACL,MAAoC,EAAEC,YAA0B,EAAE;IAC5F,MAAM,EAAEK,SAAS,CAAA,EAAE,GAAGC,YAAY,EAAE,GAAGP,MAAM,AAAC;IAC9C,MAAMQ,MAAM,GAAG,CAAC,cAAc,EAAEC,kBAAkB,CAACH,SAAS,CAAC,CAAC,OAAO,CAAC,AAAC;IACvE,OAAOI,YAAY,CAA2CF,MAAM,EAAED,YAAY,EAAEN,YAAY,CAAC,CAAC;AACpG,CAAC;AAED,SAASS,YAAY,CAAwCF,MAAc,EAAER,MAAS,EAAEC,YAA0B,EAAE;IAClH,MAAM,EAAEU,aAAa,CAAA,EAAE,GAAGV,YAAY,AAAC;IAEvC,IAAIW,GAAG,GAAG,CAAC,EAAED,aAAa,CAAC,EAAEH,MAAM,CAAC,CAAC,AAAC;IACtC,MAAMK,SAAS,GAAGC,kBAAkB,CAACd,MAAM,CAAC,CAACe,QAAQ,EAAE,AAAC;IACxD,IAAIF,SAAS,KAAK,EAAE,EAAE;QACpBD,GAAG,IAAI,CAAC,CAAC,EAAEC,SAAS,CAAC,CAAC,CAAC;IACzB,CAAC;IACD,OAAOf,SAAS,CAAYc,GAAG,EAAE;QAAEI,MAAM,EAAE,KAAK;KAAE,CAAC,CAAC;AACtD,CAAC;AAED,SAASd,aAAa,CAAwCM,MAAc,EAAER,MAAS,EAAEC,YAA0B,EAAE;IACnH,MAAM,EAAEU,aAAa,CAAA,EAAEM,OAAO,CAAA,EAAE,GAAGhB,YAAY,AAAC;IAEhD,MAAMW,GAAG,GAAG,CAAC,EAAED,aAAa,CAAC,EAAEH,MAAM,CAAC,CAAC,AAAC;IACxC,MAAMU,IAAI,GAAG;QACXF,MAAM,EAAE,MAAM;QACdC,OAAO,EAAE;YACP,cAAc,EAAE,mCAAmC;YACnD,GAAGA,OAAO;SACX;QACDE,IAAI,EAAEL,kBAAkB,CAACd,MAAM,CAAC;KACjC,AAAC;IACF,OAAOoB,YAAY,CAAYR,GAAG,EAAEM,IAAI,CAAC,CAAC;AAC5C,CAAC;AAWD;;CAEC,GACD,SAASJ,kBAAkB,CAA6Bd,MAAS,EAAE;IACjE,MAAMO,YAAY,GAAG,IAAIc,eAAe,EAAE,AAAC;IAC3C,IAAK,MAAMC,GAAG,IAAItB,MAAM,CAAE;QACxB,MAAMuB,KAAK,GAAevB,MAAM,CAACsB,GAAG,CAAC,AAAC;QACtC,IAAIC,KAAK,KAAKC,SAAS,EAAE,SAAS;QAElC,IAAI,OAAOD,KAAK,KAAK,QAAQ,EAAE;YAC7BhB,YAAY,CAACkB,MAAM,CAACH,GAAG,EAAEC,KAAK,CAAC,CAAC;YAChC,SAAS;QACX,CAAC;QAED,IAAI,OAAOA,KAAK,KAAK,QAAQ,EAAE;YAC7BhB,YAAY,CAACkB,MAAM,CAACH,GAAG,EAAEC,KAAK,CAACR,QAAQ,EAAE,CAAC,CAAC;YAC3C,SAAS;QACX,CAAC;QAED,KAAK,MAAMW,GAAG,IAAIH,KAAK,CAAE;YACvBhB,YAAY,CAACkB,MAAM,CAACH,GAAG,EAAEI,GAAG,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;IACD,OAAOnB,YAAY,CAAC;AACtB,CAAC;AAED;;CAEC,GACD,OAAO,eAAea,YAAY,CAAI,GAAGO,IAAI,AAAiC,EAAE;IAC9E,MAAMC,QAAQ,GAAG,MAAM/B,KAAK,IAAI8B,IAAI,CAAC,AAAC;IACtC,MAAME,IAAI,GAAM,MAAMD,QAAQ,CAACC,IAAI,EAAE,AAAC;IACtC,OAAO;QAAE,GAAGA,IAAI;QAAEC,WAAW,EAAEF,QAAQ;KAAE,CAAC;AAC5C,CAAC"}

package/dist/plugins/prometheus-datasource.js

@@ -14,7 +14,7 @@ import { instantQuery, rangeQuery, labelNames, labelValues } from '../model';
 /**
  * Creates a PrometheusClient for a specific datasource spec.
  */ const createClient = (spec, options)=>{
-    const { direct_url , headers  } = spec;
+    const { direct_url , headers: specHeaders  } = spec;
     const { proxyUrl  } = options;
     // Use the direct URL if specified, but fallback to the proxyUrl by default if not specified
     const datasourceUrl = direct_url !== null && direct_url !== void 0 ? direct_url : proxyUrl;
@@ -26,21 +26,21 @@ import { instantQuery, rangeQuery, labelNames, labelValues } from '../model';
         options: {
             datasourceUrl
         },
-        instantQuery: (params)=>instantQuery(params, {
+        instantQuery: (params, headers)=>instantQuery(params, {
                 datasourceUrl,
-                headers
+                headers: headers !== null && headers !== void 0 ? headers : specHeaders
             }),
-        rangeQuery: (params)=>rangeQuery(params, {
+        rangeQuery: (params, headers)=>rangeQuery(params, {
                 datasourceUrl,
-                headers
+                headers: headers !== null && headers !== void 0 ? headers : specHeaders
             }),
-        labelNames: (params)=>labelNames(params, {
+        labelNames: (params, headers)=>labelNames(params, {
                 datasourceUrl,
-                headers
+                headers: headers !== null && headers !== void 0 ? headers : specHeaders
             }),
-        labelValues: (params)=>labelValues(params, {
+        labelValues: (params, headers)=>labelValues(params, {
                 datasourceUrl,
-                headers
+                headers: headers !== null && headers !== void 0 ? headers : specHeaders
             })
     };
 };

package/dist/plugins/prometheus-datasource.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/plugins/prometheus-datasource.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 { RequestHeaders } from '@perses-dev/core';\nimport { DatasourcePlugin } from '@perses-dev/plugin-system';\nimport { instantQuery, rangeQuery, labelNames, labelValues, PrometheusClient } from '../model';\n\nexport interface PrometheusDatasourceSpec {\n  direct_url?: string;\n  headers?: RequestHeaders;\n}\n\n/**\n * Creates a PrometheusClient for a specific datasource spec.\n */\nconst createClient: DatasourcePlugin<PrometheusDatasourceSpec, PrometheusClient>['createClient'] = (spec, options) => {\n  const { direct_url, headers } = spec;\n  const { proxyUrl } = options;\n\n  // Use the direct URL if specified, but fallback to the proxyUrl by default if not specified\n  const datasourceUrl = direct_url ?? proxyUrl;\n  if (datasourceUrl === undefined) {\n    throw new Error('No URL specified for Prometheus client. You can use direct_url in the spec to configure it.');\n  }\n\n  // Could think about this becoming a class, although it definitely doesn't have to be\n  return {\n    options: {\n      datasourceUrl,\n    },\n    instantQuery: (params) => instantQuery(params, { datasourceUrl, headers }),\n    rangeQuery: (params) => rangeQuery(params, { datasourceUrl, headers }),\n    labelNames: (params) => labelNames(params, { datasourceUrl, headers }),\n    labelValues: (params) => labelValues(params, { datasourceUrl, headers }),\n  };\n};\n\nexport const PrometheusDatasource: DatasourcePlugin<PrometheusDatasourceSpec, PrometheusClient> = {\n  createClient,\n  OptionsEditorComponent: () => null,\n  createInitialOptions: () => ({ direct_url: '' }),\n};\n"],"names":["instantQuery","rangeQuery","labelNames","labelValues","createClient","spec","options","direct_url","headers","proxyUrl","datasourceUrl","undefined","Error","params","PrometheusDatasource","OptionsEditorComponent","createInitialOptions"],"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;AAIjC,SAASA,YAAY,EAAEC,UAAU,EAAEC,UAAU,EAAEC,WAAW,QAA0B,UAAU,CAAC;AAO/F;;CAEC,GACD,MAAMC,YAAY,GAAiF,CAACC,IAAI,EAAEC,OAAO,GAAK;IACpH,MAAM,EAAEC,UAAU,CAAA,EAAEC,OAAO,CAAA,EAAE,GAAGH,IAAI,AAAC;IACrC,MAAM,EAAEI,QAAQ,CAAA,EAAE,GAAGH,OAAO,AAAC;IAE7B,4FAA4F;IAC5F,MAAMI,aAAa,GAAGH,UAAU,aAAVA,UAAU,cAAVA,UAAU,GAAIE,QAAQ,AAAC;IAC7C,IAAIC,aAAa,KAAKC,SAAS,EAAE;QAC/B,MAAM,IAAIC,KAAK,CAAC,6FAA6F,CAAC,CAAC;IACjH,CAAC;IAED,qFAAqF;IACrF,OAAO;QACLN,OAAO,EAAE;YACPI,aAAa;SACd;QACDV,YAAY,EAAE,CAACa,MAAM,GAAKb,YAAY,CAACa,MAAM,EAAE;gBAAEH,aAAa;gBAAEF,OAAO;aAAE,CAAC;QAC1EP,UAAU,EAAE,CAACY,MAAM,GAAKZ,UAAU,CAACY,MAAM,EAAE;gBAAEH,aAAa;gBAAEF,OAAO;aAAE,CAAC;QACtEN,UAAU,EAAE,CAACW,MAAM,GAAKX,UAAU,CAACW,MAAM,EAAE;gBAAEH,aAAa;gBAAEF,OAAO;aAAE,CAAC;QACtEL,WAAW,EAAE,CAACU,MAAM,GAAKV,WAAW,CAACU,MAAM,EAAE;gBAAEH,aAAa;gBAAEF,OAAO;aAAE,CAAC;KACzE,CAAC;AACJ,CAAC,AAAC;AAEF,OAAO,MAAMM,oBAAoB,GAAiE;IAChGV,YAAY;IACZW,sBAAsB,EAAE,IAAM,IAAI;IAClCC,oBAAoB,EAAE,IAAO,CAAA;YAAET,UAAU,EAAE,EAAE;SAAE,CAAA,AAAC;CACjD,CAAC"}
+{"version":3,"sources":["../../src/plugins/prometheus-datasource.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 { RequestHeaders } from '@perses-dev/core';\nimport { DatasourcePlugin } from '@perses-dev/plugin-system';\nimport { instantQuery, rangeQuery, labelNames, labelValues, PrometheusClient } from '../model';\n\nexport interface PrometheusDatasourceSpec {\n  direct_url?: string;\n  headers?: RequestHeaders;\n}\n\n/**\n * Creates a PrometheusClient for a specific datasource spec.\n */\nconst createClient: DatasourcePlugin<PrometheusDatasourceSpec, PrometheusClient>['createClient'] = (spec, options) => {\n  const { direct_url, headers: specHeaders } = spec;\n  const { proxyUrl } = options;\n\n  // Use the direct URL if specified, but fallback to the proxyUrl by default if not specified\n  const datasourceUrl = direct_url ?? proxyUrl;\n  if (datasourceUrl === undefined) {\n    throw new Error('No URL specified for Prometheus client. You can use direct_url in the spec to configure it.');\n  }\n\n  // Could think about this becoming a class, although it definitely doesn't have to be\n  return {\n    options: {\n      datasourceUrl,\n    },\n    instantQuery: (params, headers) => instantQuery(params, { datasourceUrl, headers: headers ?? specHeaders }),\n    rangeQuery: (params, headers) => rangeQuery(params, { datasourceUrl, headers: headers ?? specHeaders }),\n    labelNames: (params, headers) => labelNames(params, { datasourceUrl, headers: headers ?? specHeaders }),\n    labelValues: (params, headers) => labelValues(params, { datasourceUrl, headers: headers ?? specHeaders }),\n  };\n};\n\nexport const PrometheusDatasource: DatasourcePlugin<PrometheusDatasourceSpec, PrometheusClient> = {\n  createClient,\n  OptionsEditorComponent: () => null,\n  createInitialOptions: () => ({ direct_url: '' }),\n};\n"],"names":["instantQuery","rangeQuery","labelNames","labelValues","createClient","spec","options","direct_url","headers","specHeaders","proxyUrl","datasourceUrl","undefined","Error","params","PrometheusDatasource","OptionsEditorComponent","createInitialOptions"],"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;AAIjC,SAASA,YAAY,EAAEC,UAAU,EAAEC,UAAU,EAAEC,WAAW,QAA0B,UAAU,CAAC;AAO/F;;CAEC,GACD,MAAMC,YAAY,GAAiF,CAACC,IAAI,EAAEC,OAAO,GAAK;IACpH,MAAM,EAAEC,UAAU,CAAA,EAAEC,OAAO,EAAEC,WAAW,CAAA,EAAE,GAAGJ,IAAI,AAAC;IAClD,MAAM,EAAEK,QAAQ,CAAA,EAAE,GAAGJ,OAAO,AAAC;IAE7B,4FAA4F;IAC5F,MAAMK,aAAa,GAAGJ,UAAU,aAAVA,UAAU,cAAVA,UAAU,GAAIG,QAAQ,AAAC;IAC7C,IAAIC,aAAa,KAAKC,SAAS,EAAE;QAC/B,MAAM,IAAIC,KAAK,CAAC,6FAA6F,CAAC,CAAC;IACjH,CAAC;IAED,qFAAqF;IACrF,OAAO;QACLP,OAAO,EAAE;YACPK,aAAa;SACd;QACDX,YAAY,EAAE,CAACc,MAAM,EAAEN,OAAO,GAAKR,YAAY,CAACc,MAAM,EAAE;gBAAEH,aAAa;gBAAEH,OAAO,EAAEA,OAAO,aAAPA,OAAO,cAAPA,OAAO,GAAIC,WAAW;aAAE,CAAC;QAC3GR,UAAU,EAAE,CAACa,MAAM,EAAEN,OAAO,GAAKP,UAAU,CAACa,MAAM,EAAE;gBAAEH,aAAa;gBAAEH,OAAO,EAAEA,OAAO,aAAPA,OAAO,cAAPA,OAAO,GAAIC,WAAW;aAAE,CAAC;QACvGP,UAAU,EAAE,CAACY,MAAM,EAAEN,OAAO,GAAKN,UAAU,CAACY,MAAM,EAAE;gBAAEH,aAAa;gBAAEH,OAAO,EAAEA,OAAO,aAAPA,OAAO,cAAPA,OAAO,GAAIC,WAAW;aAAE,CAAC;QACvGN,WAAW,EAAE,CAACW,MAAM,EAAEN,OAAO,GAAKL,WAAW,CAACW,MAAM,EAAE;gBAAEH,aAAa;gBAAEH,OAAO,EAAEA,OAAO,aAAPA,OAAO,cAAPA,OAAO,GAAIC,WAAW;aAAE,CAAC;KAC1G,CAAC;AACJ,CAAC,AAAC;AAEF,OAAO,MAAMM,oBAAoB,GAAiE;IAChGX,YAAY;IACZY,sBAAsB,EAAE,IAAM,IAAI;IAClCC,oBAAoB,EAAE,IAAO,CAAA;YAAEV,UAAU,EAAE,EAAE;SAAE,CAAA,AAAC;CACjD,CAAC"}

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":"AAaA,OAAO,EAAkB,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAWlF,OAAO,EAAE,6BAA6B,EAAE,MAAM,2BAA2B,CAAC;AAE1E,eAAO,MAAM,iBAAiB,EAAE,qBAAqB,CAAC,6BAA6B,CAAC,CAAC,mBAAmB,CAoEvG,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":"AAcA,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAWlE,OAAO,EAAE,6BAA6B,EAAE,MAAM,2BAA2B,CAAC;AAE1E,eAAO,MAAM,iBAAiB,EAAE,qBAAqB,CAAC,6BAA6B,CAAC,CAAC,mBAAmB,CA8EvG,CAAC"}

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

@@ -12,7 +12,7 @@
 // limitations under the License.
 import { fromUnixTime } from 'date-fns';
 import { parseValueTuple, getDurationStringSeconds, getPrometheusTimeRange, getRangeStep, DEFAULT_PROM } from '../../model';
-import { getUniqueKeyForPrometheusResult, replaceTemplateVariables, formatSeriesName } from '../../utils';
+import { getFormattedPrometheusSeriesName, replaceTemplateVariables } from '../../utils';
 export const getTimeSeriesData = async (spec, context)=>{
     var ref;
     if (spec.query === undefined || spec.query === null || spec.query === '') {
@@ -47,6 +47,20 @@ export const getTimeSeriesData = async (spec, context)=>{
     var ref1;
     // TODO: What about error responses from Prom that have a response body?
     const result = (ref1 = (ref = response.data) === null || ref === void 0 ? void 0 : ref.result) !== null && ref1 !== void 0 ? ref1 : [];
+    // Custom display for response header warnings, configurable error responses display coming next
+    const notices = [];
+    if (response.status === 'success') {
+        var _warnings;
+        const warnings = (_warnings = response.warnings) !== null && _warnings !== void 0 ? _warnings : [];
+        var ref2;
+        const warningMessage = (ref2 = warnings[0]) !== null && ref2 !== void 0 ? ref2 : '';
+        if (warningMessage !== '') {
+            notices.push({
+                type: 'warning',
+                message: warningMessage
+            });
+        }
+    }
     // Transform response
     const chartData = {
         // Return the time range and step we actually used for the query
@@ -57,20 +71,18 @@ export const getTimeSeriesData = async (spec, context)=>{
         stepMs: step * 1000,
         series: result.map((value)=>{
             const { metric , values  } = value;
-            // Name the series after the metric labels or if no metric, use the query
-            let name = getUniqueKeyForPrometheusResult(metric);
-            if (name === '') {
-                name = query;
-            }
-            // query editor allows you to define an optional series_name_format
-            // property to customize legend and tooltip display
-            const formattedName = spec.series_name_format ? formatSeriesName(spec.series_name_format, metric) : name;
+            // Account for series_name_format from query editor when determining name to show in legend, tooltip, etc.
+            const { name , formattedName  } = getFormattedPrometheusSeriesName(query, metric, spec.series_name_format);
             return {
                 name,
                 values: values.map(parseValueTuple),
-                formattedName
+                formattedName,
+                labels: metric
             };
-        })
+        }),
+        metadata: {
+            notices
+        }
     };
     return chartData;
 };

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 { TimeSeriesData, TimeSeriesQueryPlugin } from '@perses-dev/plugin-system';\nimport { fromUnixTime } from 'date-fns';\nimport {\n  parseValueTuple,\n  PrometheusClient,\n  getDurationStringSeconds,\n  getPrometheusTimeRange,\n  getRangeStep,\n  DEFAULT_PROM,\n} from '../../model';\nimport { getUniqueKeyForPrometheusResult, replaceTemplateVariables, formatSeriesName } from '../../utils';\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 minStep = getDurationStringSeconds(spec.min_step);\n  const timeRange = getPrometheusTimeRange(context.timeRange);\n  const step = getRangeStep(timeRange, minStep, undefined, context.suggestedStepMs);\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  let query = spec.query.replace('$__rate_interval', `15s`);\n  query = replaceTemplateVariables(query, context.variableState);\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  // 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      // Name the series after the metric labels or if no metric, use the query\n      let name = getUniqueKeyForPrometheusResult(metric);\n      if (name === '') {\n        name = query;\n      }\n\n      // query editor allows you to define an optional series_name_format\n      // property to customize legend and tooltip display\n      const formattedName = spec.series_name_format ? formatSeriesName(spec.series_name_format, metric) : name;\n\n      return {\n        name,\n        values: values.map(parseValueTuple),\n        formattedName,\n      };\n    }),\n  };\n\n  return chartData;\n};\n"],"names":["fromUnixTime","parseValueTuple","getDurationStringSeconds","getPrometheusTimeRange","getRangeStep","DEFAULT_PROM","getUniqueKeyForPrometheusResult","replaceTemplateVariables","formatSeriesName","getTimeSeriesData","spec","context","response","query","undefined","series","minStep","min_step","timeRange","step","suggestedStepMs","start","end","utcOffsetSec","Date","getTimezoneOffset","alignedEnd","Math","floor","alignedStart","replace","variableState","client","datasourceStore","getDatasourceClient","datasource","rangeQuery","result","data","chartData","stepMs","map","value","metric","values","name","formattedName","series_name_format"],"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 { Notice, TimeSeriesData } from '@perses-dev/core';\nimport { TimeSeriesQueryPlugin } from '@perses-dev/plugin-system';\nimport { fromUnixTime } from 'date-fns';\nimport {\n  parseValueTuple,\n  PrometheusClient,\n  getDurationStringSeconds,\n  getPrometheusTimeRange,\n  getRangeStep,\n  DEFAULT_PROM,\n} from '../../model';\nimport { getFormattedPrometheusSeriesName, replaceTemplateVariables } from '../../utils';\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 minStep = getDurationStringSeconds(spec.min_step);\n  const timeRange = getPrometheusTimeRange(context.timeRange);\n  const step = getRangeStep(timeRange, minStep, undefined, context.suggestedStepMs);\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  let query = spec.query.replace('$__rate_interval', `15s`);\n  query = replaceTemplateVariables(query, context.variableState);\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 series_name_format from query editor when determining name to show in legend, tooltip, etc.\n      const { name, formattedName } = getFormattedPrometheusSeriesName(query, metric, spec.series_name_format);\n\n      return {\n        name,\n        values: values.map(parseValueTuple),\n        formattedName,\n        labels: metric,\n      };\n    }),\n    metadata: {\n      notices,\n    },\n  };\n\n  return chartData;\n};\n"],"names":["fromUnixTime","parseValueTuple","getDurationStringSeconds","getPrometheusTimeRange","getRangeStep","DEFAULT_PROM","getFormattedPrometheusSeriesName","replaceTemplateVariables","getTimeSeriesData","spec","context","response","query","undefined","series","minStep","min_step","timeRange","step","suggestedStepMs","start","end","utcOffsetSec","Date","getTimezoneOffset","alignedEnd","Math","floor","alignedStart","replace","variableState","client","datasourceStore","getDatasourceClient","datasource","rangeQuery","result","data","notices","status","warnings","warningMessage","push","type","message","chartData","stepMs","map","value","metric","values","name","formattedName","series_name_format","labels","metadata"],"mappings":"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"}

package/dist/utils/utils.d.ts

@@ -1,5 +1,6 @@
 import { VariableValue } from '@perses-dev/core';
 import { VariableStateMap } from '@perses-dev/plugin-system';
+import { Metric } from '../model/api-types';
 export declare function replaceTemplateVariables(text: string, variableState: VariableStateMap): string;
 export declare function replaceTemplateVariable(text: string, varName: string, templateVariableValue: VariableValue): string;
 /**
@@ -16,4 +17,11 @@ export declare function getUniqueKeyForPrometheusResult(metricLabels: {
 }, { removeExprWrap }?: {
     removeExprWrap?: boolean;
 }): string;
+export declare function getFormattedPrometheusSeriesName(query: string, metric: Metric, formatter?: string): {
+    name: string;
+    formattedName?: undefined;
+} | {
+    name: string;
+    formattedName: string;
+};
 //# sourceMappingURL=utils.d.ts.map

package/dist/utils/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils/utils.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAE7D,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,gBAAgB,GAAG,MAAM,CAW9F;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,qBAAqB,EAAE,aAAa,UAW1G;AAMD;;GAEG;AACH,eAAO,MAAM,sBAAsB,SAAU,MAAM,aAYlD,CAAC;AAEF;;GAEG;AACH,oBAAY,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAMlD,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,GAAG,MAAM,CAGxF;AAyBD,wBAAgB,+BAA+B,CAC7C,YAAY,EAAE;IACZ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACvB,EACD,EAAE,cAAc,EAAE,GAAE;IAAE,cAAc,CAAC,EAAE,OAAO,CAAA;CAAO,UAqBtD"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils/utils.ts"],"names":[],"mappings":"AAaA,OAAO,EAAiB,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,gBAAgB,GAAG,MAAM,CAW9F;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,qBAAqB,EAAE,aAAa,UAW1G;AAMD;;GAEG;AACH,eAAO,MAAM,sBAAsB,SAAU,MAAM,aAYlD,CAAC;AAEF;;GAEG;AACH,oBAAY,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAMlD,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,GAAG,MAAM,CAGxF;AAyBD,wBAAgB,+BAA+B,CAC7C,YAAY,EAAE;IACZ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACvB,EACD,EAAE,cAAc,EAAE,GAAE;IAAE,cAAc,CAAC,EAAE,OAAO,CAAA;CAAO,UAqBtD;AAKD,wBAAgB,gCAAgC,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;;;;;;EAejG"}

package/dist/utils/utils.js

@@ -10,6 +10,7 @@
 // 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 { isEmptyObject } from '@perses-dev/core';
 export function replaceTemplateVariables(text, variableState) {
     const variables = parseTemplateVariables(text);
     let finalText = text;
@@ -92,5 +93,26 @@ const TEMPLATE_VARIABLE_REGEX = /\$(\w+)|\${(\w+)(?:\.([^:^\}]+))?(?::([^\}]+))?
     }
     return '';
 }
+/*
+ * Determine human-readable series name to be used in legend and tooltip
+ */ export function getFormattedPrometheusSeriesName(query, metric, formatter) {
+    if (isEmptyObject(metric)) {
+        return {
+            name: query
+        };
+    }
+    // Name the series after the metric labels or if no metric, use the query
+    let name = getUniqueKeyForPrometheusResult(metric);
+    if (name === '') {
+        name = query;
+    }
+    // Query editor allows you to define an optional series_name_format
+    // property to customize legend and tooltip display
+    const formattedName = formatter ? formatSeriesName(formatter, metric) : name;
+    return {
+        name,
+        formattedName
+    };
+}
 
 //# sourceMappingURL=utils.js.map

package/dist/utils/utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/utils.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 { VariableValue } from '@perses-dev/core';\nimport { VariableStateMap } from '@perses-dev/plugin-system';\n\nexport function replaceTemplateVariables(text: string, variableState: VariableStateMap): string {\n  const variables = parseTemplateVariables(text);\n  let finalText = text;\n  variables.forEach((v) => {\n    const variable = variableState[v];\n    if (variable && variable?.value) {\n      finalText = replaceTemplateVariable(finalText, v, variable?.value);\n    }\n  });\n\n  return finalText;\n}\n\nexport function replaceTemplateVariable(text: string, varName: string, templateVariableValue: VariableValue) {\n  const variableTemplate = '$' + varName;\n  let replaceString = '';\n  if (Array.isArray(templateVariableValue)) {\n    replaceString = `(${templateVariableValue.join('|')})`; // regex style\n  }\n  if (typeof templateVariableValue === 'string') {\n    replaceString = templateVariableValue;\n  }\n\n  return text.replaceAll(variableTemplate, replaceString);\n}\n\n// TODO: Fix this lint error\n// eslint-disable-next-line no-useless-escape\nconst TEMPLATE_VARIABLE_REGEX = /\\$(\\w+)|\\${(\\w+)(?:\\.([^:^\\}]+))?(?::([^\\}]+))?}/gm;\n\n/**\n * Returns a list of template variables\n */\nexport const parseTemplateVariables = (text: string) => {\n  const regex = TEMPLATE_VARIABLE_REGEX;\n  const matches = new Set<string>();\n  let match;\n\n  while ((match = regex.exec(text)) !== null) {\n    if (match && match.length > 1 && match[1]) {\n      matches.add(match[1]);\n    }\n  }\n  // return unique matches\n  return Array.from(matches.values());\n};\n\n/**\n * Types for metric labels, used in series_name_format implementation\n */\nexport type SeriesLabels = Record<string, string>;\n\n/*\n * Formatter used for series name display in legends and tooltips\n * Regex replaces label {{ name }} with resolved label value\n */\nexport function formatSeriesName(inputFormat: string, seriesLabels: SeriesLabels): string {\n  const resolveLabelsRegex = /\\{\\{\\s*(.+?)\\s*\\}\\}/g;\n  return inputFormat.replace(resolveLabelsRegex, (_, g) => (seriesLabels[g] ? seriesLabels[g] : g));\n}\n\n/*\n * Stringifies object of labels into valid PromQL for querying metric by label\n */\nfunction stringifyPrometheusMetricLabels(labels: { [key: string]: unknown }, removeExprWrap?: boolean) {\n  const labelStrings: string[] = [];\n  Object.keys(labels)\n    .sort()\n    .forEach((labelName) => {\n      const labelValue = labels[labelName];\n      if (labelValue !== undefined) {\n        if (removeExprWrap) {\n          labelStrings.push(`\"${labelName}\":\"${labelValue}\"`);\n        } else {\n          labelStrings.push(`${labelName}=\"${labelValue}\"`);\n        }\n      }\n    });\n  return `{${labelStrings.join(',')}}`;\n}\n\n/*\n * Metric labels formattter which checks for __name__ and outputs valid PromQL for series name\n */\nexport function getUniqueKeyForPrometheusResult(\n  metricLabels: {\n    [key: string]: string;\n  },\n  { removeExprWrap }: { removeExprWrap?: boolean } = {}\n) {\n  const metricNameKey = '__name__';\n  if (metricLabels) {\n    if (Object.prototype.hasOwnProperty.call(metricLabels, metricNameKey)) {\n      const stringifiedLabels = stringifyPrometheusMetricLabels(\n        {\n          ...metricLabels,\n          [metricNameKey]: undefined,\n        },\n        removeExprWrap\n      );\n      if (removeExprWrap === true) {\n        return `${stringifiedLabels}`;\n      } else {\n        return `${metricLabels[metricNameKey]}${stringifiedLabels}`;\n      }\n    }\n    return stringifyPrometheusMetricLabels(metricLabels, removeExprWrap);\n  }\n  return '';\n}\n"],"names":["replaceTemplateVariables","text","variableState","variables","parseTemplateVariables","finalText","forEach","v","variable","value","replaceTemplateVariable","varName","templateVariableValue","variableTemplate","replaceString","Array","isArray","join","replaceAll","TEMPLATE_VARIABLE_REGEX","regex","matches","Set","match","exec","length","add","from","values","formatSeriesName","inputFormat","seriesLabels","resolveLabelsRegex","replace","_","g","stringifyPrometheusMetricLabels","labels","removeExprWrap","labelStrings","Object","keys","sort","labelName","labelValue","undefined","push","getUniqueKeyForPrometheusResult","metricLabels","metricNameKey","prototype","hasOwnProperty","call","stringifiedLabels"],"mappings":"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"}
+{"version":3,"sources":["../../src/utils/utils.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 { isEmptyObject, VariableValue } from '@perses-dev/core';\nimport { VariableStateMap } from '@perses-dev/plugin-system';\nimport { Metric } from '../model/api-types';\n\nexport function replaceTemplateVariables(text: string, variableState: VariableStateMap): string {\n  const variables = parseTemplateVariables(text);\n  let finalText = text;\n  variables.forEach((v) => {\n    const variable = variableState[v];\n    if (variable && variable?.value) {\n      finalText = replaceTemplateVariable(finalText, v, variable?.value);\n    }\n  });\n\n  return finalText;\n}\n\nexport function replaceTemplateVariable(text: string, varName: string, templateVariableValue: VariableValue) {\n  const variableTemplate = '$' + varName;\n  let replaceString = '';\n  if (Array.isArray(templateVariableValue)) {\n    replaceString = `(${templateVariableValue.join('|')})`; // regex style\n  }\n  if (typeof templateVariableValue === 'string') {\n    replaceString = templateVariableValue;\n  }\n\n  return text.replaceAll(variableTemplate, replaceString);\n}\n\n// TODO: Fix this lint error\n// eslint-disable-next-line no-useless-escape\nconst TEMPLATE_VARIABLE_REGEX = /\\$(\\w+)|\\${(\\w+)(?:\\.([^:^\\}]+))?(?::([^\\}]+))?}/gm;\n\n/**\n * Returns a list of template variables\n */\nexport const parseTemplateVariables = (text: string) => {\n  const regex = TEMPLATE_VARIABLE_REGEX;\n  const matches = new Set<string>();\n  let match;\n\n  while ((match = regex.exec(text)) !== null) {\n    if (match && match.length > 1 && match[1]) {\n      matches.add(match[1]);\n    }\n  }\n  // return unique matches\n  return Array.from(matches.values());\n};\n\n/**\n * Types for metric labels, used in series_name_format implementation\n */\nexport type SeriesLabels = Record<string, string>;\n\n/*\n * Formatter used for series name display in legends and tooltips\n * Regex replaces label {{ name }} with resolved label value\n */\nexport function formatSeriesName(inputFormat: string, seriesLabels: SeriesLabels): string {\n  const resolveLabelsRegex = /\\{\\{\\s*(.+?)\\s*\\}\\}/g;\n  return inputFormat.replace(resolveLabelsRegex, (_, g) => (seriesLabels[g] ? seriesLabels[g] : g));\n}\n\n/*\n * Stringifies object of labels into valid PromQL for querying metric by label\n */\nfunction stringifyPrometheusMetricLabels(labels: { [key: string]: unknown }, removeExprWrap?: boolean) {\n  const labelStrings: string[] = [];\n  Object.keys(labels)\n    .sort()\n    .forEach((labelName) => {\n      const labelValue = labels[labelName];\n      if (labelValue !== undefined) {\n        if (removeExprWrap) {\n          labelStrings.push(`\"${labelName}\":\"${labelValue}\"`);\n        } else {\n          labelStrings.push(`${labelName}=\"${labelValue}\"`);\n        }\n      }\n    });\n  return `{${labelStrings.join(',')}}`;\n}\n\n/*\n * Metric labels formattter which checks for __name__ and outputs valid PromQL for series name\n */\nexport function getUniqueKeyForPrometheusResult(\n  metricLabels: {\n    [key: string]: string;\n  },\n  { removeExprWrap }: { removeExprWrap?: boolean } = {}\n) {\n  const metricNameKey = '__name__';\n  if (metricLabels) {\n    if (Object.prototype.hasOwnProperty.call(metricLabels, metricNameKey)) {\n      const stringifiedLabels = stringifyPrometheusMetricLabels(\n        {\n          ...metricLabels,\n          [metricNameKey]: undefined,\n        },\n        removeExprWrap\n      );\n      if (removeExprWrap === true) {\n        return `${stringifiedLabels}`;\n      } else {\n        return `${metricLabels[metricNameKey]}${stringifiedLabels}`;\n      }\n    }\n    return stringifyPrometheusMetricLabels(metricLabels, removeExprWrap);\n  }\n  return '';\n}\n\n/*\n * Determine human-readable series name to be used in legend and tooltip\n */\nexport function getFormattedPrometheusSeriesName(query: string, metric: Metric, formatter?: string) {\n  if (isEmptyObject(metric)) {\n    return { name: query };\n  }\n\n  // Name the series after the metric labels or if no metric, use the query\n  let name = getUniqueKeyForPrometheusResult(metric);\n  if (name === '') {\n    name = query;\n  }\n\n  // Query editor allows you to define an optional series_name_format\n  // property to customize legend and tooltip display\n  const formattedName = formatter ? formatSeriesName(formatter, metric) : name;\n  return { name, formattedName };\n}\n"],"names":["isEmptyObject","replaceTemplateVariables","text","variableState","variables","parseTemplateVariables","finalText","forEach","v","variable","value","replaceTemplateVariable","varName","templateVariableValue","variableTemplate","replaceString","Array","isArray","join","replaceAll","TEMPLATE_VARIABLE_REGEX","regex","matches","Set","match","exec","length","add","from","values","formatSeriesName","inputFormat","seriesLabels","resolveLabelsRegex","replace","_","g","stringifyPrometheusMetricLabels","labels","removeExprWrap","labelStrings","Object","keys","sort","labelName","labelValue","undefined","push","getUniqueKeyForPrometheusResult","metricLabels","metricNameKey","prototype","hasOwnProperty","call","stringifiedLabels","getFormattedPrometheusSeriesName","query","metric","formatter","name","formattedName"],"mappings":"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"}

package/package.json

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