diff --git a/puppetboard/app.py b/puppetboard/app.py index afe1311..23d7457 100644 --- a/puppetboard/app.py +++ b/puppetboard/app.py @@ -137,10 +137,7 @@ def node(node_name): """ node = get_or_abort(puppetdb.node, node_name) facts = node.facts() - if app.config['PUPPETDB_API'] > 2: - reports = ten_reports(node.reports()) - else: - reports = iter([]) + reports = ten_reports(node.reports()) return render_template('node.html', node=node, facts=yield_or_stop(facts), reports=yield_or_stop(reports)) @@ -148,22 +145,14 @@ def node(node_name): def reports(): """Doesn't do much yet but is meant to show something like the reports of the last half our, something like that.""" - if app.config['PUPPETDB_API'] > 2: - return render_template('reports.html') - else: - log.warn('PuppetDB API prior to v3 cannot access reports.') - abort(412) + return render_template('reports.html') @app.route('/reports/') def reports_node(node): """Fetches all reports for a node and processes them eventually rendering a table displaying those reports.""" - if app.config['PUPPETDB_API'] > 2: - reports = ten_reports(yield_or_stop( - puppetdb.reports('["=", "certname", "{0}"]'.format(node)))) - else: - log.warn('PuppetDB API prior to v3 cannot access reports.') - abort(412) + reports = ten_reports(yield_or_stop( + puppetdb.reports('["=", "certname", "{0}"]'.format(node)))) return render_template('reports_node.html', reports=reports, nodename=node) @@ -175,10 +164,7 @@ def report_latest(node_name): """ # 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([]) + reports = ten_reports(node.reports()) report = list(yield_or_stop(reports))[0] return redirect(url_for('report', node=node_name, report_id=report)) @@ -187,11 +173,7 @@ def report(node, report_id): """Displays a single report including all the events associated with that report and their status. """ - if app.config['PUPPETDB_API'] > 2: - reports = puppetdb.reports('["=", "certname", "{0}"]'.format(node)) - else: - log.warn('PuppetDB API prior to v3 cannot access reports.') - abort(412) + reports = puppetdb.reports('["=", "certname", "{0}"]'.format(node)) for report in reports: if report.hash_ == report_id: diff --git a/puppetboard/templates/node.html b/puppetboard/templates/node.html index d65a464..6b817af 100644 --- a/puppetboard/templates/node.html +++ b/puppetboard/templates/node.html @@ -18,16 +18,13 @@ Facts retrieved at {{node.facts_timestamp}} - {% if config.PUPPETDB_EXPERIMENTAL %} Report uploaded at {{node.report_timestamp}} - {% endif %} - {% if config.PUPPETDB_API > 2 %}

Facts

{{macros.facts_table(facts, condensed=True, margin_top=10)}} @@ -36,11 +33,5 @@

Reports

{{ macros.reports_table(reports, node.name, condensed=True, hash_truncate=True, show_conf_col=False, show_agent_col=False, show_host_col=False)}}
- {% else %} -
-

Facts

- {{macros.facts_table(facts, condensed=True, margin_top=10)}} -
- {% endif %} {% endblock content %} diff --git a/puppetboard/templates/nodes.html b/puppetboard/templates/nodes.html index c1e30d5..626525b 100644 --- a/puppetboard/templates/nodes.html +++ b/puppetboard/templates/nodes.html @@ -21,10 +21,8 @@ Status Hostname Catalog compiled at - {% if config.PUPPETDB_API > 2 %} Last report   - {% endif %} @@ -38,7 +36,6 @@ {{node.name}} {{node.catalog_timestamp}} - {% if config.PUPPETDB_API > 2 %} {% if node.report_timestamp %} {{ node.report_timestamp }} @@ -52,7 +49,6 @@ Reports {% endif %} - {% endif %} {% endfor %}