jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Actually use cpu values in system graphs

Browse Source
This commit is contained in:
Johannes Zellner
2020-05-13 21:18:34 +02:00
parent fc7277a542
commit 428893d5c5
2 changed files with 152 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
src/views/system.html
View File

@@ -64,6 +64,75 @@
</h1>
</div>
<div class="text-left">
<h3>Graphs</h3>
</div>
<uib-tabset active="activeTab">
<uib-tab index="0" heading="Disk Usage">
<div class="card card-large">
<div class="row" ng-if="disks.errorMessage">
<br>
<div class="alert alert-warning text-center">
{{ disks.errorMessage }}
</div>
</div>
<div class="row" ng-show="disks.busy">
<div class="col-md-12 text-center">
<h2><i class="fa fa-circle-notch fa-spin"></i></h2>
</div>
</div>
<div ng-show="!disks.busy" class="ng-hide">
<div class="row" ng-repeat="disk in disks.disks" style="margin-bottom: 20px;">
<div class="col-md-12">
<h3>{{ disk.filesystem }} <small>mounted at</small> {{ disk.mountpoint }} <span class="pull-right small"><b>{{ disk.available | prettyDiskSize }}</b> of <b>{{ disk.size | prettyDiskSize }}</b> available</span></h3>
<div class="progress">
<div class="progress-bar" ng-repeat="content in disk.contains" style="width: {{ content.usage / disk.size * 100 }}%; background-color: {{ content.color }};" uib-tooltip="{{ content.label + ' ' + (content.usage | prettyDiskSize) }}"></div>
</div>
<br/>
<p>This {{ disk.type }} disk contains:</p>
<ul>
<li ng-repeat="content in disk.contains">
<span ng-hide="content.app">{{ content.label }} <span class="color-indicator" style="background-color: {{ content.color }};">&nbsp;</span> <small class="text-muted">{{ content.usage | prettyDiskSize }}</small></span>
<span ng-show="content.app"><a href="https://{{ content.app.fqdn }}" target="_blank">{{ content.app.label || content.app.fqdn }}</a> <span class="color-indicator" style="background-color: {{ content.color }};">&nbsp;</span> <small class="text-muted">{{ content.usage | prettyDiskSize }}</small></span>
</li>
</ul>
</div>
</div>
</div>
</div>
</uib-tab>
<uib-tab index="1" heading="System Memory" select="graphs.show()">
<div class="card card-large" style="min-height: 300px;">
<label>Megabytes</label>
<canvas id="graphsSystemMemoryChart" style="width: 100%;"></canvas>
</div>
</uib-tab>
<uib-tab index="2" heading="CPU Usage" select="graphs.show()">
<div class="card card-large" style="min-height: 300px;">
<label>Percentage</label>
<canvas id="graphsCPUChart" style="width: 100%;"></canvas>
</div>
</uib-tab>
<div class="dropdown pull-right" ng-hide="activeTab === 0">
<button class="btn btn-sm btn-primary dropdown-toggle" type="button" data-toggle="dropdown">
Select Period {{ graphs.periodLabel }}
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li><a href="" ng-click="graphs.setPeriod(6, '6 hours')">6 hours</a></li>
<li><a href="" ng-click="graphs.setPeriod(24, '24 hours')">24 hours</a></li>
<li><a href="" ng-click="graphs.setPeriod(24*7, '7 days')">7 days</a></li>
<li><a href="" ng-click="graphs.setPeriod(24*30, '30 days')">30 days</a></li>
</ul>
</div>
</uib-tabset>
<div class="text-left">
<h3>Services</h3>
</div>
@@ -162,42 +231,4 @@
</div>
</div>
</div>
<div class="text-left">
<h3>Disk Usage</h3>
</div>
<div class="card card-large">
<div class="row" ng-if="disks.errorMessage">
<br>
<div class="alert alert-warning text-center">
{{ disks.errorMessage }}
</div>
</div>
<div class="row" ng-show="disks.busy">
<div class="col-md-12 text-center">
<h2><i class="fa fa-circle-notch fa-spin"></i></h2>
</div>
</div>
<div ng-show="!disks.busy" class="ng-hide">
<div class="row" ng-repeat="disk in disks.disks" style="margin-bottom: 20px;">
<div class="col-md-12">
<h3>{{ disk.filesystem }} <small>mounted at</small> {{ disk.mountpoint }} <span class="pull-right small"><b>{{ disk.available | prettyDiskSize }}</b> of <b>{{ disk.size | prettyDiskSize }}</b> available</span></h3>
<div class="progress">
<div class="progress-bar" ng-repeat="content in disk.contains" style="width: {{ content.usage / disk.size * 100 }}%; background-color: {{ content.color }};" uib-tooltip="{{ content.label + ' ' + (content.usage | prettyDiskSize) }}"></div>
</div>
<br/>
<p>This {{ disk.type }} disk contains:</p>
<ul>
<li ng-repeat="content in disk.contains">
<span ng-hide="content.app">{{ content.label }} <span class="color-indicator" style="background-color: {{ content.color }};">&nbsp;</span> <small class="text-muted">{{ content.usage | prettyDiskSize }}</small></span>
<span ng-show="content.app"><a href="https://{{ content.app.fqdn }}" target="_blank">{{ content.app.label || content.app.fqdn }}</a> <span class="color-indicator" style="background-color: {{ content.color }};">&nbsp;</span> <small class="text-muted">{{ content.usage | prettyDiskSize }}</small></span>
</li>
</ul>
</div>
</div>
</div>
</div>
</div>