mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Elasticsearch: rename public/app/plugins/source/elasticsearch/query_def.ts to follow convention (#55415)
This commit is contained in:
parent
ff043aebef
commit
79a5e3e802
@ -15,7 +15,7 @@ import {
|
|||||||
MetricAggregation,
|
MetricAggregation,
|
||||||
MetricAggregationWithInlineScript,
|
MetricAggregationWithInlineScript,
|
||||||
} from './components/QueryEditor/MetricAggregationsEditor/aggregations';
|
} from './components/QueryEditor/MetricAggregationsEditor/aggregations';
|
||||||
import { defaultBucketAgg, defaultMetricAgg, findMetricById, highlightTags } from './query_def';
|
import { defaultBucketAgg, defaultMetricAgg, findMetricById, highlightTags } from './queryDef';
|
||||||
import { ElasticsearchQuery, TermsQuery } from './types';
|
import { ElasticsearchQuery, TermsQuery } from './types';
|
||||||
import { convertOrderByToMetricId, getScriptValue } from './utils';
|
import { convertOrderByToMetricId, getScriptValue } from './utils';
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import { reducerTester } from 'test/core/redux/reducerTester';
|
import { reducerTester } from 'test/core/redux/reducerTester';
|
||||||
|
|
||||||
import { defaultBucketAgg } from 'app/plugins/datasource/elasticsearch/query_def';
|
import { defaultBucketAgg } from 'app/plugins/datasource/elasticsearch/queryDef';
|
||||||
import { ElasticsearchQuery } from 'app/plugins/datasource/elasticsearch/types';
|
import { ElasticsearchQuery } from 'app/plugins/datasource/elasticsearch/types';
|
||||||
|
|
||||||
import { changeMetricType } from '../../MetricAggregationsEditor/state/actions';
|
import { changeMetricType } from '../../MetricAggregationsEditor/state/actions';
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import { Action } from '@reduxjs/toolkit';
|
import { Action } from '@reduxjs/toolkit';
|
||||||
|
|
||||||
import { defaultBucketAgg } from '../../../../query_def';
|
import { defaultBucketAgg } from '../../../../queryDef';
|
||||||
import { ElasticsearchQuery } from '../../../../types';
|
import { ElasticsearchQuery } from '../../../../types';
|
||||||
import { removeEmpty } from '../../../../utils';
|
import { removeEmpty } from '../../../../utils';
|
||||||
import { changeMetricType } from '../../MetricAggregationsEditor/state/actions';
|
import { changeMetricType } from '../../MetricAggregationsEditor/state/actions';
|
||||||
|
@ -5,7 +5,7 @@ import { from } from 'rxjs';
|
|||||||
import { getDefaultTimeRange } from '@grafana/data';
|
import { getDefaultTimeRange } from '@grafana/data';
|
||||||
|
|
||||||
import { ElasticDatasource } from '../../../datasource';
|
import { ElasticDatasource } from '../../../datasource';
|
||||||
import { defaultBucketAgg, defaultMetricAgg } from '../../../query_def';
|
import { defaultBucketAgg, defaultMetricAgg } from '../../../queryDef';
|
||||||
import { ElasticsearchQuery } from '../../../types';
|
import { ElasticsearchQuery } from '../../../types';
|
||||||
import { ElasticsearchProvider } from '../ElasticsearchQueryContext';
|
import { ElasticsearchProvider } from '../ElasticsearchQueryContext';
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ import React, { useRef } from 'react';
|
|||||||
import { Input, InlineField, Select, InlineSwitch } from '@grafana/ui';
|
import { Input, InlineField, Select, InlineSwitch } from '@grafana/ui';
|
||||||
|
|
||||||
import { useDispatch } from '../../../../hooks/useStatelessReducer';
|
import { useDispatch } from '../../../../hooks/useStatelessReducer';
|
||||||
import { movingAvgModelOptions } from '../../../../query_def';
|
import { movingAvgModelOptions } from '../../../../queryDef';
|
||||||
import { isEWMAMovingAverage, isHoltMovingAverage, isHoltWintersMovingAverage, MovingAverage } from '../aggregations';
|
import { isEWMAMovingAverage, isHoltMovingAverage, isHoltWintersMovingAverage, MovingAverage } from '../aggregations';
|
||||||
import { changeMetricSetting } from '../state/actions';
|
import { changeMetricSetting } from '../state/actions';
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ import React, { ComponentProps, useRef, useState } from 'react';
|
|||||||
import { InlineField, Input, InlineSwitch, Select } from '@grafana/ui';
|
import { InlineField, Input, InlineSwitch, Select } from '@grafana/ui';
|
||||||
|
|
||||||
import { useDispatch } from '../../../../hooks/useStatelessReducer';
|
import { useDispatch } from '../../../../hooks/useStatelessReducer';
|
||||||
import { extendedStats } from '../../../../query_def';
|
import { extendedStats } from '../../../../queryDef';
|
||||||
import { useQuery } from '../../ElasticsearchQueryContext';
|
import { useQuery } from '../../ElasticsearchQueryContext';
|
||||||
import { SettingsEditorContainer } from '../../SettingsEditorContainer';
|
import { SettingsEditorContainer } from '../../SettingsEditorContainer';
|
||||||
import {
|
import {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import { extendedStats } from '../../../../query_def';
|
import { extendedStats } from '../../../../queryDef';
|
||||||
import { MetricAggregation } from '../aggregations';
|
import { MetricAggregation } from '../aggregations';
|
||||||
|
|
||||||
const hasValue = (value: string) => (object: { value: string }) => object.value === value;
|
const hasValue = (value: string) => (object: { value: string }) => object.value === value;
|
||||||
|
@ -2,7 +2,7 @@ import { reducerTester } from 'test/core/redux/reducerTester';
|
|||||||
|
|
||||||
import { ElasticsearchQuery } from 'app/plugins/datasource/elasticsearch/types';
|
import { ElasticsearchQuery } from 'app/plugins/datasource/elasticsearch/types';
|
||||||
|
|
||||||
import { defaultMetricAgg } from '../../../../query_def';
|
import { defaultMetricAgg } from '../../../../queryDef';
|
||||||
import { initQuery } from '../../state';
|
import { initQuery } from '../../state';
|
||||||
import { Derivative, ExtendedStats, MetricAggregation } from '../aggregations';
|
import { Derivative, ExtendedStats, MetricAggregation } from '../aggregations';
|
||||||
import { metricAggregationConfig } from '../utils';
|
import { metricAggregationConfig } from '../utils';
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import { Action } from '@reduxjs/toolkit';
|
import { Action } from '@reduxjs/toolkit';
|
||||||
|
|
||||||
import { defaultMetricAgg } from '../../../../query_def';
|
import { defaultMetricAgg } from '../../../../queryDef';
|
||||||
import { ElasticsearchQuery } from '../../../../types';
|
import { ElasticsearchQuery } from '../../../../types';
|
||||||
import { removeEmpty } from '../../../../utils';
|
import { removeEmpty } from '../../../../utils';
|
||||||
import { initQuery } from '../../state';
|
import { initQuery } from '../../state';
|
||||||
|
@ -49,7 +49,7 @@ import {
|
|||||||
import { metricAggregationConfig } from './components/QueryEditor/MetricAggregationsEditor/utils';
|
import { metricAggregationConfig } from './components/QueryEditor/MetricAggregationsEditor/utils';
|
||||||
import { ElasticResponse } from './elastic_response';
|
import { ElasticResponse } from './elastic_response';
|
||||||
import { IndexPattern } from './index_pattern';
|
import { IndexPattern } from './index_pattern';
|
||||||
import { defaultBucketAgg, hasMetricOfType } from './query_def';
|
import { defaultBucketAgg, hasMetricOfType } from './queryDef';
|
||||||
import { DataLinkConfig, ElasticsearchOptions, ElasticsearchQuery, TermsQuery } from './types';
|
import { DataLinkConfig, ElasticsearchOptions, ElasticsearchQuery, TermsQuery } from './types';
|
||||||
import { coerceESVersion, getScriptValue, isSupportedVersion } from './utils';
|
import { coerceESVersion, getScriptValue, isSupportedVersion } from './utils';
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@ import {
|
|||||||
TopMetrics,
|
TopMetrics,
|
||||||
} from './components/QueryEditor/MetricAggregationsEditor/aggregations';
|
} from './components/QueryEditor/MetricAggregationsEditor/aggregations';
|
||||||
import { metricAggregationConfig } from './components/QueryEditor/MetricAggregationsEditor/utils';
|
import { metricAggregationConfig } from './components/QueryEditor/MetricAggregationsEditor/utils';
|
||||||
import * as queryDef from './query_def';
|
import * as queryDef from './queryDef';
|
||||||
import { ElasticsearchAggregation, ElasticsearchQuery } from './types';
|
import { ElasticsearchAggregation, ElasticsearchQuery } from './types';
|
||||||
import { describeMetric, getScriptValue } from './utils';
|
import { describeMetric, getScriptValue } from './utils';
|
||||||
|
|
||||||
|
@ -8,7 +8,7 @@ import { BucketAggregationType } from '../components/QueryEditor/BucketAggregati
|
|||||||
import { ElasticsearchProvider } from '../components/QueryEditor/ElasticsearchQueryContext';
|
import { ElasticsearchProvider } from '../components/QueryEditor/ElasticsearchQueryContext';
|
||||||
import { MetricAggregationType } from '../components/QueryEditor/MetricAggregationsEditor/aggregations';
|
import { MetricAggregationType } from '../components/QueryEditor/MetricAggregationsEditor/aggregations';
|
||||||
import { ElasticDatasource } from '../datasource';
|
import { ElasticDatasource } from '../datasource';
|
||||||
import { defaultBucketAgg, defaultMetricAgg } from '../query_def';
|
import { defaultBucketAgg, defaultMetricAgg } from '../queryDef';
|
||||||
import { ElasticsearchQuery } from '../types';
|
import { ElasticsearchQuery } from '../types';
|
||||||
|
|
||||||
import { useFields } from './useFields';
|
import { useFields } from './useFields';
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import { isPipelineAgg, isPipelineAggWithMultipleBucketPaths } from '../query_def';
|
import { isPipelineAgg, isPipelineAggWithMultipleBucketPaths } from './queryDef';
|
||||||
|
|
||||||
describe('ElasticQueryDef', () => {
|
describe('ElasticQueryDef', () => {
|
||||||
describe('isPipelineMetric', () => {
|
describe('isPipelineMetric', () => {
|
@ -2,7 +2,7 @@ import { DataFrameView, FieldCache, KeyValue, MutableDataFrame } from '@grafana/
|
|||||||
import flatten from 'app/core/utils/flatten';
|
import flatten from 'app/core/utils/flatten';
|
||||||
|
|
||||||
import { ElasticResponse } from '../elastic_response';
|
import { ElasticResponse } from '../elastic_response';
|
||||||
import { highlightTags } from '../query_def';
|
import { highlightTags } from '../queryDef';
|
||||||
import { ElasticsearchQuery } from '../types';
|
import { ElasticsearchQuery } from '../types';
|
||||||
|
|
||||||
describe('ElasticResponse', () => {
|
describe('ElasticResponse', () => {
|
||||||
|
Loading…
Reference in New Issue
Block a user