aggregate results for regions in table

Signed-off-by: Matthias Büchse <[email protected]>

Author: mbuechse

compliance-monitor/monitor.py

@@ -785,13 +785,34 @@ async def get_healthz(request: Request):
     return Response()  # empty response with status 200
 
 
-def pick_filter(results, scope, subject):
+def pick_filter(results, scope, *subjects):
     """Jinja filter to pick scope results from `results` for given `subject` and `scope`"""
-    return results.get(subject, {}).get(scope, {})
+    # simple case (backwards compatible): precisely one subject
+    if len(subjects) == 1:
+        return results.get(subjects[0], {}).get(scope, {})
+    # generalized case: multiple subjects
+    # in this case, drop None
+    rs = [results.get(subject, {}).get(scope, {}) for subject in subjects]
+    return [r for r in rs if r is not None]
+
+
+STATUS_ORDERING = {
+    'effective': 10,
+    'warn': 5,
+    'deprecated': 1,
+}
 
 
 def summary_filter(scope_results):
     """Jinja filter to construct summary from `scope_results`"""
+    if not isinstance(scope_results, dict):
+        # new generalized case: "aggregate" results for multiple subjects
+        # simplified computation: just select the worst subject to represent the group
+        scope_results = min(
+            scope_results,
+            default={},
+            key=lambda sr: STATUS_ORDERING.get(sr.get('best_passed'), -1),
+        )
     passed_str = scope_results.get('passed_str', '') or '–'
     best_passed = scope_results.get('best_passed')
     # avoid simple 🟢🔴 (hard to distinguish for color-blind folks)

compliance-monitor/templates/overview.md.j2

@@ -22,15 +22,9 @@ Version numbers are suffixed by a symbol depending on state: * for _draft_, †
 | [CNDS](https://cnds.io/) | Public cloud for customers | artcodix GmbH |
 {#- #} [{{ results | pick(iaas, 'artcodix') | summary }}]({{ detail_url('artcodix', iaas) }}) {# -#}
 | [HM](https://ohm.muc.cloud.cnds.io/) |
-| [pluscloud open](https://www.plusserver.com/en/products/pluscloud-open)<br />(4 regions) | Public cloud for customers  | plusserver GmbH | {# #}
-{#- #}prod1: [{{ results | pick(iaas, 'pco-prod1') | summary }}]({{ detail_url('pco-prod1', iaas) }}){# -#}
-<br />
-{#- #}prod2: [{{ results | pick(iaas, 'pco-prod2') | summary }}]({{ detail_url('pco-prod2', iaas) }}){# -#}
-<br />
-{#- #}prod3: [{{ results | pick(iaas, 'pco-prod3') | summary }}]({{ detail_url('pco-prod3', iaas) }}){# -#}
-<br />
-{#- #}prod4: [{{ results | pick(iaas, 'pco-prod4') | summary }}]({{ detail_url('pco-prod4', iaas) }}) {# -#}
-| [HM1](https://health.prod1.plusserver.sovereignit.cloud:3000/d/9ltTEmlnk/openstack-health-monitor2?orgId=1&var-mycloud=plus-pco)<br />[HM2](https://health.prod1.plusserver.sovereignit.cloud:3000/d/9ltTEmlnk/openstack-health-monitor2?orgId=1&var-mycloud=plus-prod2)<br />[HM3](https://health.prod1.plusserver.sovereignit.cloud:3000/d/9ltTEmlnk/openstack-health-monitor2?orgId=1&var-mycloud=plus-prod3)<br />[HM4](https://health.prod1.plusserver.sovereignit.cloud:3000/d/9ltTEmlnk/openstack-health-monitor2?orgId=1&var-mycloud=plus-prod4) |
+| [pluscloud open](https://www.plusserver.com/en/products/pluscloud-open) | Public cloud for customers (4 regions)  | plusserver GmbH | {# #}
+{#- #}[{{ results | pick(iaas, 'pco-prod1', 'pco-prod2', 'pco-prod3', 'pco-prod4') | summary }}]({{ detail_url('pco-prod1', iaas) }}) {# -#}
+| [HM1](https://health.prod1.plusserver.sovereignit.cloud:3000/d/9ltTEmlnk/openstack-health-monitor2?orgId=1&var-mycloud=plus-pco) [HM2](https://health.prod1.plusserver.sovereignit.cloud:3000/d/9ltTEmlnk/openstack-health-monitor2?orgId=1&var-mycloud=plus-prod2) [HM3](https://health.prod1.plusserver.sovereignit.cloud:3000/d/9ltTEmlnk/openstack-health-monitor2?orgId=1&var-mycloud=plus-prod3) [HM4](https://health.prod1.plusserver.sovereignit.cloud:3000/d/9ltTEmlnk/openstack-health-monitor2?orgId=1&var-mycloud=plus-prod4) |
 | PoC WG-Cloud OSBA | Cloud PoC for FITKO | Cloud&amp;Heat Technologies GmbH |
 {#- #} [{{ results | pick(iaas, 'poc-wgcloud') | summary }}]({{ detail_url('poc-wgcloud', iaas) }}) {# -#}
 | [HM](https://health.poc-wgcloud.osba.sovereignit.cloud:3000/d/9ltTEmlnk/openstack-health-monitor2?var-mycloud=poc-wgcloud&orgId=1) |
@@ -40,11 +34,9 @@ Version numbers are suffixed by a symbol depending on state: * for _draft_, †
 | [ScaleUp Open Cloud](https://www.scaleuptech.com/cloud-hosting/) | Public cloud for customers | ScaleUp Technologies GmbH & Co. KG |
 {#- #} [{{ results | pick(iaas, 'scaleup-occ2') | summary }}]({{ detail_url('scaleup-occ2', iaas) }}) {# -#}
 | [HM](https://health.occ2.scaleup.sovereignit.cloud) |
-| [syseleven](https://www.syseleven.de/en/products-services/openstack-cloud/)<br />(2 SCS regions) | Public OpenStack Cloud | SysEleven GmbH | {# #}
-{#- #}dus2: [{{ results | pick(iaas, 'syseleven-dus2') | summary }}]({{ detail_url('syseleven-dus2', iaas) }}){# -#}
-<br />
-{#- #}ham1: [{{ results | pick(iaas, 'syseleven-ham1') | summary }}]({{ detail_url('syseleven-ham1', iaas) }}) {# -#}
-| (soon)<br />(soon) |
+| [syseleven](https://www.syseleven.de/en/products-services/openstack-cloud/) | Public OpenStack Cloud (2 SCS regions) | SysEleven GmbH | {# #}
+{#- #} [{{ results | pick(iaas, 'syseleven-dus2', 'syseleven-ham1') | summary }}]({{ detail_url('syseleven-dus2', iaas) }}) {# -#}
+| (soon) |
 | [Wavestack](https://www.noris.de/wavestack-cloud/) | Public cloud for customers | noris network AG/Wavecon GmbH |
 {#- #} [{{ results | pick(iaas, 'wavestack') | summary }}]({{ detail_url('wavestack', iaas) }}) {# -#}
 | [HM](https://health.wavestack1.sovereignit.cloud:3000/) |