Update defaultPrecisionString and move
This commit is contained in:
@@ -7,7 +7,7 @@ import {
|
||||
isPipelineAggregation,
|
||||
isPipelineAggregationWithMultipleBucketPaths,
|
||||
} from './components/QueryEditor/MetricAggregationsEditor/aggregations';
|
||||
import { defaultBucketAgg, defaultMetricAgg, findMetricById, highlightTags } from './queryDef';
|
||||
import { defaultBucketAgg, defaultMetricAgg, findMetricById, highlightTags, defaultPrecisionString } from './queryDef';
|
||||
import {
|
||||
ElasticsearchQuery,
|
||||
TermsQuery,
|
||||
@@ -231,7 +231,7 @@ export class ElasticQueryBuilder {
|
||||
case 'geohash_grid': {
|
||||
esAgg['geohash_grid'] = {
|
||||
field: aggDef.field,
|
||||
precision: aggDef.settings?.precision,
|
||||
precision: aggDef.settings?.precision || defaultPrecisionString,
|
||||
};
|
||||
break;
|
||||
}
|
||||
|
||||
+3
-1
@@ -1,7 +1,9 @@
|
||||
import { defaultPrecisionString } from 'app/plugins/datasource/elasticsearch/queryDef';
|
||||
|
||||
import { BucketAggregation } from '../../../../types';
|
||||
import { describeMetric, convertOrderByToMetricId } from '../../../../utils';
|
||||
import { useQuery } from '../../ElasticsearchQueryContext';
|
||||
import { bucketAggregationConfig, orderByOptions, orderOptions, defaultPrecisionString } from '../utils';
|
||||
import { bucketAggregationConfig, orderByOptions, orderOptions } from '../utils';
|
||||
|
||||
const hasValue = (value: string) => (object: { value?: string }) => object.value === value;
|
||||
|
||||
|
||||
+1
-1
@@ -1,9 +1,9 @@
|
||||
import { InternalTimeZones, SelectableValue } from '@grafana/data';
|
||||
|
||||
import { defaultPrecisionString } from '../../../queryDef';
|
||||
import { BucketsConfiguration } from '../../../types';
|
||||
|
||||
import { defaultFilter } from './SettingsEditor/FiltersSettingsEditor/utils';
|
||||
export const defaultPrecisionString = '3';
|
||||
|
||||
export const bucketAggregationConfig: BucketsConfiguration = {
|
||||
terms: {
|
||||
|
||||
@@ -32,6 +32,8 @@ export const highlightTags = {
|
||||
post: '@/HIGHLIGHT@',
|
||||
};
|
||||
|
||||
export const defaultPrecisionString = '3';
|
||||
|
||||
export function defaultMetricAgg(id = '1'): MetricAggregation {
|
||||
return { type: 'count', id };
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user