Add basic support for node status by using the most recent report

The following frontend features are implemented
- Number of failures, successes, noops/skips in overview
- Show latest reports with 1 or more events in overview
- Direct links to latest Report
- Number and types of events in nodes list
This commit is contained in:
Julius Härtl
2013-10-25 15:43:14 +02:00
parent efae19dc6d
commit 7c027dd97d
6 changed files with 110 additions and 14 deletions

View File

@@ -8,7 +8,7 @@ import urllib
from flask import (
Flask, render_template, abort, url_for,
Response, stream_with_context,
Response, stream_with_context, redirect,
)
from pypuppetdb import connect
@@ -71,8 +71,9 @@ def server_error(e):
@app.route('/')
def index():
"""This view generates the index page and displays a set of metrics fetched
from PuppetDB."""
"""This view generates the index page and displays a set of metrics and latest reports on
nodes fetched from PuppetDB.
"""
# TODO: Would be great if we could parallelize this somehow, doing these
# requests in sequence is rather pointless.
num_nodes = get_or_abort(puppetdb.metric,
@@ -85,6 +86,8 @@ def index():
'com.puppetlabs.puppetdb.command:type=global,name=fatal')
mean_command_time = get_or_abort(puppetdb.metric,
'com.puppetlabs.puppetdb.command:type=global,name=processing-time')
mean_command_time = get_or_abort(puppetdb.metric,
'com.puppetlabs.puppetdb.command:type=global,name=processing-time')
metrics = {
'num_nodes': num_nodes['Value'],
'num_resources': num_resources['Value'],
@@ -92,7 +95,13 @@ def index():
'mean_failed_commands': mean_failed_commands['MeanRate'],
'mean_command_time': "{0:10.6f}".format(mean_command_time['MeanRate']),
}
return render_template('index.html', metrics=metrics)
latest_event_count = puppetdb._query('aggregate-event-counts', query='["=", "latest-report?", true]', summarize_by='certname')
latest_event_count['noopskip'] = latest_event_count['noops']+latest_event_count['skips']
latest_events = puppetdb._query('event-counts', query='["=", "latest-report?", true]', summarize_by='certname')
return render_template('index.html', metrics=metrics, latest_event_count=latest_event_count, latest_events=latest_events)
@app.route('/nodes')
def nodes():
@@ -105,8 +114,19 @@ def nodes():
works. Once pagination is in place we can change this but we'll need to
provide a search feature instead.
"""
latest_events = puppetdb._query('event-counts', query='["=", "latest-report?", true]', summarize_by='certname')
nodes = []
for node in yield_or_stop(puppetdb.nodes()):
# check if node name is contained in any of the event-counts (grouped by certname)
status = [s for s in latest_events if s['subject']['title'] == node.name]
if status:
node.status = status[0]
else:
node.status = None
nodes.append(node)
return Response(stream_with_context(stream_template('nodes.html',
nodes=yield_or_stop(puppetdb.nodes()))))
nodes=nodes)))
@app.route('/node/<node_name>')
def node(node_name):
@@ -146,10 +166,26 @@ def reports_node(node):
return render_template('reports_node.html', reports=reports,
nodename=node)
@app.route('/report/latest/<node_name>')
def report_latest(node_name):
"""Redirect to the latest report of a given node. This is a workaround
as long as PuppetDB can't filter reports for latest-report? field. This
feature has been requested: http://projects.puppetlabs.com/issues/21554
"""
# TODO: use limit parameter in _query to get just one report
node = get_or_abort(puppetdb.node, node_name)
if app.config['PUPPETDB_API'] > 2:
reports = ten_reports(node.reports())
else:
reports = iter([])
report = list(yield_or_stop(reports))[0]
return redirect(url_for('report', node=node_name, report_id=report))
@app.route('/report/<node>/<report_id>')
def report(node, report_id):
"""Displays a single report including all the events associated with that
report and their status."""
report and their status.
"""
if app.config['PUPPETDB_API'] > 2:
reports = puppetdb.reports('["=", "certname", "{0}"]'.format(node))
else:

View File

@@ -52,3 +52,16 @@ th.headerSortDown:after {
.table tbody tr.error>td {
background-color: #f2dede;
}
h1.error {
color: rgb(223, 46, 27);
}
h1.success {
color: #18BC9C;
}
h1.noop {
color:#aaa;
}
.numtag {
width:20px;
text-align:center;
}

View File

@@ -8,11 +8,11 @@
$('.nodes').tablesorter({
headers: {
3: {
4: {
sorter: false
}
},
sortList: [[0, 0]]
sortList: [[1, 0]]
});
$('.facts').tablesorter({

View File

@@ -1,11 +1,27 @@
{% extends 'layout.html' %}
{% block row_fluid %}
<div class="span12">
<div class='alert alert-info'>
We need something fancy here.
</div>
</div>
<div class="container" style="margin-bottom:55px;">
<div class="row">
<h2>Statistics</h2>
<hr />
</div>
<div class="row">
<div class="span12">
<div class="span4 stat">
<h1 class="error">{{latest_event_count['failures']}} Failures</h1>
<span>in the latest node reports</span>
</div>
<div class="span4 stat">
<h1 class="success">{{latest_event_count['successes']}} Successes</h1>
<span>in the latest node reports</span>
</div>
<div class="span4 stat">
<h1 class="noop">{{latest_event_count['noopskip']}} Noop/Skip</h1>
<span>in the latest node reports</span>
</div>
</div>
</div>
<div class="row">
<div class="span12">
<div class="span4 stat">
@@ -34,5 +50,25 @@
</div>
</div>
</div>
<div class="row">
<div class="span12">
<h2>Latest Reports with events</h2>
<hr />
<table class='nodes table table-striped table-condensed'>
<tbody class="searchable">
{% for event in latest_events %}
<tr>
<td>{% if event['failures'] %}<span class="label label-important numtag">{{event['failures']}}</span>{% endif%}</td>
<td>{% if event['successes'] %}<span class="label label-success numtag">{{event['successes']}}</span>{% endif%}</td>
<td style="width:730px;"><a href="{{url_for('node', node_name=event['subject']['title'])}}">{{event['subject']['title']}}</a></td>
<td><a class="btn btn-small btn-primary" href="{{url_for('report_latest', node_name=event['subject']['title'])}}">Latest Report</a></td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
</div>
{% endblock row_fluid %}

View File

@@ -18,6 +18,7 @@
<table class='nodes table table-striped table-condensed'>
<thead>
<tr>
<th width>Status</th>
<th>Hostname</th>
<th>Catalog compiled at</th>
{% if config.PUPPETDB_API > 2 %}
@@ -29,6 +30,16 @@
<tbody class="searchable">
{% for node in nodes %}
<tr>
<td><a href="{{url_for('report_latest', node_name=node.name)}}">
{% if node.status %}
{% if node.status['failures'] %}<span class="label label-important">{{node.status['failures']}}</span>{% endif %}
{% if node.status['successes'] %}<span class="label label-success">{{node.status['successes']}}</span>{% endif %}
{% if node.status['noops'] or node.status['skips'] %}<span class="label">{{node.status['skips']+node.status['noops']}}</span>{% endif %}
{% else %}
<span class="label">0</span>
{% endif %}
</a>
</td>
<td><a href="{{url_for('node', node_name=node.name)}}">{{node.name}}</a></td>
<td rel="utctimestamp">{{node.catalog_timestamp}}</td>
{% if config.PUPPETDB_API > 2 %}