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

fixed promql and loggging syntax so all punctuation chars are treated the same, remove hover move

Browse Source
This commit is contained in:
Torkel Ödegaard 2018-12-04 14:57:01 +01:00
parent 47523f80dd
commit 1fddb6144d
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/app/plugins/datasource/logging/syntax.ts
View File

@ -18,6 +18,7 @@ const tokenizer = {
greedy: true, greedy: true,
alias: 'attr-value', alias: 'attr-value',
}, },
punctuation: /[{]/,
}, },
}, },
// number: /\b-?\d+((\.\d*)?([eE][+-]?\d+)?)?\b/, // number: /\b-?\d+((\.\d*)?([eE][+-]?\d+)?)?\b/,

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

@ -386,9 +386,10 @@ const tokenizer = {
lookbehind: true, lookbehind: true,
inside: { inside: {
'label-key': { 'label-key': {
pattern: /[^,\s][^,]*[^,\s]*/, pattern: /[^(),\s][^,)]*[^),\s]*/,
alias: 'attr-name', alias: 'attr-name',
}, },
punctuation: /[()]/,
}, },
}, },
'context-labels': { 'context-labels': {
@ -403,6 +404,7 @@ const tokenizer = {
greedy: true, greedy: true,
alias: 'attr-value', alias: 'attr-value',
}, },
punctuation: /[{]/,
}, },
}, },
function: new RegExp(`\\b(?:${FUNCTIONS.map(f => f.label).join('|')})(?=\\s*\\()`, 'i'), function: new RegExp(`\\b(?:${FUNCTIONS.map(f => f.label).join('|')})(?=\\s*\\()`, 'i'),

4
public/sass/pages/_explore.scss
View File

@ -36,10 +36,6 @@
transition: all 0.1s linear; transition: all 0.1s linear;
} }
.explore-panel__header:hover {
transform: translateY(-1px);
}
.explore-panel__header-label { .explore-panel__header-label {
font-weight: 500; font-weight: 500;
margin-right: $panel-margin; margin-right: $panel-margin;