harmacist/healthchecks
1
0
Fork 0
forked from GithubBackups/healthchecks
Code Issues Pull Requests Projects Releases Wiki Activity

Prepare for auto-refresh in "My Checks" screen.

Browse Source
This commit is contained in:
Pēteris Caune 2018-02-25 00:00:37 +02:00
parent d05607d73c
commit 1b4ca77096
11 changed files with 115 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hc/front/urls.py
View File

@ -44,6 +44,7 @@ urlpatterns = [
url(r'^checks/$', views.my_checks, name="hc-checks"),
url(r'^checks/add/$', views.add_check, name="hc-add-check"),
url(r'^checks/cron_preview/$', views.cron_preview),
url(r'^checks/status/$', views.status),
url(r'^checks/([\w-]+)/', include(check_urls)),
url(r'^integrations/', include(channel_urls)),

58
hc/front/views.py
View File

@ -8,7 +8,7 @@ from django.contrib.auth.decorators import login_required
from django.core import signing
from django.db.models import Count
from django.http import (Http404, HttpResponse, HttpResponseBadRequest,
HttpResponseForbidden)
HttpResponseForbidden, JsonResponse)
from django.shortcuts import get_object_or_404, redirect, render
from django.template.loader import render_to_string
from django.urls import reverse
@ -34,6 +34,24 @@ import requests
VALID_SORT_VALUES = ("name", "-name", "last_ping", "-last_ping", "created")
def _tags_statuses(checks):
tags, down, grace = {}, {}, {}
for check in checks:
if check.get_status() == "down":
for tag in check.tags_list():
down[tag] = "down"
elif check.in_grace_period():
for tag in check.tags_list():
grace[tag] = "grace"
else:
for tag in check.tags_list():
tags[tag] = "up"
tags.update(grace)
tags.update(down)
return tags
@login_required
def my_checks(request):
if request.GET.get("sort") in VALID_SORT_VALUES:
@ -42,35 +60,41 @@ def my_checks(request):
checks = list(Check.objects.filter(user=request.team.user))
tags, down_tags, grace_tags = set(), set(), set()
for check in checks:
status = check.get_status()
for tag in check.tags_list():
tags.add(tag)
if status == "down":
down_tags.add(tag)
elif check.in_grace_period():
grace_tags.add(tag)
can_add_more = len(checks) < request.team.check_limit
pairs = list(_tags_statuses(checks).items())
pairs.sort(key=lambda pair: pair[0].lower())
ctx = {
"page": "checks",
"checks": checks,
"now": timezone.now(),
"tags": sorted(tags, key=lambda s: s.lower()),
"down_tags": down_tags,
"grace_tags": grace_tags,
"tags": pairs,
"ping_endpoint": settings.PING_ENDPOINT,
"timezones": all_timezones,
"can_add_more": can_add_more,
"can_add_more": len(checks) < request.team.check_limit,
"sort": request.profile.sort
}
return render(request, "front/my_checks.html", ctx)
@login_required
def status(request):
checks = list(Check.objects.filter(user=request.team.user))
details = []
for check in checks:
status = "grace" if check.in_grace_period() else check.get_status()
ctx = {"check": check}
details.append({
"code": str(check.code),
"status": status,
"last_ping": render_to_string("front/last_ping_cell.html", ctx)
})
return JsonResponse({"details": details, "tags": _tags_statuses(checks)})
def _welcome_check(request):
check = None
if "welcome_code" in request.session:

2
static/css/base.css
View File

