From 23f495d4cdcca97a590f0bb2bee747e1d5e25e7a Mon Sep 17 00:00:00 2001 From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com> Date: Wed, 22 Jan 2025 15:18:41 +0100 Subject: [PATCH] Big tent data sources: Replace deprecated `@grafana/experimental` with `@grafana/plugin-ui` (#99331) * Zipkin: Replace deprecated @grafana/experimental with @grafana/plugin-ui * Prometheus: Replace deprecated @grafana/experimental with @grafana/plugin-ui * Mysql: Replace deprecated @grafana/experimental with @grafana/plugin-ui * Jaeger: Replace deprecated @grafana/experimental with @grafana/plugin-ui * Postgresql: Replace deprecated @grafana/experimental with @grafana/plugin-ui * Brin experimental back to main package.json - accidentally removed * Fix order of imports --- .../configuration/ConfigurationEditor.tsx | 34 ++++++++--------- .../datasource.ts | 2 +- .../package.json | 2 +- .../sqlCompletionProvider.ts | 2 +- .../jaeger/configuration/ConfigEditor.tsx | 4 +- .../plugins/datasource/jaeger/package.json | 2 +- .../datasource/mysql/MySqlDatasource.ts | 2 +- .../configuration/ConfigurationEditor.tsx | 10 ++--- .../app/plugins/datasource/mysql/package.json | 2 +- .../datasource/mysql/sqlCompletionProvider.ts | 2 +- .../configuration/ConfigEditorPackage.tsx | 2 +- .../DataSourceHttpSettingsOverhaulPackage.tsx | 2 +- .../datasource/zipkin/ConfigEditor.tsx | 4 +- .../plugins/datasource/zipkin/package.json | 2 +- yarn.lock | 38 +++++++++++++++++-- 15 files changed, 70 insertions(+), 40 deletions(-) diff --git a/public/app/plugins/datasource/grafana-postgresql-datasource/configuration/ConfigurationEditor.tsx b/public/app/plugins/datasource/grafana-postgresql-datasource/configuration/ConfigurationEditor.tsx index 3c1d5da4e40..5d8cb9aae06 100644 --- a/public/app/plugins/datasource/grafana-postgresql-datasource/configuration/ConfigurationEditor.tsx +++ b/public/app/plugins/datasource/grafana-postgresql-datasource/configuration/ConfigurationEditor.tsx @@ -8,7 +8,7 @@ import { updateDatasourcePluginJsonDataOption, updateDatasourcePluginResetOption, } from '@grafana/data'; -import { ConfigSection, ConfigSubSection, DataSourceDescription, Stack } from '@grafana/experimental'; +import { ConfigSection, ConfigSubSection, DataSourceDescription, EditorStack } from '@grafana/plugin-ui'; import { config } from '@grafana/runtime'; import { ConnectionLimits, Divider, TLSSecretsConfig, useMigrateDatabaseFields } from '@grafana/sql'; import { @@ -157,7 +157,7 @@ export const PostgresConfigEditor = (props: DataSourcePluginOptionsEditorProps

- + TLS/SSL Mode - + } > @@ -185,7 +185,7 @@ export const PostgresConfigEditor = (props: DataSourcePluginOptionsEditorProps

- + TLS/SSL Method - + } > @@ -236,7 +236,7 @@ export const PostgresConfigEditor = (props: DataSourcePluginOptionsEditorProps

- + TLS/SSL Root Certificate - + } > @@ -262,7 +262,7 @@ export const PostgresConfigEditor = (props: DataSourcePluginOptionsEditorProps

- + TLS/SSL Client Certificate - + } > @@ -288,7 +288,7 @@ export const PostgresConfigEditor = (props: DataSourcePluginOptionsEditorProps

- + TLS/SSL Client Key - + } > @@ -325,7 +325,7 @@ export const PostgresConfigEditor = (props: DataSourcePluginOptionsEditorProps

- + Version - + } > @@ -348,7 +348,7 @@ export const PostgresConfigEditor = (props: DataSourcePluginOptionsEditorProps

- + Min time interval - + } > @@ -375,7 +375,7 @@ export const PostgresConfigEditor = (props: DataSourcePluginOptionsEditorProps

- + TimescaleDB - + } > diff --git a/public/app/plugins/datasource/grafana-postgresql-datasource/datasource.ts b/public/app/plugins/datasource/grafana-postgresql-datasource/datasource.ts index b53203c9e4b..24dd9e1c15d 100644 --- a/public/app/plugins/datasource/grafana-postgresql-datasource/datasource.ts +++ b/public/app/plugins/datasource/grafana-postgresql-datasource/datasource.ts @@ -1,7 +1,7 @@ import { v4 as uuidv4 } from 'uuid'; import { DataSourceInstanceSettings, ScopedVars } from '@grafana/data'; -import { LanguageDefinition } from '@grafana/experimental'; +import { LanguageDefinition } from '@grafana/plugin-ui'; import { TemplateSrv, config } from '@grafana/runtime'; import { COMMON_FNS, diff --git a/public/app/plugins/datasource/grafana-postgresql-datasource/package.json b/public/app/plugins/datasource/grafana-postgresql-datasource/package.json index a2a7b51292e..8cea9b0a65b 100644 --- a/public/app/plugins/datasource/grafana-postgresql-datasource/package.json +++ b/public/app/plugins/datasource/grafana-postgresql-datasource/package.json @@ -6,7 +6,7 @@ "dependencies": { "@emotion/css": "11.13.5", "@grafana/data": "11.5.0-pre", - "@grafana/experimental": "2.1.6", + "@grafana/plugin-ui": "^0.9.6", "@grafana/runtime": "11.5.0-pre", "@grafana/sql": "11.5.0-pre", "@grafana/ui": "11.5.0-pre", diff --git a/public/app/plugins/datasource/grafana-postgresql-datasource/sqlCompletionProvider.ts b/public/app/plugins/datasource/grafana-postgresql-datasource/sqlCompletionProvider.ts index a1936af881f..b12ef823339 100644 --- a/public/app/plugins/datasource/grafana-postgresql-datasource/sqlCompletionProvider.ts +++ b/public/app/plugins/datasource/grafana-postgresql-datasource/sqlCompletionProvider.ts @@ -6,7 +6,7 @@ import { TableDefinition, TableIdentifier, TokenType, -} from '@grafana/experimental'; +} from '@grafana/plugin-ui'; import { DB, SQLQuery } from '@grafana/sql'; interface CompletionProviderGetterArgs { diff --git a/public/app/plugins/datasource/jaeger/configuration/ConfigEditor.tsx b/public/app/plugins/datasource/jaeger/configuration/ConfigEditor.tsx index c032084fbb2..ec5114c48e3 100644 --- a/public/app/plugins/datasource/jaeger/configuration/ConfigEditor.tsx +++ b/public/app/plugins/datasource/jaeger/configuration/ConfigEditor.tsx @@ -1,6 +1,7 @@ import { css } from '@emotion/css'; import { DataSourcePluginOptionsEditorProps, GrafanaTheme2 } from '@grafana/data'; +import { NodeGraphSection, SpanBarSection, TraceToLogsSection, TraceToMetricsSection } from '@grafana/o11y-ds-frontend'; import { AdvancedHttpSettings, Auth, @@ -8,8 +9,7 @@ import { ConnectionSettings, DataSourceDescription, convertLegacyAuthProps, -} from '@grafana/experimental'; -import { NodeGraphSection, SpanBarSection, TraceToLogsSection, TraceToMetricsSection } from '@grafana/o11y-ds-frontend'; +} from '@grafana/plugin-ui'; import { config } from '@grafana/runtime'; import { useStyles2, Divider, Stack, SecureSocksProxySettings } from '@grafana/ui'; diff --git a/public/app/plugins/datasource/jaeger/package.json b/public/app/plugins/datasource/jaeger/package.json index fc3e3562d0e..e1b2b9f8e89 100644 --- a/public/app/plugins/datasource/jaeger/package.json +++ b/public/app/plugins/datasource/jaeger/package.json @@ -7,8 +7,8 @@ "@emotion/css": "11.13.5", "@grafana/data": "workspace:*", "@grafana/e2e-selectors": "workspace:*", - "@grafana/experimental": "2.1.6", "@grafana/o11y-ds-frontend": "workspace:*", + "@grafana/plugin-ui": "^0.9.6", "@grafana/runtime": "workspace:*", "@grafana/ui": "workspace:*", "lodash": "4.17.21", diff --git a/public/app/plugins/datasource/mysql/MySqlDatasource.ts b/public/app/plugins/datasource/mysql/MySqlDatasource.ts index fdcaabed151..b44775fe81a 100644 --- a/public/app/plugins/datasource/mysql/MySqlDatasource.ts +++ b/public/app/plugins/datasource/mysql/MySqlDatasource.ts @@ -1,7 +1,7 @@ import { v4 as uuidv4 } from 'uuid'; import { DataSourceInstanceSettings, TimeRange } from '@grafana/data'; -import { CompletionItemKind, LanguageDefinition, TableIdentifier } from '@grafana/experimental'; +import { CompletionItemKind, LanguageDefinition, TableIdentifier } from '@grafana/plugin-ui'; import { config } from '@grafana/runtime'; import { COMMON_FNS, DB, FuncParameter, MACRO_FUNCTIONS, SQLQuery, SqlDatasource, formatSQL } from '@grafana/sql'; diff --git a/public/app/plugins/datasource/mysql/configuration/ConfigurationEditor.tsx b/public/app/plugins/datasource/mysql/configuration/ConfigurationEditor.tsx index 95dabda1c76..bf0acc0731d 100644 --- a/public/app/plugins/datasource/mysql/configuration/ConfigurationEditor.tsx +++ b/public/app/plugins/datasource/mysql/configuration/ConfigurationEditor.tsx @@ -7,7 +7,7 @@ import { updateDatasourcePluginJsonDataOption, updateDatasourcePluginResetOption, } from '@grafana/data'; -import { ConfigSection, ConfigSubSection, DataSourceDescription, Stack } from '@grafana/experimental'; +import { ConfigSection, ConfigSubSection, DataSourceDescription, EditorStack } from '@grafana/plugin-ui'; import { config } from '@grafana/runtime'; import { ConnectionLimits, Divider, TLSSecretsConfig, useMigrateDatabaseFields } from '@grafana/sql'; import { @@ -169,7 +169,7 @@ export const ConfigurationEditor = (props: DataSourcePluginOptionsEditorProps - + Session timezone - + } > @@ -200,7 +200,7 @@ export const ConfigurationEditor = (props: DataSourcePluginOptionsEditorProps - + Min time interval - + } description="A lower limit for the auto group by time interval. Recommended to be set to write frequency, for example 1m if your data is written every minute." diff --git a/public/app/plugins/datasource/mysql/package.json b/public/app/plugins/datasource/mysql/package.json index a6de38fd8df..757edda8588 100644 --- a/public/app/plugins/datasource/mysql/package.json +++ b/public/app/plugins/datasource/mysql/package.json @@ -6,7 +6,7 @@ "dependencies": { "@emotion/css": "11.13.5", "@grafana/data": "11.5.0-pre", - "@grafana/experimental": "2.1.6", + "@grafana/plugin-ui": "^0.9.6", "@grafana/runtime": "11.5.0-pre", "@grafana/sql": "11.5.0-pre", "@grafana/ui": "11.5.0-pre", diff --git a/public/app/plugins/datasource/mysql/sqlCompletionProvider.ts b/public/app/plugins/datasource/mysql/sqlCompletionProvider.ts index b44b2475027..19fca7d6f56 100644 --- a/public/app/plugins/datasource/mysql/sqlCompletionProvider.ts +++ b/public/app/plugins/datasource/mysql/sqlCompletionProvider.ts @@ -11,7 +11,7 @@ import { TableDefinition, TableIdentifier, TokenType, -} from '@grafana/experimental'; +} from '@grafana/plugin-ui'; interface CompletionProviderGetterArgs { getMeta: (t?: TableIdentifier) => Promise; diff --git a/public/app/plugins/datasource/prometheus/configuration/ConfigEditorPackage.tsx b/public/app/plugins/datasource/prometheus/configuration/ConfigEditorPackage.tsx index 5a35f1e0ecf..16a65d8a89d 100644 --- a/public/app/plugins/datasource/prometheus/configuration/ConfigEditorPackage.tsx +++ b/public/app/plugins/datasource/prometheus/configuration/ConfigEditorPackage.tsx @@ -3,7 +3,7 @@ import { css } from '@emotion/css'; import { SIGV4ConnectionConfig } from '@grafana/aws-sdk'; import { hasCredentials } from '@grafana/azure-sdk'; import { DataSourcePluginOptionsEditorProps, GrafanaTheme2 } from '@grafana/data'; -import { AdvancedHttpSettings, ConfigSection, DataSourceDescription } from '@grafana/experimental'; +import { AdvancedHttpSettings, ConfigSection, DataSourceDescription } from '@grafana/plugin-ui'; import { AlertingSettingsOverhaul, PromOptions, PromSettings } from '@grafana/prometheus'; import { config } from '@grafana/runtime'; import { Alert, FieldValidationMessage, useTheme2 } from '@grafana/ui'; diff --git a/public/app/plugins/datasource/prometheus/configuration/DataSourceHttpSettingsOverhaulPackage.tsx b/public/app/plugins/datasource/prometheus/configuration/DataSourceHttpSettingsOverhaulPackage.tsx index 90e719ad8d1..010c1ba2f63 100644 --- a/public/app/plugins/datasource/prometheus/configuration/DataSourceHttpSettingsOverhaulPackage.tsx +++ b/public/app/plugins/datasource/prometheus/configuration/DataSourceHttpSettingsOverhaulPackage.tsx @@ -1,7 +1,7 @@ import { ReactElement, useState } from 'react'; import * as React from 'react'; -import { Auth, ConnectionSettings, convertLegacyAuthProps, AuthMethod } from '@grafana/experimental'; +import { Auth, ConnectionSettings, convertLegacyAuthProps, AuthMethod } from '@grafana/plugin-ui'; import { docsTip, overhaulStyles } from '@grafana/prometheus'; import { Alert, SecureSocksProxySettings, useTheme2 } from '@grafana/ui'; // NEED TO EXPORT THIS FROM GRAFANA/UI FOR EXTERNAL DS diff --git a/public/app/plugins/datasource/zipkin/ConfigEditor.tsx b/public/app/plugins/datasource/zipkin/ConfigEditor.tsx index f66965bd452..ef3079e59bb 100644 --- a/public/app/plugins/datasource/zipkin/ConfigEditor.tsx +++ b/public/app/plugins/datasource/zipkin/ConfigEditor.tsx @@ -1,6 +1,7 @@ import { css } from '@emotion/css'; import { DataSourcePluginOptionsEditorProps, GrafanaTheme2 } from '@grafana/data'; +import { NodeGraphSection, SpanBarSection, TraceToLogsSection, TraceToMetricsSection } from '@grafana/o11y-ds-frontend'; import { AdvancedHttpSettings, Auth, @@ -8,8 +9,7 @@ import { ConnectionSettings, DataSourceDescription, convertLegacyAuthProps, -} from '@grafana/experimental'; -import { NodeGraphSection, SpanBarSection, TraceToLogsSection, TraceToMetricsSection } from '@grafana/o11y-ds-frontend'; +} from '@grafana/plugin-ui'; import { config } from '@grafana/runtime'; import { useStyles2, Divider, Stack, SecureSocksProxySettings } from '@grafana/ui'; diff --git a/public/app/plugins/datasource/zipkin/package.json b/public/app/plugins/datasource/zipkin/package.json index 42be4af6721..3a9f96042ae 100644 --- a/public/app/plugins/datasource/zipkin/package.json +++ b/public/app/plugins/datasource/zipkin/package.json @@ -7,8 +7,8 @@ "@emotion/css": "11.13.5", "@grafana/data": "workspace:*", "@grafana/e2e-selectors": "workspace:*", - "@grafana/experimental": "2.1.6", "@grafana/o11y-ds-frontend": "workspace:*", + "@grafana/plugin-ui": "^0.9.6", "@grafana/runtime": "workspace:*", "@grafana/ui": "workspace:*", "lodash": "4.17.21", diff --git a/yarn.lock b/yarn.lock index 4e72390e5f5..a2b0292dbc7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2711,8 +2711,8 @@ __metadata: "@emotion/css": "npm:11.13.5" "@grafana/data": "npm:11.5.0-pre" "@grafana/e2e-selectors": "npm:11.5.0-pre" - "@grafana/experimental": "npm:2.1.6" "@grafana/plugin-configs": "npm:11.5.0-pre" + "@grafana/plugin-ui": "npm:^0.9.6" "@grafana/runtime": "npm:11.5.0-pre" "@grafana/sql": "npm:11.5.0-pre" "@grafana/ui": "npm:11.5.0-pre" @@ -2822,9 +2822,9 @@ __metadata: "@emotion/css": "npm:11.13.5" "@grafana/data": "workspace:*" "@grafana/e2e-selectors": "workspace:*" - "@grafana/experimental": "npm:2.1.6" "@grafana/o11y-ds-frontend": "workspace:*" "@grafana/plugin-configs": "workspace:*" + "@grafana/plugin-ui": "npm:^0.9.6" "@grafana/runtime": "workspace:*" "@grafana/ui": "workspace:*" "@testing-library/dom": "npm:10.4.0" @@ -2895,8 +2895,8 @@ __metadata: "@emotion/css": "npm:11.13.5" "@grafana/data": "npm:11.5.0-pre" "@grafana/e2e-selectors": "npm:11.5.0-pre" - "@grafana/experimental": "npm:2.1.6" "@grafana/plugin-configs": "npm:11.5.0-pre" + "@grafana/plugin-ui": "npm:^0.9.6" "@grafana/runtime": "npm:11.5.0-pre" "@grafana/sql": "npm:11.5.0-pre" "@grafana/ui": "npm:11.5.0-pre" @@ -3064,9 +3064,9 @@ __metadata: "@emotion/css": "npm:11.13.5" "@grafana/data": "workspace:*" "@grafana/e2e-selectors": "workspace:*" - "@grafana/experimental": "npm:2.1.6" "@grafana/o11y-ds-frontend": "workspace:*" "@grafana/plugin-configs": "workspace:*" + "@grafana/plugin-ui": "npm:^0.9.6" "@grafana/runtime": "workspace:*" "@grafana/ui": "workspace:*" "@testing-library/dom": "npm:10.4.0" @@ -3491,6 +3491,36 @@ __metadata: languageName: node linkType: hard +"@grafana/plugin-ui@npm:^0.9.6": + version: 0.9.6 + resolution: "@grafana/plugin-ui@npm:0.9.6" + dependencies: + "@hello-pangea/dnd": "npm:^17.0.0" + lodash: "npm:^4.17.21" + prismjs: "npm:^1.29.0" + prompts: "npm:^2.4.2" + rc-cascader: "npm:1.0.1" + react-awesome-query-builder: "npm:^5.3.1" + react-popper-tooltip: "npm:^4.4.2" + react-use: "npm:17.3.1" + react-virtualized-auto-sizer: "npm:^1.0.6" + sql-formatter-plus: "npm:^1.3.6" + uuid: "npm:^8.3.2" + peerDependencies: + "@changesets/cli": ">=2.x" + "@grafana/data": ^10.4.0 || ^11.0.0 + "@grafana/e2e-selectors": ^10.4.0 || ^11.0.0 + "@grafana/runtime": ^10.4.0 || ^11.0.0 + "@grafana/ui": ^10.4.0 || ^11.0.0 + react: ^18.2.0 + react-dom: ^18.2.0 + rxjs: ^7.8.1 + bin: + changeset-improved: dist/utils/changeset/index.js + checksum: 10/260317fd20becd3bed4b7beb758e855075c707952622169e1cd1c8624ff40e2d297b8b92584abb55a012cecbf81f1712372bc5420c3b93cfb0079504e649f858 + languageName: node + linkType: hard + "@grafana/prometheus@workspace:*, @grafana/prometheus@workspace:packages/grafana-prometheus": version: 0.0.0-use.local resolution: "@grafana/prometheus@workspace:packages/grafana-prometheus"