mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
partner data sources: remove experimental imports from datasources (#99370)
* remove experimental imports from datasources * add plugin-ui deps * remove * trigger workflow * Make versions of plugin-ui fixed * Fix import in test --------- Co-authored-by: Ivana Huckova <ivana.huckova@gmail.com>
This commit is contained in:
parent
d2eac460cf
commit
ecc9b0c10c
@ -1,7 +1,7 @@
|
|||||||
import { intersection } from 'lodash';
|
import { intersection } from 'lodash';
|
||||||
import { useState, useMemo } from 'react';
|
import { useState, useMemo } from 'react';
|
||||||
|
|
||||||
import { EditorFieldGroup, EditorRow, EditorRows } from '@grafana/experimental';
|
import { EditorFieldGroup, EditorRow, EditorRows } from '@grafana/plugin-ui';
|
||||||
|
|
||||||
import Datasource from '../../datasource';
|
import Datasource from '../../datasource';
|
||||||
import { selectors } from '../../e2e/selectors';
|
import { selectors } from '../../e2e/selectors';
|
||||||
|
@ -2,7 +2,7 @@ import { useMemo } from 'react';
|
|||||||
|
|
||||||
import { AzureAuthType, AzureCredentials, getAzureClouds } from '@grafana/azure-sdk';
|
import { AzureAuthType, AzureCredentials, getAzureClouds } from '@grafana/azure-sdk';
|
||||||
import { SelectableValue } from '@grafana/data';
|
import { SelectableValue } from '@grafana/data';
|
||||||
import { ConfigSection } from '@grafana/experimental';
|
import { ConfigSection } from '@grafana/plugin-ui';
|
||||||
import { Select, Field } from '@grafana/ui';
|
import { Select, Field } from '@grafana/ui';
|
||||||
|
|
||||||
import { selectors } from '../../e2e/selectors';
|
import { selectors } from '../../e2e/selectors';
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import { PureComponent } from 'react';
|
import { PureComponent } from 'react';
|
||||||
|
|
||||||
import { DataSourcePluginOptionsEditorProps, SelectableValue, updateDatasourcePluginOption } from '@grafana/data';
|
import { DataSourcePluginOptionsEditorProps, SelectableValue, updateDatasourcePluginOption } from '@grafana/data';
|
||||||
import { ConfigSection, DataSourceDescription } from '@grafana/experimental';
|
import { ConfigSection, DataSourceDescription } from '@grafana/plugin-ui';
|
||||||
import { getBackendSrv, getTemplateSrv, isFetchError, TemplateSrv, config } from '@grafana/runtime';
|
import { getBackendSrv, getTemplateSrv, isFetchError, TemplateSrv, config } from '@grafana/runtime';
|
||||||
import { Alert, Divider, SecureSocksProxySettings } from '@grafana/ui';
|
import { Alert, Divider, SecureSocksProxySettings } from '@grafana/ui';
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@ import { useMemo } from 'react';
|
|||||||
|
|
||||||
import { AadCurrentUserCredentials, AzureCredentials, instanceOfAzureCredential } from '@grafana/azure-sdk';
|
import { AadCurrentUserCredentials, AzureCredentials, instanceOfAzureCredential } from '@grafana/azure-sdk';
|
||||||
import { SelectableValue } from '@grafana/data';
|
import { SelectableValue } from '@grafana/data';
|
||||||
import { ConfigSection } from '@grafana/experimental';
|
import { ConfigSection } from '@grafana/plugin-ui';
|
||||||
import { config } from '@grafana/runtime';
|
import { config } from '@grafana/runtime';
|
||||||
import { Select, Field, RadioButtonGroup, Alert, Stack } from '@grafana/ui';
|
import { Select, Field, RadioButtonGroup, Alert, Stack } from '@grafana/ui';
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@ import { css } from '@emotion/css';
|
|||||||
import { useEffect } from 'react';
|
import { useEffect } from 'react';
|
||||||
|
|
||||||
import { GrafanaTheme2 } from '@grafana/data';
|
import { GrafanaTheme2 } from '@grafana/data';
|
||||||
import { AccessoryButton } from '@grafana/experimental';
|
import { AccessoryButton } from '@grafana/plugin-ui';
|
||||||
import { Icon, Input, Tooltip, Label, Button, useStyles2 } from '@grafana/ui';
|
import { Icon, Input, Tooltip, Label, Button, useStyles2 } from '@grafana/ui';
|
||||||
|
|
||||||
export interface ResourcePickerProps<T> {
|
export interface ResourcePickerProps<T> {
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import { useEffect, useState } from 'react';
|
import { useEffect, useState } from 'react';
|
||||||
|
|
||||||
import { PanelData, TimeRange } from '@grafana/data';
|
import { PanelData, TimeRange } from '@grafana/data';
|
||||||
import { EditorFieldGroup, EditorRow, EditorRows } from '@grafana/experimental';
|
import { EditorFieldGroup, EditorRow, EditorRows } from '@grafana/plugin-ui';
|
||||||
import { getTemplateSrv } from '@grafana/runtime';
|
import { getTemplateSrv } from '@grafana/runtime';
|
||||||
import { Alert, LinkButton, Text, TextLink } from '@grafana/ui';
|
import { Alert, LinkButton, Text, TextLink } from '@grafana/ui';
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@ import { css } from '@emotion/css';
|
|||||||
import { useEffect } from 'react';
|
import { useEffect } from 'react';
|
||||||
|
|
||||||
import { GrafanaTheme2 } from '@grafana/data';
|
import { GrafanaTheme2 } from '@grafana/data';
|
||||||
import { AccessoryButton } from '@grafana/experimental';
|
import { AccessoryButton } from '@grafana/plugin-ui';
|
||||||
import { Input, Label, InlineField, Button, useStyles2 } from '@grafana/ui';
|
import { Input, Label, InlineField, Button, useStyles2 } from '@grafana/ui';
|
||||||
|
|
||||||
import { selectors } from '../../e2e/selectors';
|
import { selectors } from '../../e2e/selectors';
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import { useEffect, useMemo, useState } from 'react';
|
import { useEffect, useMemo, useState } from 'react';
|
||||||
|
|
||||||
import { SelectableValue, DataFrame, PanelData, Labels } from '@grafana/data';
|
import { SelectableValue, DataFrame, PanelData, Labels } from '@grafana/data';
|
||||||
import { EditorList, AccessoryButton } from '@grafana/experimental';
|
import { EditorList, AccessoryButton } from '@grafana/plugin-ui';
|
||||||
import { Select, HorizontalGroup, MultiSelect } from '@grafana/ui';
|
import { Select, HorizontalGroup, MultiSelect } from '@grafana/ui';
|
||||||
|
|
||||||
import { AzureMetricDimension, AzureMonitorOption, AzureMonitorQuery, AzureQueryEditorFieldProps } from '../../types';
|
import { AzureMetricDimension, AzureMonitorOption, AzureMonitorQuery, AzureQueryEditorFieldProps } from '../../types';
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import { PanelData } from '@grafana/data';
|
import { PanelData } from '@grafana/data';
|
||||||
import { EditorRows, EditorRow, EditorFieldGroup } from '@grafana/experimental';
|
import { EditorRows, EditorRow, EditorFieldGroup } from '@grafana/plugin-ui';
|
||||||
|
|
||||||
import { multiResourceCompatibleTypes } from '../../azureMetadata';
|
import { multiResourceCompatibleTypes } from '../../azureMetadata';
|
||||||
import type Datasource from '../../datasource';
|
import type Datasource from '../../datasource';
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import { useCallback } from 'react';
|
import { useCallback } from 'react';
|
||||||
|
|
||||||
import { SelectableValue } from '@grafana/data';
|
import { SelectableValue } from '@grafana/data';
|
||||||
import { EditorHeader, InlineSelect } from '@grafana/experimental';
|
import { EditorHeader, InlineSelect } from '@grafana/plugin-ui';
|
||||||
|
|
||||||
import { selectors } from '../../e2e/selectors';
|
import { selectors } from '../../e2e/selectors';
|
||||||
import { AzureMonitorQuery, AzureQueryType } from '../../types';
|
import { AzureMonitorQuery, AzureQueryType } from '../../types';
|
||||||
|
@ -5,7 +5,7 @@ import { lastValueFrom } from 'rxjs';
|
|||||||
|
|
||||||
import { CoreApp, DataFrame, getDefaultTimeRange, SelectableValue, TimeRange } from '@grafana/data';
|
import { CoreApp, DataFrame, getDefaultTimeRange, SelectableValue, TimeRange } from '@grafana/data';
|
||||||
import { selectors } from '@grafana/e2e-selectors';
|
import { selectors } from '@grafana/e2e-selectors';
|
||||||
import { AccessoryButton } from '@grafana/experimental';
|
import { AccessoryButton } from '@grafana/plugin-ui';
|
||||||
import {
|
import {
|
||||||
HorizontalGroup,
|
HorizontalGroup,
|
||||||
Select,
|
Select,
|
||||||
|
@ -2,7 +2,7 @@ import { uniq } from 'lodash';
|
|||||||
import { useEffect, useMemo, useState } from 'react';
|
import { useEffect, useMemo, useState } from 'react';
|
||||||
|
|
||||||
import { SelectableValue } from '@grafana/data';
|
import { SelectableValue } from '@grafana/data';
|
||||||
import { EditorList } from '@grafana/experimental';
|
import { EditorList } from '@grafana/plugin-ui';
|
||||||
import { Field } from '@grafana/ui';
|
import { Field } from '@grafana/ui';
|
||||||
|
|
||||||
import { AzureQueryEditorFieldProps, AzureTracesFilter } from '../../types';
|
import { AzureQueryEditorFieldProps, AzureTracesFilter } from '../../types';
|
||||||
|
@ -3,7 +3,7 @@ import * as React from 'react';
|
|||||||
import { usePrevious } from 'react-use';
|
import { usePrevious } from 'react-use';
|
||||||
|
|
||||||
import { TimeRange } from '@grafana/data';
|
import { TimeRange } from '@grafana/data';
|
||||||
import { EditorFieldGroup, EditorRow, EditorRows } from '@grafana/experimental';
|
import { EditorFieldGroup, EditorRow, EditorRows } from '@grafana/plugin-ui';
|
||||||
import { Input } from '@grafana/ui';
|
import { Input } from '@grafana/ui';
|
||||||
|
|
||||||
import Datasource from '../../datasource';
|
import Datasource from '../../datasource';
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import { EditorField } from '@grafana/experimental';
|
import { EditorField } from '@grafana/plugin-ui';
|
||||||
import { InlineField } from '@grafana/ui';
|
import { InlineField } from '@grafana/ui';
|
||||||
import { Props as InlineFieldProps } from '@grafana/ui/src/components/Forms/InlineField';
|
import { Props as InlineFieldProps } from '@grafana/ui/src/components/Forms/InlineField';
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@emotion/css": "11.13.5",
|
"@emotion/css": "11.13.5",
|
||||||
"@grafana/data": "11.5.0-pre",
|
"@grafana/data": "11.5.0-pre",
|
||||||
"@grafana/experimental": "2.1.6",
|
"@grafana/plugin-ui": "0.9.6",
|
||||||
"@grafana/runtime": "11.5.0-pre",
|
"@grafana/runtime": "11.5.0-pre",
|
||||||
"@grafana/schema": "11.5.0-pre",
|
"@grafana/schema": "11.5.0-pre",
|
||||||
"@grafana/ui": "11.5.0-pre",
|
"@grafana/ui": "11.5.0-pre",
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import { useMemo } from 'react';
|
import { useMemo } from 'react';
|
||||||
|
|
||||||
import { SelectableValue } from '@grafana/data';
|
import { SelectableValue } from '@grafana/data';
|
||||||
import { EditorField } from '@grafana/experimental';
|
import { EditorField } from '@grafana/plugin-ui';
|
||||||
import { Select } from '@grafana/ui';
|
import { Select } from '@grafana/ui';
|
||||||
|
|
||||||
import { getAggregationOptionsByMetric } from '../functions';
|
import { getAggregationOptionsByMetric } from '../functions';
|
||||||
|
@ -2,7 +2,7 @@ import { debounce } from 'lodash';
|
|||||||
import { useState } from 'react';
|
import { useState } from 'react';
|
||||||
import * as React from 'react';
|
import * as React from 'react';
|
||||||
|
|
||||||
import { EditorField } from '@grafana/experimental';
|
import { EditorField } from '@grafana/plugin-ui';
|
||||||
import { Input } from '@grafana/ui';
|
import { Input } from '@grafana/ui';
|
||||||
|
|
||||||
export interface Props {
|
export interface Props {
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import { useMemo } from 'react';
|
import { useMemo } from 'react';
|
||||||
|
|
||||||
import { SelectableValue } from '@grafana/data';
|
import { SelectableValue } from '@grafana/data';
|
||||||
import { EditorField, EditorFieldGroup } from '@grafana/experimental';
|
import { EditorField, EditorFieldGroup } from '@grafana/plugin-ui';
|
||||||
|
|
||||||
import { ALIGNMENT_PERIODS } from '../constants';
|
import { ALIGNMENT_PERIODS } from '../constants';
|
||||||
import CloudMonitoringDatasource from '../datasource';
|
import CloudMonitoringDatasource from '../datasource';
|
||||||
|
@ -3,7 +3,7 @@ import * as React from 'react';
|
|||||||
import { useDebounce } from 'react-use';
|
import { useDebounce } from 'react-use';
|
||||||
|
|
||||||
import { QueryEditorProps, getDefaultTimeRange, toOption } from '@grafana/data';
|
import { QueryEditorProps, getDefaultTimeRange, toOption } from '@grafana/data';
|
||||||
import { EditorField, EditorRows } from '@grafana/experimental';
|
import { EditorField, EditorRows } from '@grafana/plugin-ui';
|
||||||
import { Input } from '@grafana/ui';
|
import { Input } from '@grafana/ui';
|
||||||
|
|
||||||
import CloudMonitoringDatasource from '../datasource';
|
import CloudMonitoringDatasource from '../datasource';
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
import { PureComponent } from 'react';
|
import { PureComponent } from 'react';
|
||||||
|
|
||||||
import { DataSourcePluginOptionsEditorProps } from '@grafana/data';
|
import { DataSourcePluginOptionsEditorProps } from '@grafana/data';
|
||||||
import { ConfigSection, DataSourceDescription } from '@grafana/experimental';
|
|
||||||
import { ConnectionConfig } from '@grafana/google-sdk';
|
import { ConnectionConfig } from '@grafana/google-sdk';
|
||||||
|
import { ConfigSection, DataSourceDescription } from '@grafana/plugin-ui';
|
||||||
import { reportInteraction, config } from '@grafana/runtime';
|
import { reportInteraction, config } from '@grafana/runtime';
|
||||||
import { Divider, SecureSocksProxySettings } from '@grafana/ui';
|
import { Divider, SecureSocksProxySettings } from '@grafana/ui';
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import { SelectableValue } from '@grafana/data';
|
import { SelectableValue } from '@grafana/data';
|
||||||
import { EditorField, EditorRow } from '@grafana/experimental';
|
import { EditorField, EditorRow } from '@grafana/plugin-ui';
|
||||||
import { HorizontalGroup, Switch } from '@grafana/ui';
|
import { HorizontalGroup, Switch } from '@grafana/ui';
|
||||||
|
|
||||||
import { GRAPH_PERIODS } from '../constants';
|
import { GRAPH_PERIODS } from '../constants';
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import { useMemo } from 'react';
|
import { useMemo } from 'react';
|
||||||
|
|
||||||
import { SelectableValue } from '@grafana/data';
|
import { SelectableValue } from '@grafana/data';
|
||||||
import { EditorField, EditorFieldGroup } from '@grafana/experimental';
|
import { EditorField, EditorFieldGroup } from '@grafana/plugin-ui';
|
||||||
import { MultiSelect } from '@grafana/ui';
|
import { MultiSelect } from '@grafana/ui';
|
||||||
|
|
||||||
import { SYSTEM_LABELS } from '../constants';
|
import { SYSTEM_LABELS } from '../constants';
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import { useMemo } from 'react';
|
import { useMemo } from 'react';
|
||||||
|
|
||||||
import { SelectableValue, toOption } from '@grafana/data';
|
import { SelectableValue, toOption } from '@grafana/data';
|
||||||
import { AccessoryButton, EditorField, EditorList, EditorRow } from '@grafana/experimental';
|
import { AccessoryButton, EditorField, EditorList, EditorRow } from '@grafana/plugin-ui';
|
||||||
import { HorizontalGroup, Select } from '@grafana/ui';
|
import { HorizontalGroup, Select } from '@grafana/ui';
|
||||||
|
|
||||||
import { labelsToGroupedOptions, stringArrayToFilters } from '../functions';
|
import { labelsToGroupedOptions, stringArrayToFilters } from '../functions';
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import { SelectableValue } from '@grafana/data';
|
import { SelectableValue } from '@grafana/data';
|
||||||
import { EditorField } from '@grafana/experimental';
|
import { EditorField } from '@grafana/plugin-ui';
|
||||||
import { Select } from '@grafana/ui';
|
import { Select } from '@grafana/ui';
|
||||||
|
|
||||||
import { LOOKBACK_PERIODS } from '../constants';
|
import { LOOKBACK_PERIODS } from '../constants';
|
||||||
|
@ -2,7 +2,8 @@ import { useCallback, useEffect } from 'react';
|
|||||||
import * as React from 'react';
|
import * as React from 'react';
|
||||||
|
|
||||||
import { SelectableValue, TimeRange } from '@grafana/data';
|
import { SelectableValue, TimeRange } from '@grafana/data';
|
||||||
import { EditorRows, Stack } from '@grafana/experimental';
|
import { EditorRows } from '@grafana/plugin-ui';
|
||||||
|
import { Stack } from '@grafana/ui';
|
||||||
|
|
||||||
import CloudMonitoringDatasource from '../datasource';
|
import CloudMonitoringDatasource from '../datasource';
|
||||||
import { AlignmentTypes, CloudMonitoringQuery, QueryType, TimeSeriesList, TimeSeriesQuery } from '../types/query';
|
import { AlignmentTypes, CloudMonitoringQuery, QueryType, TimeSeriesList, TimeSeriesQuery } from '../types/query';
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import { useMemo } from 'react';
|
import { useMemo } from 'react';
|
||||||
|
|
||||||
import { SelectableValue } from '@grafana/data';
|
import { SelectableValue } from '@grafana/data';
|
||||||
import { EditorField } from '@grafana/experimental';
|
import { EditorField } from '@grafana/plugin-ui';
|
||||||
import { RadioButtonGroup } from '@grafana/ui';
|
import { RadioButtonGroup } from '@grafana/ui';
|
||||||
|
|
||||||
import { getAlignmentPickerData } from '../functions';
|
import { getAlignmentPickerData } from '../functions';
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import { useEffect, useMemo, useState } from 'react';
|
import { useEffect, useMemo, useState } from 'react';
|
||||||
|
|
||||||
import { SelectableValue } from '@grafana/data';
|
import { SelectableValue } from '@grafana/data';
|
||||||
import { EditorField } from '@grafana/experimental';
|
import { EditorField } from '@grafana/plugin-ui';
|
||||||
import { Select } from '@grafana/ui';
|
import { Select } from '@grafana/ui';
|
||||||
|
|
||||||
import CloudMonitoringDatasource from '../datasource';
|
import CloudMonitoringDatasource from '../datasource';
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import * as React from 'react';
|
import * as React from 'react';
|
||||||
|
|
||||||
import { SelectableValue } from '@grafana/data';
|
import { SelectableValue } from '@grafana/data';
|
||||||
import { EditorField, EditorRow } from '@grafana/experimental';
|
import { EditorField, EditorRow } from '@grafana/plugin-ui';
|
||||||
import { TextArea, Input } from '@grafana/ui';
|
import { TextArea, Input } from '@grafana/ui';
|
||||||
|
|
||||||
import CloudMonitoringDatasource from '../datasource';
|
import CloudMonitoringDatasource from '../datasource';
|
||||||
|
@ -3,7 +3,7 @@ import { isEqual } from 'lodash';
|
|||||||
import { useEffect, useState } from 'react';
|
import { useEffect, useState } from 'react';
|
||||||
|
|
||||||
import { QueryEditorProps, getDefaultTimeRange, toOption } from '@grafana/data';
|
import { QueryEditorProps, getDefaultTimeRange, toOption } from '@grafana/data';
|
||||||
import { EditorRows } from '@grafana/experimental';
|
import { EditorRows } from '@grafana/plugin-ui';
|
||||||
import { ConfirmModal } from '@grafana/ui';
|
import { ConfirmModal } from '@grafana/ui';
|
||||||
|
|
||||||
import CloudMonitoringDatasource from '../datasource';
|
import CloudMonitoringDatasource from '../datasource';
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import { EditorHeader, FlexItem, InlineSelect } from '@grafana/experimental';
|
import { EditorHeader, FlexItem, InlineSelect } from '@grafana/plugin-ui';
|
||||||
|
|
||||||
import { QUERY_TYPES } from '../constants';
|
import { QUERY_TYPES } from '../constants';
|
||||||
import { CloudMonitoringQuery } from '../types/query';
|
import { CloudMonitoringQuery } from '../types/query';
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import { useEffect, useState } from 'react';
|
import { useEffect, useState } from 'react';
|
||||||
|
|
||||||
import { SelectableValue } from '@grafana/data';
|
import { SelectableValue } from '@grafana/data';
|
||||||
import { EditorField } from '@grafana/experimental';
|
import { EditorField } from '@grafana/plugin-ui';
|
||||||
import { Select } from '@grafana/ui';
|
import { Select } from '@grafana/ui';
|
||||||
|
|
||||||
import CloudMonitoringDatasource from '../datasource';
|
import CloudMonitoringDatasource from '../datasource';
|
||||||
|
@ -2,7 +2,7 @@ import { useMemo } from 'react';
|
|||||||
import * as React from 'react';
|
import * as React from 'react';
|
||||||
|
|
||||||
import { SelectableValue } from '@grafana/data';
|
import { SelectableValue } from '@grafana/data';
|
||||||
import { EditorField, EditorFieldGroup, EditorRow } from '@grafana/experimental';
|
import { EditorField, EditorFieldGroup, EditorRow } from '@grafana/plugin-ui';
|
||||||
|
|
||||||
import { ALIGNMENT_PERIODS, SLO_BURN_RATE_SELECTOR_NAME } from '../constants';
|
import { ALIGNMENT_PERIODS, SLO_BURN_RATE_SELECTOR_NAME } from '../constants';
|
||||||
import CloudMonitoringDatasource from '../datasource';
|
import CloudMonitoringDatasource from '../datasource';
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import { SelectableValue } from '@grafana/data';
|
import { SelectableValue } from '@grafana/data';
|
||||||
import { EditorField } from '@grafana/experimental';
|
import { EditorField } from '@grafana/plugin-ui';
|
||||||
import { Select } from '@grafana/ui';
|
import { Select } from '@grafana/ui';
|
||||||
|
|
||||||
import { SELECTORS } from '../constants';
|
import { SELECTORS } from '../constants';
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import { useEffect, useState } from 'react';
|
import { useEffect, useState } from 'react';
|
||||||
|
|
||||||
import { SelectableValue } from '@grafana/data';
|
import { SelectableValue } from '@grafana/data';
|
||||||
import { EditorField } from '@grafana/experimental';
|
import { EditorField } from '@grafana/plugin-ui';
|
||||||
import { Select } from '@grafana/ui';
|
import { Select } from '@grafana/ui';
|
||||||
|
|
||||||
import CloudMonitoringDatasource from '../datasource';
|
import CloudMonitoringDatasource from '../datasource';
|
||||||
|
@ -5,7 +5,7 @@ import { useCallback, useEffect, useState } from 'react';
|
|||||||
import * as React from 'react';
|
import * as React from 'react';
|
||||||
|
|
||||||
import { GrafanaTheme2, SelectableValue, TimeRange } from '@grafana/data';
|
import { GrafanaTheme2, SelectableValue, TimeRange } from '@grafana/data';
|
||||||
import { EditorField, EditorFieldGroup, EditorRow } from '@grafana/experimental';
|
import { EditorField, EditorFieldGroup, EditorRow } from '@grafana/plugin-ui';
|
||||||
import { reportInteraction } from '@grafana/runtime';
|
import { reportInteraction } from '@grafana/runtime';
|
||||||
import { getSelectStyles, Select, AsyncSelect, useStyles2, useTheme2 } from '@grafana/ui';
|
import { getSelectStyles, Select, AsyncSelect, useStyles2, useTheme2 } from '@grafana/ui';
|
||||||
|
|
||||||
|
@ -6,8 +6,8 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@emotion/css": "11.13.5",
|
"@emotion/css": "11.13.5",
|
||||||
"@grafana/data": "11.5.0-pre",
|
"@grafana/data": "11.5.0-pre",
|
||||||
"@grafana/experimental": "2.1.6",
|
|
||||||
"@grafana/google-sdk": "0.1.2",
|
"@grafana/google-sdk": "0.1.2",
|
||||||
|
"@grafana/plugin-ui": "0.9.6",
|
||||||
"@grafana/runtime": "11.5.0-pre",
|
"@grafana/runtime": "11.5.0-pre",
|
||||||
"@grafana/schema": "11.5.0-pre",
|
"@grafana/schema": "11.5.0-pre",
|
||||||
"@grafana/ui": "11.5.0-pre",
|
"@grafana/ui": "11.5.0-pre",
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import { AccessoryButton } from '@grafana/experimental';
|
import { AccessoryButton } from '@grafana/plugin-ui';
|
||||||
|
|
||||||
import { DEFAULT_POLICY } from '../../../../../types';
|
import { DEFAULT_POLICY } from '../../../../../types';
|
||||||
import { toSelectableValue } from '../utils/toSelectableValue';
|
import { toSelectableValue } from '../utils/toSelectableValue';
|
||||||
|
@ -2,7 +2,7 @@ import { css, cx } from '@emotion/css';
|
|||||||
import { Fragment, useMemo } from 'react';
|
import { Fragment, useMemo } from 'react';
|
||||||
|
|
||||||
import { GrafanaTheme2, SelectableValue } from '@grafana/data';
|
import { GrafanaTheme2, SelectableValue } from '@grafana/data';
|
||||||
import { AccessoryButton } from '@grafana/experimental';
|
import { AccessoryButton } from '@grafana/plugin-ui';
|
||||||
import { useTheme2 } from '@grafana/ui';
|
import { useTheme2 } from '@grafana/ui';
|
||||||
|
|
||||||
import { toSelectableValue } from '../utils/toSelectableValue';
|
import { toSelectableValue } from '../utils/toSelectableValue';
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import { SelectableValue } from '@grafana/data';
|
import { SelectableValue } from '@grafana/data';
|
||||||
import { AccessoryButton } from '@grafana/experimental';
|
import { AccessoryButton } from '@grafana/plugin-ui';
|
||||||
|
|
||||||
import { InfluxQueryTag } from '../../../../../types';
|
import { InfluxQueryTag } from '../../../../../types';
|
||||||
import { adjustOperatorIfNeeded, getCondition, getOperator } from '../utils/tagUtils';
|
import { adjustOperatorIfNeeded, getCondition, getOperator } from '../utils/tagUtils';
|
||||||
|
@ -38,13 +38,12 @@ jest.mock('../../../../../influxql_metadata_query', () => {
|
|||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
jest.mock('@grafana/runtime', () => {
|
jest.mock('@grafana/runtime', () => ({
|
||||||
return {
|
...jest.requireActual('@grafana/runtime'),
|
||||||
getTemplateSrv: jest.fn().mockReturnValueOnce({
|
getTemplateSrv: jest.fn().mockReturnValueOnce({
|
||||||
getVariables: jest.fn().mockReturnValueOnce([]),
|
getVariables: jest.fn().mockReturnValueOnce([]),
|
||||||
}),
|
}),
|
||||||
};
|
}));
|
||||||
});
|
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
(mockedMeta.getTagKeys as jest.Mock).mockClear();
|
(mockedMeta.getTagKeys as jest.Mock).mockClear();
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import { v4 as uuidv4 } from 'uuid';
|
import { v4 as uuidv4 } from 'uuid';
|
||||||
|
|
||||||
import { DataSourceInstanceSettings, TimeRange } from '@grafana/data';
|
import { DataSourceInstanceSettings, TimeRange } from '@grafana/data';
|
||||||
import { CompletionItemKind, LanguageDefinition, TableIdentifier } from '@grafana/experimental';
|
import { CompletionItemKind, LanguageDefinition, TableIdentifier } from '@grafana/plugin-ui';
|
||||||
import { TemplateSrv, config, getTemplateSrv } from '@grafana/runtime';
|
import { TemplateSrv, config, getTemplateSrv } from '@grafana/runtime';
|
||||||
import { COMMON_FNS, DB, FuncParameter, SQLQuery, SqlDatasource, formatSQL } from '@grafana/sql';
|
import { COMMON_FNS, DB, FuncParameter, SQLQuery, SqlDatasource, formatSQL } from '@grafana/sql';
|
||||||
|
|
||||||
|
@ -11,7 +11,7 @@ import {
|
|||||||
TableDefinition,
|
TableDefinition,
|
||||||
TableIdentifier,
|
TableIdentifier,
|
||||||
TokenType,
|
TokenType,
|
||||||
} from '@grafana/experimental';
|
} from '@grafana/plugin-ui';
|
||||||
|
|
||||||
interface CompletionProviderGetterArgs {
|
interface CompletionProviderGetterArgs {
|
||||||
getMeta: (t?: TableIdentifier) => Promise<TableDefinition[]>;
|
getMeta: (t?: TableIdentifier) => Promise<TableDefinition[]>;
|
||||||
|
@ -10,7 +10,7 @@ import {
|
|||||||
updateDatasourcePluginJsonDataOption,
|
updateDatasourcePluginJsonDataOption,
|
||||||
updateDatasourcePluginResetOption,
|
updateDatasourcePluginResetOption,
|
||||||
} from '@grafana/data';
|
} from '@grafana/data';
|
||||||
import { ConfigSection, ConfigSubSection, DataSourceDescription } from '@grafana/experimental';
|
import { ConfigSection, ConfigSubSection, DataSourceDescription } from '@grafana/plugin-ui';
|
||||||
import { config } from '@grafana/runtime';
|
import { config } from '@grafana/runtime';
|
||||||
import { ConnectionLimits, useMigrateDatabaseFields } from '@grafana/sql';
|
import { ConnectionLimits, useMigrateDatabaseFields } from '@grafana/sql';
|
||||||
import { NumberInput } from '@grafana/sql/src/components/configuration/NumberInput';
|
import { NumberInput } from '@grafana/sql/src/components/configuration/NumberInput';
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import { SyntheticEvent } from 'react';
|
import { SyntheticEvent } from 'react';
|
||||||
|
|
||||||
import { DataSourcePluginOptionsEditorProps, updateDatasourcePluginJsonDataOption } from '@grafana/data';
|
import { DataSourcePluginOptionsEditorProps, updateDatasourcePluginJsonDataOption } from '@grafana/data';
|
||||||
import { ConfigSubSection } from '@grafana/experimental';
|
import { ConfigSubSection } from '@grafana/plugin-ui';
|
||||||
import { FieldSet, Input, Field } from '@grafana/ui';
|
import { FieldSet, Input, Field } from '@grafana/ui';
|
||||||
|
|
||||||
import { MSSQLAuthenticationType, MssqlOptions } from '../types';
|
import { MSSQLAuthenticationType, MssqlOptions } from '../types';
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import { v4 as uuidv4 } from 'uuid';
|
import { v4 as uuidv4 } from 'uuid';
|
||||||
|
|
||||||
import { DataSourceInstanceSettings, ScopedVars } from '@grafana/data';
|
import { DataSourceInstanceSettings, ScopedVars } from '@grafana/data';
|
||||||
import { LanguageDefinition } from '@grafana/experimental';
|
import { LanguageDefinition } from '@grafana/plugin-ui';
|
||||||
import { TemplateSrv, config } from '@grafana/runtime';
|
import { TemplateSrv, config } from '@grafana/runtime';
|
||||||
import {
|
import {
|
||||||
COMMON_FNS,
|
COMMON_FNS,
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@emotion/css": "11.13.5",
|
"@emotion/css": "11.13.5",
|
||||||
"@grafana/data": "11.5.0-pre",
|
"@grafana/data": "11.5.0-pre",
|
||||||
"@grafana/experimental": "2.1.6",
|
"@grafana/plugin-ui": "0.9.6",
|
||||||
"@grafana/runtime": "11.5.0-pre",
|
"@grafana/runtime": "11.5.0-pre",
|
||||||
"@grafana/sql": "11.5.0-pre",
|
"@grafana/sql": "11.5.0-pre",
|
||||||
"@grafana/ui": "11.5.0-pre",
|
"@grafana/ui": "11.5.0-pre",
|
||||||
|
@ -6,7 +6,7 @@ import {
|
|||||||
TableDefinition,
|
TableDefinition,
|
||||||
TableIdentifier,
|
TableIdentifier,
|
||||||
TokenType,
|
TokenType,
|
||||||
} from '@grafana/experimental';
|
} from '@grafana/plugin-ui';
|
||||||
import { DB, SQLQuery } from '@grafana/sql';
|
import { DB, SQLQuery } from '@grafana/sql';
|
||||||
|
|
||||||
interface CompletionProviderGetterArgs {
|
interface CompletionProviderGetterArgs {
|
||||||
|
@ -2706,8 +2706,8 @@ __metadata:
|
|||||||
"@emotion/css": "npm:11.13.5"
|
"@emotion/css": "npm:11.13.5"
|
||||||
"@grafana/data": "npm:11.5.0-pre"
|
"@grafana/data": "npm:11.5.0-pre"
|
||||||
"@grafana/e2e-selectors": "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-configs": "npm:11.5.0-pre"
|
||||||
|
"@grafana/plugin-ui": "npm:0.9.6"
|
||||||
"@grafana/runtime": "npm:11.5.0-pre"
|
"@grafana/runtime": "npm:11.5.0-pre"
|
||||||
"@grafana/schema": "npm:11.5.0-pre"
|
"@grafana/schema": "npm:11.5.0-pre"
|
||||||
"@grafana/ui": "npm:11.5.0-pre"
|
"@grafana/ui": "npm:11.5.0-pre"
|
||||||
@ -2903,8 +2903,8 @@ __metadata:
|
|||||||
"@emotion/css": "npm:11.13.5"
|
"@emotion/css": "npm:11.13.5"
|
||||||
"@grafana/data": "npm:11.5.0-pre"
|
"@grafana/data": "npm:11.5.0-pre"
|
||||||
"@grafana/e2e-selectors": "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-configs": "npm:11.5.0-pre"
|
||||||
|
"@grafana/plugin-ui": "npm:0.9.6"
|
||||||
"@grafana/runtime": "npm:11.5.0-pre"
|
"@grafana/runtime": "npm:11.5.0-pre"
|
||||||
"@grafana/sql": "npm:11.5.0-pre"
|
"@grafana/sql": "npm:11.5.0-pre"
|
||||||
"@grafana/ui": "npm:11.5.0-pre"
|
"@grafana/ui": "npm:11.5.0-pre"
|
||||||
@ -2997,9 +2997,9 @@ __metadata:
|
|||||||
"@emotion/css": "npm:11.13.5"
|
"@emotion/css": "npm:11.13.5"
|
||||||
"@grafana/data": "npm:11.5.0-pre"
|
"@grafana/data": "npm:11.5.0-pre"
|
||||||
"@grafana/e2e-selectors": "npm:11.5.0-pre"
|
"@grafana/e2e-selectors": "npm:11.5.0-pre"
|
||||||
"@grafana/experimental": "npm:2.1.6"
|
|
||||||
"@grafana/google-sdk": "npm:0.1.2"
|
"@grafana/google-sdk": "npm:0.1.2"
|
||||||
"@grafana/plugin-configs": "npm:11.5.0-pre"
|
"@grafana/plugin-configs": "npm:11.5.0-pre"
|
||||||
|
"@grafana/plugin-ui": "npm:0.9.6"
|
||||||
"@grafana/runtime": "npm:11.5.0-pre"
|
"@grafana/runtime": "npm:11.5.0-pre"
|
||||||
"@grafana/schema": "npm:11.5.0-pre"
|
"@grafana/schema": "npm:11.5.0-pre"
|
||||||
"@grafana/ui": "npm:11.5.0-pre"
|
"@grafana/ui": "npm:11.5.0-pre"
|
||||||
|
Loading…
Reference in New Issue
Block a user