@perses-dev/prometheus-plugin 0.41.1 → 0.42.1

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

@@ -10,18 +10,18 @@
 // 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 { jsx as _jsx } from "react/jsx-runtime";
 import { produce } from 'immer';
-import { Stack, TextField, FormControl, InputLabel } from '@mui/material';
-import { DatasourceSelect, useDatasource, useDatasourceClient } from '@perses-dev/plugin-system';
-import { DEFAULT_PROM, isDefaultPromSelector, isPrometheusDatasourceSelector, PROM_DATASOURCE_KIND } from '../../model';
-import { PromQLEditor } from '../../components';
+import { useDatasource, useDatasourceClient } from '@perses-dev/plugin-system';
+import { DEFAULT_PROM, isDefaultPromSelector, isPrometheusDatasourceSelector } from '../../model';
 import { DEFAULT_SCRAPE_INTERVAL } from '../types';
 import { useQueryState, useFormatState, useMinStepState } from './query-editor-model';
+import { DashboardPrometheusTimeSeriesQueryEditor } from './DashboardPrometheusTimeSeriesQueryEditor';
+import { ExplorePrometheusTimeSeriesQueryEditor } from './ExplorePrometheusTimeSeriesQueryEditor';
 /**
  * The options editor component for editing a PrometheusTimeSeriesQuery's spec.
  */ export function PrometheusTimeSeriesQueryEditor(props) {
-    const { onChange , value  } = props;
+    const { onChange , value , isExplore  } = props;
     const { datasource  } = value;
     const selectedDatasource = datasource !== null && datasource !== void 0 ? datasource : DEFAULT_PROM;
     const { data: client  } = useDatasourceClient(selectedDatasource);
@@ -43,63 +43,37 @@ import { useQueryState, useFormatState, useMinStepState } from './query-editor-m
         }
         throw new Error('Got unexpected non-Prometheus datasource selector');
     };
