@perses-dev/prometheus-plugin 0.9.0 → 0.10.0

package/dist/cjs/model/index.js

@@ -0,0 +1,34 @@
+// Copyright 2022 The Perses Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+_exportStar(require("./api-types"), exports);
+_exportStar(require("./parse-sample-values"), exports);
+_exportStar(require("./prometheus-client"), exports);
+_exportStar(require("./prometheus-selectors"), exports);
+_exportStar(require("./templating"), exports);
+_exportStar(require("./time"), exports);
+_exportStar(require("./utils"), 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

@@ -42,8 +42,8 @@ function labelValues(params, queryOptions) {
     return fetchWithGet(apiURI, searchParams, queryOptions);
 }
 function fetchWithGet(apiURI, params, queryOptions) {
-    const { datasource: { direct_url: datasourceURL  } ,  } = queryOptions;
-    let url = `${datasourceURL}${apiURI}`;
+    const { datasourceUrl  } = queryOptions;
+    let url = `${datasourceUrl}${apiURI}`;
     const urlParams = createSearchParams(params).toString();
     if (urlParams !== '') {
         url += `?${urlParams}`;
@@ -53,8 +53,8 @@ function fetchWithGet(apiURI, params, queryOptions) {
     });
 }
 function fetchWithPost(apiURI, params, queryOptions) {
-    const { datasource: { direct_url: datasourceURL  } ,  } = queryOptions;
-    const url = `${datasourceURL}${apiURI}`;
+    const { datasourceUrl  } = queryOptions;
+    const url = `${datasourceUrl}${apiURI}`;
     const init = {
         method: 'POST',
         headers: {

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

@@ -0,0 +1,37 @@
+// Copyright 2022 The Perses Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    DEFAULT_PROM: ()=>DEFAULT_PROM,
+    isDefaultPromSelector: ()=>isDefaultPromSelector,
+    isPrometheusDatasourceSelector: ()=>isPrometheusDatasourceSelector
+});
+const PROM_DATASOURCE_KIND = 'PrometheusDatasource';
+const DEFAULT_PROM = {
+    kind: PROM_DATASOURCE_KIND
+};
+function isDefaultPromSelector(selector) {
+    return selector.name === undefined;
+}
+function isPrometheusDatasourceSelector(selector) {
+    return selector.kind === PROM_DATASOURCE_KIND;
+}

package/dist/cjs/plugins/JSONSpecEditor.js

@@ -0,0 +1,54 @@
+// Copyright 2022 The Perses Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "JSONSpecEditor", {
+    enumerable: true,
+    get: ()=>JSONSpecEditor
+});
+const _jsxRuntime = require("react/jsx-runtime");
+const _react = require("react");
+const _material = require("@mui/material");
+function JSONSpecEditor(props) {
+    const ref = (0, _react.useRef)(null);
+    const [value, setValue] = (0, _react.useState)(JSON.stringify(props.value, null, 2));
+    const [invalidJSON, setInvalidJSON] = (0, _react.useState)(false);
+    (0, _react.useEffect)(()=>{
+        setValue(JSON.stringify(props.value, null, 2));
+        setInvalidJSON(false);
+    }, [
+        props.value
+    ]);
+    return /*#__PURE__*/ (0, _jsxRuntime.jsx)(_material.TextField, {
+        label: "JSON",
+        error: invalidJSON,
+        helperText: invalidJSON ? 'Invalid JSON' : '',
+        multiline: true,
+        inputRef: ref,
+        value: value,
+        onChange: (event)=>{
+            setValue(event.target.value);
+        },
+        onBlur: ()=>{
+            try {
+                const json = JSON.parse(value !== null && value !== void 0 ? value : '{}');
+                setInvalidJSON(false);
+                props.onChange(json);
+            } catch (e) {
+                setInvalidJSON(true);
+            }
+        }
+    });
+}

package/dist/cjs/plugins/PrometheusTimeSeriesQueryEditor.js

@@ -0,0 +1,77 @@
+// Copyright 2022 The Perses Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "PrometheusTimeSeriesQueryEditor", {
+    enumerable: true,
+    get: ()=>PrometheusTimeSeriesQueryEditor
+});
+const _jsxRuntime = require("react/jsx-runtime");
+const _immer = /*#__PURE__*/ _interopRequireDefault(require("immer"));
+const _material = require("@mui/material");
+const _pluginSystem = require("@perses-dev/plugin-system");
+const _model = require("../model");
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+function PrometheusTimeSeriesQueryEditor(props) {
+    const { onChange , value  } = props;
+    const { query , datasource  } = value;
+    const handleQueryChange = (e)=>{
+        onChange((0, _immer.default)(value, (draft)=>{
+            draft.query = e.target.value;
+        }));
+    };
+    const handleDatasourceChange = (next)=>{
+        if ((0, _model.isPrometheusDatasourceSelector)(next)) {
+            onChange((0, _immer.default)(value, (draft)=>{
+                // If they're using the default, just omit the datasource prop (i.e. set to undefined)
+                const nextDatasource = (0, _model.isDefaultPromSelector)(next) ? undefined : next;
+                draft.datasource = nextDatasource;
+            }));
+            return;
+        }
+        throw new Error('Got unexpected non-Prometheus datasource selector');
+    };
+    return /*#__PURE__*/ (0, _jsxRuntime.jsxs)(_material.Box, {
+        children: [
+            /*#__PURE__*/ (0, _jsxRuntime.jsx)(_material.TextField, {
+                label: "Query",
+                value: query,
+                onChange: handleQueryChange,
+                margin: "dense"
+            }),
+            /*#__PURE__*/ (0, _jsxRuntime.jsxs)(_material.FormControl, {
+                margin: "dense",
+                fullWidth: false,
+                children: [
+                    /*#__PURE__*/ (0, _jsxRuntime.jsx)(_material.InputLabel, {
+                        id: "prom-datasource-label",
+                        children: "Prometheus Datasource"
+                    }),
+                    /*#__PURE__*/ (0, _jsxRuntime.jsx)(_pluginSystem.DatasourceSelect, {
+                        datasourcePluginKind: "PrometheusDatasource",
+                        value: datasource !== null && datasource !== void 0 ? datasource : _model.DEFAULT_PROM,
+                        onChange: handleDatasourceChange,
+                        labelId: "prom-datasource-label",
+                        label: "Prometheus Datasource"
+                    })
+                ]
+            })
+        ]
+    });
+}

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

@@ -18,7 +18,35 @@ Object.defineProperty(exports, "PrometheusDatasource", {
     enumerable: true,
     get: ()=>PrometheusDatasource
 });
+const _model = require("../model");
+/**
+ * Creates a PrometheusClient for a specific datasource spec.
+ */ const createClient = (spec, options)=>{
+    const { direct_url  } = 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;
+    if (datasourceUrl === undefined) {
+        throw new Error('No URL specified for Prometheus client. You can use direct_url in the spec to configure it.');
+    }
+    // Could think about this becoming a class, although it definitely doesn't have to be
+    return {
+        instantQuery: (params)=>(0, _model.instantQuery)(params, {
+                datasourceUrl
+            }),
+        rangeQuery: (params)=>(0, _model.rangeQuery)(params, {
+                datasourceUrl
+            }),
+        labelNames: (params)=>(0, _model.labelNames)(params, {
+                datasourceUrl
+            }),
+        labelValues: (params)=>(0, _model.labelValues)(params, {
+                datasourceUrl
+            })
+    };
+};
 const PrometheusDatasource = {
+    createClient,
     OptionsEditorComponent: ()=>null,
     createInitialOptions: ()=>({
             direct_url: ''

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

@@ -24,8 +24,8 @@ _export(exports, {
     PrometheusLabelNamesVariable: ()=>PrometheusLabelNamesVariable,
     PrometheusLabelValuesVariable: ()=>PrometheusLabelValuesVariable
 });
-const _utils = require("../model/utils");
-const _prometheusClient = require("../model/prometheus-client");
+const _model = require("../model");
+const _jsonspecEditor = require("./JSONSpecEditor");
 /**
  * Takes a list of strings and returns a list of VariableOptions
  */ const stringArrayToVariableOptions = (values)=>{
@@ -35,43 +35,42 @@ const _prometheusClient = require("../model/prometheus-client");
             label: value
         }));
 };
-async function getQueryOptions(ctx, spec) {
-    var _datasource;
-    // Just use the default Prom datatsource if not specified in variable's spec
-    const datasourceSelector = (_datasource = spec.datasource) !== null && _datasource !== void 0 ? _datasource : {
-        kind: 'PrometheusDatasource'
-    };
-    const datasource = await ctx.datasourceStore.getDatasource(datasourceSelector);
-    const queryOptions = {
-        datasource: datasource.plugin.spec
-    };
-    return queryOptions;
-}
 const PrometheusLabelNamesVariable = {
     getVariableOptions: async (spec, ctx)=>{
-        const queryOptions = await getQueryOptions(ctx, spec);
-        const { data: options  } = await (0, _prometheusClient.labelNames)({}, queryOptions);
+        var _datasource;
+        const client = await ctx.datasourceStore.getDatasourceClient((_datasource = spec.datasource) !== null && _datasource !== void 0 ? _datasource : _model.DEFAULT_PROM);
+        const match = spec.matchers ? spec.matchers.map((m)=>(0, _model.replaceTemplateVariables)(m, ctx.variables)) : undefined;
+        const { data: options  } = await client.labelNames({
+            'match[]': match
+        });
         return {
             data: stringArrayToVariableOptions(options)
         };
     },
-    dependsOn: ()=>[]
+    dependsOn: ()=>[],
+    OptionsEditorComponent: _jsonspecEditor.JSONSpecEditor,
+    createInitialOptions: ()=>({})
 };
 const PrometheusLabelValuesVariable = {
     getVariableOptions: async (spec, ctx)=>{
         const pluginDef = spec;
-        const queryOptions = await getQueryOptions(ctx, spec);
-        const match = pluginDef.matchers ? pluginDef.matchers.map((m)=>(0, _utils.replaceTemplateVariables)(m, ctx.variables)) : undefined;
-        const { data: options  } = await (0, _prometheusClient.labelValues)({
+        var _datasource;
+        const client = await ctx.datasourceStore.getDatasourceClient((_datasource = spec.datasource) !== null && _datasource !== void 0 ? _datasource : _model.DEFAULT_PROM);
+        const match = pluginDef.matchers ? pluginDef.matchers.map((m)=>(0, _model.replaceTemplateVariables)(m, ctx.variables)) : undefined;
+        const { data: options  } = await client.labelValues({
             labelName: pluginDef.label_name,
             'match[]': match
-        }, queryOptions);
+        });
         return {
             data: stringArrayToVariableOptions(options)
         };
     },
     dependsOn: (spec)=>{
         var ref;
-        return ((ref = spec.matchers) === null || ref === void 0 ? void 0 : ref.map((m)=>(0, _utils.parseTemplateVariables)(m)).flat()) || [];
-    }
+        return ((ref = spec.matchers) === null || ref === void 0 ? void 0 : ref.map((m)=>(0, _model.parseTemplateVariables)(m)).flat()) || [];
+    },
+    OptionsEditorComponent: _jsonspecEditor.JSONSpecEditor,
+    createInitialOptions: ()=>({
+            label_name: ''
+        })
 };

