Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/groups #44

Merged
merged 4 commits into from Jan 24, 2013
Merged

Feature/groups #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
632aa74
* Now it is possible to specify a group to a service
stelcheck Jan 20, 2013
6901996
* Bugfix: Ftp methods were note prototype methods
stelcheck Jan 22, 2013
be677c3
* Bug fix: missing callback argument
stelcheck Jan 23, 2013
fb59154
Merge branch 'master' into feature/groups
stelcheck Jan 24, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions api.js
View file
Open in desktop
Expand Up @@ -93,6 +93,7 @@ module.exports.checkAllServices = function() {
for (var i = 0; i < settings.services.length; i++) {
status.services[i] = {};
status.services[i].name = settings.services[i].name;
status.services[i].group = settings.services[i].group;
status.services[i].label = settings.services[i].label;
status.services[i].status = 'unknown';
status.services[i].statusCode = 0;
Expand Down
65 changes: 46 additions & 19 deletions public/index.html
View file
Open in desktop
Expand Up @@ -44,13 +44,32 @@
});

socket.on('status', function (status) {
var statusTab = _.map(status.services, function(value, key) { return value; });
var statusTab = [];
var groups = [];

_.each(status.services, function(value, key) {
if (typeof(value.group) !== 'string') {
value.group = 'others';
}

var groupIndex = groups.indexOf(value.group);

if (groupIndex === -1) {
groupIndex = groups.length;
groups.push(value.group);
statusTab.push({ name:value.group, projects: []});
};

statusTab[groupIndex].projects.push(value);
});

$('#summarize').empty();
$('#projects').empty();
$("#projectTemplate").template("projectsList");

$("#groupTemplate").template("group");
$("#summarizeTemplate").template("summarizeData");
$.tmpl("projectsList", statusTab).appendTo("#projects");

$.tmpl("group", statusTab).appendTo("#projects");
$.tmpl("summarizeData", status.summarize).appendTo("#summarize");
});

Expand Down Expand Up @@ -96,17 +115,30 @@
});
});
</script>
<script id="projectTemplate" type="text/html">
<li class="project">
<h2>
<span class="service"><span class="strikethrough"></span><strong>${label}</strong></span>
<span class="status ${status} glow"><span class="strikethrough"></span><strong>${status}</strong></span>
<span class="code"><span class="strikethrough"></span><strong>{{if statusCode != 0 && status != 'up'}}${statusCode}{{else}}&nbsp;{{/if}}</strong></span>
</h2>
{{if message }}
<p class="info"><span class="label">Message:</span>${message}</p>
{{/if}}
</li>
<script id="groupTemplate" type="text/html">
<li>
<h1 class="legend">${name}</h1>

<div class="legend">
<span class="service">Service</span>
<span class="status">Status</span>
<span class="code">Code</span>
</div>
<ul>
{{each(i, project) projects}}
<li class="project">
<h2>
<span class="service"><span class="strikethrough"></span><strong>${project.label}</strong></span>
<span class="status ${project.status} glow"><span class="strikethrough"></span><strong>${project.status}</strong></span>
<span class="code"><span class="strikethrough"></span><strong>{{if project.statusCode != 0 && project.status != 'up'}}${project.statusCode}{{else}}&nbsp;{{/if}}</strong></span>
</h2>
{{if project.message }}
<p class="info"><span class="label">Message:</span>${project.message}</p>
{{/if}}
</li>
{{/each}}
</ul>
</li>
</script>
<script id="summarizeTemplate" type="text/html">
<li class="project">
Expand Down Expand Up @@ -148,11 +180,6 @@ <h1 id="title">Services Status Dashboard</h1>
</div>
<div id="plugins" class="plugins">
</div>
<div class="legend">
<span class="service">Service</span>
<span class="status">Status</span>
<span class="code">Code</span>
</div>
<ul id="projects"></ul>
</div>
<div id="footer">
Expand Down
8 changes: 8 additions & 0 deletions public/styles/master.css
View file
Open in desktop
Expand Up @@ -106,6 +106,14 @@ body {
left: 507px;
}

h1.legend {
height:auto;
font-size:24px;
line-height:36px;
padding:20px 10px 0px;
text-align:left;
color: #888;
}
/* PROJECTS */
.plugin {
cursor: pointer;
Expand Down