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

Prometheus: Fix autocomplete does not work on incomplete input (#29854)

Browse Source 
* WIP, works but need to do more testing

* Update solution

* Fix autocomplete with metrics

* Update public/app/plugins/datasource/prometheus/language_provider.ts

* Update public/app/plugins/datasource/prometheus/language_provider.ts

* Change test for new functionality
This commit is contained in:
Ivana Huckova 2021-01-08 18:31:21 +01:00 committed by GitHub
parent 2221a8c5ff
commit ae1d2fb505
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -329,11 +329,11 @@ export default class PromQlLanguageProvider extends LanguageProvider {
const suffix = line.substr(cursorOffset);
const prefix = line.substr(0, cursorOffset);
const isValueStart = text.match(/^(=|=~|!=|!~)/);
const isValueEnd = suffix.match(/^"?[,}]/);
// detect cursor in front of value, e.g., {key=|"}
const isValueEnd = suffix.match(/^"?[,}]|$/);
// Detect cursor in front of value, e.g., {key=|"}
const isPreValue = prefix.match(/(=|=~|!=|!~)$/) && suffix.match(/^"/);
// Don't suggestq anything at the beginning or inside a value
// Don't suggest anything at the beginning or inside a value
const isValueEmpty = isValueStart && isValueEnd;
const hasValuePrefix = isValueEnd && !isValueStart;
if ((!isValueEmpty && !hasValuePrefix) || isPreValue) {

5
public/app/plugins/datasource/prometheus/language_utils.test.ts
View File

@ -9,8 +9,9 @@ describe('parseSelector()', () => {
expect(parsed.labelKeys).toEqual([]);
});
it('throws if selector is broken', () => {
expect(() => parseSelector('{foo')).toThrow();
it('returns a clean selector from an unclosed selector', () => {
const parsed = parseSelector('{foo');
expect(parsed.selector).toBe('{}');
});
it('returns the selector sorted by label key', () => {

2
public/app/plugins/datasource/prometheus/language_utils.ts
View File

@ -42,7 +42,7 @@ export function processLabels(labels: Array<{ [key: string]: string }>, withName
}
// const cleanSelectorRegexp = /\{(\w+="[^"\n]*?")(,\w+="[^"\n]*?")*\}/;
export const selectorRegexp = /\{[^}]*?\}/;
export const selectorRegexp = /\{[^}]*?(\}|$)/;
export const labelRegexp = /\b(\w+)(!?=~?)("[^"\n]*?")/g;
export function parseSelector(query: string, cursorOffset = 1): { labelKeys: any[]; selector: string } {
if (!query.match(selectorRegexp)) {

2
public/app/plugins/datasource/prometheus/promql.ts
View File

@ -393,7 +393,7 @@ const tokenizer: Grammar = {
},
},
'context-labels': {
pattern: /\{[^}]*(?=})/,
pattern: /\{[^}]*(?=}?)/,
greedy: true,
inside: {
comment: {