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

fix

Browse Source
This commit is contained in:
Mitsuhiro Tanda
2017-09-12 09:31:05 +09:00
parent 56c0d91ee5
commit 1a5e786467
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
public/app/plugins/datasource/prometheus/completer.ts
View File

@@ -21,7 +21,7 @@ export class PromCompleter {
var metricName;
switch (token.type) {
case 'keyword':
case 'entity.name.tag':
metricName = this.findMetricName(session, pos.row, pos.column);
if (!metricName) {
callback(null, this.transformToCompletions(['__name__', 'instance', 'job'], 'label name'));
@@ -43,14 +43,14 @@ export class PromCompleter {
callback(null, labelNames);
});
return;
case 'string':
case 'string.quoted':
metricName = this.findMetricName(session, pos.row, pos.column);
if (!metricName) {
callback(null, []);
return;
}
var labelNameToken = this.findToken(session, pos.row, pos.column, 'keyword', null, 'paren.lparen');
var labelNameToken = this.findToken(session, pos.row, pos.column, 'entity.name.tag', null, 'paren.lparen');
if (!labelNameToken) {
callback(null, []);
return;
@@ -135,11 +135,11 @@ export class PromCompleter {
var metricName = '';
var tokens;
var nameLabelNameToken = this.findToken(session, row, column, 'keyword', '__name__', 'paren.lparen');
var nameLabelNameToken = this.findToken(session, row, column, 'entity.name.tag', '__name__', 'paren.lparen');
if (nameLabelNameToken) {
tokens = session.getTokens(nameLabelNameToken.row);
var nameLabelValueToken = tokens[nameLabelNameToken.index + 2];
if (nameLabelValueToken && nameLabelValueToken.type === 'string') {
if (nameLabelValueToken && nameLabelValueToken.type === 'string.quoted') {
metricName = nameLabelValueToken.value.slice(1, -1); // cut begin/end quotation
}
} else {

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

@@ -65,13 +65,13 @@ var PrometheusHighlightRules = function() {
regex : "\\s+"
} ],
"start-label-matcher" : [ {
token : "keyword",
token : "entity.name.tag",
regex : '[a-zA-Z_][a-zA-Z0-9_]*'
}, {
token : "keyword.operator",
regex : '=~|=|!~|!='
}, {
token : "string",
token : "string.quoted",
regex : '"[^"]*"|\'[^\']*\''
}, {
token : "punctuation.operator",
@@ -401,7 +401,7 @@ var PrometheusCompletions = function() {};
(function() {
this.getCompletions = function(state, session, pos, prefix, callback) {
var token = session.getTokenAt(pos.row, pos.column);
if (token.type === 'label.name' || token.type === 'label.value') {
if (token.type === 'entity.name.tag' || token.type === 'string.quoted') {
return callback(null, []);
}