Merge branch 'master' of github.com:grafana/grafana

pull/3005/head
Torkel Ödegaard 10 years ago
commit ae81fbdffe
  1. 2
      public/app/plugins/datasource/influxdb/datasource.js

@ -78,7 +78,7 @@ function (angular, _, dateMath, InfluxSeries, InfluxQueryBuilder) {
};
InfluxDatasource.prototype.annotationQuery = function(annotation, rangeUnparsed) {
var timeFilter = getTimeFilter({ range: rangeUnparsed });
var timeFilter = getTimeFilter({ rangeRaw: rangeUnparsed });
var query = annotation.query.replace('$timeFilter', timeFilter);
query = templateSrv.replace(query);

Loading…
Cancel
Save