puppet/puppetboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #91 from seantis/master

Browse Source 
Accept the configuration_version as alternative in the report view.
This commit is contained in:
Daniele Sluijters
2015-02-13 09:42:07 +01:00
parent bb96709c66 31a158c375
commit 44188fd12a
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
puppetboard/app.py
View File

@@ -228,11 +228,15 @@ def report_latest(node_name):
def report(node, report_id): def report(node, report_id):
"""Displays a single report including all the events associated with that """Displays a single report including all the events associated with that
report and their status. report and their status.
The report_id may be the puppetdb's report hash or the
configuration_version. This allows for better integration
into puppet-hipchat.
""" """
reports = puppetdb.reports('["=", "certname", "{0}"]'.format(node)) reports = puppetdb.reports('["=", "certname", "{0}"]'.format(node))
for report in reports: for report in reports:
if report.hash_ == report_id: if report.hash_ == report_id or report.version == report_id:
events = puppetdb.events('["=", "report", "{0}"]'.format( events = puppetdb.events('["=", "report", "{0}"]'.format(
report.hash_)) report.hash_))
return render_template( return render_template(