Merge pull request #1898 from Sir3lit/fixformatting
New server formatting
This commit is contained in:
Dane Everitt
GitHub
commit
4e2602e1e7
3 changed files with 54 additions and 54 deletions
|
|
@ -127,14 +127,31 @@
|
|||
<h3 class="box-title">Resource Management</h3>
|
||||
</div>
|
||||
<div class="box-body row">
|
||||
<div class="form-group col-sm-4">
|
||||
<div class="form-group col-xs-6">
|
||||
<label for="pCPU">CPU Limit</label>
|
||||
<div class="input-group">
|
||||
<input type="text" class="form-control" value="{{ old('cpu', 0) }}" name="cpu" id="pCPU" />
|
||||
<span class="input-group-addon">%</span>
|
||||
</div>
|
||||
<p class="text-muted small">If you do not want to limit CPU usage, set the value to <code>0</code>. To determine a value, take the number of <em>physical</em> cores and multiply it by 100. For example, on a quad core system <code>(4 * 100 = 400)</code> there is <code>400%</code> available. To limit a server to using half of a single core, you would set the value to <code>50</code>. To allow a server to use up to two physical cores, set the value to <code>200</code>. BlockIO should be a value between <code>10</code> and <code>1000</code>. Please see <a href="https://docs.docker.com/engine/reference/run/#/block-io-bandwidth-blkio-constraint" target="_blank">this documentation</a> for more information about it.<p>
|
||||
</div>
|
||||
<div class="form-group col-xs-6">
|
||||
<label for="pThreads">CPU Threads</label>
|
||||
<div>
|
||||
<input type="text" class="form-control" value="{{ old('threads') }}" name="threads" id="pThreads" />
|
||||
</div>
|
||||
<p class="text-muted small"><strong>Advanced:</strong> Enter the specific CPU cores that this process can run on, or leave blank to allow all cores. This can be a single number, or a comma seperated list. Example: <code>0</code>, <code>0-1,3</code>, or <code>0,1,3,4</code>.</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="box-body row">
|
||||
<div class="form-group col-xs-6">
|
||||
<label for="pMemory">Memory</label>
|
||||
<div class="input-group">
|
||||
<input type="text" value="{{ old('memory') }}" class="form-control" name="memory" id="pMemory" />
|
||||
<span class="input-group-addon">MB</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group col-sm-4">
|
||||
<div class="form-group col-xs-6">
|
||||
<label for="pSwap">Swap</label>
|
||||
<div class="input-group">
|
||||
<input type="text" value="{{ old('swap', 0) }}" class="form-control" name="swap" id="pSwap" />
|
||||
|
|
@ -146,28 +163,14 @@
|
|||
<p class="text-muted small">If you do not want to assign swap space to a server, simply put <code>0</code> for the value, or <code>-1</code> to allow unlimited swap space. If you want to disable memory limiting on a server, simply enter <code>0</code> into the memory field.<p>
|
||||
</div>
|
||||
<div class="box-body row">
|
||||
<div class="form-group col-sm-4">
|
||||
<div class="form-group col-xs-6">
|
||||
<label for="pDisk">Disk Space</label>
|
||||
<div class="input-group">
|
||||
<input type="text" class="form-control" value="{{ old('disk') }}" name="disk" id="pDisk" />
|
||||
<span class="input-group-addon">MB</span>
|
||||
<input type="text" class="form-control" value="{{ old('disk') }}" name="disk" id="pDisk" />
|
||||
<span class="input-group-addon">MB</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group col-sm-4">
|
||||
<label for="pCPU">CPU Limit</label>
|
||||
<div class="input-group">
|
||||
<input type="text" class="form-control" value="{{ old('cpu', 0) }}" name="cpu" id="pCPU" />
|
||||
<span class="input-group-addon">%</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group col-sm-4">
|
||||
<label for="pThreads">CPU Threads</label>
|
||||
<div>
|
||||
<input type="text" class="form-control" value="{{ old('threads') }}" name="threads" id="pThreads" />
|
||||
</div>
|
||||
<p class="text-muted small"><strong>Advanced:</strong> Enter the specific CPU cores that this process can run on, or leave blank to allow all cores. This can be a single number, or a comma seperated list. Example: <code>0</code>, <code>0-1,3</code>, or <code>0,1,3,4</code>.</p>
|
||||
</div>
|
||||
<div class="form-group col-sm-4">
|
||||
<div class="form-group col-xs-6">
|
||||
<label for="pIO">Block IO Weight</label>
|
||||
<div>
|
||||
<input type="text" class="form-control" value="{{ old('io', 500) }}" name="io" id="pIO" />
|
||||
|
|
@ -175,9 +178,6 @@
|
|||
<p class="text-muted small"><strong>Advanced</strong>: The IO performance of this server relative to other <em>running</em> containers on the system. Value should be between <code>10</code> and <code>1000</code>.</code></p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="box-footer no-border no-pad-top no-pad-bottom">
|
||||
<p class="text-muted small">If you do not want to limit CPU usage, set the value to <code>0</code>. To determine a value, take the number of <em>physical</em> cores and multiply it by 100. For example, on a quad core system <code>(4 * 100 = 400)</code> there is <code>400%</code> available. To limit a server to using half of a single core, you would set the value to <code>50</code>. To allow a server to use up to two physical cores, set the value to <code>200</code>. BlockIO should be a value between <code>10</code> and <code>1000</code>. Please see <a href="https://docs.docker.com/engine/reference/run/#/block-io-bandwidth-blkio-constraint" target="_blank">this documentation</a> for more information about it.<p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -29,6 +29,21 @@
|
|||
<h3 class="box-title">Resource Management</h3>
|
||||
</div>
|
||||
<div class="box-body">
|
||||
<div class="form-group">
|
||||
<label for="cpu" class="control-label">CPU Limit</label>
|
||||
<div class="input-group">
|
||||
<input type="text" name="cpu" class="form-control" value="{{ old('cpu', $server->cpu) }}"/>
|
||||
<span class="input-group-addon">%</span>
|
||||
</div>
|
||||
<p class="text-muted small">Each <em>physical</em> core on the system is considered to be <code>100%</code>. Setting this value to <code>0</code> will allow a server to use CPU time without restrictions.</p>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="threads" class="control-label">CPU Threads</label>
|
||||
<div>
|
||||
<input type="text" name="threads" class="form-control" value="{{ old('threads', $server->threads) }}"/>
|
||||
</div>
|
||||
<p class="text-muted small"><strong>Advanced:</strong> Enter the specific CPU cores that this process can run on, or leave blank to allow all cores. This can be a single number, or a comma seperated list. Example: <code>0</code>, <code>0-1,3</code>, or <code>0,1,3,4</code>.</p>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="memory" class="control-label">Allocated Memory</label>
|
||||
<div class="input-group">
|
||||
|
|
@ -46,19 +61,12 @@
|
|||
<p class="text-muted small">Setting this to <code>0</code> will disable swap space on this server. Setting to <code>-1</code> will allow unlimited swap.</p>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="cpu" class="control-label">CPU Limit</label>
|
||||
<label for="cpu" class="control-label">Disk Space Limit</label>
|
||||
<div class="input-group">
|
||||
<input type="text" name="cpu" class="form-control" value="{{ old('cpu', $server->cpu) }}"/>
|
||||
<span class="input-group-addon">%</span>
|
||||
<input type="text" name="disk" class="form-control" value="{{ old('disk', $server->disk) }}"/>
|
||||
<span class="input-group-addon">MB</span>
|
||||
</div>
|
||||
<p class="text-muted small">Each <em>physical</em> core on the system is considered to be <code>100%</code>. Setting this value to <code>0</code> will allow a server to use CPU time without restrictions.</p>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="threads" class="control-label">CPU Threads</label>
|
||||
<div>
|
||||
<input type="text" name="threads" class="form-control" value="{{ old('threads', $server->threads) }}"/>
|
||||
</div>
|
||||
<p class="text-muted small"><strong>Advanced:</strong> Enter the specific CPU cores that this process can run on, or leave blank to allow all cores. This can be a single number, or a comma seperated list. Example: <code>0</code>, <code>0-1,3</code>, or <code>0,1,3,4</code>.</p>
|
||||
<p class="text-muted small">This server will not be allowed to boot if it is using more than this amount of space. If a server goes over this limit while running it will be safely stopped and locked until enough space is available.</p>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="io" class="control-label">Block IO Proportion</label>
|
||||
|
|
@ -67,14 +75,6 @@
|
|||
</div>
|
||||
<p class="text-muted small"><strong>Advanced</strong>: The IO performance of this server relative to other <em>running</em> containers on the system. Value should be between <code>10</code> and <code>1000</code>.</code></p>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="cpu" class="control-label">Disk Space Limit</label>
|
||||
<div class="input-group">
|
||||
<input type="text" name="disk" class="form-control" value="{{ old('disk', $server->disk) }}"/>
|
||||
<span class="input-group-addon">MB</span>
|
||||
</div>
|
||||
<p class="text-muted small">This server will not be allowed to boot if it is using more than this amount of space. If a server goes over this limit while running it will be safely stopped and locked until enough space is available.</p>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="cpu" class="control-label">OOM Killer</label>
|
||||
<div>
|
||||
|
|
|
|||
|
|
@ -57,18 +57,6 @@
|
|||
<td>Name</td>
|
||||
<td>{{ $server->name }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Memory</td>
|
||||
<td><code>{{ $server->memory }}MB</code> / <code data-toggle="tooltip" data-placement="top" title="Swap Space">{{ $server->swap }}MB</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Disk Space</td>
|
||||
<td><code>{{ $server->disk }}MB</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Block IO Weight</td>
|
||||
<td><code>{{ $server->io }}</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>CPU Limit</td>
|
||||
<td><code>{{ $server->cpu }}%</code></td>
|
||||
|
|
@ -83,6 +71,18 @@
|
|||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Memory</td>
|
||||
<td><code>{{ $server->memory }}MB</code> / <code data-toggle="tooltip" data-placement="top" title="Swap Space">{{ $server->swap }}MB</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Disk Space</td>
|
||||
<td><code>{{ $server->disk }}MB</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Block IO Weight</td>
|
||||
<td><code>{{ $server->io }}</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Default Connection</td>
|
||||
<td><code>{{ $server->allocation->ip }}:{{ $server->allocation->port }}</code></td>
|
||||
|
|
|
|||
Loading…
Reference in a new issue