From 6901bad03bdc63a7f6ba005a85a94f961d4e755b Mon Sep 17 00:00:00 2001 From: ismail simsek Date: Thu, 16 Jan 2025 22:38:40 +0100 Subject: [PATCH] Chore: Export some more from index for explore metrics (#99110) * export some more from index.ts for explore metrics * lint * export default member * update imports in explore metrics * Update packages/grafana-prometheus/src/index.ts Co-authored-by: Nick Richmond <5732000+NWRichmond@users.noreply.github.com> * Update public/app/features/trails/helpers/MetricDatasourceHelper.ts Co-authored-by: Nick Richmond <5732000+NWRichmond@users.noreply.github.com> --------- Co-authored-by: Nick Richmond <5732000+NWRichmond@users.noreply.github.com> --- packages/grafana-prometheus/src/index.ts | 8 ++++++++ .../features/trails/ActionTabs/MetricOverviewScene.tsx | 3 +-- .../features/trails/Breakdown/LabelBreakdownScene.tsx | 2 +- .../app/features/trails/Integrations/getQueryMetrics.ts | 3 +-- public/app/features/trails/Integrations/utils.ts | 2 +- public/app/features/trails/MetricSelect/api.ts | 4 +--- .../features/trails/autoQuery/getAutoQueriesForMetric.ts | 2 +- .../features/trails/helpers/MetricDatasourceHelper.ts | 9 +++++++-- public/app/features/trails/otel/api.ts | 3 +-- public/app/features/trails/otel/util.ts | 2 +- public/app/features/trails/utils.ts | 2 +- 11 files changed, 24 insertions(+), 16 deletions(-) diff --git a/packages/grafana-prometheus/src/index.ts b/packages/grafana-prometheus/src/index.ts index acf324f7e92..4eb15995aae 100644 --- a/packages/grafana-prometheus/src/index.ts +++ b/packages/grafana-prometheus/src/index.ts @@ -85,3 +85,11 @@ export { type StandardPromVariableQuery, } from './types'; export { PrometheusVariableSupport } from './variables'; + +// For explore metrics +export { default as PromQlLanguageProvider } from './language_provider'; +export { getPrometheusTime } from './language_utils'; +export { isValidLegacyName, utf8Support, wrapUtf8Filters } from './utf8_support'; +export { buildVisualQueryFromString } from './querybuilder/parsing'; +export { PromQueryModeller } from './querybuilder/PromQueryModeller'; +export { type QueryBuilderLabelFilter } from './querybuilder/shared/types'; diff --git a/public/app/features/trails/ActionTabs/MetricOverviewScene.tsx b/public/app/features/trails/ActionTabs/MetricOverviewScene.tsx index 4f3807c6034..021a6cbe26e 100644 --- a/public/app/features/trails/ActionTabs/MetricOverviewScene.tsx +++ b/public/app/features/trails/ActionTabs/MetricOverviewScene.tsx @@ -1,7 +1,6 @@ import { useEffect } from 'react'; -import { PromMetricsMetadataItem } from '@grafana/prometheus'; -import { isValidLegacyName } from '@grafana/prometheus/src/utf8_support'; +import { isValidLegacyName, PromMetricsMetadataItem } from '@grafana/prometheus'; import { QueryVariable, SceneComponentProps, diff --git a/public/app/features/trails/Breakdown/LabelBreakdownScene.tsx b/public/app/features/trails/Breakdown/LabelBreakdownScene.tsx index c650e3876ae..8b9e014aa57 100644 --- a/public/app/features/trails/Breakdown/LabelBreakdownScene.tsx +++ b/public/app/features/trails/Breakdown/LabelBreakdownScene.tsx @@ -4,7 +4,7 @@ import { isNumber, max, min, throttle } from 'lodash'; import { useEffect, useState } from 'react'; import { DataFrame, FieldType, GrafanaTheme2, PanelData, SelectableValue } from '@grafana/data'; -import { isValidLegacyName, utf8Support } from '@grafana/prometheus/src/utf8_support'; +import { isValidLegacyName, utf8Support } from '@grafana/prometheus'; import { config } from '@grafana/runtime'; import { ConstantVariable, diff --git a/public/app/features/trails/Integrations/getQueryMetrics.ts b/public/app/features/trails/Integrations/getQueryMetrics.ts index 5273756dc22..784808ca16f 100644 --- a/public/app/features/trails/Integrations/getQueryMetrics.ts +++ b/public/app/features/trails/Integrations/getQueryMetrics.ts @@ -1,5 +1,4 @@ -import { buildVisualQueryFromString } from '@grafana/prometheus/src/querybuilder/parsing'; -import { QueryBuilderLabelFilter } from '@grafana/prometheus/src/querybuilder/shared/types'; +import { buildVisualQueryFromString, QueryBuilderLabelFilter } from '@grafana/prometheus'; import { isEquals } from './utils'; diff --git a/public/app/features/trails/Integrations/utils.ts b/public/app/features/trails/Integrations/utils.ts index 9cb4b51e592..8e8af363e1a 100644 --- a/public/app/features/trails/Integrations/utils.ts +++ b/public/app/features/trails/Integrations/utils.ts @@ -1,4 +1,4 @@ -import { QueryBuilderLabelFilter } from '@grafana/prometheus/src/querybuilder/shared/types'; +import { QueryBuilderLabelFilter } from '@grafana/prometheus'; import { DashboardScene } from 'app/features/dashboard-scene/scene/DashboardScene'; import { QueryMetric } from './getQueryMetrics'; // We only support label filters with the '=' operator diff --git a/public/app/features/trails/MetricSelect/api.ts b/public/app/features/trails/MetricSelect/api.ts index cd61a3782d5..bb807ee31e9 100644 --- a/public/app/features/trails/MetricSelect/api.ts +++ b/public/app/features/trails/MetricSelect/api.ts @@ -1,7 +1,5 @@ import { AdHocVariableFilter, RawTimeRange, Scope } from '@grafana/data'; -import { getPrometheusTime } from '@grafana/prometheus/src/language_utils'; -import { PromQueryModeller } from '@grafana/prometheus/src/querybuilder/PromQueryModeller'; -import { utf8Support } from '@grafana/prometheus/src/utf8_support'; +import { getPrometheusTime, PromQueryModeller, utf8Support } from '@grafana/prometheus'; import { config, getBackendSrv } from '@grafana/runtime'; import { limitOtelMatchTerms } from '../otel/util'; diff --git a/public/app/features/trails/autoQuery/getAutoQueriesForMetric.ts b/public/app/features/trails/autoQuery/getAutoQueriesForMetric.ts index 01b74f22ace..77ddceff54f 100644 --- a/public/app/features/trails/autoQuery/getAutoQueriesForMetric.ts +++ b/public/app/features/trails/autoQuery/getAutoQueriesForMetric.ts @@ -1,4 +1,4 @@ -import { isValidLegacyName } from '@grafana/prometheus/src/utf8_support'; +import { isValidLegacyName } from '@grafana/prometheus'; import { createDefaultMetricQueryDefs } from './queryGenerators/default'; import { createHistogramMetricQueryDefs } from './queryGenerators/histogram'; diff --git a/public/app/features/trails/helpers/MetricDatasourceHelper.ts b/public/app/features/trails/helpers/MetricDatasourceHelper.ts index b77a28d2c3c..ae473d5c7e9 100644 --- a/public/app/features/trails/helpers/MetricDatasourceHelper.ts +++ b/public/app/features/trails/helpers/MetricDatasourceHelper.ts @@ -4,8 +4,13 @@ import { DataSourceGetTagValuesOptions, MetricFindValue, } from '@grafana/data'; -import { PrometheusDatasource, PromMetricsMetadata, PromMetricsMetadataItem, PromQuery } from '@grafana/prometheus'; -import PromQlLanguageProvider from '@grafana/prometheus/src/language_provider'; +import { + PrometheusDatasource, + PromMetricsMetadata, + PromMetricsMetadataItem, + PromQlLanguageProvider, + PromQuery, +} from '@grafana/prometheus'; import { getDataSourceSrv } from '@grafana/runtime'; import { DataTrail } from '../DataTrail'; diff --git a/public/app/features/trails/otel/api.ts b/public/app/features/trails/otel/api.ts index 083d1bef15e..542e9b2cd70 100644 --- a/public/app/features/trails/otel/api.ts +++ b/public/app/features/trails/otel/api.ts @@ -1,6 +1,5 @@ import { RawTimeRange, Scope } from '@grafana/data'; -import { getPrometheusTime } from '@grafana/prometheus/src/language_utils'; -import { isValidLegacyName } from '@grafana/prometheus/src/utf8_support'; +import { getPrometheusTime, isValidLegacyName } from '@grafana/prometheus'; import { config, getBackendSrv } from '@grafana/runtime'; import { callSuggestionsApi } from '../utils'; diff --git a/public/app/features/trails/otel/util.ts b/public/app/features/trails/otel/util.ts index b0f95dabd51..7f0e1ad4f61 100644 --- a/public/app/features/trails/otel/util.ts +++ b/public/app/features/trails/otel/util.ts @@ -1,5 +1,5 @@ import { AdHocVariableFilter, MetricFindValue, RawTimeRange, VariableHide } from '@grafana/data'; -import { isValidLegacyName } from '@grafana/prometheus/src/utf8_support'; +import { isValidLegacyName } from '@grafana/prometheus'; import { config } from '@grafana/runtime'; import { AdHocFiltersVariable, ConstantVariable, sceneGraph, SceneObject } from '@grafana/scenes'; diff --git a/public/app/features/trails/utils.ts b/public/app/features/trails/utils.ts index 76ff2cc1a74..860dc630a30 100644 --- a/public/app/features/trails/utils.ts +++ b/public/app/features/trails/utils.ts @@ -10,7 +10,7 @@ import { ScopeSpecFilter, urlUtil, } from '@grafana/data'; -import { getPrometheusTime } from '@grafana/prometheus/src/language_utils'; +import { getPrometheusTime } from '@grafana/prometheus'; import { config, FetchResponse, getBackendSrv, getDataSourceSrv } from '@grafana/runtime'; import { AdHocFiltersVariable,