From f8e86ae55fb0843477b8fa52b9c2f9b908d05195 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 13 Nov 2017 23:44:39 +0100
Subject: [dnbd3] Extend server details page (altservers, config)

---
 .../dnbd3/templates/page-client-loclist.html       | 27 ----------------
 .../dnbd3/templates/page-clientlist.html           | 20 ------------
 .../dnbd3/templates/page-header-servername.html    |  1 -
 .../dnbd3/templates/page-proxy-altservers.html     | 36 ++++++++++++++++++++++
 .../dnbd3/templates/page-proxy-clients.html        | 20 ++++++++++++
 .../dnbd3/templates/page-proxy-config.html         |  4 +++
 .../dnbd3/templates/page-proxy-header.html         |  1 +
 .../dnbd3/templates/page-proxy-loclist.html        | 27 ++++++++++++++++
 .../dnbd3/templates/page-proxy-stats.html          |  9 ++++++
 .../dnbd3/templates/page-serverlist.html           | 30 ++++++++++--------
 10 files changed, 114 insertions(+), 61 deletions(-)
 delete mode 100644 modules-available/dnbd3/templates/page-client-loclist.html
 delete mode 100644 modules-available/dnbd3/templates/page-clientlist.html
 delete mode 100644 modules-available/dnbd3/templates/page-header-servername.html
 create mode 100644 modules-available/dnbd3/templates/page-proxy-altservers.html
 create mode 100644 modules-available/dnbd3/templates/page-proxy-clients.html
 create mode 100644 modules-available/dnbd3/templates/page-proxy-config.html
 create mode 100644 modules-available/dnbd3/templates/page-proxy-header.html
 create mode 100644 modules-available/dnbd3/templates/page-proxy-loclist.html
 create mode 100644 modules-available/dnbd3/templates/page-proxy-stats.html

(limited to 'modules-available/dnbd3/templates')

