opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-09-21 12:12:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Big tent data sources: Replace deprecated @grafana/experimental with @grafana/plugin-ui (#99331)

Browse Source 
* 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
This commit is contained in:
Ivana Huckova
2025-01-22 15:18:41 +01:00
committed by GitHub
parent d2d6dd2e5f
commit 23f495d4cd
15 changed files with 70 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
public/app/plugins/datasource/grafana-postgresql-datasource/configuration/ConfigurationEditor.tsx
View File

@ -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<P
<Field
label={
<Label>
<Stack gap={0.5}>
<EditorStack gap={0.5}>
<span>TLS/SSL Mode</span>
<Tooltip
content={
@ -169,7 +169,7 @@ export const PostgresConfigEditor = (props: DataSourcePluginOptionsEditorProps<P
>
<Icon name="info-circle" size="sm" />
</Tooltip>
</Stack>
</EditorStack>
</Label>
}
>
@ -185,7 +185,7 @@ export const PostgresConfigEditor = (props: DataSourcePluginOptionsEditorProps<P
<Field
label={
<Label>
<Stack gap={0.5}>
<EditorStack gap={0.5}>
<span>TLS/SSL Method</span>
<Tooltip
content={
@ -205,7 +205,7 @@ export const PostgresConfigEditor = (props: DataSourcePluginOptionsEditorProps<P
>
<Icon name="info-circle" size="sm" />
</Tooltip>
</Stack>
</EditorStack>
</Label>
}
>
@ -236,7 +236,7 @@ export const PostgresConfigEditor = (props: DataSourcePluginOptionsEditorProps<P
<Field
label={
<Label>
<Stack gap={0.5}>
<EditorStack gap={0.5}>
<span>TLS/SSL Root Certificate</span>
<Tooltip
content={
@ -248,7 +248,7 @@ export const PostgresConfigEditor = (props: DataSourcePluginOptionsEditorProps<P
>
<Icon name="info-circle" size="sm" />
</Tooltip>
</Stack>
</EditorStack>
</Label>
}
>
@ -262,7 +262,7 @@ export const PostgresConfigEditor = (props: DataSourcePluginOptionsEditorProps<P
<Field
label={
<Label>
<Stack gap={0.5}>
<EditorStack gap={0.5}>
<span>TLS/SSL Client Certificate</span>
<Tooltip
content={
@ -274,7 +274,7 @@ export const PostgresConfigEditor = (props: DataSourcePluginOptionsEditorProps<P
>
<Icon name="info-circle" size="sm" />
</Tooltip>
</Stack>
</EditorStack>
</Label>
}
>
@ -288,7 +288,7 @@ export const PostgresConfigEditor = (props: DataSourcePluginOptionsEditorProps<P
<Field
label={
<Label>
<Stack gap={0.5}>
<EditorStack gap={0.5}>
<span>TLS/SSL Client Key</span>
<Tooltip
content={
@ -301,7 +301,7 @@ export const PostgresConfigEditor = (props: DataSourcePluginOptionsEditorProps<P
>
<Icon name="info-circle" size="sm" />
</Tooltip>
</Stack>
</EditorStack>
</Label>
}
>
@ -325,7 +325,7 @@ export const PostgresConfigEditor = (props: DataSourcePluginOptionsEditorProps<P
<Field
label={
<Label>
<Stack gap={0.5}>
<EditorStack gap={0.5}>
<span>Version</span>
<Tooltip
content={
@ -334,7 +334,7 @@ export const PostgresConfigEditor = (props: DataSourcePluginOptionsEditorProps<P
>
<Icon name="info-circle" size="sm" />
</Tooltip>
</Stack>
</EditorStack>
</Label>
}
>
@ -348,7 +348,7 @@ export const PostgresConfigEditor = (props: DataSourcePluginOptionsEditorProps<P
<Field
label={
<Label>
<Stack gap={0.5}>
<EditorStack gap={0.5}>
<span>Min time interval</span>
<Tooltip
content={
@ -361,7 +361,7 @@ export const PostgresConfigEditor = (props: DataSourcePluginOptionsEditorProps<P
>
<Icon name="info-circle" size="sm" />
</Tooltip>
</Stack>
</EditorStack>
</Label>
}
>
@ -375,7 +375,7 @@ export const PostgresConfigEditor = (props: DataSourcePluginOptionsEditorProps<P
<Field
label={
<Label>
<Stack gap={0.5}>
<EditorStack gap={0.5}>
<span>TimescaleDB</span>
<Tooltip
content={
@ -389,7 +389,7 @@ export const PostgresConfigEditor = (props: DataSourcePluginOptionsEditorProps<P
>
<Icon name="info-circle" size="sm" />
</Tooltip>
</Stack>
</EditorStack>
</Label>
}
>

2
public/app/plugins/datasource/grafana-postgresql-datasource/datasource.ts
View File

@ -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,

2
public/app/plugins/datasource/grafana-postgresql-datasource/package.json
View File

@ -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",

2
public/app/plugins/datasource/grafana-postgresql-datasource/sqlCompletionProvider.ts
View File

@ -6,7 +6,7 @@ import {
TableDefinition,
TableIdentifier,
TokenType,
} from '@grafana/experimental';
} from '@grafana/plugin-ui';
import { DB, SQLQuery } from '@grafana/sql';
interface CompletionProviderGetterArgs {

4
public/app/plugins/datasource/jaeger/configuration/ConfigEditor.tsx
View File

@ -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';

2
public/app/plugins/datasource/jaeger/package.json
View File

@ -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",

2
public/app/plugins/datasource/mysql/MySqlDatasource.ts
View File

@ -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';

10
public/app/plugins/datasource/mysql/configuration/ConfigurationEditor.tsx
View File

@ -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<My
<Field
label={
<Label>
<Stack gap={0.5}>
<EditorStack gap={0.5}>
<span>Session timezone</span>
<Tooltip
content={
@ -185,7 +185,7 @@ export const ConfigurationEditor = (props: DataSourcePluginOptionsEditorProps<My
>
<Icon name="info-circle" size="sm" />
</Tooltip>
</Stack>
</EditorStack>
</Label>
}
>
@ -200,7 +200,7 @@ export const ConfigurationEditor = (props: DataSourcePluginOptionsEditorProps<My
<Field
label={
<Label>
<Stack gap={0.5}>
<EditorStack gap={0.5}>
<span>Min time interval</span>
<Tooltip
content={
@ -213,7 +213,7 @@ export const ConfigurationEditor = (props: DataSourcePluginOptionsEditorProps<My
>
<Icon name="info-circle" size="sm" />
</Tooltip>
</Stack>
</EditorStack>
</Label>
}
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."

2
public/app/plugins/datasource/mysql/package.json
View File

@ -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",

2
public/app/plugins/datasource/mysql/sqlCompletionProvider.ts
View File

@ -11,7 +11,7 @@ import {
TableDefinition,
TableIdentifier,
TokenType,
} from '@grafana/experimental';
} from '@grafana/plugin-ui';
interface CompletionProviderGetterArgs {
getMeta: (t?: TableIdentifier) => Promise<TableDefinition[]>;

2
public/app/plugins/datasource/prometheus/configuration/ConfigEditorPackage.tsx
View File

@ -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';

2
public/app/plugins/datasource/prometheus/configuration/DataSourceHttpSettingsOverhaulPackage.tsx
View File

@ -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

4
public/app/plugins/datasource/zipkin/ConfigEditor.tsx
View File

@ -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';

2
public/app/plugins/datasource/zipkin/package.json
View File

@ -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",

38
yarn.lock
View File

@ -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"