Chore: Move getOriginalMetricName to the place where it's used (#104379)

remove getOriginalMetricName from datasource as it's used only in metric_find_query
pull/104009/head
ismail simsek 4 weeks ago committed by GitHub
parent 345e81b9b7
commit 7a9fdf8609
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 6
      packages/grafana-prometheus/src/datasource.ts
  2. 4
      packages/grafana-prometheus/src/metric_find_query.ts

@ -60,7 +60,7 @@ import { getQueryHints } from './query_hints';
import { promQueryModeller } from './querybuilder/PromQueryModeller';
import { QueryBuilderLabelFilter, QueryEditorMode } from './querybuilder/shared/types';
import { CacheRequestInfo, defaultPrometheusQueryOverlapWindow, QueryCache } from './querycache/QueryCache';
import { getOriginalMetricName, transformV2 } from './result_transformer';
import { transformV2 } from './result_transformer';
import { trackQuery } from './tracking';
import {
ExemplarTraceIdDestination,
@ -904,10 +904,6 @@ export class PrometheusDatasource
};
}
getOriginalMetricName(labelData: { [key: string]: string }) {
return getOriginalMetricName(labelData);
}
/**
* This converts the adhocVariableFilter array and converts it to scopeFilter array
* @param filters

@ -12,6 +12,7 @@ import {
PrometheusMetricNamesRegex,
PrometheusQueryResultRegex,
} from './migrations/variableMigration';
import { getOriginalMetricName } from './result_transformer';
import { escapeForUtf8Support, isValidLegacyName } from './utf8_support';
export class PrometheusMetricFindQuery {
@ -182,12 +183,11 @@ export class PrometheusMetricFindQuery {
};
const url = `/api/v1/series`;
const self = this;
return this.datasource.metadataRequest(url, params).then((result) => {
return _map(result.data.data, (metric: { [key: string]: string }) => {
return {
text: self.datasource.getOriginalMetricName(metric),
text: getOriginalMetricName(metric),
expandable: true,
};
});

Loading…
Cancel
Save