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

Added templated dependency in Opentsdb

Browse Source
This commit is contained in:
utkarshcmu 2016-06-13 03:25:50 -07:00
parent 22407fc897
commit 862de3a9dc
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
public/app/plugins/datasource/opentsdb/datasource.js
View File

@ -162,12 +162,21 @@ function (angular, _, dateMath) {
}); });
}; };
this._performMetricKeyValueLookup = function(metric, key) { this._performMetricKeyValueLookup = function(metric, keys) {
if(!metric || !key) {
if(!metric || !keys) {
return $q.when([]); return $q.when([]);
} }
var m = metric + "{" + key + "=*}"; var keysArray = keys.split(",");
var key = keysArray[0];
var keysQuery = key + "=*";
if (keysArray.length > 1) {
keysQuery += "," + keysArray.splice(1).join(",");
}
var m = metric + "{" + keysQuery + "}";
return this._get('/api/search/lookup', {m: m, limit: 3000}).then(function(result) { return this._get('/api/search/lookup', {m: m, limit: 3000}).then(function(result) {
result = result.data.results; result = result.data.results;
@ -225,7 +234,7 @@ function (angular, _, dateMath) {
var metrics_regex = /metrics\((.*)\)/; var metrics_regex = /metrics\((.*)\)/;
var tag_names_regex = /tag_names\((.*)\)/; var tag_names_regex = /tag_names\((.*)\)/;
var tag_values_regex = /tag_values\((.*),\s?(.*)\)/; var tag_values_regex = /tag_values\((.*?),\s?(.*)\)/;
var tag_names_suggest_regex = /suggest_tagk\((.*)\)/; var tag_names_suggest_regex = /suggest_tagk\((.*)\)/;
var tag_values_suggest_regex = /suggest_tagv\((.*)\)/; var tag_values_suggest_regex = /suggest_tagv\((.*)\)/;