package/dist/cjs/plugins/time-series-query.js

@@ -19,15 +19,13 @@ Object.defineProperty(exports, "PrometheusTimeSeriesQuery", {
     get: ()=>PrometheusTimeSeriesQuery
 });
 const _dateFns = require("date-fns");
-const _parseSampleValues = require("../model/parse-sample-values");
-const _prometheusClient = require("../model/prometheus-client");
-const _time = require("../model/time");
-const _utils = require("../model/utils");
+const _model = require("../model");
+const _prometheusTimeSeriesQueryEditor = require("./PrometheusTimeSeriesQueryEditor");
 const getTimeSeriesData = async (spec, context)=>{
     var ref;
-    const minStep = (0, _time.getDurationStringSeconds)(spec.min_step);
-    const timeRange = (0, _time.getPrometheusTimeRange)(context.timeRange);
-    const step = (0, _time.getRangeStep)(timeRange, minStep, undefined, context.suggestedStepMs);
+    const minStep = (0, _model.getDurationStringSeconds)(spec.min_step);
+    const timeRange = (0, _model.getPrometheusTimeRange)(context.timeRange);
+    const step = (0, _model.getRangeStep)(timeRange, minStep, undefined, context.suggestedStepMs);
     // Align the time range so that it's a multiple of the step
     let { start , end  } = timeRange;
     const utcOffsetSec = new Date().getTimezoneOffset() * 60;
@@ -37,24 +35,17 @@ const getTimeSeriesData = async (spec, context)=>{
     end = alignedEnd;
     // Replace template variable placeholders in PromQL query
     let query = spec.query.replace('$__rate_interval', `15s`);
-    query = (0, _utils.replaceTemplateVariables)(query, context.variableState);
+    query = (0, _model.replaceTemplateVariables)(query, context.variableState);
     var _datasource;
     // Get the datasource, using the default Prom Datasource if one isn't specified in the query
-    const datasourceSelector = (_datasource = spec.datasource) !== null && _datasource !== void 0 ? _datasource : {
-        kind: 'PrometheusDatasource'
-    };
-    const datasource = await context.datasourceStore.getDatasource(datasourceSelector);
-    const queryOptions = {
-        datasource: datasource.plugin.spec
-    };
+    const client = await context.datasourceStore.getDatasourceClient((_datasource = spec.datasource) !== null && _datasource !== void 0 ? _datasource : _model.DEFAULT_PROM);
     // Make the request to Prom
-    const request = {
+    const response = await client.rangeQuery({
         query,
         start,
         end,
         step
-    };
-    const response = await (0, _prometheusClient.rangeQuery)(request, queryOptions);
+    });
     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 : [];
@@ -76,12 +67,16 @@ const getTimeSeriesData = async (spec, context)=>{
             if (name === '') name = query;
             return {
                 name,
-                values: values.map(_parseSampleValues.parseValueTuple)
+                values: values.map(_model.parseValueTuple)
             };
         })
     };
     return chartData;
 };
 const PrometheusTimeSeriesQuery = {
-    getTimeSeriesData
+    getTimeSeriesData,
+    OptionsEditorComponent: _prometheusTimeSeriesQueryEditor.PrometheusTimeSeriesQueryEditor,
+    createInitialOptions: ()=>({
+            query: ''
+        })
 };

package/dist/cjs/plugins/variable.js

@@ -18,6 +18,7 @@ Object.defineProperty(exports, "StaticListVariable", {
     enumerable: true,
     get: ()=>StaticListVariable
 });
+const _jsonspecEditor = require("./JSONSpecEditor");
 const StaticListVariable = {
     getVariableOptions: async (spec)=>{
         var ref;
@@ -34,5 +35,9 @@ const StaticListVariable = {
             data: values
         };
     },
-    dependsOn: ()=>[]
+    dependsOn: ()=>[],
+    OptionsEditorComponent: _jsonspecEditor.JSONSpecEditor,
+    createInitialOptions: ()=>({
+            values: []
+        })
 };

package/dist/model/index.d.ts

@@ -0,0 +1,8 @@
+export * from './api-types';
+export * from './parse-sample-values';
+export * from './prometheus-client';
+export * from './prometheus-selectors';
+export * from './templating';
+export * from './time';
+export * from './utils';
+//# sourceMappingURL=index.d.ts.map

package/dist/model/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/model/index.ts"],"names":[],"mappings":"AAaA,cAAc,aAAa,CAAC;AAC5B,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC;AACvC,cAAc,cAAc,CAAC;AAC7B,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC"}

package/dist/model/index.js

@@ -0,0 +1,21 @@
+// Copyright 2022 The Perses Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+export * from './api-types';
+export * from './parse-sample-values';
+export * from './prometheus-client';
+export * from './prometheus-selectors';
+export * from './templating';
+export * from './time';
+export * from './utils';
+
+//# sourceMappingURL=index.js.map

package/dist/model/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/model/index.ts"],"sourcesContent":["// Copyright 2022 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\nexport * from './api-types';\nexport * from './parse-sample-values';\nexport * from './prometheus-client';\nexport * from './prometheus-selectors';\nexport * from './templating';\nexport * from './time';\nexport * from './utils';\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,cAAc,aAAa,CAAC;AAC5B,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC;AACvC,cAAc,cAAc,CAAC;AAC7B,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC"}

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

@@ -1,13 +1,12 @@
-import { DatasourceSelector } from '@perses-dev/core';
 import { InstantQueryRequestParameters, InstantQueryResponse, LabelNamesRequestParameters, LabelNamesResponse, LabelValuesRequestParameters, LabelValuesResponse, RangeQueryRequestParameters, RangeQueryResponse } from './api-types';
