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

Merge pull request #212 from corey-hammerton/issue-209

Browse Source 
puppetboard/app.py: Don't filter on environments if all are selected
This commit is contained in:
Corey Hammerton
2016-02-01 20:44:16 -05:00
parent fd29fe4261 8fa0514585
commit 5874a58965
1 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
puppetboard/app.py
View File

@@ -416,14 +416,22 @@ def reports(env, page):
abort(404) abort(404)
for report in reports_events: for report in reports_events:
counts = get_or_abort(puppetdb.event_counts, if env == '*':
query='["and",' \ event_count_query = '["and",' \
'["=", "certname", "{0}"],' \
'["=", "report", "{1}"]]'.format(
report.node,
report.hash_)
else:
event_count_query = '["and",' \
'["=", "environment", "{0}"],' \ '["=", "environment", "{0}"],' \
'["=", "certname", "{1}"],' \ '["=", "certname", "{1}"],' \
'["=", "report", "{2}"]]'.format( '["=", "report", "{2}"]]'.format(
env, env,
report.node, report.node,
report.hash_), report.hash_)
counts = get_or_abort(puppetdb.event_counts,
query=event_count_query,
summarize_by="certname") summarize_by="certname")
try: try:
report_event_counts[report.hash_] = counts[0] report_event_counts[report.hash_] = counts[0]
@@ -483,11 +491,22 @@ def reports_node(env, node_name, page):
abort(404) abort(404)
for report in reports_events: for report in reports_events:
counts = get_or_abort(puppetdb.event_counts, if env == '*':
query='["and",' \ event_count_query = '["and",' \
'["=", "certname", "{0}"],' \
'["=", "report", "{1}"]]'.format(
report.node,
report.hash_)
else:
event_count_query = '["and",' \
'["=", "environment", "{0}"],' \ '["=", "environment", "{0}"],' \
'["=", "certname", "{1}"],' \ '["=", "certname", "{1}"],' \
'["=", "report", "{2}"]]'.format(env, report.node, report.hash_), '["=", "report", "{2}"]]'.format(
env,
report.node,
report.hash_)
counts = get_or_abort(puppetdb.event_counts,
query=event_count_query,
summarize_by="certname") summarize_by="certname")
try: try:
report_event_counts[report.hash_] = counts[0] report_event_counts[report.hash_] = counts[0]