Skip to content
This repository has been archived by the owner on Dec 31, 2017. It is now read-only.

Docker hosts management #25

Merged
merged 2 commits into from
Sep 25, 2016
Merged

Docker hosts management #25

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08403bb
presentation for clusters and cluster hosts, #6
kornelrabczak Sep 8, 2016
15f3fe3
templates cleanup, adds cluster hosts remove feature, proper linking …
kornelrabczak Sep 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
presentation for clusters and cluster hosts, #6
  • Loading branch information
@kornelrabczak
kornelrabczak committed Sep 8, 2016
commit 08403bbc1fdc07e0949cef766702abd5c89dbe0c
2 changes: 2 additions & 0 deletions src/main/java/com/thecookiezen/bussiness/cluster/entity/Cluster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ public class Cluster implements Identifiable, Serializable {
@Size(min = 5, max = 30)
private String name;

private int maxContainers;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[Checkstyle] WARNING: 'member def modifier' have incorrect indentation level 4, expected level should be 2.


@NotNull
private Duration healthCheckInterval = Duration.ofSeconds(15);

Expand Down
89 changes: 61 additions & 28 deletions src/main/resources/templates/clusters/all.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,38 +13,71 @@ <h1>
<section class="content">
<div class="row">
<div class="col-md-10">
<div class="box">
<div class="box-body no-padding">
<table class="table table-striped">
<thead>
<tr>
<th>#</th>
<th>name</th>
<th style="width:120px">docker version</th>
<th>status</th>
<th>hosts</th>
<th>actions</th>
</tr>
</thead>
<tbody>
<tr th:each="cluster : ${clustersList}">
<td th:text="${cluster.id}"></td>
<td th:text="${cluster.name}"></td>
<td th:text="${cluster.dockerApiVersion}"></td>
<td>ok</td>
<td th:text="${cluster.hosts.size()}"></td>
<td>
<div class="btn-group">
<div class="box box-solid">
<div class="box-body">
<div class="box-group" id="accordion">
<div class="panel box box-success" th:each="cluster,iterStat : ${clustersList}">
<div class="box-header with-border">
<h4 class="box-title">
<a data-toggle="collapse" data-parent="#accordion"
th:href="${'#collapse_' + iterStat.index}"
th:text="${cluster.name}"
aria-expanded="false" class="collapsed">
</a>
</h4>
<div class="btn-group pull-right">
<a th:href="@{/clusters/newhost(clusterId=${cluster.id})}" class="btn btn-info">Add
Host</a>
<a th:href="@{/clusters/form(clusterId=${cluster.id})}" class="btn btn-warning">Edit</a>
<form th:action="@{/clusters(clusterId=${cluster.id})}" th:method="delete" style="float:left;">
<form th:action="@{/clusters(clusterId=${cluster.id})}" th:method="delete"
style="float:left;">
<button type="submit" class="btn btn-danger">Delete</button>
</form>
<a th:href="@{/clusters/newhost(clusterId=${cluster.id})}" class="btn btn-info">Add Host</a>
</div>
</td>
</tr>
</tbody>
</table>
</div>
<div th:id="${'collapse_' + iterStat.index}" class="panel-collapse collapse" aria-expanded="true">
<div class="box-body">
<dl class="dl-horizontal">
<dt>ID</dt>
<dd th:text="${cluster.id}"></dd>
<dt>Docker version</dt>
<dd th:text="${cluster.dockerApiVersion}"></dd>
<dt>Status</dt>
<dd>Ok</dd>
<dt>Hosts count</dt>
<dd th:text="${cluster.hosts.size()}"></dd>
</dl>
</div>

<div class="box-body no-padding">
<div class="box-header">
<h3 class="box-title">Hosts list</h3>
</div>
<table class="table table-condensed">
<tbody><tr>
<th style="width: 10px">#</th>
<th>Name</th>
<th>Url</th>
<th>Host space</th>
<th style="width: 40px">Status</th>
</tr>
<tr th:each="host : ${cluster.hosts}">
<td th:text="${host.id}"></td>
<td th:text="${host.name}"></td>
<td th:text="${host.dockerDaemonUrl}"></td>
<td>
<div class="progress progress-xs">
<div class="progress-bar progress-bar-danger" style="width: 55%"></div>
</div>
</td>
<td><span class="badge bg-red">Error</span></td>
</tr>
</tbody></table>
<div class="box-footer clearfix"></div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
Expand Down
5 changes: 2 additions & 3 deletions src/main/resources/templates/fragments/common/sidebar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@
<section class="sidebar">
<!-- Sidebar Menu -->
<ul class="sidebar-menu">
<li class="header">HEADER</li>
<!-- Optionally, you can add icons to the links -->
<li class="active"><a href="#"><i class="fa fa-link"></i> <span>Link</span></a></li>
<li class="header">MENU</li>
<li class="active"><a href="/clusters/all"><i class="fa fa-server"></i> <span>Clusters</span></a></li>
<li><a href="#"><i class="fa fa-link"></i> <span>Another Link</span></a></li>
<li class="treeview">
<a href="#"><i class="fa fa-link"></i> <span>Multilevel</span>
Expand Down