-export interface QueryOptions {
-    datasource: PrometheusDatasourceSpec;
-}
-export interface PrometheusDatasourceSpec {
-    direct_url: string;
+export interface PrometheusClient {
+    instantQuery(params: InstantQueryRequestParameters): Promise<InstantQueryResponse>;
+    rangeQuery(params: RangeQueryRequestParameters): Promise<RangeQueryResponse>;
+    labelNames(params: LabelNamesRequestParameters): Promise<LabelNamesResponse>;
+    labelValues(params: LabelValuesRequestParameters): Promise<LabelValuesResponse>;
 }
-export interface PrometheusDatasourceSelector extends DatasourceSelector {
-    kind: 'PrometheusDatasource';
+export interface QueryOptions {
+    datasourceUrl: string;
 }
 /**
  * Calls the `/api/v1/query` endpoint to get metrics data.

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,EAAE,kBAAkB,EAAa,MAAM,kBAAkB,CAAC;AACjE,OAAO,EACL,6BAA6B,EAC7B,oBAAoB,EACpB,2BAA2B,EAC3B,kBAAkB,EAClB,4BAA4B,EAC5B,mBAAmB,EACnB,2BAA2B,EAC3B,kBAAkB,EACnB,MAAM,aAAa,CAAC;AAErB,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,wBAAwB,CAAC;CACtC;AAED,MAAM,WAAW,wBAAwB;IAEvC,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,4BAA6B,SAAQ,kBAAkB;IACtE,IAAI,EAAE,sBAAsB,CAAC;CAC9B;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":"AAcA,OAAO,EACL,6BAA6B,EAC7B,oBAAoB,EACpB,2BAA2B,EAC3B,kBAAkB,EAClB,4BAA4B,EAC5B,mBAAmB,EACnB,2BAA2B,EAC3B,kBAAkB,EACnB,MAAM,aAAa,CAAC;AAErB,MAAM,WAAW,gBAAgB;IAC/B,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;CACvB;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"}

package/dist/model/prometheus-client.js

@@ -34,8 +34,8 @@ import { fetchJson } from '@perses-dev/core';
     return fetchWithGet(apiURI, searchParams, queryOptions);
 }
 function fetchWithGet(apiURI, params, queryOptions) {
-    const { datasource: { direct_url: datasourceURL  } ,  } = queryOptions;
-    let url = `${datasourceURL}${apiURI}`;
+    const { datasourceUrl  } = queryOptions;
+    let url = `${datasourceUrl}${apiURI}`;
     const urlParams = createSearchParams(params).toString();
     if (urlParams !== '') {
         url += `?${urlParams}`;
@@ -45,8 +45,8 @@ function fetchWithGet(apiURI, params, queryOptions) {
     });
 }
 function fetchWithPost(apiURI, params, queryOptions) {
-    const { datasource: { direct_url: datasourceURL  } ,  } = queryOptions;
-    const url = `${datasourceURL}${apiURI}`;
+    const { datasourceUrl  } = queryOptions;
+    const url = `${datasourceUrl}${apiURI}`;
     const init = {
         method: 'POST',
         headers: {

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/model/prometheus-client.ts"],"sourcesContent":["// Copyright 2022 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 { DatasourceSelector, fetchJson } 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\nexport interface QueryOptions {\n  datasource: PrometheusDatasourceSpec;\n}\n\nexport interface PrometheusDatasourceSpec {\n  // TODO: Make optional for proxy scenario\n  direct_url: string;\n}\n\nexport interface PrometheusDatasourceSelector extends DatasourceSelector {\n  kind: 'PrometheusDatasource';\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 {\n    datasource: { direct_url: datasourceURL },\n  } = 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 {\n    datasource: { direct_url: datasourceURL },\n  } = queryOptions;\n\n  const url = `${datasourceURL}${apiURI}`;\n  const init = {\n    method: 'POST',\n    headers: {\n      'Content-Type': 'application/x-www-form-urlencoded',\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","datasource","direct_url","datasourceURL","url","urlParams","createSearchParams","toString","method","init","headers","body","URLSearchParams","key","value","undefined","append","val"],"mappings":"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"}
+{"version":3,"sources":["../../src/model/prometheus-client.ts"],"sourcesContent":["// Copyright 2022 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 } 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\nexport interface PrometheusClient {\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}\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 } = queryOptions;\n\n  const url = `${datasourceUrl}${apiURI}`;\n  const init = {\n    method: 'POST',\n    headers: {\n      'Content-Type': 'application/x-www-form-urlencoded',\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","init","headers","body","URLSearchParams","key","value","undefined","append","val"],"mappings":"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"}

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

@@ -0,0 +1,22 @@
+import { DatasourceSelector } from '@perses-dev/core';
+declare const PROM_DATASOURCE_KIND: "PrometheusDatasource";
+/**
+ * DatasourceSelector for Prom Datasources.
+ */
+export interface PrometheusDatasourceSelector extends DatasourceSelector {
+    kind: typeof PROM_DATASOURCE_KIND;
+}
+/**
+ * A default selector that asks for the default Prom Datasource.
+ */
+export declare const DEFAULT_PROM: PrometheusDatasourceSelector;
+/**
+ * Returns true if the provided PrometheusDatasourceSelector is the default one.
+ */
+export declare function isDefaultPromSelector(selector: PrometheusDatasourceSelector): boolean;
+/**
+ * Type guard to make sure a DatasourceSelector is a Prometheus one.
+ */
+export declare function isPrometheusDatasourceSelector(selector: DatasourceSelector): selector is PrometheusDatasourceSelector;
+export {};
+//# sourceMappingURL=prometheus-selectors.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"prometheus-selectors.d.ts","sourceRoot":"","sources":["../../src/model/prometheus-selectors.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEtD,QAAA,MAAM,oBAAoB,wBAAkC,CAAC;AAE7D;;GAEG;AACH,MAAM,WAAW,4BAA6B,SAAQ,kBAAkB;IACtE,IAAI,EAAE,OAAO,oBAAoB,CAAC;CACnC;AAED;;GAEG;AACH,eAAO,MAAM,YAAY,EAAE,4BAA6D,CAAC;AAEzF;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,4BAA4B,WAE3E;AAED;;GAEG;AACH,wBAAgB,8BAA8B,CAAC,QAAQ,EAAE,kBAAkB,GAAG,QAAQ,IAAI,4BAA4B,CAErH"}

package/dist/model/prometheus-selectors.js

@@ -0,0 +1,30 @@
+// Copyright 2022 The Perses Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+const PROM_DATASOURCE_KIND = 'PrometheusDatasource';
+/**
+ * A default selector that asks for the default Prom Datasource.
+ */ export const DEFAULT_PROM = {
+    kind: PROM_DATASOURCE_KIND
+};
+/**
+ * Returns true if the provided PrometheusDatasourceSelector is the default one.
+ */ export function isDefaultPromSelector(selector) {
+    return selector.name === undefined;
+}
+/**
+ * Type guard to make sure a DatasourceSelector is a Prometheus one.
+ */ export function isPrometheusDatasourceSelector(selector) {
+    return selector.kind === PROM_DATASOURCE_KIND;
+}
+
+//# sourceMappingURL=prometheus-selectors.js.map

package/dist/model/prometheus-selectors.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/model/prometheus-selectors.ts"],"sourcesContent":["// Copyright 2022 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 { DatasourceSelector } from '@perses-dev/core';\n\nconst PROM_DATASOURCE_KIND = 'PrometheusDatasource' as const;\n\n/**\n * DatasourceSelector for Prom Datasources.\n */\nexport interface PrometheusDatasourceSelector extends DatasourceSelector {\n  kind: typeof PROM_DATASOURCE_KIND;\n}\n\n/**\n * A default selector that asks for the default Prom Datasource.\n */\nexport const DEFAULT_PROM: PrometheusDatasourceSelector = { kind: PROM_DATASOURCE_KIND };\n\n/**\n * Returns true if the provided PrometheusDatasourceSelector is the default one.\n */\nexport function isDefaultPromSelector(selector: PrometheusDatasourceSelector) {\n  return selector.name === undefined;\n}\n\n/**\n * Type guard to make sure a DatasourceSelector is a Prometheus one.\n */\nexport function isPrometheusDatasourceSelector(selector: DatasourceSelector): selector is PrometheusDatasourceSelector {\n  return selector.kind === PROM_DATASOURCE_KIND;\n}\n"],"names":["PROM_DATASOURCE_KIND","DEFAULT_PROM","kind","isDefaultPromSelector","selector","name","undefined","isPrometheusDatasourceSelector"],"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,MAAMA,oBAAoB,GAAG,sBAAsB,AAAS,AAAC;AAS7D;;CAEC,GACD,OAAO,MAAMC,YAAY,GAAiC;IAAEC,IAAI,EAAEF,oBAAoB;CAAE,CAAC;AAEzF;;CAEC,GACD,OAAO,SAASG,qBAAqB,CAACC,QAAsC,EAAE;IAC5E,OAAOA,QAAQ,CAACC,IAAI,KAAKC,SAAS,CAAC;AACrC,CAAC;AAED;;CAEC,GACD,OAAO,SAASC,8BAA8B,CAACH,QAA4B,EAA4C;IACrH,OAAOA,QAAQ,CAACF,IAAI,KAAKF,oBAAoB,CAAC;AAChD,CAAC"}

package/dist/plugins/JSONSpecEditor.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="react" />
+import { OptionsEditorProps } from '@perses-dev/plugin-system';
+export declare function JSONSpecEditor<T>(props: OptionsEditorProps<T>): JSX.Element;
+//# sourceMappingURL=JSONSpecEditor.d.ts.map

package/dist/plugins/JSONSpecEditor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"JSONSpecEditor.d.ts","sourceRoot":"","sources":["../../src/plugins/JSONSpecEditor.tsx"],"names":[],"mappings":";AAeA,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE/D,wBAAgB,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,kBAAkB,CAAC,CAAC,CAAC,eAgC7D"}

package/dist/plugins/JSONSpecEditor.js

@@ -0,0 +1,48 @@
+// Copyright 2022 The Perses Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useEffect, useRef, useState } from 'react';
+import { TextField } from '@mui/material';
+export function JSONSpecEditor(props) {
+    const ref = useRef(null);
+    const [value, setValue] = useState(JSON.stringify(props.value, null, 2));
+    const [invalidJSON, setInvalidJSON] = useState(false);
+    useEffect(()=>{
+        setValue(JSON.stringify(props.value, null, 2));
+        setInvalidJSON(false);
+    }, [
+        props.value
+    ]);
+    return /*#__PURE__*/ _jsx(TextField, {
+        label: "JSON",
+        error: invalidJSON,
+        helperText: invalidJSON ? 'Invalid JSON' : '',
+        multiline: true,
+        inputRef: ref,
+        value: value,
+        onChange: (event)=>{
+            setValue(event.target.value);
+        },
+        onBlur: ()=>{
+            try {
+                const json = JSON.parse(value !== null && value !== void 0 ? value : '{}');
+                setInvalidJSON(false);
+                props.onChange(json);
+            } catch (e) {
+                setInvalidJSON(true);
+            }
+        }
+    });
+}
+
+//# sourceMappingURL=JSONSpecEditor.js.map

package/dist/plugins/JSONSpecEditor.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/plugins/JSONSpecEditor.tsx"],"sourcesContent":["// Copyright 2022 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 { useEffect, useRef, useState } from 'react';\nimport { TextField } from '@mui/material';\nimport { OptionsEditorProps } from '@perses-dev/plugin-system';\n\nexport function JSONSpecEditor<T>(props: OptionsEditorProps<T>) {\n  const ref = useRef<HTMLInputElement>(null);\n  const [value, setValue] = useState(JSON.stringify(props.value, null, 2));\n  const [invalidJSON, setInvalidJSON] = useState(false);\n\n  useEffect(() => {\n    setValue(JSON.stringify(props.value, null, 2));\n    setInvalidJSON(false);\n  }, [props.value]);\n\n  return (\n    <TextField\n      label=\"JSON\"\n      error={invalidJSON}\n      helperText={invalidJSON ? 'Invalid JSON' : ''}\n      multiline\n      inputRef={ref}\n      value={value}\n      onChange={(event) => {\n        setValue(event.target.value);\n      }}\n      onBlur={() => {\n        try {\n          const json = JSON.parse(value ?? '{}');\n          setInvalidJSON(false);\n          props.onChange(json);\n        } catch (e) {\n          setInvalidJSON(true);\n        }\n      }}\n    />\n  );\n}\n"],"names":["useEffect","useRef","useState","TextField","JSONSpecEditor","props","ref","value","setValue","JSON","stringify","invalidJSON","setInvalidJSON","label","error","helperText","multiline","inputRef","onChange","event","target","onBlur","json","parse","e"],"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;AAAA,SAASA,SAAS,EAAEC,MAAM,EAAEC,QAAQ,QAAQ,OAAO,CAAC;AACpD,SAASC,SAAS,QAAQ,eAAe,CAAC;AAG1C,OAAO,SAASC,cAAc,CAAIC,KAA4B,EAAE;IAC9D,MAAMC,GAAG,GAAGL,MAAM,CAAmB,IAAI,CAAC,AAAC;IAC3C,MAAM,CAACM,KAAK,EAAEC,QAAQ,CAAC,GAAGN,QAAQ,CAACO,IAAI,CAACC,SAAS,CAACL,KAAK,CAACE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,AAAC;IACzE,MAAM,CAACI,WAAW,EAAEC,cAAc,CAAC,GAAGV,QAAQ,CAAC,KAAK,CAAC,AAAC;IAEtDF,SAAS,CAAC,IAAM;QACdQ,QAAQ,CAACC,IAAI,CAACC,SAAS,CAACL,KAAK,CAACE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC/CK,cAAc,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC,EAAE;QAACP,KAAK,CAACE,KAAK;KAAC,CAAC,CAAC;IAElB,qBACE,KAACJ,SAAS;QACRU,KAAK,EAAC,MAAM;QACZC,KAAK,EAAEH,WAAW;QAClBI,UAAU,EAAEJ,WAAW,GAAG,cAAc,GAAG,EAAE;QAC7CK,SAAS;QACTC,QAAQ,EAAEX,GAAG;QACbC,KAAK,EAAEA,KAAK;QACZW,QAAQ,EAAE,CAACC,KAAK,GAAK;YACnBX,QAAQ,CAACW,KAAK,CAACC,MAAM,CAACb,KAAK,CAAC,CAAC;QAC/B,CAAC;QACDc,MAAM,EAAE,IAAM;YACZ,IAAI;gBACF,MAAMC,IAAI,GAAGb,IAAI,CAACc,KAAK,CAAChB,KAAK,aAALA,KAAK,cAALA,KAAK,GAAI,IAAI,CAAC,AAAC;gBACvCK,cAAc,CAAC,KAAK,CAAC,CAAC;gBACtBP,KAAK,CAACa,QAAQ,CAACI,IAAI,CAAC,CAAC;YACvB,EAAE,OAAOE,CAAC,EAAE;gBACVZ,cAAc,CAAC,IAAI,CAAC,CAAC;YACvB,CAAC;QACH,CAAC;MACD,CACF;AACJ,CAAC"}

package/dist/plugins/PrometheusTimeSeriesQueryEditor.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="react" />
+import { OptionsEditorProps } from '@perses-dev/plugin-system';
+import { PrometheusTimeSeriesQuerySpec } from './time-series-query';
+export declare type PrometheusTimeSeriesQueryEditorProps = OptionsEditorProps<PrometheusTimeSeriesQuerySpec>;
+export declare function PrometheusTimeSeriesQueryEditor(props: PrometheusTimeSeriesQueryEditorProps): JSX.Element;
+//# sourceMappingURL=PrometheusTimeSeriesQueryEditor.d.ts.map

package/dist/plugins/PrometheusTimeSeriesQueryEditor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"PrometheusTimeSeriesQueryEditor.d.ts","sourceRoot":"","sources":["../../src/plugins/PrometheusTimeSeriesQueryEditor.tsx"],"names":[],"mappings":";AAgBA,OAAO,EAAE,kBAAkB,EAA2C,MAAM,2BAA2B,CAAC;AAExG,OAAO,EAAE,6BAA6B,EAAE,MAAM,qBAAqB,CAAC;AAEpE,oBAAY,oCAAoC,GAAG,kBAAkB,CAAC,6BAA6B,CAAC,CAAC;AAErG,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,oCAAoC,eA4C1F"}

