Alerting: Fix DataQuery and DataSourceRef deprecated imports in alerting code (#102095)
Fix DataQuery and DataSourceRef deprecated imports in alerting code
This commit is contained in:
@@ -2,9 +2,10 @@ import { css, cx } from '@emotion/css';
|
||||
import { keyBy, startCase, uniqueId } from 'lodash';
|
||||
import * as React from 'react';
|
||||
|
||||
import { DataSourceInstanceSettings, DataSourceRef, GrafanaTheme2, PanelData, urlUtil } from '@grafana/data';
|
||||
import { DataSourceInstanceSettings, GrafanaTheme2, PanelData, urlUtil } from '@grafana/data';
|
||||
import { secondsToHms } from '@grafana/data/src/datetime/rangeutil';
|
||||
import { config } from '@grafana/runtime';
|
||||
import { DataSourceRef } from '@grafana/schema';
|
||||
import { Preview } from '@grafana/sql/src/components/visual-query-builder/Preview';
|
||||
import { Alert, Badge, ErrorBoundaryAlert, LinkButton, Stack, Text, useStyles2 } from '@grafana/ui';
|
||||
import { CombinedRule } from 'app/types/unified-alerting';
|
||||
|
||||
@@ -3,9 +3,10 @@ import { noop } from 'lodash';
|
||||
import { useCallback, useMemo } from 'react';
|
||||
import { useAsync } from 'react-use';
|
||||
|
||||
import { CoreApp, DataQuery, DataSourcePluginContextProvider, GrafanaTheme2, LoadingState } from '@grafana/data';
|
||||
import { CoreApp, DataSourcePluginContextProvider, GrafanaTheme2, LoadingState } from '@grafana/data';
|
||||
import { PromQuery } from '@grafana/prometheus';
|
||||
import { getDataSourceSrv } from '@grafana/runtime';
|
||||
import { DataQuery } from '@grafana/schema';
|
||||
import { Alert, Button, useStyles2 } from '@grafana/ui';
|
||||
import { LokiQuery } from 'app/plugins/datasource/loki/types';
|
||||
|
||||
|
||||
@@ -3,7 +3,6 @@ import { omit } from 'lodash';
|
||||
import { PureComponent, useState } from 'react';
|
||||
|
||||
import {
|
||||
DataQuery,
|
||||
DataSourceInstanceSettings,
|
||||
LoadingState,
|
||||
PanelData,
|
||||
@@ -12,6 +11,7 @@ import {
|
||||
rangeUtil,
|
||||
} from '@grafana/data';
|
||||
import { getDataSourceSrv } from '@grafana/runtime';
|
||||
import { DataQuery } from '@grafana/schema';
|
||||
import { Button, Card, Icon, Stack } from '@grafana/ui';
|
||||
import { QueryOperationRow } from 'app/core/components/QueryOperationRow/QueryOperationRow';
|
||||
import { getDatasourceSrv } from 'app/features/plugins/datasource_srv';
|
||||
|
||||
+1
-1
@@ -1,7 +1,6 @@
|
||||
import { createAction, createReducer, original } from '@reduxjs/toolkit';
|
||||
|
||||
import {
|
||||
DataQuery,
|
||||
ReducerID,
|
||||
RelativeTimeRange,
|
||||
getDataSourceRef,
|
||||
@@ -10,6 +9,7 @@ import {
|
||||
rangeUtil,
|
||||
} from '@grafana/data';
|
||||
import { getDataSourceSrv } from '@grafana/runtime';
|
||||
import { DataQuery } from '@grafana/schema';
|
||||
import { dataSource as expressionDatasource } from 'app/features/expressions/ExpressionDatasource';
|
||||
import { isExpressionQuery } from 'app/features/expressions/guards';
|
||||
import { ExpressionDatasourceUID, ExpressionQuery, ExpressionQueryType } from 'app/features/expressions/types';
|
||||
|
||||
+2
-1
@@ -1,8 +1,9 @@
|
||||
import { useEffect, useMemo } from 'react';
|
||||
|
||||
import { DataQuery, DataQueryRequest, DataQueryResponse, TestDataSourceResponse } from '@grafana/data';
|
||||
import { DataQueryRequest, DataQueryResponse, TestDataSourceResponse } from '@grafana/data';
|
||||
import { getTemplateSrv } from '@grafana/runtime';
|
||||
import { RuntimeDataSource, sceneUtils } from '@grafana/scenes';
|
||||
import { DataQuery } from '@grafana/schema';
|
||||
import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv';
|
||||
import { dispatch } from 'app/store/store';
|
||||
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
import {
|
||||
DataQuery,
|
||||
DataSourceInstanceSettings,
|
||||
DataSourceRef,
|
||||
IntervalValues,
|
||||
RelativeTimeRange,
|
||||
ScopedVars,
|
||||
@@ -14,7 +12,7 @@ import { PromQuery } from '@grafana/prometheus';
|
||||
import { config, getDataSourceSrv } from '@grafana/runtime';
|
||||
import { ExpressionDatasourceRef } from '@grafana/runtime/src/utils/DataSourceWithBackend';
|
||||
import { VizPanel, sceneGraph } from '@grafana/scenes';
|
||||
import { DataSourceJsonData } from '@grafana/schema';
|
||||
import { DataQuery, DataSourceJsonData, DataSourceRef } from '@grafana/schema';
|
||||
import { DashboardModel } from 'app/features/dashboard/state/DashboardModel';
|
||||
import { PanelModel } from 'app/features/dashboard/state/PanelModel';
|
||||
import {
|
||||
|
||||
Reference in New Issue
Block a user