From 693efda4d586a3cedfeca05b82a785b32cbd7d1f Mon Sep 17 00:00:00 2001
From: Sven Klemm <pentabarf@gmail.com>
Date: Fri, 13 Jul 2018 09:31:39 +0200
Subject: [PATCH] send timerange with metricFindQuery

---
 .../app/plugins/datasource/postgres/datasource.ts  | 14 +++++---------
 .../plugins/datasource/postgres/query_builder.ts   |  1 +
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/public/app/plugins/datasource/postgres/datasource.ts b/public/app/plugins/datasource/postgres/datasource.ts
index 3a4bd27bb4c..1324dbadebf 100644
--- a/public/app/plugins/datasource/postgres/datasource.ts
+++ b/public/app/plugins/datasource/postgres/datasource.ts
@@ -8,7 +8,7 @@ export class PostgresDatasource {
   responseParser: ResponseParser;
 
   /** @ngInject **/
-  constructor(instanceSettings, private backendSrv, private $q, private templateSrv) {
+  constructor(instanceSettings, private backendSrv, private $q, private templateSrv, private timeSrv) {
     this.name = instanceSettings.name;
     this.id = instanceSettings.id;
     this.responseParser = new ResponseParser(this.$q);
@@ -106,17 +106,13 @@ export class PostgresDatasource {
       format: 'table',
     };
 
-    var data = {
+    let range = this.timeSrv.timeRange();
+    let data = {
       queries: [interpolatedQuery],
+      from: range.from.valueOf().toString(),
+      to: range.to.valueOf().toString(),
     };
 
-    if (optionalOptions && optionalOptions.range && optionalOptions.range.from) {
-      data['from'] = optionalOptions.range.from.valueOf().toString();
-    }
-    if (optionalOptions && optionalOptions.range && optionalOptions.range.to) {
-      data['to'] = optionalOptions.range.to.valueOf().toString();
-    }
-
     return this.backendSrv
       .datasourceRequest({
         url: '/api/tsdb/query',
diff --git a/public/app/plugins/datasource/postgres/query_builder.ts b/public/app/plugins/datasource/postgres/query_builder.ts
index 852fb91a706..cfee317d96f 100644
--- a/public/app/plugins/datasource/postgres/query_builder.ts
+++ b/public/app/plugins/datasource/postgres/query_builder.ts
@@ -46,6 +46,7 @@ export class PostgresQueryBuilder {
   buildValueQuery(column: string) {
     var query = 'SELECT DISTINCT quote_literal(' + column + ')';
     query += ' FROM ' + this.target.schema + '.' + this.target.table;
+    query += ' WHERE $__timeFilter(' + this.target.timeColumn + ')';
     query += ' ORDER BY 1 LIMIT 100';
     return query;
   }