package/dist/plugins/PrometheusTimeSeriesQueryEditor.js

@@ -0,0 +1,66 @@
+// Copyright 2022 The Perses Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import produce from 'immer';
+import { Box, TextField, FormControl, InputLabel } from '@mui/material';
+import { DatasourceSelect } from '@perses-dev/plugin-system';
+import { DEFAULT_PROM, isDefaultPromSelector, isPrometheusDatasourceSelector } from '../model';
+export function PrometheusTimeSeriesQueryEditor(props) {
+    const { onChange , value  } = props;
+    const { query , datasource  } = value;
+    const handleQueryChange = (e)=>{
+        onChange(produce(value, (draft)=>{
+            draft.query = e.target.value;
+        }));
+    };
+    const handleDatasourceChange = (next)=>{
+        if (isPrometheusDatasourceSelector(next)) {
+            onChange(produce(value, (draft)=>{
+                // If they're using the default, just omit the datasource prop (i.e. set to undefined)
+                const nextDatasource = isDefaultPromSelector(next) ? undefined : next;
+                draft.datasource = nextDatasource;
+            }));
+            return;
+        }
+        throw new Error('Got unexpected non-Prometheus datasource selector');
+    };
+    return /*#__PURE__*/ _jsxs(Box, {
+        children: [
+            /*#__PURE__*/ _jsx(TextField, {
+                label: "Query",
+                value: query,
+                onChange: handleQueryChange,
+                margin: "dense"
+            }),
+            /*#__PURE__*/ _jsxs(FormControl, {
+                margin: "dense",
+                fullWidth: false,
+                children: [
+                    /*#__PURE__*/ _jsx(InputLabel, {
+                        id: "prom-datasource-label",
+                        children: "Prometheus Datasource"
+                    }),
+                    /*#__PURE__*/ _jsx(DatasourceSelect, {
+                        datasourcePluginKind: "PrometheusDatasource",
+                        value: datasource !== null && datasource !== void 0 ? datasource : DEFAULT_PROM,
+                        onChange: handleDatasourceChange,
+                        labelId: "prom-datasource-label",
+                        label: "Prometheus Datasource"
+                    })
+                ]
+            })
+        ]
+    });
+}
+
+//# sourceMappingURL=PrometheusTimeSeriesQueryEditor.js.map

package/dist/plugins/PrometheusTimeSeriesQueryEditor.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/plugins/PrometheusTimeSeriesQueryEditor.tsx"],"sourcesContent":["// Copyright 2022 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 { ChangeEvent } from 'react';\nimport produce from 'immer';\nimport { Box, TextField, FormControl, InputLabel } from '@mui/material';\nimport { OptionsEditorProps, DatasourceSelect, DatasourceSelectProps } from '@perses-dev/plugin-system';\nimport { DEFAULT_PROM, isDefaultPromSelector, isPrometheusDatasourceSelector } from '../model';\nimport { PrometheusTimeSeriesQuerySpec } from './time-series-query';\n\nexport type PrometheusTimeSeriesQueryEditorProps = OptionsEditorProps<PrometheusTimeSeriesQuerySpec>;\n\nexport function PrometheusTimeSeriesQueryEditor(props: PrometheusTimeSeriesQueryEditorProps) {\n  const { onChange, value } = props;\n  const { query, datasource } = value;\n\n  const handleQueryChange = (e: ChangeEvent<HTMLInputElement>) => {\n    onChange(\n      produce(value, (draft) => {\n        draft.query = e.target.value;\n      })\n    );\n  };\n\n  const handleDatasourceChange: DatasourceSelectProps['onChange'] = (next) => {\n    if (isPrometheusDatasourceSelector(next)) {\n      onChange(\n        produce(value, (draft) => {\n          // If they're using the default, just omit the datasource prop (i.e. set to undefined)\n          const nextDatasource = isDefaultPromSelector(next) ? undefined : next;\n          draft.datasource = nextDatasource;\n        })\n      );\n      return;\n    }\n\n    throw new Error('Got unexpected non-Prometheus datasource selector');\n  };\n\n  return (\n    <Box>\n      <TextField label=\"Query\" value={query} onChange={handleQueryChange} margin=\"dense\" />\n      <FormControl margin=\"dense\" fullWidth={false}>\n        {/* TODO: How do we ensure unique ID values if there are multiple of these? Can we use React 18 useId and\n            maintain 17 compatibility somehow with a polyfill/shim? */}\n        <InputLabel id=\"prom-datasource-label\">Prometheus Datasource</InputLabel>\n        <DatasourceSelect\n          datasourcePluginKind=\"PrometheusDatasource\"\n          value={datasource ?? DEFAULT_PROM}\n          onChange={handleDatasourceChange}\n          labelId=\"prom-datasource-label\"\n          label=\"Prometheus Datasource\"\n        />\n      </FormControl>\n    </Box>\n  );\n}\n"],"names":["produce","Box","TextField","FormControl","InputLabel","DatasourceSelect","DEFAULT_PROM","isDefaultPromSelector","isPrometheusDatasourceSelector","PrometheusTimeSeriesQueryEditor","props","onChange","value","query","datasource","handleQueryChange","e","draft","target","handleDatasourceChange","next","nextDatasource","undefined","Error","label","margin","fullWidth","id","datasourcePluginKind","labelId"],"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;AACA,OAAOA,OAAO,MAAM,OAAO,CAAC;AAC5B,SAASC,GAAG,EAAEC,SAAS,EAAEC,WAAW,EAAEC,UAAU,QAAQ,eAAe,CAAC;AACxE,SAA6BC,gBAAgB,QAA+B,2BAA2B,CAAC;AACxG,SAASC,YAAY,EAAEC,qBAAqB,EAAEC,8BAA8B,QAAQ,UAAU,CAAC;AAK/F,OAAO,SAASC,+BAA+B,CAACC,KAA2C,EAAE;IAC3F,MAAM,EAAEC,QAAQ,CAAA,EAAEC,KAAK,CAAA,EAAE,GAAGF,KAAK,AAAC;IAClC,MAAM,EAAEG,KAAK,CAAA,EAAEC,UAAU,CAAA,EAAE,GAAGF,KAAK,AAAC;IAEpC,MAAMG,iBAAiB,GAAG,CAACC,CAAgC,GAAK;QAC9DL,QAAQ,CACNX,OAAO,CAACY,KAAK,EAAE,CAACK,KAAK,GAAK;YACxBA,KAAK,CAACJ,KAAK,GAAGG,CAAC,CAACE,MAAM,CAACN,KAAK,CAAC;QAC/B,CAAC,CAAC,CACH,CAAC;IACJ,CAAC,AAAC;IAEF,MAAMO,sBAAsB,GAAsC,CAACC,IAAI,GAAK;QAC1E,IAAIZ,8BAA8B,CAACY,IAAI,CAAC,EAAE;YACxCT,QAAQ,CACNX,OAAO,CAACY,KAAK,EAAE,CAACK,KAAK,GAAK;gBACxB,sFAAsF;gBACtF,MAAMI,cAAc,GAAGd,qBAAqB,CAACa,IAAI,CAAC,GAAGE,SAAS,GAAGF,IAAI,AAAC;gBACtEH,KAAK,CAACH,UAAU,GAAGO,cAAc,CAAC;YACpC,CAAC,CAAC,CACH,CAAC;YACF,OAAO;QACT,CAAC;QAED,MAAM,IAAIE,KAAK,CAAC,mDAAmD,CAAC,CAAC;IACvE,CAAC,AAAC;IAEF,qBACE,MAACtB,GAAG;;0BACF,KAACC,SAAS;gBAACsB,KAAK,EAAC,OAAO;gBAACZ,KAAK,EAAEC,KAAK;gBAAEF,QAAQ,EAAEI,iBAAiB;gBAAEU,MAAM,EAAC,OAAO;cAAG;0BACrF,MAACtB,WAAW;gBAACsB,MAAM,EAAC,OAAO;gBAACC,SAAS,EAAE,KAAK;;kCAG1C,KAACtB,UAAU;wBAACuB,EAAE,EAAC,uBAAuB;kCAAC,uBAAqB;sBAAa;kCACzE,KAACtB,gBAAgB;wBACfuB,oBAAoB,EAAC,sBAAsB;wBAC3ChB,KAAK,EAAEE,UAAU,aAAVA,UAAU,cAAVA,UAAU,GAAIR,YAAY;wBACjCK,QAAQ,EAAEQ,sBAAsB;wBAChCU,OAAO,EAAC,uBAAuB;wBAC/BL,KAAK,EAAC,uBAAuB;sBAC7B;;cACU;;MACV,CACN;AACJ,CAAC"}

