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

Mini work on InfluxDB 0.9 datasource, still needs a lot of work

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-03-29 20:47:34 +02:00
parent c42d09b267
commit 8e33c2c4d3
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/partials/metrics.html
View File

@ -7,7 +7,7 @@
Add query
</button>
<div class="pull-right" style="margin-right: 10px;">
<div class="pull-right dropdown" style="margin-right: 10px;">
<button class="btn btn-inverse dropdown-toggle" data-toggle="dropdown" bs-tooltip="'Datasource'">
<i class="fa fa-database"></i>&nbsp;
{{datasource.name}} <span class="caret"></span>

8
public/app/plugins/datasource/influxdb/queryBuilder.js
View File

@ -32,12 +32,10 @@ function (_) {
}
query += aggregationFunc + '(value)';
query += ' FROM ' + measurement + ' WHERE ';
query += ' FROM ' + measurement + ' WHERE $timeFilter';
query += _.map(target.tags, function(value, key) {
return key + ' = ' + "'" + value + "' AND ";
});
query += '$timeFilter';
return ' AND ' + key + '=' + "'" + value + "'";
}).join('');
query += ' GROUP BY time($interval)';

4
public/test/specs/influx09-querybuilder-specs.js
View File

@ -27,8 +27,8 @@ define([
var query = builder.build();
it('should generate correct query', function() {
expect(query).to.be('SELECT mean(value) FROM "cpu" WHERE hostname = \'server1\'' +
' AND $timeFilter GROUP BY time($interval) ORDER BY asc');
expect(query).to.be('SELECT mean(value) FROM "cpu" WHERE $timeFilter ' +
'AND hostname=\'server1\' GROUP BY time($interval) ORDER BY asc');
});
});