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 branch 'master' into timepicker2

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-09-18 10:36:50 +02:00
parent f93215f4ec 5d05de8bda
commit a8a94ef87b
7 changed files with 127 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/plugins/datasource/graphite/gfunc.js
View File

@@ -242,7 +242,7 @@ function (_, $) {
{
name: "function",
type: "string",
options: ['sum', 'avg']
options: ['sum', 'avg', 'maxSeries']
}
],
defaultParams: [3, "sum"]

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

@@ -93,11 +93,13 @@ function (angular, _, kbn) {
var m = metric + "{" + key + "=*}";
return this._get('/api/search/lookup', {m: m}).then(function(result) {
return this._get('/api/search/lookup', {m: m, limit: 3000}).then(function(result) {
result = result.data.results;
var tagvs = [];
_.each(result, function(r) {
tagvs.push(r.tags[key]);
if (tagvs.indexOf(r.tags[key]) === -1) {
tagvs.push(r.tags[key]);
}
});
return tagvs;
});