From f26babf484846bb2e4f8f426d9dea88274b5ce0f Mon Sep 17 00:00:00 2001 From: GitStart <1501599+gitstart@users.noreply.github.com> Date: Fri, 16 Sep 2022 13:46:54 +0530 Subject: [PATCH] Loki: Rename public/app/plugins/datasource/loki/query_utils.ts file to follow convention (#55180) --- public/app/plugins/datasource/loki/backendResultTransformer.ts | 2 +- .../datasource/loki/components/AnnotationsQueryEditor.tsx | 2 +- public/app/plugins/datasource/loki/datasource.ts | 2 +- public/app/plugins/datasource/loki/queryHints.ts | 2 +- .../datasource/loki/{query_utils.test.ts => queryUtils.test.ts} | 2 +- .../plugins/datasource/loki/{query_utils.ts => queryUtils.ts} | 0 .../loki/querybuilder/components/LokiQueryBuilderOptions.tsx | 2 +- .../loki/querybuilder/components/UnwrapParamEditor.tsx | 2 +- 8 files changed, 7 insertions(+), 7 deletions(-) rename public/app/plugins/datasource/loki/{query_utils.test.ts => queryUtils.test.ts} (99%) rename public/app/plugins/datasource/loki/{query_utils.ts => queryUtils.ts} (100%) diff --git a/public/app/plugins/datasource/loki/backendResultTransformer.ts b/public/app/plugins/datasource/loki/backendResultTransformer.ts index 140681cfd20..4d7e969ba6e 100644 --- a/public/app/plugins/datasource/loki/backendResultTransformer.ts +++ b/public/app/plugins/datasource/loki/backendResultTransformer.ts @@ -2,7 +2,7 @@ import { DataQueryResponse, DataFrame, isDataFrame, FieldType, QueryResultMeta, import { getDerivedFields } from './getDerivedFields'; import { makeTableFrames } from './makeTableFrames'; -import { formatQuery, getHighlighterExpressionsFromQuery } from './query_utils'; +import { formatQuery, getHighlighterExpressionsFromQuery } from './queryUtils'; import { dataFrameHasLokiError } from './responseUtils'; import { DerivedFieldConfig, LokiQuery, LokiQueryType } from './types'; diff --git a/public/app/plugins/datasource/loki/components/AnnotationsQueryEditor.tsx b/public/app/plugins/datasource/loki/components/AnnotationsQueryEditor.tsx index dfa648685c6..9c3eabd5351 100644 --- a/public/app/plugins/datasource/loki/components/AnnotationsQueryEditor.tsx +++ b/public/app/plugins/datasource/loki/components/AnnotationsQueryEditor.tsx @@ -5,7 +5,7 @@ import { AnnotationQuery } from '@grafana/data'; import { EditorField, EditorRow, Input } from '@grafana/ui'; // Types -import { getNormalizedLokiQuery } from '../query_utils'; +import { getNormalizedLokiQuery } from '../queryUtils'; import { LokiQuery, LokiQueryType } from '../types'; import { LokiOptionFields } from './LokiOptionFields'; diff --git a/public/app/plugins/datasource/loki/datasource.ts b/public/app/plugins/datasource/loki/datasource.ts index 5d96329a0de..f02f954d083 100644 --- a/public/app/plugins/datasource/loki/datasource.ts +++ b/public/app/plugins/datasource/loki/datasource.ts @@ -59,7 +59,7 @@ import { removeCommentsFromQuery, } from './modifyQuery'; import { getQueryHints } from './queryHints'; -import { getNormalizedLokiQuery, isLogsQuery, isValidQuery } from './query_utils'; +import { getNormalizedLokiQuery, isLogsQuery, isValidQuery } from './queryUtils'; import { sortDataFrameByTime } from './sortDataFrame'; import { doLokiChannelStream } from './streaming'; import { diff --git a/public/app/plugins/datasource/loki/queryHints.ts b/public/app/plugins/datasource/loki/queryHints.ts index fcad80179cb..96c16ec73d0 100644 --- a/public/app/plugins/datasource/loki/queryHints.ts +++ b/public/app/plugins/datasource/loki/queryHints.ts @@ -1,6 +1,6 @@ import { DataFrame, QueryHint } from '@grafana/data'; -import { isQueryPipelineErrorFiltering, isQueryWithLabelFormat, isQueryWithParser } from './query_utils'; +import { isQueryPipelineErrorFiltering, isQueryWithLabelFormat, isQueryWithParser } from './queryUtils'; import { dataFrameHasLevelLabel, extractHasErrorLabelFromDataFrame, diff --git a/public/app/plugins/datasource/loki/query_utils.test.ts b/public/app/plugins/datasource/loki/queryUtils.test.ts similarity index 99% rename from public/app/plugins/datasource/loki/query_utils.test.ts rename to public/app/plugins/datasource/loki/queryUtils.test.ts index 4f1b8fe1488..8650682cabd 100644 --- a/public/app/plugins/datasource/loki/query_utils.test.ts +++ b/public/app/plugins/datasource/loki/queryUtils.test.ts @@ -5,7 +5,7 @@ import { isQueryWithLabelFormat, isQueryWithParser, isValidQuery, -} from './query_utils'; +} from './queryUtils'; import { LokiQuery, LokiQueryType } from './types'; describe('getHighlighterExpressionsFromQuery', () => { diff --git a/public/app/plugins/datasource/loki/query_utils.ts b/public/app/plugins/datasource/loki/queryUtils.ts similarity index 100% rename from public/app/plugins/datasource/loki/query_utils.ts rename to public/app/plugins/datasource/loki/queryUtils.ts diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.tsx index 2d89b8fa259..21311f9ad07 100644 --- a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.tsx +++ b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.tsx @@ -6,7 +6,7 @@ import { RadioButtonGroup, Select, AutoSizeInput, EditorField, EditorRow } from import { QueryOptionGroup } from 'app/plugins/datasource/prometheus/querybuilder/shared/QueryOptionGroup'; import { preprocessMaxLines, queryTypeOptions, RESOLUTION_OPTIONS } from '../../components/LokiOptionFields'; -import { isLogsQuery } from '../../query_utils'; +import { isLogsQuery } from '../../queryUtils'; import { LokiQuery, LokiQueryType } from '../../types'; export interface Props { diff --git a/public/app/plugins/datasource/loki/querybuilder/components/UnwrapParamEditor.tsx b/public/app/plugins/datasource/loki/querybuilder/components/UnwrapParamEditor.tsx index 54c1070b0f6..aa59e9093f9 100644 --- a/public/app/plugins/datasource/loki/querybuilder/components/UnwrapParamEditor.tsx +++ b/public/app/plugins/datasource/loki/querybuilder/components/UnwrapParamEditor.tsx @@ -8,7 +8,7 @@ import { getOperationParamId } from '../../../prometheus/querybuilder/shared/ope import { QueryBuilderOperationParamEditorProps } from '../../../prometheus/querybuilder/shared/types'; import { LokiDatasource } from '../../datasource'; import { isBytesString } from '../../languageUtils'; -import { getLogQueryFromMetricsQuery, isValidQuery } from '../../query_utils'; +import { getLogQueryFromMetricsQuery, isValidQuery } from '../../queryUtils'; import { lokiQueryModeller } from '../LokiQueryModeller'; import { LokiVisualQuery } from '../types';