diff --git a/modules-available/dnbd3/templates/page-client-loclist.html b/modules-available/dnbd3/templates/page-client-loclist.html
deleted file mode 100644
index 67c90683..00000000
--- a/modules-available/dnbd3/templates/page-client-loclist.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<div class="col-md-6">
-	<h2>{{lang_clientsByLocation}}</h2>
-
-	<table class="table table-condensed">
-		<tr>
-			<th>{{lang_location}}</th>
-			<th class="text-right">{{lang_count}}</th>
-			<th class="text-right">{{lang_recursiveCount}}</th>
-		</tr>
-		{{#list}}
-			<tr>
-				<td>
-					{{#depth}}
-						<div style="display:inline-block;width:{{depth}}em"></div>
-					{{/depth}}
-					{{locationname}}
-				</td>
-				<td class="text-right">
-					{{clientCount}}
-				</td>
-				<td class="text-right">
-					{{recCount}}
-				</td>
-			</tr>
-		{{/list}}
-	</table>
-</div>
\ No newline at end of file
diff --git a/modules-available/dnbd3/templates/page-clientlist.html b/modules-available/dnbd3/templates/page-clientlist.html
deleted file mode 100644
index 9e7cec4c..00000000
--- a/modules-available/dnbd3/templates/page-clientlist.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<div class="col-md-6">
-	<h2>{{lang_clientList}}</h2>
-
-	<table class="table table-condensed">
-		<tr>
-			<th>{{lang_client}}</th>
-			<th class="text-right">{{lang_bytesSent}}</th>
-		</tr>
-		{{#clients}}
-			<tr>
-				<td>
-					{{address}}
-				</td>
-				<td data-sort="int" data-sort-value="{{bytesSent}}" class="text-right">
-					{{bytesSent_s}}
-				</td>
-			</tr>
-		{{/clients}}
-	</table>
-</div>
\ No newline at end of file
diff --git a/modules-available/dnbd3/templates/page-header-servername.html b/modules-available/dnbd3/templates/page-header-servername.html
deleted file mode 100644
index 6f3f1b7f..00000000
--- a/modules-available/dnbd3/templates/page-header-servername.html
+++ /dev/null
@@ -1 +0,0 @@
-<h1>{{ip}}</h1>
\ No newline at end of file
diff --git a/modules-available/dnbd3/templates/page-proxy-altservers.html b/modules-available/dnbd3/templates/page-proxy-altservers.html
new file mode 100644
index 00000000..00a884cc
--- /dev/null
+++ b/modules-available/dnbd3/templates/page-proxy-altservers.html
@@ -0,0 +1,36 @@
+<div class="col-md-6">
+	<h2>{{lang_altservers}}</h2>
+	<table class="table table-condensed">
+		<tr>
+			<th>{{lang_proxyServerTHead}}</th>
+			<th>{{lang_numFails}}</th>
+			<th class="text-right">{{lang_latency}}</th>
+			<th>{{lang_flags}}</th>
+			<th>{{lang_comment}}</th>
+		</tr>
+		{{#altservers}}
+			<tr>
+				<td class="text-nowrap">{{host}}</td>
+				<td>
+					{{^isClientOnly}}
+						{{numFails}}
+					{{/isClientOnly}}
+				</td>
+				<td class="text-right text-nowrap">
+					{{^isClientOnly}}
+						{{rtt}}&thinsp;ms
+					{{/isClientOnly}}
+				</td>
+				<td>
+					{{#isClientOnly}}
+						[CO]
+					{{/isClientOnly}}
+					{{#isPrivate}}
+						[PO]
+					{{/isPrivate}}
+				</td>
+				<td><table class="slx-ellipsis"><tr><td>{{comment}}</td></tr></table></td>
+			</tr>
+		{{/altservers}}
+	</table>
+</div>
\ No newline at end of file
diff --git a/modules-available/dnbd3/templates/page-proxy-clients.html b/modules-available/dnbd3/templates/page-proxy-clients.html
new file mode 100644
index 00000000..9e7cec4c
--- /dev/null
+++ b/modules-available/dnbd3/templates/page-proxy-clients.html
@@ -0,0 +1,20 @@
+<div class="col-md-6">
+	<h2>{{lang_clientList}}</h2>
+
+	<table class="table table-condensed">
+		<tr>
+			<th>{{lang_client}}</th>
+			<th class="text-right">{{lang_bytesSent}}</th>
+		</tr>
+		{{#clients}}
+			<tr>
+				<td>
+					{{address}}
+				</td>
+				<td data-sort="int" data-sort-value="{{bytesSent}}" class="text-right">
+					{{bytesSent_s}}
+				</td>
+			</tr>
+		{{/clients}}
+	</table>
+</div>
\ No newline at end of file
diff --git a/modules-available/dnbd3/templates/page-proxy-config.html b/modules-available/dnbd3/templates/page-proxy-config.html
new file mode 100644
index 00000000..adc73a57
--- /dev/null
+++ b/modules-available/dnbd3/templates/page-proxy-config.html
@@ -0,0 +1,4 @@
+<div class="col-md-6">
+	<h2>{{lang_proxyConfig}}</h2>
+	<pre>{{config}}</pre>
+</div>
\ No newline at end of file
diff --git a/modules-available/dnbd3/templates/page-proxy-header.html b/modules-available/dnbd3/templates/page-proxy-header.html
new file mode 100644
index 00000000..6f3f1b7f
--- /dev/null
+++ b/modules-available/dnbd3/templates/page-proxy-header.html
@@ -0,0 +1 @@
+<h1>{{ip}}</h1>
\ No newline at end of file
diff --git a/modules-available/dnbd3/templates/page-proxy-loclist.html b/modules-available/dnbd3/templates/page-proxy-loclist.html
new file mode 100644
index 00000000..67c90683
--- /dev/null
+++ b/modules-available/dnbd3/templates/page-proxy-loclist.html
@@ -0,0 +1,27 @@
+<div class="col-md-6">
+	<h2>{{lang_clientsByLocation}}</h2>
+
+	<table class="table table-condensed">
+		<tr>
+			<th>{{lang_location}}</th>
+			<th class="text-right">{{lang_count}}</th>
+			<th class="text-right">{{lang_recursiveCount}}</th>
+		</tr>
+		{{#list}}
+			<tr>
+				<td>
+					{{#depth}}
+						<div style="display:inline-block;width:{{depth}}em"></div>
+					{{/depth}}
+					{{locationname}}
+				</td>
+				<td class="text-right">
+					{{clientCount}}
+				</td>
+				<td class="text-right">
+					{{recCount}}
+				</td>
+			</tr>
+		{{/list}}
+	</table>
+</div>
\ No newline at end of file
diff --git a/modules-available/dnbd3/templates/page-proxy-stats.html b/modules-available/dnbd3/templates/page-proxy-stats.html
new file mode 100644
index 00000000..e7811028
--- /dev/null
+++ b/modules-available/dnbd3/templates/page-proxy-stats.html
@@ -0,0 +1,9 @@
+<div class="panel panel-default">
+	<div class="panel-body">
+		{{lang_sessionTx}}: <b>{{bytesSent_s}}</b>
+		––
+		{{lang_sessionRx}}: <b>{{bytesReceived_s}}</b>
+		––
+		{{lang_uptime}}: <b>{{uptime_s}}</b>
+	</div>
+</div>
\ No newline at end of file
diff --git a/modules-available/dnbd3/templates/page-serverlist.html b/modules-available/dnbd3/templates/page-serverlist.html
index 1a4d8255..c5905dcd 100644
--- a/modules-available/dnbd3/templates/page-serverlist.html
+++ b/modules-available/dnbd3/templates/page-serverlist.html
@@ -15,9 +15,13 @@
 			<form method="post" action="?do=dnbd3">
 				<input type="hidden" name="token" value="{{token}}">
 				<div class="checkbox">
-					<input id="enable-dnbd3" type="checkbox" name="enabled" {{checked_s}}>
+					<input id="enable-dnbd3" type="checkbox" name="enabled" {{enabled_checked_s}}>
 					<label for="enable-dnbd3">{{lang_enableDnbd3}}</label>
 				</div>
+				<div class="checkbox">
+					<input id="allow-nfs" type="checkbox" name="with-nfs" {{nfs_checked_s}}>
+					<label for="allow-nfs">{{lang_allowNfsFallback}}</label>
+				</div>
 				<button type="submit" name="action" value="toggle-usage" class="btn btn-success">
 					<span class="glyphicon glyphicon-floppy-disk"></span>
 					{{lang_save}}
@@ -58,7 +62,7 @@
 		<tbody>
 			{{#list}}
 				<tr>
-					<td class="text-right">
+					<td class="text-right text-nowrap">
 						{{#slxOk}}
 							<span class="glyphicon glyphicon-ok text-success"></span>
 						{{/slxOk}}
@@ -73,11 +77,16 @@
 						{{/uptime}}
 					</td>
 					<td class="{{#self}}slx-bold{{/self}}">
-						{{fixedip}}
 						{{#machineuuid}}
-							<a href="?do=Statistics&uuid={{machineuuid}}">{{clientip}}</a>
-							<div class="small">{{hostname}}</div>
+							<a class="pull-right btn btn-default btn-xs" href="?do=Statistics&uuid={{machineuuid}}">
+								<span class="glyphicon glyphicon-eye-open"></span>
+							</a>
 						{{/machineuuid}}
+						<a href="?do=dnbd3&amp;show=proxy&amp;server={{serverid}}">
+							{{fixedip}}
+							<span class="small">{{clientip}}</span>
+						</a>
+						<div class="small">{{hostname}}</div>
 					</td>
 					<td data-sort="int" data-sort-default="desc" data-sort-value="{{disktotal}}">
 						<div style="border:1px solid #ddd;background:linear-gradient(to right, #f85 {{diskUsePercent}}%, transparent {{diskUsePercent}}%)"
@@ -92,12 +101,7 @@
 						{{/errormsg}}
 					</td>
 					<td data-sort="int" data-sort-default="desc" class="text-right">
-						{{#uptime}}
-							<a href="?do=dnbd3&amp;show=clients&amp;server={{serverid}}">{{clientcount}}</a>
-						{{/uptime}}
-						{{^uptime}}
-							-
-						{{/uptime}}
+						{{clientcount}}
 					</td>
 					<td data-sort="int" data-sort-default="desc" data-sort-value="{{dnbd3lastseen}}" class="text-right text-nowrap">
 						{{dnbd3lastseen_s}}
@@ -124,7 +128,7 @@
 							</a>
 						{{/self}}
 					</td>
-					<td class="text-right">
+					<td class="text-right text-nowrap">
 						{{#machineuuid}}
 							{{#rebootcontrol}}
 								<button class="btn btn-warning btn-xs reboot-btn" type="button" data-id="{{serverid}}"
@@ -241,7 +245,7 @@
 				<h4 class="modal-title"><b>{{lang_rebootProxyHeading}}</b></h4>
 			</div>
 			<div class="modal-body">
-				<p>{{lang_rebootServerText}}</p>
+				<p>{{lang_rebootProxyText}}</p>
 				<p id="reboot-status"></p>
 			</div>
 			<div class="modal-footer text-right">
-- 
cgit v1.2.3-55-g7522