nicolargo/glances
1
1
Fork 0
mirror of https://github.com/nicolargo/glances.git synced 2024-12-27 03:04:16 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into issue1776

Browse Source
This commit is contained in:
nicolargo 2020-12-24 09:52:07 +01:00
commit db342d2c70
4 changed files with 41 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
glances/outputs/static/js/components/plugin-gpu/view.html
View File

@ -5,27 +5,26 @@
<div class="table"> <div class="table">
<div class="table-row" ng-if="arguments.meangpu || vm.gpus.length === 1"> <div class="table-row" ng-if="arguments.meangpu || vm.gpus.length === 1">
<div class="table-cell text-left">proc:</div> <div class="table-cell text-left">proc:</div>
<div class="table-cell" ng-class="vm.getMeanDecoration('proc')" ng-if="vm.mean.proc">{{ vm.mean.proc | <div class="table-cell" ng-class="vm.getMeanDecoration('proc')" ng-if="vm.mean.proc != null">{{ vm.mean.proc |
number : 0 }}% number : 0 }}%
</div> </div>
<div class="table-cell" ng-if="!vm.mean.proc">N/A</div> <div class="table-cell" ng-if="vm.mean.proc == null">N/A</div>
</div> </div>
<div class="table-row" ng-if="arguments.meangpu || vm.gpus.length === 1"> <div class="table-row" ng-if="arguments.meangpu || vm.gpus.length === 1">
<div class="table-cell text-left">mem:</div> <div class="table-cell text-left">mem:</div>
<div class="table-cell" ng-class="vm.getMeanDecoration('mem')" ng-if="vm.mean.mem">{{ vm.mean.mem | number : <div class="table-cell" ng-class="vm.getMeanDecoration('mem')" ng-if="vm.mean.mem != null">{{ vm.mean.mem | number :
0 }}% 0 }}%
</div> </div>
<div class="table-cell" ng-if="!vm.mean.mem">N/A</div> <div class="table-cell" ng-if="vm.mean.mem == null">N/A</div>
</div> </div>
<div class="table-row" ng-if="!arguments.meangpu && vm.gpus.length > 1" ng-repeat="gpu in vm.gpus"> <div class="table-row" ng-if="!arguments.meangpu && vm.gpus.length > 1" ng-repeat="gpu in vm.gpus">
<div class="table-cell text-left"> <div class="table-cell text-left">
{{ gpu.gpu_id }}: {{ gpu.gpu_id }}:
<span ng-class="vm.getDecoration(gpu.gpu_id, 'proc')" <span ng-class="vm.getDecoration(gpu.gpu_id, 'proc')" ng-if="gpu.proc != null">{{ gpu.proc | number : 0 }}%</span>
ng-if="gpu.proc">{{ gpu.proc | number : 0 }}%</span> <span ng-if="gpu.proc == null">N/A</span>
<span ng-if="!gpu.proc">N/A</span>
mem: mem:
<span ng-class="vm.getDecoration(gpu.gpu_id, 'mem')" ng-if="gpu.mem">{{ gpu.mem | number : 0 }}%</span> <span ng-class="vm.getDecoration(gpu.gpu_id, 'mem')" ng-if="gpu.mem != null">{{ gpu.mem | number : 0 }}%</span>
<span ng-if="!gpu.mem">N/A</span> <span ng-if="gpu.mem == null">N/A</span>
</div> </div>
</div> </div>
</div> </div>

62
glances/outputs/static/public/glances.js vendored
View File

File diff suppressed because one or more lines are too long

2
glances/outputs/static/public/glances.map.js vendored
View File

File diff suppressed because one or more lines are too long

2
glances/static_list.py
View File

@ -54,7 +54,7 @@ class GlancesStaticServer(object):
for s in ['name', 'port', 'alias']: for s in ['name', 'port', 'alias']:
new_server[s] = config.get_value(self._section, '%s%s' % (postfix, s)) new_server[s] = config.get_value(self._section, '%s%s' % (postfix, s))
if new_server['name'] is not None: if new_server['name'] is not None:
# Manage optionnal information # Manage optional information
if new_server['port'] is None: if new_server['port'] is None:
new_server['port'] = '61209' new_server['port'] = '61209'
new_server['username'] = 'glances' new_server['username'] = 'glances'