summaryrefslogtreecommitdiffstats
path: root/modules-available/statistics/templates
diff options
context:
space:
mode:
authorSimon Rettberg2019-01-28 13:48:35 +0100
committerSimon Rettberg2019-01-28 13:48:35 +0100
commit3b1df888c963d906005ff139892df06a0d1ae2b4 (patch)
treee083400a996893fec66ed3c7e03cc234ca50a1af /modules-available/statistics/templates
parent[inc/Util] readableFileSize: support input in KB/MB/... (diff)
downloadslx-admin-3b1df888c963d906005ff139892df06a0d1ae2b4.tar.gz
slx-admin-3b1df888c963d906005ff139892df06a0d1ae2b4.tar.xz
slx-admin-3b1df888c963d906005ff139892df06a0d1ae2b4.zip
[statistics] Track and display memory/tmp usage of clients
Diffstat (limited to 'modules-available/statistics/templates')
-rw-r--r--modules-available/statistics/templates/filterbox.html5
-rw-r--r--modules-available/statistics/templates/machine-main.html33
2 files changed, 33 insertions, 5 deletions
diff --git a/modules-available/statistics/templates/filterbox.html b/modules-available/statistics/templates/filterbox.html
index cd8ec24d..07aa7320 100644
--- a/modules-available/statistics/templates/filterbox.html
+++ b/modules-available/statistics/templates/filterbox.html
@@ -101,7 +101,10 @@ var slxFilterNames = {
currentuser: '{{lang_currentUser}}',
subnet: '{{lang_subnet}}',
runtime: '{{lang_runtimeHours}}',
- hostname: '{{lang_hostname}}'
+ hostname: '{{lang_hostname}}',
+ live_swapfree: '{{lang_swapFree}}',
+ live_memfree: '{{lang_memFree}}',
+ live_tmpfree: '{{lang_tmpFree}}'
};
slxLocations = {{{locations}}};
diff --git a/modules-available/statistics/templates/machine-main.html b/modules-available/statistics/templates/machine-main.html
index f1021482..904c780b 100644
--- a/modules-available/statistics/templates/machine-main.html
+++ b/modules-available/statistics/templates/machine-main.html
@@ -1,3 +1,4 @@
+{{%FILTERS}}
<h1>
{{hostname}} {{#hostname}}–{{/hostname}} {{clientip}}
{{#notes}}<a href="#usernotes"><span class="glyphicon glyphicon-exclamation-sign"></span></a>{{/notes}}
@@ -117,9 +118,23 @@
<tr class="{{ramclass}}">
<td class="text-nowrap">{{lang_ram}}</td>
<td>
- {{gbram}}&thinsp;GiB
- {{#maxram}}({{lang_maximumAbbrev}} {{maxram}}){{/maxram}}
- {{ramtype}}
+ <div>
+ {{gbram}}&thinsp;GiB
+ {{#maxram}}({{lang_maximumAbbrev}} {{maxram}}){{/maxram}}
+ {{ramtype}}
+ </div>
+ {{#live_memsize}}
+ <div class="meter">
+ <div class="text">{{live_memfree_s}} {{lang_free}}</div>
+ <div class="bar" style="width:{{live_mempercent}}%"></div>
+ </div>
+ {{/live_memsize}}
+ {{#live_swapsize}}
+ <div class="meter">
+ <div class="text">{{live_swapfree_s}} {{lang_free}}</div>
+ <div class="bar" style="width:{{live_swappercent}}%"></div>
+ </div>
+ {{/live_swapsize}}
</td>
</tr>
{{#extram}}
@@ -135,7 +150,17 @@
{{/extram}}
<tr class="{{hddclass}}">
<td class="text-nowrap">{{lang_tempPart}}</td>
- <td>{{gbtmp}}&thinsp;GiB</td>
+ <td>
+ <div>
+ {{gbtmp}}&thinsp;GiB
+ </div>
+ {{#live_tmpsize}}
+ <div class="meter">
+ <div class="text">{{live_tmpfree_s}} {{lang_free}}</div>
+ <div class="bar" style="width:{{live_tmppercent}}%"></div>
+ </div>
+ {{/live_tmpsize}}
+ </td>
</tr>
<tr class="{{kvmclass}}">
<td class="text-nowrap">{{lang_64bitSupport}}</td>