chore: reduce Azure barrel files (#114297)

eslint-suppressions.json

@@ -3706,16 +3706,6 @@
       "count": 7
     }
   },
-  "public/app/plugins/datasource/azuremonitor/types/query.ts": {
-    "no-barrel-files/no-barrel-files": {
-      "count": 3
-    }
-  },
-  "public/app/plugins/datasource/azuremonitor/types/templateVariables.ts": {
-    "no-barrel-files/no-barrel-files": {
-      "count": 1
-    }
-  },
   "public/app/plugins/datasource/azuremonitor/utils/common.ts": {
     "@typescript-eslint/consistent-type-assertions": {
       "count": 1

public/app/plugins/datasource/azuremonitor/azure_log_analytics/azure_log_analytics_datasource.test.ts

@@ -1,9 +1,10 @@
 import { CustomVariableModel } from '@grafana/data';
 
+import { AzureLogsQuery, AzureQueryType, AzureTracesQuery } from '../dataquery.gen';
 import { Context, createContext } from '../mocks/datasource';
 import createMockQuery from '../mocks/query';
 import { singleVariable } from '../mocks/variables';
-import { AzureLogsQuery, AzureMonitorQuery, AzureQueryType, AzureTracesQuery } from '../types/query';
+import { AzureMonitorQuery } from '../types/query';
 
 import AzureLogAnalyticsDatasource from './azure_log_analytics_datasource';
 import FakeSchemaData from './mocks/schema';

public/app/plugins/datasource/azuremonitor/azure_log_analytics/azure_log_analytics_datasource.ts

@@ -6,7 +6,8 @@ import { DataSourceWithBackend, getTemplateSrv, TemplateSrv } from '@grafana/run
 
 import ResponseParser from '../azure_monitor/response_parser';
 import { getCredentials } from '../credentials';
-import { AzureMonitorQuery, AzureQueryType } from '../types/query';
+import { AzureQueryType } from '../dataquery.gen';
+import { AzureMonitorQuery } from '../types/query';
 import {
   AzureMonitorDataSourceJsonData,
   AzureMonitorDataSourceInstanceSettings,

public/app/plugins/datasource/azuremonitor/azure_monitor/azure_monitor_datasource.ts

@@ -5,8 +5,9 @@ import { ScopedVars } from '@grafana/data';
 import { DataSourceWithBackend, getTemplateSrv, TemplateSrv } from '@grafana/runtime';
 
 import { getCredentials } from '../credentials';
+import { AzureMetricQuery, AzureQueryType } from '../dataquery.gen';
 import TimegrainConverter from '../time_grain_converter';
-import { AzureMetricQuery, AzureMonitorQuery, AzureQueryType } from '../types/query';
+import { AzureMonitorQuery } from '../types/query';
 import {
   AzureAPIResponse,
   AzureMonitorDataSourceInstanceSettings,

public/app/plugins/datasource/azuremonitor/azure_monitor/url_builder.ts

@@ -1,6 +1,6 @@
 import { TemplateSrv } from '@grafana/runtime';
 
-import { AzureMonitorResource } from '../types/query';
+import { AzureMonitorResource } from '../dataquery.gen';
 import { GetMetricNamespacesQuery, GetMetricNamesQuery } from '../types/types';
 
 export default class UrlBuilder {

public/app/plugins/datasource/azuremonitor/azure_resource_graph/azure_resource_graph_datasource.test.ts

@@ -2,12 +2,12 @@ import { get, set } from 'lodash';
 
 import { CustomVariableModel } from '@grafana/data';
 
+import { AzureQueryType } from '../dataquery.gen';
 import { Context, createContext } from '../mocks/datasource';
 import { createMockInstanceSetttings } from '../mocks/instanceSettings';
 import createMockQuery from '../mocks/query';
 import { createTemplateVariables } from '../mocks/utils';
 import { multiVariable, singleVariable, subscriptionsVariable } from '../mocks/variables';
-import { AzureQueryType } from '../types/query';
 
 import AzureResourceGraphDatasource from './azure_resource_graph_datasource';
 

public/app/plugins/datasource/azuremonitor/azure_resource_graph/azure_resource_graph_datasource.ts

@@ -4,9 +4,9 @@ import { ScopedVars } from '@grafana/data';
 import { DataSourceWithBackend, getTemplateSrv, TemplateSrv } from '@grafana/runtime';
 
 import { resourceTypes } from '../azureMetadata/resourceTypes';
-import { ARGScope } from '../dataquery.gen';
+import { ARGScope, AzureQueryType } from '../dataquery.gen';
 import { createFilter } from '../resourcePicker/resourcePickerData';
-import { AzureMonitorQuery, AzureQueryType } from '../types/query';
+import { AzureMonitorQuery } from '../types/query';
 import {
   AzureGetResourceNamesQuery,
   AzureGraphResponse,

public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/AzureCheatSheet.tsx

@@ -18,7 +18,8 @@ import {
 } from '@grafana/ui';
 
 import AzureLogAnalyticsDatasource from '../../azure_log_analytics/azure_log_analytics_datasource';
-import { AzureMonitorQuery, AzureQueryType } from '../../types/query';
+import { AzureQueryType } from '../../dataquery.gen';
+import { AzureMonitorQuery } from '../../types/query';
 import { Category, CheatsheetQueries, CheatsheetQuery, DropdownCategories } from '../../types/types';
 
 import { RawQuery } from './RawQuery';

public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/LogsQueryEditor.tsx

@@ -6,11 +6,11 @@ import { EditorFieldGroup, EditorRow, EditorRows } from '@grafana/plugin-ui';
 import { config, getTemplateSrv } from '@grafana/runtime';
 import { Alert, LinkButton, Space, Text, TextLink } from '@grafana/ui';
 
-import { LogsEditorMode } from '../../dataquery.gen';
+import { LogsEditorMode, ResultFormat } from '../../dataquery.gen';
 import Datasource from '../../datasource';
 import { selectors } from '../../e2e/selectors';
 import { AzureLogAnalyticsMetadataTable } from '../../types/logAnalyticsMetadata';
-import { AzureMonitorQuery, ResultFormat } from '../../types/query';
+import { AzureMonitorQuery } from '../../types/query';
 import { AzureMonitorErrorish, AzureMonitorOption, EngineSchema } from '../../types/types';
 import { LogsQueryBuilder } from '../LogsQueryBuilder/LogsQueryBuilder';
 import ResourceField from '../ResourceField/ResourceField';

public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/setQueryValue.ts

@@ -1,6 +1,7 @@
 import { SelectableValue } from '@grafana/data';
 
-import { AzureMonitorQuery, ResultFormat } from '../../types/query';
+import { ResultFormat } from '../../dataquery.gen';
+import { AzureMonitorQuery } from '../../types/query';
 
 export function setKustoQuery(query: AzureMonitorQuery, kustoQuery: string): AzureMonitorQuery {
   return {

public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/AdvancedResourcePicker.tsx

@@ -6,8 +6,8 @@ import { Trans, t } from '@grafana/i18n';
 import { AccessoryButton } from '@grafana/plugin-ui';
 import { Input, Label, InlineField, Button, useStyles2 } from '@grafana/ui';
 
+import { AzureMonitorResource } from '../../dataquery.gen';
 import { selectors } from '../../e2e/selectors';
-import { AzureMonitorResource } from '../../types/query';
 
 export interface ResourcePickerProps<T> {
   resources: T[];

public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/DimensionFields.tsx

@@ -5,7 +5,8 @@ import { t } from '@grafana/i18n';
 import { EditorList, AccessoryButton } from '@grafana/plugin-ui';
 import { Select, Stack, MultiSelect } from '@grafana/ui';
 
-import { AzureMetricDimension, AzureMonitorQuery } from '../../types/query';
+import { AzureMetricDimension } from '../../dataquery.gen';
+import { AzureMonitorQuery } from '../../types/query';
 import { AzureMonitorOption, AzureQueryEditorFieldProps } from '../../types/types';
 import { Field } from '../shared/Field';
 

public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricsQueryEditor.tsx

@@ -2,9 +2,10 @@ import { PanelData } from '@grafana/data';
 import { EditorRows, EditorRow, EditorFieldGroup } from '@grafana/plugin-ui';
 
 import { multiResourceCompatibleTypes } from '../../azureMetadata/resourceTypes';
+import { AzureMonitorResource } from '../../dataquery.gen';
 import type Datasource from '../../datasource';
 import { selectors } from '../../e2e/selectors';
-import { AzureMonitorQuery, AzureMonitorResource } from '../../types/query';
+import { AzureMonitorQuery } from '../../types/query';
 import { AzureMonitorOption, AzureMonitorErrorish } from '../../types/types';
 import ResourceField from '../ResourceField/ResourceField';
 import { ResourceRow, ResourceRowGroup, ResourceRowType } from '../ResourcePicker/types';

public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/dataHooks.test.ts

@@ -1,8 +1,9 @@
 import { renderHook, waitFor } from '@testing-library/react';
 
+import { AzureMetricQuery, AzureQueryType } from '../../dataquery.gen';
 import Datasource from '../../datasource';
 import createMockDatasource from '../../mocks/datasource';
-import { AzureMetricQuery, AzureMonitorQuery, AzureQueryType } from '../../types/query';
+import { AzureMonitorQuery } from '../../types/query';
 import { AzureMonitorOption } from '../../types/types';
 
 import {

public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/dataHooks.ts

@@ -2,9 +2,10 @@ import { useEffect, useState } from 'react';
 
 import { rangeUtil } from '@grafana/data';
 
+import { AzureMonitorResource } from '../../dataquery.gen';
 import Datasource from '../../datasource';
 import TimegrainConverter from '../../time_grain_converter';
-import { AzureMonitorQuery, AzureMonitorResource } from '../../types/query';
+import { AzureMonitorQuery } from '../../types/query';
 import { AzureMonitorErrorish, AzureMonitorOption } from '../../types/types';
 import { toOption } from '../../utils/common';
 import { useAsyncState } from '../../utils/useAsyncState';

public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/setQueryValue.ts

@@ -1,4 +1,5 @@
-import { AzureMetricDimension, AzureMonitorQuery } from '../../types/query';
+import { AzureMetricDimension } from '../../dataquery.gen';
+import { AzureMonitorQuery } from '../../types/query';
 
 export function setCustomNamespace(query: AzureMonitorQuery, selection: string | undefined): AzureMonitorQuery {
   if (query.azureMonitor?.customNamespace === selection) {

public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryEditor.test.tsx

@@ -5,11 +5,11 @@ import { config } from '@grafana/runtime';
 // eslint-disable-next-line no-restricted-imports
 import * as ui from '@grafana/ui';
 
+import { AzureQueryType, ResultFormat } from '../../dataquery.gen';
 import { selectors } from '../../e2e/selectors';
 import createMockDatasource from '../../mocks/datasource';
 import { invalidNamespaceError } from '../../mocks/errors';
 import createMockQuery from '../../mocks/query';
-import { AzureQueryType, ResultFormat } from '../../types/query';
 import { selectOptionInTest } from '../../utils/testUtils';
 import { createMockResourcePickerData } from '../LogsQueryEditor/mocks';
 

public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryEditor.tsx

@@ -7,9 +7,10 @@ import { Trans, t } from '@grafana/i18n';
 import { config } from '@grafana/runtime';
 import { Alert, CodeEditor, Space, TextLink } from '@grafana/ui';
 
+import { AzureQueryType } from '../../dataquery.gen';
 import AzureMonitorDatasource from '../../datasource';
 import { selectors } from '../../e2e/selectors';
-import { AzureMonitorQuery, AzureQueryType } from '../../types/query';
+import { AzureMonitorQuery } from '../../types/query';
 import { AzureMonitorDataSourceJsonData, AzureMonitorErrorish, AzureMonitorOption } from '../../types/types';
 import useLastError from '../../utils/useLastError';
 import ArgQueryEditor from '../ArgQueryEditor/ArgQueryEditor';

public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryHeader.tsx

@@ -6,9 +6,9 @@ import { EditorHeader, FlexItem, InlineSelect } from '@grafana/plugin-ui';
 import { config, reportInteraction } from '@grafana/runtime';
 import { Button, ConfirmModal, RadioButtonGroup } from '@grafana/ui';
 
-import { LogsEditorMode } from '../../dataquery.gen';
+import { AzureQueryType, LogsEditorMode } from '../../dataquery.gen';
 import { selectors } from '../../e2e/selectors';
-import { AzureMonitorQuery, AzureQueryType } from '../../types/query';
+import { AzureMonitorQuery } from '../../types/query';
 
 interface QueryTypeFieldProps {
   query: AzureMonitorQuery;

public/app/plugins/datasource/azuremonitor/components/QueryEditor/usePreparedQuery.ts

@@ -2,7 +2,8 @@ import deepEqual from 'fast-deep-equal';
 import { defaults } from 'lodash';
 import { useEffect, useMemo } from 'react';
 
-import { AzureMonitorQuery, AzureQueryType, ResultFormat } from '../../types/query';
+import { AzureQueryType, ResultFormat } from '../../dataquery.gen';
+import { AzureMonitorQuery } from '../../types/query';
 import migrateQuery from '../../utils/migrateQuery';
 
 const DEFAULT_QUERY = {

public/app/plugins/datasource/azuremonitor/components/ResourceField/ResourceField.tsx

@@ -5,10 +5,10 @@ import * as React from 'react';
 import { Trans, t } from '@grafana/i18n';
 import { Button, Icon, Modal, useStyles2, IconName } from '@grafana/ui';
 
+import { AzureMonitorResource } from '../../dataquery.gen';
 import Datasource from '../../datasource';
 import { selectors } from '../../e2e/selectors';
 import { ResourcePickerQueryType } from '../../resourcePicker/resourcePickerData';
-import { AzureMonitorResource } from '../../types/query';
 import { AzureQueryEditorFieldProps } from '../../types/types';
 import ResourcePicker from '../ResourcePicker/ResourcePicker';
 import getStyles from '../ResourcePicker/styles';

public/app/plugins/datasource/azuremonitor/components/ResourcePicker/AdvancedMulti.tsx

@@ -4,8 +4,8 @@ import * as React from 'react';
 import { t } from '@grafana/i18n';
 import { Collapse, Space } from '@grafana/ui';
 
+import { AzureMonitorResource } from '../../dataquery.gen';
 import { selectors } from '../../e2e/selectors';
-import { AzureMonitorResource } from '../../types/query';
 
 export interface ResourcePickerProps<T> {
   resources: T[];

public/app/plugins/datasource/azuremonitor/components/ResourcePicker/ResourcePicker.tsx

@@ -24,10 +24,10 @@ import {
 } from '@grafana/ui';
 
 import { resourceTypeDisplayNames } from '../../azureMetadata/resourceTypes';
+import { AzureMonitorResource } from '../../dataquery.gen';
 import Datasource from '../../datasource';
 import { selectors } from '../../e2e/selectors';
 import ResourcePickerData, { ResourcePickerQueryType } from '../../resourcePicker/resourcePickerData';
-import { AzureMonitorResource } from '../../types/query';
 import { ResourceGraphFilters } from '../../types/types';
 import messageFromError from '../../utils/messageFromError';
 

public/app/plugins/datasource/azuremonitor/components/ResourcePicker/utils.ts

@@ -3,8 +3,9 @@ import { produce } from 'immer';
 import { getTemplateSrv } from '@grafana/runtime';
 
 import UrlBuilder from '../../azure_monitor/url_builder';
+import { AzureMonitorResource } from '../../dataquery.gen';
 import { ResourcePickerQueryType } from '../../resourcePicker/resourcePickerData';
-import { AzureMonitorQuery, AzureMonitorResource } from '../../types/query';
+import { AzureMonitorQuery } from '../../types/query';
 
 import { ResourceRow, ResourceRowGroup } from './types';
 

public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/Filters.tsx

@@ -6,7 +6,7 @@ import { t } from '@grafana/i18n';
 import { EditorList } from '@grafana/plugin-ui';
 import { Field } from '@grafana/ui';
 
-import { AzureTracesFilter } from '../../types/query';
+import { AzureTracesFilter } from '../../dataquery.gen';
 import { AzureQueryEditorFieldProps } from '../../types/types';
 
 import { makeRenderItem } from './Filter';

public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/TracesQueryEditor.tsx

@@ -7,9 +7,10 @@ import { t } from '@grafana/i18n';
 import { EditorFieldGroup, EditorRow, EditorRows } from '@grafana/plugin-ui';
 import { Input } from '@grafana/ui';
 
+import { AzureQueryType, ResultFormat } from '../../dataquery.gen';
 import Datasource from '../../datasource';
 import { selectors } from '../../e2e/selectors';
-import { AzureMonitorQuery, AzureQueryType, ResultFormat } from '../../types/query';
+import { AzureMonitorQuery } from '../../types/query';
 import { AzureMonitorErrorish, AzureMonitorOption } from '../../types/types';
 import AdvancedResourcePicker from '../LogsQueryEditor/AdvancedResourcePicker';
 import ResourceField from '../ResourceField/ResourceField';

public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/setQueryValue.ts

@@ -1,6 +1,7 @@
 import { SelectableValue } from '@grafana/data';
 
-import { AzureMonitorQuery, AzureQueryType, AzureTracesFilter, ResultFormat } from '../../types/query';
+import { AzureQueryType, AzureTracesFilter, ResultFormat } from '../../dataquery.gen';
+import { AzureMonitorQuery } from '../../types/query';
 
 // Used when switching from a traces exemplar query to a standard Azure Traces query
 export function setDefaultTracesQuery(query: AzureMonitorQuery): AzureMonitorQuery {

public/app/plugins/datasource/azuremonitor/components/VariableEditor/GrafanaTemplateVariableFn.tsx

@@ -3,9 +3,10 @@ import { ChangeEvent, useCallback, useEffect, useState } from 'react';
 import { t } from '@grafana/i18n';
 import { InlineField, Input } from '@grafana/ui';
 
+import { AzureQueryType } from '../../dataquery.gen';
 import DataSource from '../../datasource';
 import { migrateStringQueriesToObjectQueries } from '../../grafanaTemplateVariableFns';
-import { AzureMonitorQuery, AzureQueryType } from '../../types/query';
+import { AzureMonitorQuery } from '../../types/query';
 
 const GrafanaTemplateVariableFnInput = ({
   query,

public/app/plugins/datasource/azuremonitor/components/VariableEditor/VariableEditor.test.tsx

@@ -6,8 +6,9 @@ import { select, openMenu } from 'react-select-event';
 // eslint-disable-next-line no-restricted-imports
 import * as ui from '@grafana/ui';
 
+import { AzureQueryType } from '../../dataquery.gen';
 import createMockDatasource from '../../mocks/datasource';
-import { AzureMonitorQuery, AzureQueryType } from '../../types/query';
+import { AzureMonitorQuery } from '../../types/query';
 
 import VariableEditor from './VariableEditor';
 

public/app/plugins/datasource/azuremonitor/components/VariableEditor/VariableEditor.tsx

@@ -8,10 +8,11 @@ import { getTemplateSrv } from '@grafana/runtime';
 import { Alert, Field, Select, Space } from '@grafana/ui';
 
 import UrlBuilder from '../../azure_monitor/url_builder';
+import { AzureQueryType } from '../../dataquery.gen';
 import DataSource from '../../datasource';
 import { selectors } from '../../e2e/selectors';
 import { migrateQuery } from '../../grafanaTemplateVariableFns';
-import { AzureMonitorQuery, AzureQueryType } from '../../types/query';
+import { AzureMonitorQuery } from '../../types/query';
 import { AzureMonitorOption } from '../../types/types';
 import useLastError from '../../utils/useLastError';
 import ArgQueryEditor from '../ArgQueryEditor/ArgQueryEditor';

public/app/plugins/datasource/azuremonitor/components/shared/FormatAsField.test.tsx

@@ -2,9 +2,10 @@ import { render, screen } from '@testing-library/react';
 
 import { SelectableValue } from '@grafana/data';
 
+import { ResultFormat } from '../../dataquery.gen';
 import createMockDatasource from '../../mocks/datasource';
 import createMockQuery from '../../mocks/query';
-import { AzureMonitorQuery, ResultFormat } from '../../types/query';
+import { AzureMonitorQuery } from '../../types/query';
 
 import FormatAsField from './FormatAsField';
 

public/app/plugins/datasource/azuremonitor/components/shared/FormatAsField.tsx

@@ -5,8 +5,8 @@ import { SelectableValue } from '@grafana/data';
 import { t } from '@grafana/i18n';
 import { Select } from '@grafana/ui';
 
+import { ResultFormat } from '../../dataquery.gen';
 import { selectors } from '../../e2e/selectors';
-import { ResultFormat } from '../../types/query';
 import { FormatAsFieldProps } from '../../types/types';
 
 import { Field } from './Field';

public/app/plugins/datasource/azuremonitor/datasource.test.ts

@@ -1,8 +1,8 @@
+import { AzureQueryType } from './dataquery.gen';
 import Datasource from './datasource';
 import { createMockInstanceSetttings } from './mocks/instanceSettings';
 import createMockQuery from './mocks/query';
 import { singleVariable } from './mocks/variables';
-import { AzureQueryType } from './types/query';
 
 jest.mock('@grafana/runtime', () => {
   return {

public/app/plugins/datasource/azuremonitor/datasource.ts

@@ -17,8 +17,9 @@ import { DataSourceWithBackend, getTemplateSrv, TemplateSrv } from '@grafana/run
 import AzureLogAnalyticsDatasource from './azure_log_analytics/azure_log_analytics_datasource';
 import AzureMonitorDatasource from './azure_monitor/azure_monitor_datasource';
 import AzureResourceGraphDatasource from './azure_resource_graph/azure_resource_graph_datasource';
+import { AzureQueryType } from './dataquery.gen';
 import ResourcePickerData from './resourcePicker/resourcePickerData';
-import { AzureMonitorQuery, AzureQueryType } from './types/query';
+import { AzureMonitorQuery } from './types/query';
 import { AzureMonitorDataSourceJsonData } from './types/types';
 import migrateAnnotation from './utils/migrateAnnotation';
 import migrateQuery from './utils/migrateQuery';

public/app/plugins/datasource/azuremonitor/grafanaTemplateVariableFns.ts

@@ -1,9 +1,8 @@
 import { isGUIDish } from './components/ResourcePicker/utils';
-import DataSource from './datasource';
-import { AzureMonitorQuery, AzureQueryType } from './types/query';
 import {
   AppInsightsGroupByQuery,
   AppInsightsMetricNameQuery,
+  AzureQueryType,
   GrafanaTemplateVariableQuery,
   MetricNamespaceQuery,
   MetricNamesQuery,
@@ -11,7 +10,9 @@ import {
   ResourceNamesQuery,
   SubscriptionsQuery,
   WorkspacesQuery,
-} from './types/templateVariables';
+} from './dataquery.gen';
+import DataSource from './datasource';
+import { AzureMonitorQuery } from './types/query';
 
 /* 
   Grafana Template Variable Functions

public/app/plugins/datasource/azuremonitor/grafanaTemplateVariables.test.ts

@@ -1,6 +1,7 @@
+import { AzureQueryType } from './dataquery.gen';
 import { migrateQuery, migrateStringQueriesToObjectQueries } from './grafanaTemplateVariableFns';
 import createMockDatasource from './mocks/datasource';
-import { AzureMonitorQuery, AzureQueryType } from './types/query';
+import { AzureMonitorQuery } from './types/query';
 
 describe('migrateStringQueriesToObjectQueries', () => {
   const expectedMigrations: Array<{ input: string; output: AzureMonitorQuery }> = [

public/app/plugins/datasource/azuremonitor/mocks/query.ts

@@ -1,4 +1,5 @@
-import { AzureMonitorQuery, AzureQueryType, ResultFormat } from '../types/query';
+import { AzureQueryType, ResultFormat } from '../dataquery.gen';
+import { AzureMonitorQuery } from '../types/query';
 
 export default function createMockQuery(overrides?: Partial<AzureMonitorQuery>): AzureMonitorQuery {
   return {

public/app/plugins/datasource/azuremonitor/module.ts

@@ -4,10 +4,11 @@ import { getAppEvents } from '@grafana/runtime';
 
 import { ConfigEditor } from './components/ConfigEditor/ConfigEditor';
 import AzureMonitorQueryEditor from './components/QueryEditor/QueryEditor';
+import { AzureQueryType, ResultFormat } from './dataquery.gen';
 import Datasource from './datasource';
 import pluginJson from './plugin.json';
 import { trackAzureMonitorDashboardLoaded } from './tracking';
-import { AzureMonitorQuery, AzureQueryType, ResultFormat } from './types/query';
+import { AzureMonitorQuery } from './types/query';
 import { AzureMonitorDataSourceJsonData } from './types/types';
 
 // don't load plugin translations in test environments

public/app/plugins/datasource/azuremonitor/resourcePicker/resourcePickerData.ts

@@ -13,7 +13,8 @@ import {
   parseResourceURI,
   resourceToString,
 } from '../components/ResourcePicker/utils';
-import { AzureMonitorQuery, AzureMonitorResource } from '../types/query';
+import { AzureMonitorResource } from '../dataquery.gen';
+import { AzureMonitorQuery } from '../types/query';
 import {
   AzureMonitorDataSourceInstanceSettings,
   AzureMonitorDataSourceJsonData,

public/app/plugins/datasource/azuremonitor/types/query.ts

@@ -1,17 +1,5 @@
 import { AzureMonitorQuery as AzureMonitorQueryBase, AzureQueryType } from '../dataquery.gen';
 
-export { AzureQueryType };
-export type {
-  AzureMetricQuery,
-  AzureLogsQuery,
-  AzureResourceGraphQuery,
-  AzureTracesQuery,
-  AzureMonitorResource,
-  AzureMetricDimension,
-  AzureTracesFilter,
-} from '../dataquery.gen';
-export { ResultFormat } from '../dataquery.gen';
-
 /**
  * Represents the query as it moves through the frontend query editor and datasource files.
  * It can represent new queries that are still being edited, so all properties are optional

public/app/plugins/datasource/azuremonitor/types/templateVariables.ts

@@ -1,14 +0,0 @@
-export type {
-  GrafanaTemplateVariableQueryType,
-  UnknownQuery,
-  AppInsightsMetricNameQuery,
-  AppInsightsGroupByQuery,
-  SubscriptionsQuery,
-  ResourceGroupsQuery,
-  ResourceNamesQuery,
-  MetricNamespaceQuery,
-  MetricDefinitionsQuery,
-  MetricNamesQuery,
-  WorkspacesQuery,
-  GrafanaTemplateVariableQuery,
-} from '../dataquery.gen';

public/app/plugins/datasource/azuremonitor/types/types.ts

@@ -3,10 +3,11 @@ import { EntityGroup, Function, ScalarParameter, TabularParameter } from '@kusto
 import { AzureDataSourceJsonData, AzureDataSourceSecureJsonData } from '@grafana/azure-sdk';
 import { DataSourceInstanceSettings, DataSourceSettings, PanelData, SelectableValue, TimeRange } from '@grafana/data';
 
+import { ResultFormat } from '../dataquery.gen';
 import Datasource from '../datasource';
 
 import { AzureLogAnalyticsMetadataTable } from './logAnalyticsMetadata';
-import { AzureMonitorQuery, ResultFormat } from './query';
+import { AzureMonitorQuery } from './query';
 
 export type AzureMonitorDataSourceSettings = DataSourceSettings<
   AzureMonitorDataSourceJsonData,

public/app/plugins/datasource/azuremonitor/utils/migrateAnnotation.test.ts

@@ -1,6 +1,7 @@
 import { AnnotationQuery } from '@grafana/data';
 
-import { AzureMonitorQuery, AzureQueryType } from '../types/query';
+import { AzureQueryType } from '../dataquery.gen';
+import { AzureMonitorQuery } from '../types/query';
 
 import migrateAnnotation from './migrateAnnotation';
 

public/app/plugins/datasource/azuremonitor/utils/migrateAnnotation.ts

@@ -1,6 +1,7 @@
 import { AnnotationQuery } from '@grafana/data';
 
-import { AzureMonitorQuery, AzureQueryType } from '../types/query';
+import { AzureQueryType } from '../dataquery.gen';
+import { AzureMonitorQuery } from '../types/query';
 
 // The old Angular annotations editor put some properties (rawQuery, workspace, subscription)
 // on the root annotation object, rather than down in the 'targets' query value

public/app/plugins/datasource/azuremonitor/utils/migrateQuery.test.ts

@@ -1,4 +1,5 @@
-import { AzureMetricDimension, AzureMonitorQuery, AzureQueryType, ResultFormat } from '../types/query';
+import { AzureMetricDimension, AzureQueryType, ResultFormat } from '../dataquery.gen';
+import { AzureMonitorQuery } from '../types/query';
 
 import migrateQuery from './migrateQuery';
 

public/app/plugins/datasource/azuremonitor/utils/migrateQuery.ts

@@ -4,8 +4,9 @@ import {
   setTimeGrain as setMetricsTimeGrain,
 } from '../components/MetricsQueryEditor/setQueryValue';
 import { parseResourceDetails } from '../components/ResourcePicker/utils';
+import { AzureMetricDimension, AzureQueryType } from '../dataquery.gen';
 import TimegrainConverter from '../time_grain_converter';
-import { AzureMetricDimension, AzureMonitorQuery, AzureQueryType } from '../types/query';
+import { AzureMonitorQuery } from '../types/query';
 
 const OLD_DEFAULT_DROPDOWN_VALUE = 'select';
 

public/app/plugins/datasource/azuremonitor/variables.test.ts

@@ -2,9 +2,10 @@ import { from, lastValueFrom } from 'rxjs';
 
 import { DataQueryRequest, toDataFrame } from '@grafana/data';
 
+import { AzureQueryType } from './dataquery.gen';
 import createMockDatasource from './mocks/datasource';
 import { invalidSubscriptionError } from './mocks/errors';
-import { AzureMonitorQuery, AzureQueryType } from './types/query';
+import { AzureMonitorQuery } from './types/query';
 import { VariableSupport } from './variables';
 
 jest.mock('@grafana/runtime', () => ({

public/app/plugins/datasource/azuremonitor/variables.ts

@@ -13,10 +13,10 @@ import { getTemplateSrv, TemplateSrv } from '@grafana/runtime';
 import UrlBuilder from './azure_monitor/url_builder';
 import { parseResourceURI } from './components/ResourcePicker/utils';
 import VariableEditor from './components/VariableEditor/VariableEditor';
+import { AzureQueryType, GrafanaTemplateVariableQuery } from './dataquery.gen';
 import DataSource from './datasource';
 import { migrateQuery } from './grafanaTemplateVariableFns';
-import { AzureMonitorQuery, AzureQueryType } from './types/query';
-import { GrafanaTemplateVariableQuery } from './types/templateVariables';
+import { AzureMonitorQuery } from './types/query';
 import { RawAzureResourceItem } from './types/types';
 import messageFromError from './utils/messageFromError';