-    return /*#__PURE__*/ _jsxs(Stack, {
-        spacing: 2,
-        children: [
-            /*#__PURE__*/ _jsxs(FormControl, {
-                margin: "dense",
-                fullWidth: false,
-                children: [
-                    /*#__PURE__*/ _jsx(InputLabel, {
-                        id: "prom-datasource-label",
-                        children: "Prometheus Datasource"
-                    }),
-                    /*#__PURE__*/ _jsx(DatasourceSelect, {
-                        datasourcePluginKind: PROM_DATASOURCE_KIND,
-                        value: selectedDatasource,
-                        onChange: handleDatasourceChange,
-                        labelId: "prom-datasource-label",
-                        label: "Prometheus Datasource"
-                    })
-                ]
-            }),
-            /*#__PURE__*/ _jsx(PromQLEditor, {
-                completeConfig: {
-                    remote: {
-                        url: promURL
-                    }
-                },
-                value: query,
-                onChange: handleQueryChange,
-                onBlur: handleQueryBlur
-            }),
-            /*#__PURE__*/ _jsxs(Stack, {
-                direction: "row",
-                spacing: 2,
-                children: [
-                    /*#__PURE__*/ _jsx(TextField, {
-                        fullWidth: true,
-                        label: "Legend Name",
-                        placeholder: "Tip: Use {{label_name}}. Example: {{instance}} will be replaced with values such as 'webserver-123' and 'webserver-456'.",
-                        helperText: "Name for each series in the legend and the tooltip.",
-                        value: format !== null && format !== void 0 ? format : '',
-                        onChange: (e)=>handleFormatChange(e.target.value),
-                        onBlur: handleFormatBlur
-                    }),
-                    /*#__PURE__*/ _jsx(TextField, {
-                        label: "Min Step",
-                        placeholder: minStepPlaceholder,
-                        helperText: "Step parameter of the query. Used by $__interval and $__rate_interval too.",
-                        value: minStep,
-                        onChange: (e)=>handleMinStepChange(e.target.value),
-                        onBlur: handleMinStepBlur,
-                        sx: {
-                            width: '250px'
-                        }
-                    })
-                ]
-            })
-        ]
+    if (isExplore) {
+        return /*#__PURE__*/ _jsx(ExplorePrometheusTimeSeriesQueryEditor, {
+            selectedDatasource: selectedDatasource,
+            handleDatasourceChange: handleDatasourceChange,
+            promURL: promURL,
+            query: query,
+            handleQueryChange: handleQueryChange,
+            handleQueryBlur: handleQueryBlur,
+            format: format,
+            handleFormatChange: handleFormatChange,
+            handleFormatBlur: handleFormatBlur,
+            minStepPlaceholder: minStepPlaceholder,
+            minStep: minStep,
+            handleMinStepChange: handleMinStepChange,
+            handleMinStepBlur: handleMinStepBlur
+        });
+    }
+    return /*#__PURE__*/ _jsx(DashboardPrometheusTimeSeriesQueryEditor, {
+        selectedDatasource: selectedDatasource,
+        handleDatasourceChange: handleDatasourceChange,
+        promURL: promURL,
+        query: query,
+        handleQueryChange: handleQueryChange,
+        handleQueryBlur: handleQueryBlur,
+        format: format,
+        handleFormatChange: handleFormatChange,
+        handleFormatBlur: handleFormatBlur,
+        minStepPlaceholder: minStepPlaceholder,
+        minStep: minStep,
+        handleMinStepChange: handleMinStepChange,
+        handleMinStepBlur: handleMinStepBlur
     });
 }
 

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/plugins/prometheus-time-series-query/PrometheusTimeSeriesQueryEditor.tsx"],"sourcesContent":["// Copyright 2023 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { produce } from 'immer';\nimport { Stack, TextField, FormControl, InputLabel } from '@mui/material';\nimport { DatasourceSelect, DatasourceSelectProps, useDatasource, useDatasourceClient } from '@perses-dev/plugin-system';\nimport {\n  DEFAULT_PROM,\n  DurationString,\n  isDefaultPromSelector,\n  isPrometheusDatasourceSelector,\n  PROM_DATASOURCE_KIND,\n  PrometheusClient,\n} from '../../model';\nimport { PromQLEditor } from '../../components';\nimport { DEFAULT_SCRAPE_INTERVAL, PrometheusDatasourceSpec } from '../types';\nimport {\n  PrometheusTimeSeriesQueryEditorProps,\n  useQueryState,\n  useFormatState,\n  useMinStepState,\n} from './query-editor-model';\n\n/**\n * The options editor component for editing a PrometheusTimeSeriesQuery's spec.\n */\nexport function PrometheusTimeSeriesQueryEditor(props: PrometheusTimeSeriesQueryEditorProps) {\n  const { onChange, value } = props;\n  const { datasource } = value;\n  const selectedDatasource = datasource ?? DEFAULT_PROM;\n\n  const { data: client } = useDatasourceClient<PrometheusClient>(selectedDatasource);\n  const promURL = client?.options.datasourceUrl;\n  const { data: datasourceResource } = useDatasource(selectedDatasource);\n\n  const { query, handleQueryChange, handleQueryBlur } = useQueryState(props);\n  const { format, handleFormatChange, handleFormatBlur } = useFormatState(props);\n  const { minStep, handleMinStepChange, handleMinStepBlur } = useMinStepState(props);\n  const minStepPlaceholder =\n    minStep ??\n    (datasourceResource && (datasourceResource?.plugin.spec as PrometheusDatasourceSpec).scrapeInterval) ??\n    DEFAULT_SCRAPE_INTERVAL;\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    <Stack spacing={2}>\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={PROM_DATASOURCE_KIND}\n          value={selectedDatasource}\n          onChange={handleDatasourceChange}\n          labelId=\"prom-datasource-label\"\n          label=\"Prometheus Datasource\"\n        />\n      </FormControl>\n      <PromQLEditor\n        completeConfig={{ remote: { url: promURL } }}\n        value={query}\n        onChange={handleQueryChange}\n        onBlur={handleQueryBlur}\n      />\n      <Stack direction=\"row\" spacing={2}>\n        <TextField\n          fullWidth\n          label=\"Legend Name\"\n          placeholder=\"Tip: Use {{label_name}}. Example: {{instance}} will be replaced with values such as 'webserver-123' and 'webserver-456'.\"\n          helperText=\"Name for each series in the legend and the tooltip.\"\n          value={format ?? ''}\n          onChange={(e) => handleFormatChange(e.target.value)}\n          onBlur={handleFormatBlur}\n        />\n        <TextField\n          label=\"Min Step\"\n          placeholder={minStepPlaceholder}\n          helperText=\"Step parameter of the query. Used by $__interval and $__rate_interval too.\"\n          value={minStep}\n          onChange={(e) => handleMinStepChange(e.target.value as DurationString)}\n          onBlur={handleMinStepBlur}\n          sx={{ width: '250px' }}\n        />\n      </Stack>\n    </Stack>\n  );\n}\n"],"names":["produce","Stack","TextField","FormControl","InputLabel","DatasourceSelect","useDatasource","useDatasourceClient","DEFAULT_PROM","isDefaultPromSelector","isPrometheusDatasourceSelector","PROM_DATASOURCE_KIND","PromQLEditor","DEFAULT_SCRAPE_INTERVAL","useQueryState","useFormatState","useMinStepState","PrometheusTimeSeriesQueryEditor","props","onChange","value","datasource","selectedDatasource","data","client","promURL","options","datasourceUrl","datasourceResource","query","handleQueryChange","handleQueryBlur","format","handleFormatChange","handleFormatBlur","minStep","handleMinStepChange","handleMinStepBlur","minStepPlaceholder","plugin","spec","scrapeInterval","handleDatasourceChange","next","draft","nextDatasource","undefined","Error","spacing","margin","fullWidth","id","datasourcePluginKind","labelId","label","completeConfig","remote","url","onBlur","direction","placeholder","helperText","e","target","sx","width"],"mappings":"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"}
+{"version":3,"sources":["../../../src/plugins/prometheus-time-series-query/PrometheusTimeSeriesQueryEditor.tsx"],"sourcesContent":["// Copyright 2023 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { produce } from 'immer';\nimport { DatasourceSelectProps, useDatasource, useDatasourceClient } from '@perses-dev/plugin-system';\nimport { DEFAULT_PROM, isDefaultPromSelector, isPrometheusDatasourceSelector, PrometheusClient } from '../../model';\nimport { DEFAULT_SCRAPE_INTERVAL, PrometheusDatasourceSpec } from '../types';\nimport {\n  PrometheusTimeSeriesQueryEditorProps,\n  useQueryState,\n  useFormatState,\n  useMinStepState,\n} from './query-editor-model';\nimport { DashboardPrometheusTimeSeriesQueryEditor } from './DashboardPrometheusTimeSeriesQueryEditor';\nimport { ExplorePrometheusTimeSeriesQueryEditor } from './ExplorePrometheusTimeSeriesQueryEditor';\n\n/**\n * The options editor component for editing a PrometheusTimeSeriesQuery's spec.\n */\nexport function PrometheusTimeSeriesQueryEditor(props: PrometheusTimeSeriesQueryEditorProps) {\n  const { onChange, value, isExplore } = props;\n  const { datasource } = value;\n  const selectedDatasource = datasource ?? DEFAULT_PROM;\n\n  const { data: client } = useDatasourceClient<PrometheusClient>(selectedDatasource);\n  const promURL = client?.options.datasourceUrl;\n  const { data: datasourceResource } = useDatasource(selectedDatasource);\n\n  const { query, handleQueryChange, handleQueryBlur } = useQueryState(props);\n  const { format, handleFormatChange, handleFormatBlur } = useFormatState(props);\n  const { minStep, handleMinStepChange, handleMinStepBlur } = useMinStepState(props);\n  const minStepPlaceholder =\n    minStep ??\n    (datasourceResource && (datasourceResource?.plugin.spec as PrometheusDatasourceSpec).scrapeInterval) ??\n    DEFAULT_SCRAPE_INTERVAL;\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  if (isExplore) {\n    return (\n      <ExplorePrometheusTimeSeriesQueryEditor\n        selectedDatasource={selectedDatasource}\n        handleDatasourceChange={handleDatasourceChange}\n        promURL={promURL}\n        query={query}\n        handleQueryChange={handleQueryChange}\n        handleQueryBlur={handleQueryBlur}\n        format={format}\n        handleFormatChange={handleFormatChange}\n        handleFormatBlur={handleFormatBlur}\n        minStepPlaceholder={minStepPlaceholder}\n        minStep={minStep}\n        handleMinStepChange={handleMinStepChange}\n        handleMinStepBlur={handleMinStepBlur}\n      />\n    );\n  }\n\n  return (\n    <DashboardPrometheusTimeSeriesQueryEditor\n      selectedDatasource={selectedDatasource}\n      handleDatasourceChange={handleDatasourceChange}\n      promURL={promURL}\n      query={query}\n      handleQueryChange={handleQueryChange}\n      handleQueryBlur={handleQueryBlur}\n      format={format}\n      handleFormatChange={handleFormatChange}\n      handleFormatBlur={handleFormatBlur}\n      minStepPlaceholder={minStepPlaceholder}\n      minStep={minStep}\n      handleMinStepChange={handleMinStepChange}\n      handleMinStepBlur={handleMinStepBlur}\n    />\n  );\n}\n"],"names":["produce","useDatasource","useDatasourceClient","DEFAULT_PROM","isDefaultPromSelector","isPrometheusDatasourceSelector","DEFAULT_SCRAPE_INTERVAL","useQueryState","useFormatState","useMinStepState","DashboardPrometheusTimeSeriesQueryEditor","ExplorePrometheusTimeSeriesQueryEditor","PrometheusTimeSeriesQueryEditor","props","onChange","value","isExplore","datasource","selectedDatasource","data","client","promURL","options","datasourceUrl","datasourceResource","query","handleQueryChange","handleQueryBlur","format","handleFormatChange","handleFormatBlur","minStep","handleMinStepChange","handleMinStepBlur","minStepPlaceholder","plugin","spec","scrapeInterval","handleDatasourceChange","next","draft","nextDatasource","undefined","Error"],"mappings":"AAAA,oCAAoC;AACpC,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;;AAEjC,SAASA,OAAO,QAAQ,QAAQ;AAChC,SAAgCC,aAAa,EAAEC,mBAAmB,QAAQ,4BAA4B;AACtG,SAASC,YAAY,EAAEC,qBAAqB,EAAEC,8BAA8B,QAA0B,cAAc;AACpH,SAASC,uBAAuB,QAAkC,WAAW;AAC7E,SAEEC,aAAa,EACbC,cAAc,EACdC,eAAe,QACV,uBAAuB;AAC9B,SAASC,wCAAwC,QAAQ,6CAA6C;AACtG,SAASC,sCAAsC,QAAQ,2CAA2C;AAElG;;CAEC,GACD,OAAO,SAASC,gCAAgCC,KAA2C;IACzF,MAAM,EAAEC,SAAQ,EAAEC,MAAK,EAAEC,UAAS,EAAE,GAAGH;IACvC,MAAM,EAAEI,WAAU,EAAE,GAAGF;IACvB,MAAMG,qBAAqBD,uBAAAA,wBAAAA,aAAcd;IAEzC,MAAM,EAAEgB,MAAMC,OAAM,EAAE,GAAGlB,oBAAsCgB;IAC/D,MAAMG,UAAUD,mBAAAA,oBAAAA,KAAAA,IAAAA,OAAQE,QAAQC;IAChC,MAAM,EAAEJ,MAAMK,mBAAkB,EAAE,GAAGvB,cAAciB;IAEnD,MAAM,EAAEO,MAAK,EAAEC,kBAAiB,EAAEC,gBAAe,EAAE,GAAGpB,cAAcM;IACpE,MAAM,EAAEe,OAAM,EAAEC,mBAAkB,EAAEC,iBAAgB,EAAE,GAAGtB,eAAeK;IACxE,MAAM,EAAEkB,QAAO,EAAEC,oBAAmB,EAAEC,kBAAiB,EAAE,GAAGxB,gBAAgBI;QAE1EkB;IADF,MAAMG,qBACJH,CAAAA,OAAAA,oBAAAA,qBAAAA,UACCP,sBAAsB,CAACA,+BAAAA,gCAAAA,KAAAA,IAAAA,mBAAoBW,OAAOC,IAAgC,EAAEC,4BADrFN,kBAAAA,OAEAzB;IAEF,MAAMgC,yBAA4D,CAACC;QACjE,IAAIlC,+BAA+BkC,OAAO;YACxCzB,SACEd,QAAQe,OAAO,CAACyB;gBACd,sFAAsF;gBACtF,MAAMC,iBAAiBrC,sBAAsBmC,QAAQG,YAAYH;gBACjEC,MAAMvB,aAAawB;YACrB;YAEF;QACF;QAEA,MAAM,IAAIE,MAAM;IAClB;IAEA,IAAI3B,WAAW;QACb,qBACE,KAACL;YACCO,oBAAoBA;YACpBoB,wBAAwBA;YACxBjB,SAASA;YACTI,OAAOA;YACPC,mBAAmBA;YACnBC,iBAAiBA;YACjBC,QAAQA;YACRC,oBAAoBA;YACpBC,kBAAkBA;YAClBI,oBAAoBA;YACpBH,SAASA;YACTC,qBAAqBA;YACrBC,mBAAmBA;;IAGzB;IAEA,qBACE,KAACvB;QACCQ,oBAAoBA;QACpBoB,wBAAwBA;QACxBjB,SAASA;QACTI,OAAOA;QACPC,mBAAmBA;QACnBC,iBAAiBA;QACjBC,QAAQA;QACRC,oBAAoBA;QACpBC,kBAAkBA;QAClBI,oBAAoBA;QACpBH,SAASA;QACTC,qBAAqBA;QACrBC,mBAAmBA;;AAGzB"}

package/dist/plugins/types.d.ts

@@ -1,4 +1,4 @@
-import { DurationString, RequestHeaders } from '@perses-dev/core';
+import { DurationString, HTTPProxy } from '@perses-dev/core';
 import { PrometheusDatasourceSelector } from '../model';
 export declare const DEFAULT_SCRAPE_INTERVAL: DurationString;
 export interface PrometheusDatasourceSpec {
@@ -6,20 +6,6 @@ export interface PrometheusDatasourceSpec {
     proxy?: HTTPProxy;
     scrapeInterval?: DurationString;
 }
-export interface HTTPProxy {
-    kind: 'HTTPProxy';
-    spec: HTTPProxySpec;
-}
-export interface HTTPProxySpec {
-    url: string;
-    allowedEndpoints?: HTTPAllowedEndpoint[];
-    headers?: RequestHeaders;
-    secret?: string;
-}
-export interface HTTPAllowedEndpoint {
-    endpointPattern: string;
-    method: string;
-}
 export interface PrometheusVariableOptionsBase {
     datasource?: PrometheusDatasourceSelector;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/plugins/types.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAC;AAExD,eAAO,MAAM,uBAAuB,EAAE,cAAqB,CAAC;AAE5D,MAAM,WAAW,wBAAwB;IACvC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,WAAW,CAAC;IAClB,IAAI,EAAE,aAAa,CAAC;CACrB;AACD,MAAM,WAAW,aAAa;IAG5B,GAAG,EAAE,MAAM,CAAC;IAGZ,gBAAgB,CAAC,EAAE,mBAAmB,EAAE,CAAC;IAEzC,OAAO,CAAC,EAAE,cAAc,CAAC;IAGzB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,mBAAmB;IAClC,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,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,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAEF,oBAAY,+BAA+B,GAAG,6BAA6B,GAAG;IAE5E,IAAI,EAAE,MAAM,CAAC;IAGb,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/plugins/types.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAC;AAExD,eAAO,MAAM,uBAAuB,EAAE,cAAqB,CAAC;AAE5D,MAAM,WAAW,wBAAwB;IACvC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC;AAED,MAAM,WAAW,6BAA6B;IAC5C,UAAU,CAAC,EAAE,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,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAEF,oBAAY,+BAA+B,GAAG,6BAA6B,GAAG;IAE5E,IAAI,EAAE,MAAM,CAAC;IAGb,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC"}

package/dist/plugins/types.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/plugins/types.ts"],"sourcesContent":["// Copyright 2023 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { DurationString, RequestHeaders } from '@perses-dev/core';\nimport { PrometheusDatasourceSelector } from '../model';\n\nexport const DEFAULT_SCRAPE_INTERVAL: DurationString = '1m';\n\nexport interface PrometheusDatasourceSpec {\n  directUrl?: string;\n  proxy?: HTTPProxy;\n  scrapeInterval?: DurationString; // default to 1m\n}\n\nexport interface HTTPProxy {\n  kind: 'HTTPProxy';\n  spec: HTTPProxySpec;\n}\nexport interface HTTPProxySpec {\n  // url is the url of the datasource. It is not the url of the proxy.\n  // The Perses server is the proxy, so it needs to know where to redirect the request.\n  url: string;\n  // allowedEndpoints is a list of tuples of http methods and http endpoints that will be accessible.\n  // Leave it empty if you don't want to restrict the access to the datasource.\n  allowedEndpoints?: HTTPAllowedEndpoint[];\n  // headers can be used to provide additional headers that need to be forwarded when requesting the datasource\n  headers?: RequestHeaders;\n  // secret is the name of the secret that should be used for the proxy or discovery configuration\n  // It will contain any sensitive information such as password, token, certificate.\n  secret?: string;\n}\n\nexport interface HTTPAllowedEndpoint {\n  endpointPattern: string;\n  method: string;\n}\n\nexport interface PrometheusVariableOptionsBase {\n  datasource?: PrometheusDatasourceSelector;\n}\n\nexport type PrometheusLabelNamesVariableOptions = PrometheusVariableOptionsBase & {\n  matchers?: string[];\n};\n\nexport type PrometheusLabelValuesVariableOptions = PrometheusVariableOptionsBase & {\n  labelName: string;\n  matchers?: string[];\n};\n\nexport type PrometheusPromQLVariableOptions = PrometheusVariableOptionsBase & {\n  // expr is the PromQL expression.\n  expr: string;\n  // labelName is the name of the label that will be used after the PromQL query is performed to select the label value.\n  // Note: This field is not part of the Prometheus API.\n  labelName: string;\n};\n"],"names":["DEFAULT_SCRAPE_INTERVAL"],"mappings":"AAAA,oCAAoC;AACpC,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAKjC,OAAO,MAAMA,0BAA0C,KAAK"}
+{"version":3,"sources":["../../src/plugins/types.ts"],"sourcesContent":["// Copyright 2023 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { DurationString, HTTPProxy } from '@perses-dev/core';\nimport { PrometheusDatasourceSelector } from '../model';\n\nexport const DEFAULT_SCRAPE_INTERVAL: DurationString = '1m';\n\nexport interface PrometheusDatasourceSpec {\n  directUrl?: string;\n  proxy?: HTTPProxy;\n  scrapeInterval?: DurationString; // default to 1m\n}\n\nexport interface PrometheusVariableOptionsBase {\n  datasource?: PrometheusDatasourceSelector;\n}\n\nexport type PrometheusLabelNamesVariableOptions = PrometheusVariableOptionsBase & {\n  matchers?: string[];\n};\n\nexport type PrometheusLabelValuesVariableOptions = PrometheusVariableOptionsBase & {\n  labelName: string;\n  matchers?: string[];\n};\n\nexport type PrometheusPromQLVariableOptions = PrometheusVariableOptionsBase & {\n  // expr is the PromQL expression.\n  expr: string;\n  // labelName is the name of the label that will be used after the PromQL query is performed to select the label value.\n  // Note: This field is not part of the Prometheus API.\n  labelName: string;\n};\n"],"names":["DEFAULT_SCRAPE_INTERVAL"],"mappings":"AAAA,oCAAoC;AACpC,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAKjC,OAAO,MAAMA,0BAA0C,KAAK"}

package/package.json

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