fine tuning.

Author: guettli

compliance-monitor/monitor.py

@@ -84,6 +84,7 @@ def __init__(self):
 ROLES = {'read_any': 1, 'append_any': 2, 'admin': 4, 'approve': 8}
 # number of days that expired results will be considered in lieu of more recent, but unapproved ones
 GRACE_PERIOD_DAYS = 7
+HISTORY_LIMIT = 500
 # separator between signature and report data; use something like
 #     ssh-keygen \
 #       -Y sign -f ~/.ssh/id_ed25519 -n report myreport.yaml
@@ -719,10 +720,10 @@ async def get_history(
     scopes = get_scopes()
     scope_name = scopes[scopeuuid]['name'] if scopeuuid in scopes else scopeuuid
     with conn.cursor() as cur:
-        history = db_get_report_history(cur, subject, scopeuuid)
+        history = db_get_report_history(cur, subject, scopeuuid, limit=HISTORY_LIMIT)
     return render_view(
         VIEW_HISTORY, view_type, history=history, subject=subject, scope_name=scope_name,
-        base_url=settings.base_url, title=f'Compliance history for {subject}',
+        history_limit=HISTORY_LIMIT, base_url=settings.base_url, title=f'📜 Compliance history for {subject}',
     )
 
 

compliance-monitor/sql.py

@@ -419,7 +419,7 @@ def db_get_recent_results2(cur: cursor, approved, limit, skip, max_age_days=None
     return [{col: val for col, val in zip(columns, row)} for row in cur.fetchall()]
 
 
-def db_get_report_history(cur: cursor, subject, scopeuuid):
+def db_get_report_history(cur: cursor, subject, scopeuuid, limit=500):
     """list all past reports for a subject/scope, newest first, with pass/fail/abort counts"""
     cur.execute('''
     SELECT report.reportuuid, report.checked_at,
@@ -431,8 +431,9 @@ def db_get_report_history(cur: cursor, subject, scopeuuid):
     WHERE report.subject = %(subject)s
       AND result2.scopeuuid = %(scopeuuid)s
     GROUP BY report.reportuuid, report.checked_at
-    ORDER BY report.checked_at DESC;
-    ''', {"subject": subject, "scopeuuid": scopeuuid})
+    ORDER BY report.checked_at DESC
+    LIMIT %(limit)s;
+    ''', {"subject": subject, "scopeuuid": scopeuuid, "limit": limit})
     columns = ('reportuuid', 'checked_at', 'pass_count', 'fail_count', 'abort_count')
     return [{col: val for col, val in zip(columns, row)} for row in cur.fetchall()]
 

compliance-monitor/templates/details.md.j2

@@ -22,7 +22,7 @@ Jump to
 ## {{ subject }}: {{ scope_result.name }}
 
 - [spec overview]({{ scope_url(scopeuuid) }})
-- [compliance history]({{ history_url(subject, scopeuuid) }})
+- [📜 compliance history]({{ history_url(subject, scopeuuid) }})
 
 {% if not scope_result.relevant -%}
 

compliance-monitor/templates/history.md.j2

@@ -1,11 +1,14 @@
-## Compliance history: {{ subject }} — {{ scope_name }}
+## 📜 Compliance history: {{ subject }} — {{ scope_name }}
 
 {% if history %}
 | Date | PASS | FAIL | ABORT | Report |
 |---|---|---|---|---|
 {% for entry in history -%}
 | {{ entry.checked_at | short_isodate }} | {{ entry.pass_count }} | {{ entry.fail_count }} | {{ entry.abort_count }} | [view]({{ report_url(entry.reportuuid) }}) |
 {% endfor %}
+{% if history | length == history_limit %}
+_Showing the most recent {{ history_limit }} reports. Older entries are not displayed._
+{% endif %}
 {% else %}
 No history available.
 {% endif %}

compliance-monitor/templates/report.md.j2

@@ -3,6 +3,7 @@
 - uuid: [{{ report.run.uuid }}]({{ report_url(report.run.uuid, download=True) }})
 - subject: {{ report.subject }}
 - scope: [{{ report.spec.name }}]({{ scope_url(report.spec.uuid) }})
+- [📜 compliance history]({{ history_url(report.subject, report.spec.uuid) }})
 - checked at: {{ report.checked_at }}
 - variable assignment: {% set comma = joiner(", ") %}{% for key, value in report.run.assignment.items() -%}{{comma()}}`{{ key }}`=`{{ value }}`{% endfor %}