Merge branch 'main' into fix/cinder-backup-check-reliability

Author: markus-hentsch

compliance-monitor/monitor.py

@@ -281,18 +281,16 @@ def evaluate(self, scope_results):
             by_validity[self.versions[vname].validity].append(vname)
         # go through worsening validity values until a passing version is found
         relevant = []
+        best_passed = None
         for validity in ('effective', 'warn', 'deprecated'):
             vnames = by_validity[validity]
             relevant.extend(vnames)
             if any(version_results[vname]['result'] == 1 for vname in vnames):
+                best_passed = validity
                 break
         # always include draft (but only at the end)
         relevant.extend(by_validity['draft'])
         passed = [vname for vname in relevant if version_results[vname]['result'] == 1]
-        if passed:
-            summary = 1 if self.versions[passed[0]].validity in ('effective', 'warn') else -1
-        else:
-            summary = 0
         return {
             'name': self.name,
             'versions': version_results,
@@ -302,7 +300,7 @@ def evaluate(self, scope_results):
                 vname + ASTERISK_LOOKUP[self.versions[vname].validity]
                 for vname in passed
             ]),
-            'summary': summary,
+            'best_passed': best_passed,
         }
 
     def update_lookup(self, target_dict):
@@ -727,8 +725,13 @@ def pick_filter(results, subject, scope):
 def summary_filter(scope_results):
     """Jinja filter to construct summary from `scope_results`"""
     passed_str = scope_results.get('passed_str', '') or '–'
-    summary = scope_results.get('summary', 0)
-    color = {1: '✅'}.get(summary, '🛑')  # instead of 🟢🔴 (hard to distinguish for color-blind folks)
+    best_passed = scope_results.get('best_passed')
+    # avoid simple 🟢🔴 (hard to distinguish for color-blind folks)
+    color = {
+        'effective': '✅',
+        'warn': '✅',  # forgo differentiation here in favor of simplicity (will be apparent in version list)
+        'deprecated': '🟧',
+    }.get(best_passed, '🛑')
     return f'{color} {passed_str}'
 
 

compliance-monitor/templates/overview.md.j2

@@ -2,6 +2,9 @@
 we could of course iterate over results etc., but hardcode the table (except the actual results, of course)
 for the time being to have the highest degree of control
 -#}
+
+Version numbers are suffixed by a symbol depending on state: * for _draft_, † for _warn_ (soon to be deprecated), and †† for _deprecated_.
+
 {% set iaas = '50393e6f-2ae1-4c5c-a62c-3b75f2abef3f' -%}
 | Name  | Description  | Operator  | [SCS-compatible IaaS](https://docs.scs.community/standards/scs-compatible-iaas/)  | HealthMon  |
 |-------|--------------|-----------|----------------------|:----------:|