root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 169 Packages Projects Releases Wiki Activity

Datasources: Replace deprecated @grafana/experimental with @grafana/plugin-ui in Cloudwatch and Elasticsearch (#99374)

This commit is contained in:
Ida Štambuk 2025-01-23 03:00:30 +01:00 committed by GitHub
parent 1a634b0539
commit dfc565db8d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
30 changed files with 60 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -259,7 +259,6 @@
"@grafana/azure-sdk": "0.0.5",
"@grafana/data": "workspace:*",
"@grafana/e2e-selectors": "workspace:*",
"@grafana/experimental": "2.1.6",
"@grafana/faro-core": "^1.3.6",
"@grafana/faro-web-sdk": "^1.3.6",
"@grafana/faro-web-tracing": "^1.8.2",
@ -268,6 +267,7 @@
"@grafana/lezer-logql": "0.2.7",
"@grafana/monaco-logql": "^0.0.8",
"@grafana/o11y-ds-frontend": "workspace:*",
"@grafana/plugin-ui": "^0.9.6",
"@grafana/prometheus": "workspace:*",
"@grafana/runtime": "workspace:*",
"@grafana/saga-icons": "workspace:*",

2
public/app/plugins/datasource/cloudwatch/components/AnnotationQueryEditor/AnnotationQueryEditor.tsx
View File

@ -1,7 +1,7 @@
import { ChangeEvent } from 'react';
import { QueryEditorProps } from '@grafana/data';
import { EditorField, EditorHeader, EditorRow, EditorSwitch, InlineSelect } from '@grafana/experimental';
import { EditorField, EditorHeader, EditorRow, EditorSwitch, InlineSelect } from '@grafana/plugin-ui';
import { Alert, Input, Space } from '@grafana/ui';
import { CloudWatchDatasource } from '../../datasource';

2
public/app/plugins/datasource/cloudwatch/components/ConfigEditor/ConfigEditor.tsx
View File

@ -12,7 +12,7 @@ import {
DataSourceTestFailed,
GrafanaTheme2,
} from '@grafana/data';
import { ConfigSection } from '@grafana/experimental';
import { ConfigSection } from '@grafana/plugin-ui';
import { getAppEvents, usePluginInteractionReporter, getDataSourceSrv, config } from '@grafana/runtime';
import { Alert, Input, FieldProps, Field, Divider, useStyles2 } from '@grafana/ui';

2
public/app/plugins/datasource/cloudwatch/components/ConfigEditor/SecureSocksProxySettingsNewStyling.tsx
View File

@ -1,5 +1,5 @@
import { DataSourceJsonData, DataSourcePluginOptionsEditorProps } from '@grafana/data';
import { ConfigSection } from '@grafana/experimental';
import { ConfigSection } from '@grafana/plugin-ui';
import { Field, Switch } from '@grafana/ui';
export interface Props<T extends DataSourceJsonData>

2
public/app/plugins/datasource/cloudwatch/components/ConfigEditor/XrayLinkConfig.tsx
View File

@ -1,7 +1,7 @@
import { css } from '@emotion/css';
import { GrafanaTheme2, DataSourceInstanceSettings } from '@grafana/data';
import { ConfigSection } from '@grafana/experimental';
import { ConfigSection } from '@grafana/plugin-ui';
import { DataSourcePicker, getDataSourceSrv } from '@grafana/runtime';
import { Alert, Field, InlineField, useStyles2 } from '@grafana/ui';

2
public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/LogsQueryEditor.tsx
View File

@ -2,7 +2,7 @@ import { memo, useCallback, useEffect, useState } from 'react';
import { useEffectOnce } from 'react-use';
import { QueryEditorProps, SelectableValue } from '@grafana/data';
import { InlineSelect } from '@grafana/experimental';
import { InlineSelect } from '@grafana/plugin-ui';
import { CloudWatchDatasource } from '../../../datasource';
import { DEFAULT_CWLI_QUERY_STRING, DEFAULT_PPL_QUERY_STRING, DEFAULT_SQL_QUERY_STRING } from '../../../defaultQueries';

2
public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/MetricsQueryEditor.tsx
View File

@ -2,7 +2,7 @@ import { ChangeEvent, useCallback, useEffect, useState } from 'react';
import * as React from 'react';
import { QueryEditorProps, SelectableValue } from '@grafana/data';
import { EditorField, EditorRow, InlineSelect } from '@grafana/experimental';
import { EditorField, EditorRow, InlineSelect } from '@grafana/plugin-ui';
import { ConfirmModal, Input, RadioButtonGroup, Space } from '@grafana/ui';
import { CloudWatchDatasource } from '../../../datasource';

2
public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLBuilderEditor.tsx
View File

@ -1,7 +1,7 @@
import { useCallback, useEffect, useState } from 'react';
import * as React from 'react';
import { EditorField, EditorRow, EditorRows } from '@grafana/experimental';
import { EditorField, EditorRow, EditorRows } from '@grafana/plugin-ui';
import { Input } from '@grafana/ui';
import { CloudWatchDatasource } from '../../../../datasource';

2
public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLBuilderSelectRow.tsx
View File

@ -1,7 +1,7 @@
import { useEffect, useMemo } from 'react';
import { SelectableValue, toOption } from '@grafana/data';
import { EditorField, EditorFieldGroup, EditorSwitch } from '@grafana/experimental';
import { EditorField, EditorFieldGroup, EditorSwitch } from '@grafana/plugin-ui';
import { config } from '@grafana/runtime';
import { Select } from '@grafana/ui';

2
public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLFilter.tsx
View File

@ -3,7 +3,7 @@ import { useMemo, useState } from 'react';
import { useAsyncFn } from 'react-use';
import { SelectableValue, toOption } from '@grafana/data';
import { AccessoryButton, EditorList, InputGroup } from '@grafana/experimental';
import { AccessoryButton, EditorList, InputGroup } from '@grafana/plugin-ui';
import { config } from '@grafana/runtime';
import { Alert, Select, useStyles2 } from '@grafana/ui';

2
public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLGroupBy.tsx
View File

@ -1,7 +1,7 @@
import { useMemo, useState } from 'react';
import { SelectableValue, toOption } from '@grafana/data';
import { AccessoryButton, EditorList, InputGroup } from '@grafana/experimental';
import { AccessoryButton, EditorList, InputGroup } from '@grafana/plugin-ui';
import { config } from '@grafana/runtime';
import { Select } from '@grafana/ui';

2
public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLOrderByGroup.tsx
View File

@ -1,5 +1,5 @@
import { SelectableValue, toOption } from '@grafana/data';
import { AccessoryButton, EditorField, EditorFieldGroup, InputGroup } from '@grafana/experimental';
import { AccessoryButton, EditorField, EditorFieldGroup, InputGroup } from '@grafana/plugin-ui';
import { Select } from '@grafana/ui';
import { CloudWatchDatasource } from '../../../../datasource';

2
public/app/plugins/datasource/cloudwatch/components/QueryEditor/QueryHeader.tsx
View File

@ -1,5 +1,5 @@
import { CoreApp, LoadingState, QueryEditorProps, SelectableValue } from '@grafana/data';
import { EditorHeader, InlineSelect, FlexItem } from '@grafana/experimental';
import { EditorHeader, InlineSelect, FlexItem } from '@grafana/plugin-ui';
import { config } from '@grafana/runtime';
import { Badge, Button } from '@grafana/ui';

2
public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/MultiFilter.tsx
View File

@ -1,7 +1,7 @@
import { isEqual } from 'lodash';
import { useEffect, useState } from 'react';
import { EditorList } from '@grafana/experimental';
import { EditorList } from '@grafana/plugin-ui';
import { type CloudWatchDatasource } from '../../datasource';
import { MultiFilters } from '../../types';

2
public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/MultiFilterItem.tsx
View File

@ -2,7 +2,7 @@ import { css, cx } from '@emotion/css';
import { useState } from 'react';
import { GrafanaTheme2 } from '@grafana/data';
import { AccessoryButton, InputGroup } from '@grafana/experimental';
import { AccessoryButton, InputGroup } from '@grafana/plugin-ui';
import { Alert, Input, useStyles2 } from '@grafana/ui';
import { type CloudWatchDatasource } from '../../datasource';

2
public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/VariableQueryEditor.tsx
View File

@ -1,7 +1,7 @@
import { css } from '@emotion/css';
import { GrafanaTheme2, QueryEditorProps, SelectableValue } from '@grafana/data';
import { EditorField } from '@grafana/experimental';
import { EditorField } from '@grafana/plugin-ui';
import { config } from '@grafana/runtime';
import { useStyles2 } from '@grafana/ui';

2
public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/VariableQueryField.tsx
View File

@ -1,5 +1,5 @@
import { SelectableValue } from '@grafana/data';
import { EditorField } from '@grafana/experimental';
import { EditorField } from '@grafana/plugin-ui';
import { Alert, Select } from '@grafana/ui';
import { VariableQueryType } from '../../types';

2
public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/VariableTextField.tsx
View File

@ -1,6 +1,6 @@
import { useState } from 'react';
import { EditorField } from '@grafana/experimental';
import { EditorField } from '@grafana/plugin-ui';
import { Input, PopoverContent } from '@grafana/ui';
import { removeMarginBottom } from '../styles';

2
public/app/plugins/datasource/cloudwatch/components/shared/Account.tsx
View File

@ -1,7 +1,7 @@
import { useMemo } from 'react';
import { SelectableValue } from '@grafana/data';
import { EditorField } from '@grafana/experimental';
import { EditorField } from '@grafana/plugin-ui';
import { Select } from '@grafana/ui';
export interface Props {

2
public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/Dimensions.tsx
View File

@ -1,7 +1,7 @@
import { isEqual } from 'lodash';
import { useMemo, useState } from 'react';
import { EditorList } from '@grafana/experimental';
import { EditorList } from '@grafana/plugin-ui';
import { CloudWatchDatasource } from '../../../datasource';
import { Dimensions as DimensionsType, MetricStat } from '../../../types';

2
public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/FilterItem.tsx
View File

@ -3,7 +3,7 @@ import { useMemo } from 'react';
import { useAsyncFn } from 'react-use';
import { GrafanaTheme2, SelectableValue, toOption } from '@grafana/data';
import { AccessoryButton, InputGroup } from '@grafana/experimental';
import { AccessoryButton, InputGroup } from '@grafana/plugin-ui';
import { Alert, Select, useStyles2 } from '@grafana/ui';
import { CloudWatchDatasource } from '../../../datasource';

2
public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LogGroupsSelector.tsx
View File

@ -1,7 +1,7 @@
import { useEffect, useMemo, useState } from 'react';
import { SelectableValue } from '@grafana/data';
import { EditorField } from '@grafana/experimental';
import { EditorField } from '@grafana/plugin-ui';
import { Button, Checkbox, Icon, Label, LoadingPlaceholder, Modal, Select, Space, useStyles2 } from '@grafana/ui';
import { DescribeLogGroupsRequest, ResourceResponse, LogGroupResponse } from '../../../resources/types';

2
public/app/plugins/datasource/cloudwatch/components/shared/MetricStatEditor/MetricStatEditor.tsx
View File

@ -2,7 +2,7 @@ import { useEffect } from 'react';
import * as React from 'react';
import { SelectableValue } from '@grafana/data';
import { EditorField, EditorFieldGroup, EditorRow, EditorRows, EditorSwitch } from '@grafana/experimental';
import { EditorField, EditorFieldGroup, EditorRow, EditorRows, EditorSwitch } from '@grafana/plugin-ui';
import { config } from '@grafana/runtime';
import { Select } from '@grafana/ui';

2
public/app/plugins/datasource/cloudwatch/language/dynamic-labels/CompletionItemProvider.test.ts
View File

@ -1,4 +1,4 @@
import { CompletionItemPriority } from '@grafana/experimental';
import { CompletionItemPriority } from '@grafana/plugin-ui';
import { Monaco, monacoTypes } from '@grafana/ui';
import { afterLabelValue, insideLabelValue } from '../../__mocks__/dynamic-label-test-data';

2
public/app/plugins/datasource/elasticsearch/components/QueryEditor/AnnotationQueryEditor.tsx
View File

@ -1,5 +1,5 @@
import { AnnotationQuery } from '@grafana/data';
import { EditorField, EditorRow } from '@grafana/experimental';
import { EditorField, EditorRow } from '@grafana/plugin-ui';
import { Input, Stack } from '@grafana/ui';
import { ElasticsearchQuery } from '../../types';

2
public/app/plugins/datasource/elasticsearch/configuration/ConfigEditor.tsx
View File

@ -10,7 +10,7 @@ import {
ConnectionSettings,
convertLegacyAuthProps,
DataSourceDescription,
} from '@grafana/experimental';
} from '@grafana/plugin-ui';
import { config } from '@grafana/runtime';
import { Alert, SecureSocksProxySettings, Divider, Stack } from '@grafana/ui';

2
public/app/plugins/datasource/elasticsearch/configuration/DataLinks.tsx
View File

@ -1,7 +1,7 @@
import { css } from '@emotion/css';
import { GrafanaTheme2, VariableOrigin, DataLinkBuiltInVars } from '@grafana/data';
import { ConfigDescriptionLink, ConfigSubSection } from '@grafana/experimental';
import { ConfigDescriptionLink, ConfigSubSection } from '@grafana/plugin-ui';
import { Button, useStyles2 } from '@grafana/ui';
import { DataLinkConfig } from '../types';

2
public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.tsx
View File

@ -1,7 +1,7 @@
import * as React from 'react';
import { DataSourceSettings, SelectableValue } from '@grafana/data';
import { ConfigDescriptionLink, ConfigSubSection } from '@grafana/experimental';
import { ConfigDescriptionLink, ConfigSubSection } from '@grafana/plugin-ui';
import { InlineField, Input, Select, InlineSwitch } from '@grafana/ui';
import { ElasticsearchOptions, Interval } from '../types';

2
public/app/plugins/datasource/elasticsearch/configuration/LogsConfig.tsx
View File

@ -1,6 +1,6 @@
import * as React from 'react';
import { ConfigDescriptionLink, ConfigSubSection } from '@grafana/experimental';
import { ConfigDescriptionLink, ConfigSubSection } from '@grafana/plugin-ui';
import { Input, InlineField } from '@grafana/ui';
import { ElasticsearchOptions } from '../types';

32
yarn.lock
View File

@ -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"
@ -17354,7 +17384,6 @@ __metadata:
"@grafana/e2e-selectors": "workspace:*"
"@grafana/eslint-config": "npm:8.0.0"
"@grafana/eslint-plugin": "link:./packages/grafana-eslint-rules"
"@grafana/experimental": "npm:2.1.6"
"@grafana/faro-core": "npm:^1.3.6"
"@grafana/faro-web-sdk": "npm:^1.3.6"
"@grafana/faro-web-tracing": "npm:^1.8.2"
@ -17364,6 +17393,7 @@ __metadata:
"@grafana/monaco-logql": "npm:^0.0.8"
"@grafana/o11y-ds-frontend": "workspace:*"
"@grafana/plugin-e2e": "npm:^1.11.0"
"@grafana/plugin-ui": "npm:^0.9.6"
"@grafana/prometheus": "workspace:*"
"@grafana/runtime": "workspace:*"
"@grafana/saga-icons": "workspace:*"