From 12230dfa71892da2fcaf8426195edf611ba72e91 Mon Sep 17 00:00:00 2001
From: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Date: Tue, 2 Oct 2018 17:43:15 +0200
Subject: [PATCH] ux: put connection limits under own section

---
 .../datasource/mssql/partials/config.html     | 43 ++++++++++++-------
 .../datasource/mysql/partials/config.html     | 43 ++++++++++++-------
 .../datasource/postgres/partials/config.html  | 43 ++++++++++++-------
 3 files changed, 84 insertions(+), 45 deletions(-)

diff --git a/public/app/plugins/datasource/mssql/partials/config.html b/public/app/plugins/datasource/mssql/partials/config.html
index f59bf6ae267..4cb42e90f7c 100644
--- a/public/app/plugins/datasource/mssql/partials/config.html
+++ b/public/app/plugins/datasource/mssql/partials/config.html
@@ -29,22 +29,35 @@
 	</div>
 </div>
 
+<b>Connection limits</b>
+
 <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 class="gf-form max-width-15">
+		<span class="gf-form-label width-7">Max open</span>
+		<input type="number" min="0" class="gf-form-input" ng-model="ctrl.current.jsonData.maxOpenConns" placeholder="unlimited"></input>
+		<info-popover mode="right-absolute">
+			The maximum number of open connections to the database. If <i>Max idle connections</i> is greater than 0 and the
+			<i>Max open connections</i> is less than <i>Max idle connections</i>, then <i>Max idle connections</i> will be
+			reduced to match the <i>Max open connections</i> limit. If set to 0, there is no limit on the number of open
+			connections.
+		</info-popover>
+	</div>
+	<div class="gf-form max-width-15">
+		<span class="gf-form-label width-7">Max idle</span>
+		<input type="number" min="0" class="gf-form-input" ng-model="ctrl.current.jsonData.maxIdleConns" placeholder="2"></input>
+		<info-popover mode="right-absolute">
+			The maximum number of connections in the idle connection pool. If <i>Max open connections</i> is greater than 0 but
+			less than the <i>Max idle connections</i>, then the <i>Max idle connections</i> will be reduced to match the
+			<i>Max open connections</i> limit. If set to 0, no idle connections are retained.
+		</info-popover>
+	</div>
+	<div class="gf-form max-width-15">
+		<span class="gf-form-label width-7">Max 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 maximum amount of time in seconds a connection may be reused. If set to 0, connections are reused forever.
+		</info-popover>
+	</div>
 </div>
 
 <h3 class="page-heading">MSSQL details</h3>
diff --git a/public/app/plugins/datasource/mysql/partials/config.html b/public/app/plugins/datasource/mysql/partials/config.html
index 8ddad1f47cc..3d27dd38bf5 100644
--- a/public/app/plugins/datasource/mysql/partials/config.html
+++ b/public/app/plugins/datasource/mysql/partials/config.html
@@ -24,22 +24,35 @@
 	</div>
 </div>
 
+<b>Connection limits</b>
+
 <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 class="gf-form max-width-15">
+		<span class="gf-form-label width-7">Max open</span>
+		<input type="number" min="0" class="gf-form-input" ng-model="ctrl.current.jsonData.maxOpenConns" placeholder="unlimited"></input>
+		<info-popover mode="right-absolute">
+			The maximum number of open connections to the database. If <i>Max idle connections</i> is greater than 0 and the
+			<i>Max open connections</i> is less than <i>Max idle connections</i>, then <i>Max idle connections</i> will be
+			reduced to match the <i>Max open connections</i> limit. If set to 0, there is no limit on the number of open
+			connections.
+		</info-popover>
+	</div>
+	<div class="gf-form max-width-15">
+		<span class="gf-form-label width-7">Max idle</span>
+		<input type="number" min="0" class="gf-form-input" ng-model="ctrl.current.jsonData.maxIdleConns" placeholder="2"></input>
+		<info-popover mode="right-absolute">
+			The maximum number of connections in the idle connection pool. If <i>Max open connections</i> is greater than 0 but
+			less than the <i>Max idle connections</i>, then the <i>Max idle connections</i> will be reduced to match the
+			<i>Max open connections</i> limit. If set to 0, no idle connections are retained.
+		</info-popover>
+	</div>
+	<div class="gf-form max-width-15">
+		<span class="gf-form-label width-7">Max 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 maximum amount of time in seconds a connection may be reused. If set to 0, connections are reused forever.
+		</info-popover>
+	</div>
 </div>
 
 <h3 class="page-heading">MySQL details</h3>
diff --git a/public/app/plugins/datasource/postgres/partials/config.html b/public/app/plugins/datasource/postgres/partials/config.html
index b0012faacbd..13b74d6b20e 100644
--- a/public/app/plugins/datasource/postgres/partials/config.html
+++ b/public/app/plugins/datasource/postgres/partials/config.html
@@ -38,22 +38,35 @@
 	</div>
 </div>
 
+<b>Connection limits</b>
+
 <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 class="gf-form max-width-15">
+		<span class="gf-form-label width-7">Max open</span>
+		<input type="number" min="0" class="gf-form-input" ng-model="ctrl.current.jsonData.maxOpenConns" placeholder="unlimited"></input>
+		<info-popover mode="right-absolute">
+			The maximum number of open connections to the database. If <i>Max idle connections</i> is greater than 0 and the
+			<i>Max open connections</i> is less than <i>Max idle connections</i>, then <i>Max idle connections</i> will be
+			reduced to match the <i>Max open connections</i> limit. If set to 0, there is no limit on the number of open
+			connections.
+		</info-popover>
+	</div>
+	<div class="gf-form max-width-15">
+		<span class="gf-form-label width-7">Max idle</span>
+		<input type="number" min="0" class="gf-form-input" ng-model="ctrl.current.jsonData.maxIdleConns" placeholder="2"></input>
+		<info-popover mode="right-absolute">
+			The maximum number of connections in the idle connection pool. If <i>Max open connections</i> is greater than 0 but
+			less than the <i>Max idle connections</i>, then the <i>Max idle connections</i> will be reduced to match the
+			<i>Max open connections</i> limit. If set to 0, no idle connections are retained.
+		</info-popover>
+	</div>
+	<div class="gf-form max-width-15">
+		<span class="gf-form-label width-7">Max 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 maximum amount of time in seconds a connection may be reused. If set to 0, connections are reused forever.
+		</info-popover>
+	</div>
 </div>
 
 <h3 class="page-heading">PostgreSQL details</h3>