@ -58,7 +58,7 @@ body {
}
.status.icon-up { color: #5cb85c; }
.status.icon-up.new, .status.icon-paused { color: #CCC; }
.status.icon-new, .status.icon-paused { color: #CCC; }
.status.icon-grace { color: #f0ad4e; }
.status.icon-down { color: #d9534f; }

2
static/css/icomoon.css
View File

@ -60,7 +60,7 @@
.icon-delete:before {
content: "\e901";
}
.icon-up:before, .icon-ok:before {
.icon-new:before, .icon-up:before, .icon-ok:before {
content: "\e902";
}
.icon-clippy:before {

19
static/css/my_checks.css
View File

@ -1,3 +1,22 @@
#my-checks-tags button.up {
color: #333;
background-color: #fff;
border-color: #ccc;
}
#my-checks-tags button.grace {
color: #fff;
background-color: #f0ad4e;
border-color: #eea236;
}
#my-checks-tags button.down {
color: #fff;
background-color: #d9534f;
border-color: #d43f3a;
}
@media (min-width: 992px) {
#update-timeout-modal .modal-dialog, #last-ping-modal .modal-dialog {
width: 800px;

30
static/js/checks.js
View File

@ -175,7 +175,7 @@ $(function () {
return false;
});
$(".last-ping").click(function() {
$(".last-ping-cell").on("click", ".last-ping", function() {
$("#last-ping-body").text("Updating...");
$('#last-ping-modal').modal("show");
@ -235,7 +235,15 @@ $(function () {
return false;
});
$('[data-toggle="tooltip"]').tooltip();
$('[data-toggle="tooltip"]').tooltip({
title: function() {
var cssClasses = this.getAttribute("class");
if (cssClasses.indexOf("icon-new") > -1)
return "New. Has never received a ping.";
if (cssClasses.indexOf("icon-paused") > -1)
return "Monitoring paused. Ping to resume.";
}
});
$(".usage-examples").click(function(e) {
var a = e.target;
@ -249,6 +257,24 @@ $(function () {
return false;
});
// Auto-refresh
function refresh() {
$.getJSON("/checks/status/", function(data) {
for(var i=0, el; el=data.details[i]; i++) {
$("#check-desktop-" + el.code + " .indicator-cell span").attr("class", "status icon-" + el.status);
$("#check-desktop-" + el.code + " .last-ping-cell").html(el.last_ping);
}
$("#my-checks-tags button").each(function(a) {
var status = data.tags[this.innerText];
if (status) {
this.setAttribute("class", "btn btn-xs " + status);
}
});
});
}
// Copy to clipboard
var clipboard = new Clipboard('button.copy-link');
$("button.copy-link").mouseout(function(e) {
setTimeout(function() {

2
templates/front/docs.html
View File

@ -204,7 +204,7 @@ using the "-command" argument:</p>
<table class="table">
<tr>
<td>
<span class="status icon-up new"></span>
<span class="status icon-new"></span>
</td>
<td>
<strong>New.</strong>

12
templates/front/last_ping_cell.html Normal file
View File

@ -0,0 +1,12 @@
{% load humanize %}
{% if check.last_ping %}
<div class="last-ping" data-url="{% url 'hc-last-ping' check.code %}">
{{ check.last_ping|naturaltime }}
{% if check.has_confirmation_link %}
<br /><span class="label label-confirmation">confirmation link</span>
{% endif %}
</div>
{% else %}
<div class="last-ping-never">Never</div>
{% endif %}

10
templates/front/my_checks.html
View File

@ -17,14 +17,8 @@
</div>
{% if tags %}
<div id="my-checks-tags" class="col-sm-12">
{% for tag in tags %}
{% if tag in down_tags %}
<button class="btn btn-danger btn-xs" data-toggle="button">{{ tag }}</button>
{% elif tag in grace_tags %}
<button class="btn btn-warning btn-xs" data-toggle="button">{{ tag }}</button>
{% else %}
<button class="btn btn-default btn-xs" data-toggle="button">{{ tag }}</button>
{% endif %}
{% for tag, status in tags %}
<button class="btn btn-xs {{ status }}" data-toggle="button">{{ tag }}</button>
{% endfor %}
</div>
{% endif %}

33
templates/front/my_checks_desktop.html
View File

@ -1,4 +1,4 @@
{% load hc_extras humanize %}
{% load hc_extras %}
<table id="checks-table" class="table hidden-xs">
<tr>
<th></th>
@ -28,20 +28,12 @@
<th></th>
</tr>
{% for check in checks|sortchecks:sort %}
<tr class="checks-row">
<tr id="check-desktop-{{ check.code }}" class="checks-row">
<td class="indicator-cell">
{% if check.get_status == "new" %}
<span class="status icon-up new"
data-toggle="tooltip" title="New. Has never received a ping."></span>
{% elif check.get_status == "paused" %}
<span class="status icon-paused"
data-toggle="tooltip" title="Monitoring paused. Ping to resume."></span>
{% elif check.in_grace_period %}
<span class="status icon-grace"></span>
{% elif check.get_status == "up" %}
<span class="status icon-up"></span>
{% elif check.get_status == "down" %}
<span class="status icon-down"></span>
{% if check.in_grace_period %}
<span class="status icon-grace" data-toggle="tooltip"></span>
{% else %}
<span class="status icon-{{ check.get_status }}" data-toggle="tooltip"></span>
{% endif %}
</td>
<td class="name-cell">
@ -85,17 +77,8 @@
</span>
</span>
</td>
<td>
{% if check.last_ping %}
<div class="last-ping" data-url="{% url 'hc-last-ping' check.code %}">
{{ check.last_ping|naturaltime }}
{% if check.has_confirmation_link %}
<br /><span class="label label-confirmation">confirmation link</span>
{% endif %}
</div>
{% else %}
<div class="last-ping-never">Never</div>
{% endif %}
<td class="last-ping-cell">
{% include "front/last_ping_cell.html" with check=check %}
</td>
<td>
<div class="check-menu dropdown">

2
templates/front/welcome.html
View File

@ -174,7 +174,7 @@
<table class="table">
<tr>
<td>
<span class="status icon-up new"></span>
<span class="status icon-new"></span>
</td>
<td>
New.