IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Handle suggestions for alternate syntax aggregation contexts

Browse Source 
In aggregation contexts using the alternate syntax form, labels will
precede metrics. A cursor at the label position cannot provide
meaningful suggestions unless a metric is specified. In the latter case,
no suggestions are presented at all.

Related: #13690
This commit is contained in:
Michael Huynh 2018-11-03 07:56:13 +08:00
parent 4f601761df
commit 5e748243af
No known key found for this signature in database
GPG Key ID: 760127DAE4EDD351
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
public/app/plugins/datasource/prometheus/language_provider.ts
View File

@ -156,7 +156,7 @@ export default class PromQlLanguageProvider extends LanguageProvider {
} }
getAggregationCompletionItems({ value }: TypeaheadInput): TypeaheadOutput { getAggregationCompletionItems({ value }: TypeaheadInput): TypeaheadOutput {
let refresher: Promise<any> = null; const refresher: Promise<any> = null;
const suggestions: CompletionItemGroup[] = []; const suggestions: CompletionItemGroup[] = [];
// Stitch all query lines together to support multi-line queries // Stitch all query lines together to support multi-line queries
@ -172,12 +172,30 @@ export default class PromQlLanguageProvider extends LanguageProvider {
return text; return text;
}, ''); }, '');
const leftSide = queryText.slice(0, queryOffset); // Try search for selector part on the left-hand side, such as `sum (m) by (l)`
const openParensAggregationIndex = leftSide.lastIndexOf('('); const openParensAggregationIndex = queryText.lastIndexOf('(', queryOffset);
const openParensSelectorIndex = leftSide.slice(0, openParensAggregationIndex).lastIndexOf('('); let openParensSelectorIndex = queryText.lastIndexOf('(', openParensAggregationIndex - 1);
const closeParensSelectorIndex = leftSide.slice(openParensSelectorIndex).indexOf(')') + openParensSelectorIndex; let closeParensSelectorIndex = queryText.indexOf(')', openParensSelectorIndex);
let selectorString = leftSide.slice(openParensSelectorIndex + 1, closeParensSelectorIndex); // Try search for selector part of an alternate aggregation clause, such as `sum by (l) (m)`
if (openParensSelectorIndex === -1) {
const closeParensAggregationIndex = queryText.indexOf(')', queryOffset);
closeParensSelectorIndex = queryText.indexOf(')', closeParensAggregationIndex + 1);
openParensSelectorIndex = queryText.lastIndexOf('(', closeParensSelectorIndex);
}
const result = {
refresher,
suggestions,
context: 'context-aggregation',
};
// Suggestions are useless for alternative aggregation clauses without a selector in context
if (openParensSelectorIndex === -1) {
return result;
}
let selectorString = queryText.slice(openParensSelectorIndex + 1, closeParensSelectorIndex);
// Range vector syntax not accounted for by subsequent parse so discard it if present // Range vector syntax not accounted for by subsequent parse so discard it if present
selectorString = selectorString.replace(/\[[^\]]+\]$/, ''); selectorString = selectorString.replace(/\[[^\]]+\]$/, '');
@ -188,14 +206,10 @@ export default class PromQlLanguageProvider extends LanguageProvider {
if (labelKeys) { if (labelKeys) {
suggestions.push({ label: 'Labels', items: labelKeys.map(wrapLabel) }); suggestions.push({ label: 'Labels', items: labelKeys.map(wrapLabel) });
} else { } else {
refresher = this.fetchSeriesLabels(selector); result.refresher = this.fetchSeriesLabels(selector);
} }
return { return result;
refresher,
suggestions,
context: 'context-aggregation',
};
} }
getLabelCompletionItems({ text, wrapperClasses, labelKey, value }: TypeaheadInput): TypeaheadOutput { getLabelCompletionItems({ text, wrapperClasses, labelKey, value }: TypeaheadInput): TypeaheadOutput {