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

Merge pull request #9555 from mtanda/prometheus_46_improve_minor_fix

Browse Source 
(prometheus) minor fix of auto complete
This commit is contained in:
Carl Bergquist 2017-10-19 10:42:34 +02:00 committed by GitHub
commit e8141b48d2
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
public/app/plugins/datasource/prometheus/mode-prometheus.js
View File

@ -46,7 +46,7 @@ var PrometheusHighlightRules = function() {
regex : "[a-zA-Z_:][a-zA-Z0-9_:]*" regex : "[a-zA-Z_:][a-zA-Z0-9_:]*"
}, { }, {
token : "keyword.operator", token : "keyword.operator",
regex : "\\+|\\-|\\*|\\/|%|\\^|=|==|!=|<=|>=|<|>|=\\~|!\\~" regex : "\\+|\\-|\\*|\\/|%|\\^|==|!=|<=|>=|<|>"
}, { }, {
token : "paren.lparen", token : "paren.lparen",
regex : "[[(]" regex : "[[(]"
@ -75,8 +75,7 @@ var PrometheusHighlightRules = function() {
regex : '"[^"]*"|\'[^\']*\'' regex : '"[^"]*"|\'[^\']*\''
}, { }, {
token : "punctuation.operator", token : "punctuation.operator",
regex : ",", regex : ","
push : 'start-label-matcher'
}, { }, {
token : "paren.rparen", token : "paren.rparen",
regex : "}", regex : "}",
@ -112,11 +111,6 @@ var keyWordsCompletions = prometheusKeyWords.map(function(word) {
}); });
var prometheusFunctions = [ var prometheusFunctions = [
{
name: 'abs()', value: 'abs',
def: 'abs(v instant-vector)',
docText: 'Returns the input vector with all sample values converted to their absolute value.'
},
{ {
name: 'abs()', value: 'abs', name: 'abs()', value: 'abs',
def: 'abs(v instant-vector)', def: 'abs(v instant-vector)',