From b46771cbfe1e7561b44133e7f375aafbe28930dc Mon Sep 17 00:00:00 2001 From: Sven Grossmann Date: Fri, 10 Mar 2023 13:13:51 +0100 Subject: [PATCH] Loki: Always fetch for new label keys in the QueryBuilder (#64597) * always fetch new labels * remove refreshLogLabels --- public/app/plugins/datasource/loki/LanguageProvider.ts | 6 ------ .../loki/querybuilder/components/LokiQueryBuilder.tsx | 3 +-- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/public/app/plugins/datasource/loki/LanguageProvider.ts b/public/app/plugins/datasource/loki/LanguageProvider.ts index 3e27c5f87ba..637bf49a2bc 100644 --- a/public/app/plugins/datasource/loki/LanguageProvider.ts +++ b/public/app/plugins/datasource/loki/LanguageProvider.ts @@ -386,12 +386,6 @@ export default class LokiLanguageProvider extends LanguageProvider { return []; } - async refreshLogLabels(forceRefresh?: boolean) { - if ((this.labelKeys && Date.now().valueOf() - this.labelFetchTs > LABEL_REFRESH_INTERVAL) || forceRefresh) { - await this.fetchLabels(); - } - } - /** * Fetch labels for a selector. This is cached by its args but also by the global timeRange currently selected as * they can change over requested time. diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilder.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilder.tsx index 9ff76b04b3f..0e92e3cd358 100644 --- a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilder.tsx +++ b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilder.tsx @@ -49,8 +49,7 @@ export const LokiQueryBuilder = React.memo(({ datasource, query, onChange const labelsToConsider = query.labels.filter((x) => x !== forLabel); if (labelsToConsider.length === 0) { - await datasource.languageProvider.refreshLogLabels(); - return datasource.languageProvider.getLabelKeys(); + return await datasource.languageProvider.fetchLabels(); } const expr = lokiQueryModeller.renderLabels(labelsToConsider);