diff --git a/pkg/tsdb/sql_engine.go b/pkg/tsdb/sql_engine.go
index 8dcf35a70bc..60b1e68ebd8 100644
--- a/pkg/tsdb/sql_engine.go
+++ b/pkg/tsdb/sql_engine.go
@@ -98,8 +98,12 @@ var NewSqlQueryEndpoint = func(config *SqlQueryEndpointConfiguration, rowTransfo
 		return nil, err
 	}
 
-	engine.SetMaxOpenConns(10)
-	engine.SetMaxIdleConns(10)
+	maxOpenConns := config.Datasource.JsonData.Get("maxOpenConns").MustInt(0)
+	engine.SetMaxOpenConns(maxOpenConns)
+	maxIdleConns := config.Datasource.JsonData.Get("maxIdleConns").MustInt(2)
+	engine.SetMaxIdleConns(maxIdleConns)
+	connMaxLifetime := config.Datasource.JsonData.Get("connMaxLifetime").MustInt(14400)
+	engine.SetConnMaxLifetime(time.Duration(connMaxLifetime) * time.Second)
 
 	engineCache.versions[config.Datasource.Id] = config.Datasource.Version
 	engineCache.cache[config.Datasource.Id] = engine
diff --git a/public/app/plugins/datasource/mssql/partials/config.html b/public/app/plugins/datasource/mssql/partials/config.html
index f8a36502009..f59bf6ae267 100644
--- a/public/app/plugins/datasource/mssql/partials/config.html
+++ b/public/app/plugins/datasource/mssql/partials/config.html
@@ -29,6 +29,24 @@
 	</div>
 </div>
 
+<div class="gf-form-group">
+  <div class="gf-form max-width-30">
+    <span class="gf-form-label width-11">Max open connections</span>
+    <input type="number" min="0" class="gf-form-input" ng-model="ctrl.current.jsonData.maxOpenConns" placeholder="unlimited"></input>
+  </div>
+  <div class="gf-form max-width-30">
+    <span class="gf-form-label width-11">Max idle connections</span>
+    <input type="number" min="0" class="gf-form-input" ng-model="ctrl.current.jsonData.maxIdleConns" placeholder="2"></input>
+  </div>
+  <div class="gf-form max-width-30">
+    <span class="gf-form-label width-11">Connection lifetime</span>
+    <input type="number" min="0" class="gf-form-input" ng-model="ctrl.current.jsonData.connMaxLifetime" placeholder="14400"></input>
+			<info-popover mode="right-absolute">
+        The connection lifetime in seconds.
+			</info-popover>
+  </div>
+</div>
+
 <h3 class="page-heading">MSSQL details</h3>
 
 <div class="gf-form-group">
diff --git a/public/app/plugins/datasource/mysql/partials/config.html b/public/app/plugins/datasource/mysql/partials/config.html
index 6bc9cceb8f1..8ddad1f47cc 100644
--- a/public/app/plugins/datasource/mysql/partials/config.html
+++ b/public/app/plugins/datasource/mysql/partials/config.html
@@ -24,6 +24,24 @@
 	</div>
 </div>
 
+<div class="gf-form-group">
+  <div class="gf-form max-width-30">
+    <span class="gf-form-label width-11">Max open connections</span>
+    <input type="number" min="0" class="gf-form-input" ng-model="ctrl.current.jsonData.maxOpenConns" placeholder="unlimited"></input>
+  </div>
+  <div class="gf-form max-width-30">
+    <span class="gf-form-label width-11">Max idle connections</span>
+    <input type="number" min="0" class="gf-form-input" ng-model="ctrl.current.jsonData.maxIdleConns" placeholder="2"></input>
+  </div>
+  <div class="gf-form max-width-30">
+    <span class="gf-form-label width-11">Connection lifetime</span>
+    <input type="number" min="0" class="gf-form-input" ng-model="ctrl.current.jsonData.connMaxLifetime" placeholder="14400"></input>
+			<info-popover mode="right-absolute">
+        The connection lifetime in seconds.
+			</info-popover>
+  </div>
+</div>
+
 <h3 class="page-heading">MySQL details</h3>
 
 <div class="gf-form-group">
diff --git a/public/app/plugins/datasource/postgres/partials/config.html b/public/app/plugins/datasource/postgres/partials/config.html
index c8b551c2aa8..b0012faacbd 100644
--- a/public/app/plugins/datasource/postgres/partials/config.html
+++ b/public/app/plugins/datasource/postgres/partials/config.html
@@ -38,6 +38,24 @@
 	</div>
 </div>
 
+<div class="gf-form-group">
+  <div class="gf-form max-width-30">
+    <span class="gf-form-label width-11">Max open connections</span>
+    <input type="number" min="0" class="gf-form-input" ng-model="ctrl.current.jsonData.maxOpenConns" placeholder="unlimited"></input>
+  </div>
+  <div class="gf-form max-width-30">
+    <span class="gf-form-label width-11">Max idle connections</span>
+    <input type="number" min="0" class="gf-form-input" ng-model="ctrl.current.jsonData.maxIdleConns" placeholder="2"></input>
+  </div>
+  <div class="gf-form max-width-30">
+    <span class="gf-form-label width-11">Connection lifetime</span>
+    <input type="number" min="0" class="gf-form-input" ng-model="ctrl.current.jsonData.connMaxLifetime" placeholder="14400"></input>
+			<info-popover mode="right-absolute">
+        The connection lifetime in seconds.
+			</info-popover>
+  </div>
+</div>
+
 <h3 class="page-heading">PostgreSQL details</h3>
 
 <div class="gf-form-group">