@perses-dev/prometheus-plugin 0.9.0 → 0.11.0

package/dist/plugins/prometheus-variables.js

@@ -10,8 +10,53 @@
 // 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 { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Stack, TextField } from '@mui/material';
+import { replaceTemplateVariables, parseTemplateVariables, DEFAULT_PROM } from '../model';
+import { MatcherEditor } from './MatcherEditor';
+function PrometheusLabelValuesVariableEditor(props) {
+    return /*#__PURE__*/ _jsxs(Stack, {
+        spacing: 1,
+        children: [
+            /*#__PURE__*/ _jsx(TextField, {
+                sx: {
+                    mb: 1
+                },
+                label: "Label Name",
+                value: props.value.label_name,
+                onChange: (e)=>{
+                    props.onChange({
+                        ...props.value,
+                        label_name: e.target.value
+                    });
+                }
+            }),
+            /*#__PURE__*/ _jsx(MatcherEditor, {
+                initialMatchers: props.value.matchers,
+                onChange: (e)=>{
+                    props.onChange({
+                        ...props.value,
+                        matchers: e
+                    });
+                }
+            })
+        ]
+    });
+}
+function PrometheusLabelNamesVariableEditor(props) {
+    return /*#__PURE__*/ _jsx(Stack, {
+        spacing: 1,
+        children: /*#__PURE__*/ _jsx(MatcherEditor, {
+            initialMatchers: props.value.matchers,
+            onChange: (e)=>{
+                props.onChange({
+                    ...props.value,
+                    matchers: e
+                });
+            }
+        })
+    });
+}
 /**
  * Takes a list of strings and returns a list of VariableOptions
  */ const stringArrayToVariableOptions = (values)=>{
@@ -21,37 +66,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: PrometheusLabelNamesVariableEditor,
+    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 +99,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: PrometheusLabelValuesVariableEditor,
+    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":"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"}
+{"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, OptionsEditorProps } from '@perses-dev/plugin-system';\nimport { Stack, TextField } from '@mui/material';\nimport { replaceTemplateVariables, parseTemplateVariables, PrometheusClient, DEFAULT_PROM } from '../model';\nimport { PrometheusLabelNamesVariableOptions, PrometheusLabelValuesVariableOptions } from './types';\nimport { MatcherEditor } from './MatcherEditor';\n\nfunction PrometheusLabelValuesVariableEditor(props: OptionsEditorProps<PrometheusLabelValuesVariableOptions>) {\n  return (\n    <Stack spacing={1}>\n      <TextField\n        sx={{ mb: 1 }}\n        label=\"Label Name\"\n        value={props.value.label_name}\n        onChange={(e) => {\n          props.onChange({ ...props.value, label_name: e.target.value });\n        }}\n      />\n      <MatcherEditor\n        initialMatchers={props.value.matchers}\n        onChange={(e) => {\n          props.onChange({ ...props.value, matchers: e });\n        }}\n      />\n    </Stack>\n  );\n}\n\nfunction PrometheusLabelNamesVariableEditor(props: OptionsEditorProps<PrometheusLabelNamesVariableOptions>) {\n  return (\n    <Stack spacing={1}>\n      <MatcherEditor\n        initialMatchers={props.value.matchers}\n        onChange={(e) => {\n          props.onChange({ ...props.value, matchers: e });\n        }}\n      />\n    </Stack>\n  );\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: PrometheusLabelNamesVariableEditor,\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: PrometheusLabelValuesVariableEditor,\n  createInitialOptions: () => ({ label_name: '' }),\n};\n"],"names":["Stack","TextField","replaceTemplateVariables","parseTemplateVariables","DEFAULT_PROM","MatcherEditor","PrometheusLabelValuesVariableEditor","props","spacing","sx","mb","label","value","label_name","onChange","e","target","initialMatchers","matchers","PrometheusLabelNamesVariableEditor","stringArrayToVariableOptions","values","map","PrometheusLabelNamesVariable","getVariableOptions","spec","ctx","client","datasourceStore","getDatasourceClient","datasource","match","m","variables","undefined","data","options","labelNames","dependsOn","OptionsEditorComponent","createInitialOptions","PrometheusLabelValuesVariable","pluginDef","labelValues","labelName","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/types.d.ts

@@ -0,0 +1,12 @@
+import { PrometheusDatasourceSelector } from '../model';
+export interface PrometheusVariableOptionsBase {
+    datasource?: PrometheusDatasourceSelector;
+}
+export declare type PrometheusLabelNamesVariableOptions = PrometheusVariableOptionsBase & {
+    matchers?: string[];
+};
+export declare type PrometheusLabelValuesVariableOptions = PrometheusVariableOptionsBase & {
+    label_name: string;
+    matchers?: string[];
+};
+//# sourceMappingURL=types.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/plugins/types.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAC;AAExD,MAAM,WAAW,6BAA6B;IAC5C,UAAU,CAAC,EAAE,4BAA4B,CAAC;CAC3C;AAED,oBAAY,mCAAmC,GAAG,6BAA6B,GAAG;IAChF,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAEF,oBAAY,oCAAoC,GAAG,6BAA6B,GAAG;IACjF,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC"}

package/dist/plugins/types.js

@@ -0,0 +1,15 @@
+// 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 { };
+
+//# sourceMappingURL=types.js.map

package/dist/plugins/types.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/plugins/types.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 { PrometheusDatasourceSelector } from '../model';\n\nexport interface PrometheusVariableOptionsBase {\n  datasource?: PrometheusDatasourceSelector;\n}\n\nexport type PrometheusLabelNamesVariableOptions = PrometheusVariableOptionsBase & {\n  matchers?: string[];\n};\n\nexport type PrometheusLabelValuesVariableOptions = PrometheusVariableOptionsBase & {\n  label_name: string;\n  matchers?: string[];\n};\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,WAaE"}

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.tsx"],"names":[],"mappings":"AAaA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAsB,MAAM,2BAA2B,CAAC;AAG/F,aAAK,gBAAgB,GAAG,MAAM,GAAG,cAAc,CAAC;AAEhD,aAAK,yBAAyB,GAAG;IAC/B,MAAM,EAAE,gBAAgB,EAAE,CAAC;CAC5B,CAAC;AAiCF,eAAO,MAAM,kBAAkB,EAAE,cAAc,CAAC,yBAAyB,CAexE,CAAC"}

package/dist/plugins/variable.js

@@ -10,6 +10,41 @@
 // 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 { Autocomplete, TextField } from '@mui/material';
+function StaticListVariableOptionEditor(props) {
+    const value = props.value.values.map((v)=>{
+        if (typeof v === 'string') {
+            return v;
+        } else {
+            return v.value;
+        }
+    });
+    const onChange = (__, value)=>{
+        props.onChange({
+            values: value.map((v)=>{
+                return {
+                    value: v,
+                    label: v
+                };
+            })
+        });
+    };
+    return /*#__PURE__*/ _jsx("div", {
+        children: /*#__PURE__*/ _jsx(Autocomplete, {
+            multiple: true,
+            value: value,
+            onChange: onChange,
+            options: [],
+            freeSolo: true,
+            renderInput: (params)=>/*#__PURE__*/ _jsx(TextField, {
+                    ...params,
+                    label: "Values",
+                    placeholder: "Values"
+                })
+        })
+    });
+}
 export const StaticListVariable = {
     getVariableOptions: async (spec)=>{
         var ref;
@@ -26,7 +61,11 @@ export const StaticListVariable = {
             data: values
         };
     },
-    dependsOn: ()=>[]
+    dependsOn: ()=>[],
+    OptionsEditorComponent: StaticListVariableOptionEditor,
+    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.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 { VariablePlugin, VariableOption, OptionsEditorProps } from '@perses-dev/plugin-system';\nimport { Autocomplete, TextField } from '@mui/material';\n\ntype StaticListOption = string | VariableOption;\n\ntype StaticListVariableOptions = {\n  values: StaticListOption[];\n};\n\nfunction StaticListVariableOptionEditor(props: OptionsEditorProps<StaticListVariableOptions>) {\n  const value = props.value.values.map((v) => {\n    if (typeof v === 'string') {\n      return v;\n    } else {\n      return v.value;\n    }\n  });\n\n  const onChange = (__: unknown, value: string[]) => {\n    props.onChange({\n      values: value.map((v) => {\n        return { value: v, label: v };\n      }),\n    });\n  };\n\n  return (\n    <div>\n      <Autocomplete\n        multiple\n        value={value}\n        onChange={onChange}\n        options={[]}\n        freeSolo\n        renderInput={(params) => <TextField {...params} label=\"Values\" placeholder=\"Values\" />}\n      />\n    </div>\n  );\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: StaticListVariableOptionEditor,\n  createInitialOptions: () => ({ values: [] }),\n};\n"],"names":["Autocomplete","TextField","StaticListVariableOptionEditor","props","value","values","map","v","onChange","__","label","div","multiple","options","freeSolo","renderInput","params","placeholder","StaticListVariable","getVariableOptions","spec","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;AAEjC;AACA,SAASA,YAAY,EAAEC,SAAS,QAAQ,eAAe,CAAC;AAQxD,SAASC,8BAA8B,CAACC,KAAoD,EAAE;IAC5F,MAAMC,KAAK,GAAGD,KAAK,CAACC,KAAK,CAACC,MAAM,CAACC,GAAG,CAAC,CAACC,CAAC,GAAK;QAC1C,IAAI,OAAOA,CAAC,KAAK,QAAQ,EAAE;YACzB,OAAOA,CAAC,CAAC;QACX,OAAO;YACL,OAAOA,CAAC,CAACH,KAAK,CAAC;QACjB,CAAC;IACH,CAAC,CAAC,AAAC;IAEH,MAAMI,QAAQ,GAAG,CAACC,EAAW,EAAEL,KAAe,GAAK;QACjDD,KAAK,CAACK,QAAQ,CAAC;YACbH,MAAM,EAAED,KAAK,CAACE,GAAG,CAAC,CAACC,CAAC,GAAK;gBACvB,OAAO;oBAAEH,KAAK,EAAEG,CAAC;oBAAEG,KAAK,EAAEH,CAAC;iBAAE,CAAC;YAChC,CAAC,CAAC;SACH,CAAC,CAAC;IACL,CAAC,AAAC;IAEF,qBACE,KAACI,KAAG;kBACF,cAAA,KAACX,YAAY;YACXY,QAAQ;YACRR,KAAK,EAAEA,KAAK;YACZI,QAAQ,EAAEA,QAAQ;YAClBK,OAAO,EAAE,EAAE;YACXC,QAAQ;YACRC,WAAW,EAAE,CAACC,MAAM,iBAAK,KAACf,SAAS;oBAAE,GAAGe,MAAM;oBAAEN,KAAK,EAAC,QAAQ;oBAACO,WAAW,EAAC,QAAQ;kBAAG;UACtF;MACE,CACN;AACJ,CAAC;AAED,OAAO,MAAMC,kBAAkB,GAA8C;IAC3EC,kBAAkB,EAAE,OAAOC,IAAI,GAAK;YACnBA,GAAW;QAA1B,MAAMf,MAAM,GAAGe,CAAAA,GAAW,GAAXA,IAAI,CAACf,MAAM,cAAXe,GAAW,WAAK,GAAhBA,KAAAA,CAAgB,GAAhBA,GAAW,CAAEd,GAAG,CAAC,CAACC,CAAC,GAAK;YACrC,IAAI,OAAOA,CAAC,KAAK,QAAQ,EAAE;gBACzB,OAAO;oBAAEG,KAAK,EAAEH,CAAC;oBAAEH,KAAK,EAAEG,CAAC;iBAAE,CAAC;YAChC,CAAC;YACD,OAAOA,CAAC,CAAC;QACX,CAAC,CAAC,AAAC;QACH,OAAO;YACLc,IAAI,EAAEhB,MAAM;SACb,CAAC;IACJ,CAAC;IACDiB,SAAS,EAAE,IAAM,EAAE;IACnBC,sBAAsB,EAAErB,8BAA8B;IACtDsB,oBAAoB,EAAE,IAAO,CAAA;YAAEnB,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.11.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.11.0",
+    "@perses-dev/plugin-system": "^0.11.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"