package/dist/plugins/prometheus-datasource.d.ts

@@ -1,4 +1,7 @@
 import { DatasourcePlugin } from '@perses-dev/plugin-system';
-import { PrometheusDatasourceSpec } from '../model/prometheus-client';
-export declare const PrometheusDatasource: DatasourcePlugin<PrometheusDatasourceSpec>;
+import { PrometheusClient } from '../model';
+export interface PrometheusDatasourceSpec {
+    direct_url?: string;
+}
+export declare const PrometheusDatasource: DatasourcePlugin<PrometheusDatasourceSpec, PrometheusClient>;
 //# sourceMappingURL=prometheus-datasource.d.ts.map

package/dist/plugins/prometheus-datasource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prometheus-datasource.d.ts","sourceRoot":"","sources":["../../src/plugins/prometheus-datasource.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAEtE,eAAO,MAAM,oBAAoB,EAAE,gBAAgB,CAAC,wBAAwB,CAG3E,CAAC"}
+{"version":3,"file":"prometheus-datasource.d.ts","sourceRoot":"","sources":["../../src/plugins/prometheus-datasource.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAqD,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE/F,MAAM,WAAW,wBAAwB;IACvC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAwBD,eAAO,MAAM,oBAAoB,EAAE,gBAAgB,CAAC,wBAAwB,EAAE,gBAAgB,CAI7F,CAAC"}

package/dist/plugins/prometheus-datasource.js

@@ -10,7 +10,35 @@
 // 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 { instantQuery, rangeQuery, labelNames, labelValues } from '../model';
+/**
+ * Creates a PrometheusClient for a specific datasource spec.
+ */ const createClient = (spec, options)=>{
+    const { direct_url  } = 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;
+    if (datasourceUrl === undefined) {
+        throw new Error('No URL specified for Prometheus client. You can use direct_url in the spec to configure it.');
+    }
+    // Could think about this becoming a class, although it definitely doesn't have to be
+    return {
+        instantQuery: (params)=>instantQuery(params, {
+                datasourceUrl
+            }),
+        rangeQuery: (params)=>rangeQuery(params, {
+                datasourceUrl
+            }),
+        labelNames: (params)=>labelNames(params, {
+                datasourceUrl
+            }),
+        labelValues: (params)=>labelValues(params, {
+                datasourceUrl
+            })
+    };
+};
 export const PrometheusDatasource = {
+    createClient,
     OptionsEditorComponent: ()=>null,
     createInitialOptions: ()=>({
             direct_url: ''

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/plugins/prometheus-datasource.ts"],"sourcesContent":["// Copyright 2022 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 { DatasourcePlugin } from '@perses-dev/plugin-system';\nimport { PrometheusDatasourceSpec } from '../model/prometheus-client';\n\nexport const PrometheusDatasource: DatasourcePlugin<PrometheusDatasourceSpec> = {\n  OptionsEditorComponent: () => null,\n  createInitialOptions: () => ({ direct_url: '' }),\n};\n"],"names":["PrometheusDatasource","OptionsEditorComponent","createInitialOptions","direct_url"],"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;AAKjC,OAAO,MAAMA,oBAAoB,GAA+C;IAC9EC,sBAAsB,EAAE,IAAM,IAAI;IAClCC,oBAAoB,EAAE,IAAO,CAAA;YAAEC,UAAU,EAAE,EAAE;SAAE,CAAA,AAAC;CACjD,CAAC"}
+{"version":3,"sources":["../../src/plugins/prometheus-datasource.ts"],"sourcesContent":["// Copyright 2022 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 { DatasourcePlugin } from '@perses-dev/plugin-system';\nimport { instantQuery, rangeQuery, labelNames, labelValues, PrometheusClient } from '../model';\n\nexport interface PrometheusDatasourceSpec {\n  direct_url?: string;\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 } = 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    instantQuery: (params) => instantQuery(params, { datasourceUrl }),\n    rangeQuery: (params) => rangeQuery(params, { datasourceUrl }),\n    labelNames: (params) => labelNames(params, { datasourceUrl }),\n    labelValues: (params) => labelValues(params, { datasourceUrl }),\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","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;AAGjC,SAASA,YAAY,EAAEC,UAAU,EAAEC,UAAU,EAAEC,WAAW,QAA0B,UAAU,CAAC;AAM/F;;CAEC,GACD,MAAMC,YAAY,GAAiF,CAACC,IAAI,EAAEC,OAAO,GAAK;IACpH,MAAM,EAAEC,UAAU,CAAA,EAAE,GAAGF,IAAI,AAAC;IAC5B,MAAM,EAAEG,QAAQ,CAAA,EAAE,GAAGF,OAAO,AAAC;IAE7B,4FAA4F;IAC5F,MAAMG,aAAa,GAAGF,UAAU,aAAVA,UAAU,cAAVA,UAAU,GAAIC,QAAQ,AAAC;IAC7C,IAAIC,aAAa,KAAKC,SAAS,EAAE;QAC/B,MAAM,IAAIC,KAAK,CAAC,6FAA6F,CAAC,CAAC;IACjH,CAAC;IAED,qFAAqF;IACrF,OAAO;QACLX,YAAY,EAAE,CAACY,MAAM,GAAKZ,YAAY,CAACY,MAAM,EAAE;gBAAEH,aAAa;aAAE,CAAC;QACjER,UAAU,EAAE,CAACW,MAAM,GAAKX,UAAU,CAACW,MAAM,EAAE;gBAAEH,aAAa;aAAE,CAAC;QAC7DP,UAAU,EAAE,CAACU,MAAM,GAAKV,UAAU,CAACU,MAAM,EAAE;gBAAEH,aAAa;aAAE,CAAC;QAC7DN,WAAW,EAAE,CAACS,MAAM,GAAKT,WAAW,CAACS,MAAM,EAAE;gBAAEH,aAAa;aAAE,CAAC;KAChE,CAAC;AACJ,CAAC,AAAC;AAEF,OAAO,MAAMI,oBAAoB,GAAiE;IAChGT,YAAY;IACZU,sBAAsB,EAAE,IAAM,IAAI;IAClCC,oBAAoB,EAAE,IAAO,CAAA;YAAER,UAAU,EAAE,EAAE;SAAE,CAAA,AAAC;CACjD,CAAC"}

package/dist/plugins/prometheus-variables.d.ts

@@ -1,9 +1,11 @@
 import { VariablePlugin } from '@perses-dev/plugin-system';
-import { PrometheusDatasourceSelector } from '../model/prometheus-client';
+import { PrometheusDatasourceSelector } from '../model';
 interface PrometheusVariableOptionsBase {
     datasource?: PrometheusDatasourceSelector;
 }
-declare type PrometheusLabelNamesVariableOptions = PrometheusVariableOptionsBase;
+declare type PrometheusLabelNamesVariableOptions = PrometheusVariableOptionsBase & {
+    matchers?: [string];
+};
 declare type PrometheusLabelValuesVariableOptions = PrometheusVariableOptionsBase & {
     label_name: string;
     matchers?: [string];

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

@@ -1 +1 @@
-{"version":3,"file":"prometheus-variables.d.ts","sourceRoot":"","sources":["../../src/plugins/prometheus-variables.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,cAAc,EAA6C,MAAM,2BAA2B,CAAC;AAEtG,OAAO,EAKL,4BAA4B,EAC7B,MAAM,4BAA4B,CAAC;AAEpC,UAAU,6BAA6B;IACrC,UAAU,CAAC,EAAE,4BAA4B,CAAC;CAC3C;AAED,aAAK,mCAAmC,GAAG,6BAA6B,CAAC;AAEzE,aAAK,oCAAoC,GAAG,6BAA6B,GAAG;IAC1E,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;CACrB,CAAC;AA0BF,eAAO,MAAM,4BAA4B,EAAE,cAAc,CAAC,mCAAmC,CAS5F,CAAC;AAEF,eAAO,MAAM,6BAA6B,EAAE,cAAc,CAAC,oCAAoC,CAe9F,CAAC"}
+{"version":3,"file":"prometheus-variables.d.ts","sourceRoot":"","sources":["../../src/plugins/prometheus-variables.tsx"],"names":[],"mappings":"AAYA,OAAO,EAAE,cAAc,EAAkB,MAAM,2BAA2B,CAAC;AAC3E,OAAO,EAKL,4BAA4B,EAC7B,MAAM,UAAU,CAAC;AAGlB,UAAU,6BAA6B;IACrC,UAAU,CAAC,EAAE,4BAA4B,CAAC;CAC3C;AAED,aAAK,mCAAmC,GAAG,6BAA6B,GAAG;IACzE,QAAQ,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;CACrB,CAAC;AAEF,aAAK,oCAAoC,GAAG,6BAA6B,GAAG;IAC1E,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;CACrB,CAAC;AAaF,eAAO,MAAM,4BAA4B,EAAE,cAAc,CAAC,mCAAmC,CAY5F,CAAC;AAEF,eAAO,MAAM,6BAA6B,EAAE,cAAc,CAAC,oCAAoC,CAiB9F,CAAC"}

package/dist/plugins/prometheus-variables.js

@@ -10,8 +10,8 @@
 // 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 { replaceTemplateVariables, parseTemplateVariables } from '../model/utils';
-import { labelValues, labelNames } from '../model/prometheus-client';
+import { replaceTemplateVariables, parseTemplateVariables, DEFAULT_PROM } from '../model';
+import { JSONSpecEditor } from './JSONSpecEditor';
 /**
  * Takes a list of strings and returns a list of VariableOptions
  */ const stringArrayToVariableOptions = (values)=>{
@@ -21,37 +21,32 @@ import { labelValues, labelNames } from '../model/prometheus-client';
             label: value
         }));
 };
-async function getQueryOptions(ctx, spec) {
-    var _datasource;
-    // Just use the default Prom datatsource if not specified in variable's spec
-    const datasourceSelector = (_datasource = spec.datasource) !== null && _datasource !== void 0 ? _datasource : {
-        kind: 'PrometheusDatasource'
-    };
-    const datasource = await ctx.datasourceStore.getDatasource(datasourceSelector);
-    const queryOptions = {
-        datasource: datasource.plugin.spec
-    };
-    return queryOptions;
-}
 export const PrometheusLabelNamesVariable = {
     getVariableOptions: async (spec, ctx)=>{
-        const queryOptions = await getQueryOptions(ctx, spec);
-        const { data: options  } = await labelNames({}, queryOptions);
+        var _datasource;
+        const client = await ctx.datasourceStore.getDatasourceClient((_datasource = spec.datasource) !== null && _datasource !== void 0 ? _datasource : DEFAULT_PROM);
+        const match = spec.matchers ? spec.matchers.map((m)=>replaceTemplateVariables(m, ctx.variables)) : undefined;
+        const { data: options  } = await client.labelNames({
+            'match[]': match
+        });
         return {
             data: stringArrayToVariableOptions(options)
         };
     },
-    dependsOn: ()=>[]
+    dependsOn: ()=>[],
+    OptionsEditorComponent: JSONSpecEditor,
+    createInitialOptions: ()=>({})
 };
 export const PrometheusLabelValuesVariable = {
     getVariableOptions: async (spec, ctx)=>{
         const pluginDef = spec;
-        const queryOptions = await getQueryOptions(ctx, spec);
+        var _datasource;
+        const client = await ctx.datasourceStore.getDatasourceClient((_datasource = spec.datasource) !== null && _datasource !== void 0 ? _datasource : DEFAULT_PROM);
         const match = pluginDef.matchers ? pluginDef.matchers.map((m)=>replaceTemplateVariables(m, ctx.variables)) : undefined;
-        const { data: options  } = await labelValues({
+        const { data: options  } = await client.labelValues({
             labelName: pluginDef.label_name,
             'match[]': match
-        }, queryOptions);
+        });
         return {
             data: stringArrayToVariableOptions(options)
         };
@@ -59,7 +54,11 @@ export const PrometheusLabelValuesVariable = {
     dependsOn: (spec)=>{
         var ref;
         return ((ref = spec.matchers) === null || ref === void 0 ? void 0 : ref.map((m)=>parseTemplateVariables(m)).flat()) || [];
-    }
+    },
+    OptionsEditorComponent: JSONSpecEditor,
+    createInitialOptions: ()=>({
+            label_name: ''
+        })
 };
 
 //# sourceMappingURL=prometheus-variables.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/plugins/prometheus-variables.ts"],"sourcesContent":["// Copyright 2022 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 { VariablePlugin, VariableOption, GetVariableOptionsContext } from '@perses-dev/plugin-system';\nimport { replaceTemplateVariables, parseTemplateVariables } from '../model/utils';\nimport {\n  labelValues,\n  labelNames,\n  PrometheusDatasourceSpec,\n  QueryOptions,\n  PrometheusDatasourceSelector,\n} from '../model/prometheus-client';\n\ninterface PrometheusVariableOptionsBase {\n  datasource?: PrometheusDatasourceSelector;\n}\n\ntype PrometheusLabelNamesVariableOptions = PrometheusVariableOptionsBase;\n\ntype PrometheusLabelValuesVariableOptions = PrometheusVariableOptionsBase & {\n  label_name: string;\n  matchers?: [string];\n};\n\n/**\n * Takes a list of strings and returns a list of VariableOptions\n */\nconst stringArrayToVariableOptions = (values?: string[]): VariableOption[] => {\n  if (!values) return [];\n  return values.map((value) => ({\n    value,\n    label: value,\n  }));\n};\n\nasync function getQueryOptions(\n  ctx: GetVariableOptionsContext,\n  spec: PrometheusVariableOptionsBase\n): Promise<QueryOptions> {\n  // Just use the default Prom datatsource if not specified in variable's spec\n  const datasourceSelector = spec.datasource ?? { kind: 'PrometheusDatasource' };\n  const datasource = await ctx.datasourceStore.getDatasource(datasourceSelector);\n  const queryOptions = {\n    datasource: datasource.plugin.spec as PrometheusDatasourceSpec,\n  };\n  return queryOptions;\n}\n\nexport const PrometheusLabelNamesVariable: VariablePlugin<PrometheusLabelNamesVariableOptions> = {\n  getVariableOptions: async (spec, ctx) => {\n    const queryOptions = await getQueryOptions(ctx, spec);\n    const { data: options } = await labelNames({}, queryOptions);\n    return {\n      data: stringArrayToVariableOptions(options),\n    };\n  },\n  dependsOn: () => [],\n};\n\nexport const PrometheusLabelValuesVariable: VariablePlugin<PrometheusLabelValuesVariableOptions> = {\n  getVariableOptions: async (spec, ctx) => {\n    const pluginDef = spec;\n    const queryOptions = await getQueryOptions(ctx, spec);\n    const match = pluginDef.matchers\n      ? pluginDef.matchers.map((m) => replaceTemplateVariables(m, ctx.variables))\n      : undefined;\n    const { data: options } = await labelValues({ labelName: pluginDef.label_name, 'match[]': match }, queryOptions);\n    return {\n      data: stringArrayToVariableOptions(options),\n    };\n  },\n  dependsOn: (spec) => {\n    return spec.matchers?.map((m) => parseTemplateVariables(m)).flat() || [];\n  },\n};\n"],"names":["replaceTemplateVariables","parseTemplateVariables","labelValues","labelNames","stringArrayToVariableOptions","values","map","value","label","getQueryOptions","ctx","spec","datasourceSelector","datasource","kind","datasourceStore","getDatasource","queryOptions","plugin","PrometheusLabelNamesVariable","getVariableOptions","data","options","dependsOn","PrometheusLabelValuesVariable","pluginDef","match","matchers","m","variables","undefined","labelName","label_name","flat"],"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;AAGjC,SAASA,wBAAwB,EAAEC,sBAAsB,QAAQ,gBAAgB,CAAC;AAClF,SACEC,WAAW,EACXC,UAAU,QAIL,4BAA4B,CAAC;AAapC;;CAEC,GACD,MAAMC,4BAA4B,GAAG,CAACC,MAAiB,GAAuB;IAC5E,IAAI,CAACA,MAAM,EAAE,OAAO,EAAE,CAAC;IACvB,OAAOA,MAAM,CAACC,GAAG,CAAC,CAACC,KAAK,GAAM,CAAA;YAC5BA,KAAK;YACLC,KAAK,EAAED,KAAK;SACb,CAAA,AAAC,CAAC,CAAC;AACN,CAAC,AAAC;AAEF,eAAeE,eAAe,CAC5BC,GAA8B,EAC9BC,IAAmC,EACZ;QAEIA,WAAe;IAD1C,4EAA4E;IAC5E,MAAMC,kBAAkB,GAAGD,CAAAA,WAAe,GAAfA,IAAI,CAACE,UAAU,cAAfF,WAAe,cAAfA,WAAe,GAAI;QAAEG,IAAI,EAAE,sBAAsB;KAAE,AAAC;IAC/E,MAAMD,UAAU,GAAG,MAAMH,GAAG,CAACK,eAAe,CAACC,aAAa,CAACJ,kBAAkB,CAAC,AAAC;IAC/E,MAAMK,YAAY,GAAG;QACnBJ,UAAU,EAAEA,UAAU,CAACK,MAAM,CAACP,IAAI;KACnC,AAAC;IACF,OAAOM,YAAY,CAAC;AACtB,CAAC;AAED,OAAO,MAAME,4BAA4B,GAAwD;IAC/FC,kBAAkB,EAAE,OAAOT,IAAI,EAAED,GAAG,GAAK;QACvC,MAAMO,YAAY,GAAG,MAAMR,eAAe,CAACC,GAAG,EAAEC,IAAI,CAAC,AAAC;QACtD,MAAM,EAAEU,IAAI,EAAEC,OAAO,CAAA,EAAE,GAAG,MAAMnB,UAAU,CAAC,EAAE,EAAEc,YAAY,CAAC,AAAC;QAC7D,OAAO;YACLI,IAAI,EAAEjB,4BAA4B,CAACkB,OAAO,CAAC;SAC5C,CAAC;IACJ,CAAC;IACDC,SAAS,EAAE,IAAM,EAAE;CACpB,CAAC;AAEF,OAAO,MAAMC,6BAA6B,GAAyD;IACjGJ,kBAAkB,EAAE,OAAOT,IAAI,EAAED,GAAG,GAAK;QACvC,MAAMe,SAAS,GAAGd,IAAI,AAAC;QACvB,MAAMM,YAAY,GAAG,MAAMR,eAAe,CAACC,GAAG,EAAEC,IAAI,CAAC,AAAC;QACtD,MAAMe,KAAK,GAAGD,SAAS,CAACE,QAAQ,GAC5BF,SAAS,CAACE,QAAQ,CAACrB,GAAG,CAAC,CAACsB,CAAC,GAAK5B,wBAAwB,CAAC4B,CAAC,EAAElB,GAAG,CAACmB,SAAS,CAAC,CAAC,GACzEC,SAAS,AAAC;QACd,MAAM,EAAET,IAAI,EAAEC,OAAO,CAAA,EAAE,GAAG,MAAMpB,WAAW,CAAC;YAAE6B,SAAS,EAAEN,SAAS,CAACO,UAAU;YAAE,SAAS,EAAEN,KAAK;SAAE,EAAET,YAAY,CAAC,AAAC;QACjH,OAAO;YACLI,IAAI,EAAEjB,4BAA4B,CAACkB,OAAO,CAAC;SAC5C,CAAC;IACJ,CAAC;IACDC,SAAS,EAAE,CAACZ,IAAI,GAAK;YACZA,GAAa;QAApB,OAAOA,CAAAA,CAAAA,GAAa,GAAbA,IAAI,CAACgB,QAAQ,cAAbhB,GAAa,WAAK,GAAlBA,KAAAA,CAAkB,GAAlBA,GAAa,CAAEL,GAAG,CAAC,CAACsB,CAAC,GAAK3B,sBAAsB,CAAC2B,CAAC,CAAC,CAAC,CAACK,IAAI,EAAE,CAAA,IAAI,EAAE,CAAC;IAC3E,CAAC;CACF,CAAC"}
+{"version":3,"sources":["../../src/plugins/prometheus-variables.tsx"],"sourcesContent":["// Copyright 2022 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\nimport { VariablePlugin, VariableOption } from '@perses-dev/plugin-system';\nimport {\n  replaceTemplateVariables,\n  parseTemplateVariables,\n  PrometheusClient,\n  DEFAULT_PROM,\n  PrometheusDatasourceSelector,\n} from '../model';\nimport { JSONSpecEditor } from './JSONSpecEditor';\n\ninterface PrometheusVariableOptionsBase {\n  datasource?: PrometheusDatasourceSelector;\n}\n\ntype PrometheusLabelNamesVariableOptions = PrometheusVariableOptionsBase & {\n  matchers?: [string];\n};\n\ntype PrometheusLabelValuesVariableOptions = PrometheusVariableOptionsBase & {\n  label_name: string;\n  matchers?: [string];\n};\n\n/**\n * Takes a list of strings and returns a list of VariableOptions\n */\nconst stringArrayToVariableOptions = (values?: string[]): VariableOption[] => {\n  if (!values) return [];\n  return values.map((value) => ({\n    value,\n    label: value,\n  }));\n};\n\nexport const PrometheusLabelNamesVariable: VariablePlugin<PrometheusLabelNamesVariableOptions> = {\n  getVariableOptions: async (spec, ctx) => {\n    const client: PrometheusClient = await ctx.datasourceStore.getDatasourceClient(spec.datasource ?? DEFAULT_PROM);\n    const match = spec.matchers ? spec.matchers.map((m) => replaceTemplateVariables(m, ctx.variables)) : undefined;\n    const { data: options } = await client.labelNames({ 'match[]': match });\n    return {\n      data: stringArrayToVariableOptions(options),\n    };\n  },\n  dependsOn: () => [],\n  OptionsEditorComponent: JSONSpecEditor,\n  createInitialOptions: () => ({}),\n};\n\nexport const PrometheusLabelValuesVariable: VariablePlugin<PrometheusLabelValuesVariableOptions> = {\n  getVariableOptions: async (spec, ctx) => {\n    const pluginDef = spec;\n    const client: PrometheusClient = await ctx.datasourceStore.getDatasourceClient(spec.datasource ?? DEFAULT_PROM);\n    const match = pluginDef.matchers\n      ? pluginDef.matchers.map((m) => replaceTemplateVariables(m, ctx.variables))\n      : undefined;\n    const { data: options } = await client.labelValues({ labelName: pluginDef.label_name, 'match[]': match });\n    return {\n      data: stringArrayToVariableOptions(options),\n    };\n  },\n  dependsOn: (spec) => {\n    return spec.matchers?.map((m) => parseTemplateVariables(m)).flat() || [];\n  },\n  OptionsEditorComponent: JSONSpecEditor,\n  createInitialOptions: () => ({ label_name: '' }),\n};\n"],"names":["replaceTemplateVariables","parseTemplateVariables","DEFAULT_PROM","JSONSpecEditor","stringArrayToVariableOptions","values","map","value","label","PrometheusLabelNamesVariable","getVariableOptions","spec","ctx","client","datasourceStore","getDatasourceClient","datasource","match","matchers","m","variables","undefined","data","options","labelNames","dependsOn","OptionsEditorComponent","createInitialOptions","PrometheusLabelValuesVariable","pluginDef","labelValues","labelName","label_name","flat"],"mappings":"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"}

package/dist/plugins/time-series-query.d.ts

@@ -1,8 +1,7 @@
 import { DurationString } from '@perses-dev/core';
 import { TimeSeriesQueryPlugin } from '@perses-dev/plugin-system';
-import { PrometheusDatasourceSelector } from '../model/prometheus-client';
-import { TemplateString } from '../model/templating';
-interface PrometheusTimeSeriesQuerySpec {
+import { PrometheusDatasourceSelector, TemplateString } from '../model';
+export interface PrometheusTimeSeriesQuerySpec {
     query: TemplateString;
     min_step?: DurationString;
     resolution?: number;
@@ -12,5 +11,4 @@ interface PrometheusTimeSeriesQuerySpec {
  * The core Prometheus TimeSeriesQuery plugin for Perses.
  */
 export declare const PrometheusTimeSeriesQuery: TimeSeriesQueryPlugin<PrometheusTimeSeriesQuerySpec>;
-export {};
 //# sourceMappingURL=time-series-query.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"time-series-query.d.ts","sourceRoot":"","sources":["../../src/plugins/time-series-query.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAkB,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAIlF,OAAO,EAIL,4BAA4B,EAC7B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAIrD,UAAU,6BAA6B;IACrC,KAAK,EAAE,cAAc,CAAC;IACtB,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,4BAA4B,CAAC;CAC3C;AAqED;;GAEG;AACH,eAAO,MAAM,yBAAyB,EAAE,qBAAqB,CAAC,6BAA6B,CAE1F,CAAC"}
+{"version":3,"file":"time-series-query.d.ts","sourceRoot":"","sources":["../../src/plugins/time-series-query.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAkB,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAElF,OAAO,EAEL,4BAA4B,EAE5B,cAAc,EAMf,MAAM,UAAU,CAAC;AAGlB,MAAM,WAAW,6BAA6B;IAC5C,KAAK,EAAE,cAAc,CAAC;IACtB,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,4BAA4B,CAAC;CAC3C;AAgED;;GAEG;AACH,eAAO,MAAM,yBAAyB,EAAE,qBAAqB,CAAC,6BAA6B,CAM1F,CAAC"}

package/dist/plugins/time-series-query.js

@@ -11,10 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 import { fromUnixTime } from 'date-fns';
-import { parseValueTuple } from '../model/parse-sample-values';
-import { rangeQuery } from '../model/prometheus-client';
-import { getDurationStringSeconds, getPrometheusTimeRange, getRangeStep } from '../model/time';
-import { replaceTemplateVariables } from '../model/utils';
+import { parseValueTuple, getDurationStringSeconds, getPrometheusTimeRange, getRangeStep, replaceTemplateVariables, DEFAULT_PROM } from '../model';
+import { PrometheusTimeSeriesQueryEditor } from './PrometheusTimeSeriesQueryEditor';
 const getTimeSeriesData = async (spec, context)=>{
     var ref;
     const minStep = getDurationStringSeconds(spec.min_step);
@@ -32,21 +30,14 @@ const getTimeSeriesData = async (spec, context)=>{
     query = replaceTemplateVariables(query, context.variableState);
     var _datasource;
     // Get the datasource, using the default Prom Datasource if one isn't specified in the query
-    const datasourceSelector = (_datasource = spec.datasource) !== null && _datasource !== void 0 ? _datasource : {
-        kind: 'PrometheusDatasource'
-    };
-    const datasource = await context.datasourceStore.getDatasource(datasourceSelector);
-    const queryOptions = {
-        datasource: datasource.plugin.spec
-    };
+    const client = await context.datasourceStore.getDatasourceClient((_datasource = spec.datasource) !== null && _datasource !== void 0 ? _datasource : DEFAULT_PROM);
     // Make the request to Prom
-    const request = {
+    const response = await client.rangeQuery({
         query,
         start,
         end,
         step
-    };
-    const response = await rangeQuery(request, queryOptions);
+    });
     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 : [];
@@ -77,7 +68,11 @@ const getTimeSeriesData = async (spec, context)=>{
 /**
  * The core Prometheus TimeSeriesQuery plugin for Perses.
  */ export const PrometheusTimeSeriesQuery = {
-    getTimeSeriesData
+    getTimeSeriesData,
+    OptionsEditorComponent: PrometheusTimeSeriesQueryEditor,
+    createInitialOptions: ()=>({
+            query: ''
+        })
 };
 
 //# sourceMappingURL=time-series-query.js.map

package/dist/plugins/time-series-query.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/plugins/time-series-query.ts"],"sourcesContent":["// Copyright 2022 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { DurationString } from '@perses-dev/core';\nimport { TimeSeriesData, TimeSeriesQueryPlugin } from '@perses-dev/plugin-system';\nimport { fromUnixTime } from 'date-fns';\nimport { RangeQueryRequestParameters } from '../model/api-types';\nimport { parseValueTuple } from '../model/parse-sample-values';\nimport {\n  PrometheusDatasourceSpec,\n  QueryOptions,\n  rangeQuery,\n  PrometheusDatasourceSelector,\n} from '../model/prometheus-client';\nimport { TemplateString } from '../model/templating';\nimport { getDurationStringSeconds, getPrometheusTimeRange, getRangeStep } from '../model/time';\nimport { replaceTemplateVariables } from '../model/utils';\n\ninterface PrometheusTimeSeriesQuerySpec {\n  query: TemplateString;\n  min_step?: DurationString;\n  resolution?: number;\n  datasource?: PrometheusDatasourceSelector;\n}\n\nconst getTimeSeriesData: TimeSeriesQueryPlugin<PrometheusTimeSeriesQuerySpec>['getTimeSeriesData'] = async (\n  spec,\n  context\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 datasourceSelector = spec.datasource ?? { kind: 'PrometheusDatasource' };\n  const datasource = await context.datasourceStore.getDatasource(datasourceSelector);\n  const queryOptions: QueryOptions = {\n    datasource: datasource.plugin.spec as PrometheusDatasourceSpec,\n  };\n\n  // Make the request to Prom\n  const request: RangeQueryRequestParameters = {\n    query,\n    start,\n    end,\n    step,\n  };\n  const response = await rangeQuery(request, queryOptions);\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    // TODO: Maybe do a proper Iterable implementation that defers some of this\n    // processing until its needed\n    series: result.map((value) => {\n      const { metric, values } = value;\n\n      // Name the series after the metric labels or if no metric, just use the\n      // overall query\n      let name = Object.entries(metric)\n        .map(([labelName, labelValue]) => `${labelName}=\"${labelValue}\"`)\n        .join(', ');\n      if (name === '') name = query;\n\n      return {\n        name,\n        values: values.map(parseValueTuple),\n      };\n    }),\n  };\n  return chartData;\n};\n\n/**\n * The core Prometheus TimeSeriesQuery plugin for Perses.\n */\nexport const PrometheusTimeSeriesQuery: TimeSeriesQueryPlugin<PrometheusTimeSeriesQuerySpec> = {\n  getTimeSeriesData,\n};\n"],"names":["fromUnixTime","parseValueTuple","rangeQuery","getDurationStringSeconds","getPrometheusTimeRange","getRangeStep","replaceTemplateVariables","getTimeSeriesData","spec","context","response","minStep","min_step","timeRange","step","undefined","suggestedStepMs","start","end","utcOffsetSec","Date","getTimezoneOffset","alignedEnd","Math","floor","alignedStart","query","replace","variableState","datasourceSelector","datasource","kind","datasourceStore","getDatasource","queryOptions","plugin","request","result","data","chartData","stepMs","series","map","value","metric","values","name","Object","entries","labelName","labelValue","join","PrometheusTimeSeriesQuery"],"mappings":"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"}
+{"version":3,"sources":["../../src/plugins/time-series-query.ts"],"sourcesContent":["// Copyright 2022 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { DurationString } from '@perses-dev/core';\nimport { TimeSeriesData, TimeSeriesQueryPlugin } from '@perses-dev/plugin-system';\nimport { fromUnixTime } from 'date-fns';\nimport {\n  parseValueTuple,\n  PrometheusDatasourceSelector,\n  PrometheusClient,\n  TemplateString,\n  getDurationStringSeconds,\n  getPrometheusTimeRange,\n  getRangeStep,\n  replaceTemplateVariables,\n  DEFAULT_PROM,\n} from '../model';\nimport { PrometheusTimeSeriesQueryEditor } from './PrometheusTimeSeriesQueryEditor';\n\nexport interface PrometheusTimeSeriesQuerySpec {\n  query: TemplateString;\n  min_step?: DurationString;\n  resolution?: number;\n  datasource?: PrometheusDatasourceSelector;\n}\n\nconst getTimeSeriesData: TimeSeriesQueryPlugin<PrometheusTimeSeriesQuerySpec>['getTimeSeriesData'] = async (\n  spec,\n  context\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    // TODO: Maybe do a proper Iterable implementation that defers some of this\n    // processing until its needed\n    series: result.map((value) => {\n      const { metric, values } = value;\n\n      // Name the series after the metric labels or if no metric, just use the\n      // overall query\n      let name = Object.entries(metric)\n        .map(([labelName, labelValue]) => `${labelName}=\"${labelValue}\"`)\n        .join(', ');\n      if (name === '') name = query;\n\n      return {\n        name,\n        values: values.map(parseValueTuple),\n      };\n    }),\n  };\n  return chartData;\n};\n\n/**\n * The core Prometheus TimeSeriesQuery plugin for Perses.\n */\nexport const PrometheusTimeSeriesQuery: TimeSeriesQueryPlugin<PrometheusTimeSeriesQuerySpec> = {\n  getTimeSeriesData,\n  OptionsEditorComponent: PrometheusTimeSeriesQueryEditor,\n  createInitialOptions: () => ({\n    query: '',\n  }),\n};\n"],"names":["fromUnixTime","parseValueTuple","getDurationStringSeconds","getPrometheusTimeRange","getRangeStep","replaceTemplateVariables","DEFAULT_PROM","PrometheusTimeSeriesQueryEditor","getTimeSeriesData","spec","context","response","minStep","min_step","timeRange","step","undefined","suggestedStepMs","start","end","utcOffsetSec","Date","getTimezoneOffset","alignedEnd","Math","floor","alignedStart","query","replace","variableState","client","datasourceStore","getDatasourceClient","datasource","rangeQuery","result","data","chartData","stepMs","series","map","value","metric","values","name","Object","entries","labelName","labelValue","join","PrometheusTimeSeriesQuery","OptionsEditorComponent","createInitialOptions"],"mappings":"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"}

package/dist/plugins/variable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"variable.d.ts","sourceRoot":"","sources":["../../src/plugins/variable.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE3E,aAAK,gBAAgB,GAAG,MAAM,GAAG,cAAc,CAAC;AAEhD,aAAK,yBAAyB,GAAG;IAC/B,MAAM,EAAE,gBAAgB,EAAE,CAAC;CAC5B,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,cAAc,CAAC,yBAAyB,CAaxE,CAAC"}
+{"version":3,"file":"variable.d.ts","sourceRoot":"","sources":["../../src/plugins/variable.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAG3E,aAAK,gBAAgB,GAAG,MAAM,GAAG,cAAc,CAAC;AAEhD,aAAK,yBAAyB,GAAG;IAC/B,MAAM,EAAE,gBAAgB,EAAE,CAAC;CAC5B,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,cAAc,CAAC,yBAAyB,CAexE,CAAC"}

package/dist/plugins/variable.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 { JSONSpecEditor } from './JSONSpecEditor';
 export const StaticListVariable = {
     getVariableOptions: async (spec)=>{
         var ref;
@@ -26,7 +27,11 @@ export const StaticListVariable = {
             data: values
         };
     },
-    dependsOn: ()=>[]
+    dependsOn: ()=>[],
+    OptionsEditorComponent: JSONSpecEditor,
+    createInitialOptions: ()=>({
+            values: []
+        })
 };
 
 //# sourceMappingURL=variable.js.map

package/dist/plugins/variable.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/plugins/variable.ts"],"sourcesContent":["// Copyright 2022 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 { VariablePlugin, VariableOption } from '@perses-dev/plugin-system';\n\ntype StaticListOption = string | VariableOption;\n\ntype StaticListVariableOptions = {\n  values: StaticListOption[];\n};\n\nexport const StaticListVariable: VariablePlugin<StaticListVariableOptions> = {\n  getVariableOptions: async (spec) => {\n    const values = spec.values?.map((v) => {\n      if (typeof v === 'string') {\n        return { label: v, value: v };\n      }\n      return v;\n    });\n    return {\n      data: values,\n    };\n  },\n  dependsOn: () => [],\n};\n"],"names":["StaticListVariable","getVariableOptions","spec","values","map","v","label","value","data","dependsOn"],"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;AAUjC,OAAO,MAAMA,kBAAkB,GAA8C;IAC3EC,kBAAkB,EAAE,OAAOC,IAAI,GAAK;YACnBA,GAAW;QAA1B,MAAMC,MAAM,GAAGD,CAAAA,GAAW,GAAXA,IAAI,CAACC,MAAM,cAAXD,GAAW,WAAK,GAAhBA,KAAAA,CAAgB,GAAhBA,GAAW,CAAEE,GAAG,CAAC,CAACC,CAAC,GAAK;YACrC,IAAI,OAAOA,CAAC,KAAK,QAAQ,EAAE;gBACzB,OAAO;oBAAEC,KAAK,EAAED,CAAC;oBAAEE,KAAK,EAAEF,CAAC;iBAAE,CAAC;YAChC,CAAC;YACD,OAAOA,CAAC,CAAC;QACX,CAAC,CAAC,AAAC;QACH,OAAO;YACLG,IAAI,EAAEL,MAAM;SACb,CAAC;IACJ,CAAC;IACDM,SAAS,EAAE,IAAM,EAAE;CACpB,CAAC"}
+{"version":3,"sources":["../../src/plugins/variable.ts"],"sourcesContent":["// Copyright 2022 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 { VariablePlugin, VariableOption } from '@perses-dev/plugin-system';\nimport { JSONSpecEditor } from './JSONSpecEditor';\n\ntype StaticListOption = string | VariableOption;\n\ntype StaticListVariableOptions = {\n  values: StaticListOption[];\n};\n\nexport const StaticListVariable: VariablePlugin<StaticListVariableOptions> = {\n  getVariableOptions: async (spec) => {\n    const values = spec.values?.map((v) => {\n      if (typeof v === 'string') {\n        return { label: v, value: v };\n      }\n      return v;\n    });\n    return {\n      data: values,\n    };\n  },\n  dependsOn: () => [],\n  OptionsEditorComponent: JSONSpecEditor,\n  createInitialOptions: () => ({ values: [] }),\n};\n"],"names":["JSONSpecEditor","StaticListVariable","getVariableOptions","spec","values","map","v","label","value","data","dependsOn","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;AAGjC,SAASA,cAAc,QAAQ,kBAAkB,CAAC;AAQlD,OAAO,MAAMC,kBAAkB,GAA8C;IAC3EC,kBAAkB,EAAE,OAAOC,IAAI,GAAK;YACnBA,GAAW;QAA1B,MAAMC,MAAM,GAAGD,CAAAA,GAAW,GAAXA,IAAI,CAACC,MAAM,cAAXD,GAAW,WAAK,GAAhBA,KAAAA,CAAgB,GAAhBA,GAAW,CAAEE,GAAG,CAAC,CAACC,CAAC,GAAK;YACrC,IAAI,OAAOA,CAAC,KAAK,QAAQ,EAAE;gBACzB,OAAO;oBAAEC,KAAK,EAAED,CAAC;oBAAEE,KAAK,EAAEF,CAAC;iBAAE,CAAC;YAChC,CAAC;YACD,OAAOA,CAAC,CAAC;QACX,CAAC,CAAC,AAAC;QACH,OAAO;YACLG,IAAI,EAAEL,MAAM;SACb,CAAC;IACJ,CAAC;IACDM,SAAS,EAAE,IAAM,EAAE;IACnBC,sBAAsB,EAAEX,cAAc;IACtCY,oBAAoB,EAAE,IAAO,CAAA;YAAER,MAAM,EAAE,EAAE;SAAE,CAAA,AAAC;CAC7C,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@perses-dev/prometheus-plugin",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "Prometheus plugin for Perses",
   "license": "Apache-2.0",
   "homepage": "https://github.com/perses/perses/blob/main/README.md",
@@ -29,10 +29,11 @@
   "dependencies": {
     "@lezer/highlight": "^1.0.0",
     "@lezer/lr": "^1.2.0",
-    "@perses-dev/core": "^0.9.0",
-    "@perses-dev/plugin-system": "^0.9.0",
+    "@perses-dev/core": "^0.10.0",
+    "@perses-dev/plugin-system": "^0.10.0",
     "@prometheus-io/lezer-promql": "^0.37.0",
-    "date-fns": "^2.28.0"
+    "date-fns": "^2.28.0",
+    "immer": "^9.0.15"
   },
   "peerDependencies": {
     "react": "^17.0.2 || ^18.0.0"