From 217e6dd3c193b5f576ade7581775993c8ed82294 Mon Sep 17 00:00:00 2001 From: maxbr Date: Fri, 19 Aug 2016 17:14:11 +0200 Subject: Add a resource utilization page JIRA: RELENG-12 Signed-off-by: maxbr --- pharos-dashboard/dashboard/urls.py | 2 + pharos-dashboard/dashboard/views.py | 23 ++++++ .../templates/dashboard/resource_utilization.html | 86 ++++++++++++++++++++++ 3 files changed, 111 insertions(+) create mode 100644 pharos-dashboard/templates/dashboard/resource_utilization.html diff --git a/pharos-dashboard/dashboard/urls.py b/pharos-dashboard/dashboard/urls.py index cf6340f..2223e39 100644 --- a/pharos-dashboard/dashboard/urls.py +++ b/pharos-dashboard/dashboard/urls.py @@ -21,6 +21,8 @@ urlpatterns = [ url(r'^ci_pods/$', CIPodsView.as_view(), name='ci_pods'), url(r'^dev_pods/$', DevelopmentPodsView.as_view(), name='dev_pods'), url(r'^jenkins_slaves/$', JenkinsSlavesView.as_view(), name='jenkins_slaves'), + url(r'^resource/all/utilization$', ResourceUtilizationView.as_view(), + name='resource_utilization'), url(r'^$', DevelopmentPodsView.as_view(), name="index"), ] diff --git a/pharos-dashboard/dashboard/views.py b/pharos-dashboard/dashboard/views.py index a4c0c4e..da31802 100644 --- a/pharos-dashboard/dashboard/views.py +++ b/pharos-dashboard/dashboard/views.py @@ -48,3 +48,26 @@ class DevelopmentPodsView(TemplateView): context = super(DevelopmentPodsView, self).get_context_data(**kwargs) context.update({'title': "Development Pods", 'dev_pods': dev_pods}) return context + + +class ResourceUtilizationView(TemplateView): + template_name = "dashboard/resource_utilization.html" + + def get_context_data(self, **kwargs): + resources = Resource.objects.all() + pods = [] + for resource in resources: + utilization = {'idle': 0, 'online': 0, 'offline': 0} + # query measurement points for the last week + statistics = JenkinsStatistic.objects.filter(slave=resource.slave, + timestamp__gte=timezone.now() - timedelta( + days=7)) + statistics_cnt = statistics.count() + if statistics_cnt != 0: + utilization['idle'] = statistics.filter(idle=True).count() + utilization['online'] = statistics.filter(online=True).count() + utilization['offline'] = statistics.filter(offline=True).count() + pods.append((resource, utilization)) + context = super(ResourceUtilizationView, self).get_context_data(**kwargs) + context.update({'title': "Development Pods", 'pods': pods}) + return context diff --git a/pharos-dashboard/templates/dashboard/resource_utilization.html b/pharos-dashboard/templates/dashboard/resource_utilization.html new file mode 100644 index 0000000..fb483d6 --- /dev/null +++ b/pharos-dashboard/templates/dashboard/resource_utilization.html @@ -0,0 +1,86 @@ +{% extends "base.html" %} +{% load staticfiles %} + +{% block extrahead %} + + + +{% endblock extrahead %} + + +{% block content %} +
+ {% for resource, utilization in pods %} +
+
+
+ {{ resource.name }} +
+
+
+
+
+
+
+
+ {% endfor %} +
+ +{% endblock content %} + + +{% block extrajs %} + + + + + + + + + + + +{% endblock extrajs %} \ No newline at end of file -- cgit 1.2.3-korg