From cc4521baefcbfb6fe73db011b9103837ed32c118 Mon Sep 17 00:00:00 2001 From: Andreas Gerstmayr Date: Thu, 31 Oct 2024 13:26:55 +0100 Subject: [PATCH] Upgrade Perses to v0.49.0-rc.1 Signed-off-by: Andreas Gerstmayr --- web/package-lock.json | 84 +++++++++---------- web/package.json | 12 +-- .../NoTempoInstanceSelectedState.tsx | 2 +- web/src/pages/TracesPage/QueryBrowser.tsx | 2 +- .../TracesPage/QueryEditor/QueryEditor.tsx | 2 +- web/src/pages/TracesPage/TraceTable.tsx | 2 +- 6 files changed, 52 insertions(+), 52 deletions(-) diff --git a/web/package-lock.json b/web/package-lock.json index 684d20b..c5c866f 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -15,12 +15,12 @@ "@mui/material": "^5.15.14", "@patternfly/react-charts": "6.92.0", "@patternfly/react-table": "^5.2.4", - "@perses-dev/components": "0.49.0-rc.0", - "@perses-dev/dashboards": "0.49.0-rc.0", - "@perses-dev/panels-plugin": "0.49.0-rc.0", - "@perses-dev/plugin-system": "0.49.0-rc.0", - "@perses-dev/prometheus-plugin": "0.49.0-rc.0", - "@perses-dev/tempo-plugin": "0.49.0-rc.0", + "@perses-dev/components": "0.49.0-rc.1", + "@perses-dev/dashboards": "0.49.0-rc.1", + "@perses-dev/panels-plugin": "0.49.0-rc.1", + "@perses-dev/plugin-system": "0.49.0-rc.1", + "@perses-dev/prometheus-plugin": "0.49.0-rc.1", + "@perses-dev/tempo-plugin": "0.49.0-rc.1", "@tanstack/react-query": "^4.7.1", "copy-webpack-plugin": "^12.0.2", "i18next": "^23.10.0", @@ -3562,15 +3562,15 @@ "integrity": "sha512-h+ducOLDMSxcuec3+YY3x+stM5ZUSnrl/lC/eVmjypil2El08NuE2MNEPMQWdhrod6VRRZFMNqZw/m82iv6U1A==" }, "node_modules/@perses-dev/components": { - "version": "0.49.0-rc.0", - "resolved": "https://registry.npmjs.org/@perses-dev/components/-/components-0.49.0-rc.0.tgz", - "integrity": "sha512-B2nKOh+juriuE91Nmi/XfOclFdaq4yK1nYvo2An1uXy2+aCtHYiuRmDjzDZ3JRhIc2jfhp1CbVsq2NINx8yYkQ==", + "version": "0.49.0-rc.1", + "resolved": "https://registry.npmjs.org/@perses-dev/components/-/components-0.49.0-rc.1.tgz", + "integrity": "sha512-T+ze0GdEWIBG7BsXjXNHcY7+yGddjOo6pIMpSyhXrHcva16ljZ5allurEIi5wjEf8OHeEwpbdHHJeb+Qjp5gwA==", "license": "Apache-2.0", "dependencies": { "@codemirror/lang-json": "^6.0.1", "@fontsource/lato": "^4.5.10", "@mui/x-date-pickers": "^6.12.1", - "@perses-dev/core": "0.49.0-rc.0", + "@perses-dev/core": "0.49.0-rc.1", "@tanstack/react-table": "^8.19.2", "@uiw/react-codemirror": "^4.19.1", "date-fns": "^2.28.0", @@ -3593,9 +3593,9 @@ } }, "node_modules/@perses-dev/core": { - "version": "0.49.0-rc.0", - "resolved": "https://registry.npmjs.org/@perses-dev/core/-/core-0.49.0-rc.0.tgz", - "integrity": "sha512-QgjkQWTgViVcucNh7iGLhTdusz3OgMPcXEscBDsug2UCR/hYRnmkTVt2sGMxpq4LbwL09m33kx6q7p/VfmEMvA==", + "version": "0.49.0-rc.1", + "resolved": "https://registry.npmjs.org/@perses-dev/core/-/core-0.49.0-rc.1.tgz", + "integrity": "sha512-Mte0aA0VnwD+7iFlVMSrsRxYmXk97OProZXTxC7CRKn0+n4adIqzyePbjNTxblgBcA+ArGeKfulTfMrI/IvZ0A==", "license": "Apache-2.0", "dependencies": { "date-fns": "^2.28.0", @@ -3610,14 +3610,14 @@ } }, "node_modules/@perses-dev/dashboards": { - "version": "0.49.0-rc.0", - "resolved": "https://registry.npmjs.org/@perses-dev/dashboards/-/dashboards-0.49.0-rc.0.tgz", - "integrity": "sha512-F+ahbYz+c4CeFpW053DhmcHC4DbxzJN8ba8ZpjtuJrtlIBfmvu7l7mFsBnUtqR4zcNVjqsbRFcrsWsOabYHA1Q==", + "version": "0.49.0-rc.1", + "resolved": "https://registry.npmjs.org/@perses-dev/dashboards/-/dashboards-0.49.0-rc.1.tgz", + "integrity": "sha512-NcqOrkEAgvu3UrFBttJcAoJnZNLchNapmpaThhliVmCYAekNiiPOccRTumIUr0gPrqFv8xIx/APaoHl5vnHFgQ==", "license": "Apache-2.0", "dependencies": { - "@perses-dev/components": "0.49.0-rc.0", - "@perses-dev/core": "0.49.0-rc.0", - "@perses-dev/plugin-system": "0.49.0-rc.0", + "@perses-dev/components": "0.49.0-rc.1", + "@perses-dev/core": "0.49.0-rc.1", + "@perses-dev/plugin-system": "0.49.0-rc.1", "@types/react-grid-layout": "^1.3.2", "date-fns": "^2.28.0", "immer": "^9.0.15", @@ -3638,15 +3638,15 @@ } }, "node_modules/@perses-dev/panels-plugin": { - "version": "0.49.0-rc.0", - "resolved": "https://registry.npmjs.org/@perses-dev/panels-plugin/-/panels-plugin-0.49.0-rc.0.tgz", - "integrity": "sha512-TFpNTjAMY79B+E9dNbENBg1f+8dO5JgqSY9DCOs38cARKjD4DrEMHja0lt0DVMfyKdPmaClkpLDotHHYSBbldw==", + "version": "0.49.0-rc.1", + "resolved": "https://registry.npmjs.org/@perses-dev/panels-plugin/-/panels-plugin-0.49.0-rc.1.tgz", + "integrity": "sha512-i1bhpRfVcjy8Ck/Jkdz905XHRj3eDVtk8dzz8KXlkBk0V6RL3yzk1HOMcU3g4eK5opr8MQoQdKqXnzP6phatrQ==", "license": "Apache-2.0", "dependencies": { "@mui/x-data-grid": "^7.6.2", - "@perses-dev/components": "0.49.0-rc.0", - "@perses-dev/core": "0.49.0-rc.0", - "@perses-dev/plugin-system": "0.49.0-rc.0", + "@perses-dev/components": "0.49.0-rc.1", + "@perses-dev/core": "0.49.0-rc.1", + "@perses-dev/plugin-system": "0.49.0-rc.1", "color-hash": "^2.0.2", "date-fns": "^2.28.0", "dompurify": "^2.4.0", @@ -3662,13 +3662,13 @@ } }, "node_modules/@perses-dev/plugin-system": { - "version": "0.49.0-rc.0", - "resolved": "https://registry.npmjs.org/@perses-dev/plugin-system/-/plugin-system-0.49.0-rc.0.tgz", - "integrity": "sha512-aH+M1XbrtUGcTZMFwRXE9Pg2sLvZqXUVhbZut6WIBcyZtZnqn9WpFJytu0LYH4NcSiBsiTbVDpZShvh+yOPu9A==", + "version": "0.49.0-rc.1", + "resolved": "https://registry.npmjs.org/@perses-dev/plugin-system/-/plugin-system-0.49.0-rc.1.tgz", + "integrity": "sha512-7VcwlhtdawHmxjcROGgJy+cd/3evN5PICxUPdf9G+p0GzPXbwjKeWNicXRdy8GEFFkRdj22pqd4r20lDiC1GUg==", "license": "Apache-2.0", "dependencies": { - "@perses-dev/components": "0.49.0-rc.0", - "@perses-dev/core": "0.49.0-rc.0", + "@perses-dev/components": "0.49.0-rc.1", + "@perses-dev/core": "0.49.0-rc.1", "date-fns": "^2.30.0", "immer": "^9.0.15", "react-hook-form": "^7.46.1", @@ -3684,16 +3684,16 @@ } }, "node_modules/@perses-dev/prometheus-plugin": { - "version": "0.49.0-rc.0", - "resolved": "https://registry.npmjs.org/@perses-dev/prometheus-plugin/-/prometheus-plugin-0.49.0-rc.0.tgz", - "integrity": "sha512-IuVfwdPVmXvNEalrz2FMp8A3VwGfBNmqWnk89pl2p2XS8jNIGumrW/3jfyoU9G7Hzo1K+N+v1mY0VGRRnAgl1g==", + "version": "0.49.0-rc.1", + "resolved": "https://registry.npmjs.org/@perses-dev/prometheus-plugin/-/prometheus-plugin-0.49.0-rc.1.tgz", + "integrity": "sha512-uwcTuMSDsxk/UMm/lqtYhetP1rOvrrPLkvQS/QbB372iG8TpRz9cFZCgm7jBaxay8C+MpXx/5nnInHvqiHZMAA==", "license": "Apache-2.0", "dependencies": { "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.2.0", - "@perses-dev/components": "0.49.0-rc.0", - "@perses-dev/core": "0.49.0-rc.0", - "@perses-dev/plugin-system": "0.49.0-rc.0", + "@perses-dev/components": "0.49.0-rc.1", + "@perses-dev/core": "0.49.0-rc.1", + "@perses-dev/plugin-system": "0.49.0-rc.1", "@prometheus-io/codemirror-promql": "^0.43.0", "@uiw/react-codemirror": "^4.19.1", "date-fns": "^2.28.0", @@ -3705,17 +3705,17 @@ } }, "node_modules/@perses-dev/tempo-plugin": { - "version": "0.49.0-rc.0", - "resolved": "https://registry.npmjs.org/@perses-dev/tempo-plugin/-/tempo-plugin-0.49.0-rc.0.tgz", - "integrity": "sha512-2f08hLv3oNjTG5IjS7xkt6eHfzlqCEgzIzl5DTorvuWqolOVI94fouTH+BZ7/PgEAtkA4MoNHbPjfjf+XKRJwg==", + "version": "0.49.0-rc.1", + "resolved": "https://registry.npmjs.org/@perses-dev/tempo-plugin/-/tempo-plugin-0.49.0-rc.1.tgz", + "integrity": "sha512-GzdgLcLaTZE3aAqT8mZnRfWRa/DRYCSXmtBIEOHI9YeTeQNOSZYUJxifhrSI+uEYh7LvAeQOjOTfojC1a0J6VA==", "license": "Apache-2.0", "dependencies": { "@codemirror/autocomplete": "^6.17.0", "@grafana/lezer-traceql": "^0.0.18", "@lezer/highlight": "^1.0.0", - "@perses-dev/components": "0.49.0-rc.0", - "@perses-dev/core": "0.49.0-rc.0", - "@perses-dev/plugin-system": "0.49.0-rc.0", + "@perses-dev/components": "0.49.0-rc.1", + "@perses-dev/core": "0.49.0-rc.1", + "@perses-dev/plugin-system": "0.49.0-rc.1", "@uiw/react-codemirror": "^4.19.1" }, "peerDependencies": { diff --git a/web/package.json b/web/package.json index 8c898ab..3b0e5ff 100644 --- a/web/package.json +++ b/web/package.json @@ -78,12 +78,12 @@ "@mui/material": "^5.15.14", "@patternfly/react-charts": "6.92.0", "@patternfly/react-table": "^5.2.4", - "@perses-dev/components": "0.49.0-rc.0", - "@perses-dev/dashboards": "0.49.0-rc.0", - "@perses-dev/panels-plugin": "0.49.0-rc.0", - "@perses-dev/plugin-system": "0.49.0-rc.0", - "@perses-dev/prometheus-plugin": "0.49.0-rc.0", - "@perses-dev/tempo-plugin": "0.49.0-rc.0", + "@perses-dev/components": "0.49.0-rc.1", + "@perses-dev/dashboards": "0.49.0-rc.1", + "@perses-dev/panels-plugin": "0.49.0-rc.1", + "@perses-dev/plugin-system": "0.49.0-rc.1", + "@perses-dev/prometheus-plugin": "0.49.0-rc.1", + "@perses-dev/tempo-plugin": "0.49.0-rc.1", "@tanstack/react-query": "^4.7.1", "copy-webpack-plugin": "^12.0.2", "i18next": "^23.10.0", diff --git a/web/src/components/NoTempoInstanceSelectedState.tsx b/web/src/components/NoTempoInstanceSelectedState.tsx index 15310a5..cf23025 100644 --- a/web/src/components/NoTempoInstanceSelectedState.tsx +++ b/web/src/components/NoTempoInstanceSelectedState.tsx @@ -6,7 +6,7 @@ import { EmptyStateIcon, Bullseye, } from '@patternfly/react-core'; -import CubesIcon from '@patternfly/react-icons/dist/esm/icons/cubes-icon'; +import { CubesIcon } from '@patternfly/react-icons'; import { useTranslation } from 'react-i18next'; diff --git a/web/src/pages/TracesPage/QueryBrowser.tsx b/web/src/pages/TracesPage/QueryBrowser.tsx index ab3dd11..7447cf4 100644 --- a/web/src/pages/TracesPage/QueryBrowser.tsx +++ b/web/src/pages/TracesPage/QueryBrowser.tsx @@ -21,7 +21,7 @@ import { } from 'use-query-params'; import { useTempoInstance } from '../../hooks/useTempoInstance'; import { useTimeRange } from '@perses-dev/plugin-system'; -import { TempoTraceQuerySpec } from '@perses-dev/tempo-plugin/dist/model/trace-query-model'; +import { TempoTraceQuerySpec } from '@perses-dev/tempo-plugin'; const durationQueryParam = withDefault(createEnumParam(DurationValues), '30m'); diff --git a/web/src/pages/TracesPage/QueryEditor/QueryEditor.tsx b/web/src/pages/TracesPage/QueryEditor/QueryEditor.tsx index cf356d2..cbc2b60 100644 --- a/web/src/pages/TracesPage/QueryEditor/QueryEditor.tsx +++ b/web/src/pages/TracesPage/QueryEditor/QueryEditor.tsx @@ -4,7 +4,7 @@ import { Button } from '@patternfly/react-core'; import { TraceQLEditor } from './TraceQLEditor'; import { useTranslation } from 'react-i18next'; import { TempoInstance } from '../../../hooks/useTempoInstance'; -import { TempoTraceQuerySpec } from '@perses-dev/tempo-plugin/dist/model/trace-query-model'; +import { TempoTraceQuerySpec } from '@perses-dev/tempo-plugin'; interface QueryEditorProps { tempo: TempoInstance | undefined; diff --git a/web/src/pages/TracesPage/TraceTable.tsx b/web/src/pages/TracesPage/TraceTable.tsx index 5fc5f17..571e1a6 100644 --- a/web/src/pages/TracesPage/TraceTable.tsx +++ b/web/src/pages/TracesPage/TraceTable.tsx @@ -14,7 +14,7 @@ import { SearchIcon } from '@patternfly/react-icons'; import { useTranslation } from 'react-i18next'; import { linkToTraceDetailPage } from '../../links'; import './TraceTable.css'; -import { TempoTraceQuerySpec } from '@perses-dev/tempo-plugin/dist/model/trace-query-model'; +import { TempoTraceQuerySpec } from '@perses-dev/tempo-plugin'; interface TraceTableProps { runQuery: (spec: TempoTraceQuerySpec) => void;