General improvements

m365/agent_based/m365_group_based_licensing.py

@@ -73,26 +73,23 @@ def discover_m365_group_based_licensing(section: Section) -> DiscoveryResult:
 
 def check_m365_group_based_licensing(section: Section) -> CheckResult:
     groups = section
-    if not groups:
+    if groups is None:
         yield Result(
             state=State.OK,
             summary="No groups with errors",
         )
-
         return
 
-    result_summary = f"Groups with errors: {len(groups)}"
-
-    result_details_list = []
+    group_details_list = []
     for group in groups:
         group_details = f"Group name: {group['group_name']}\n - ID: {group['group_id']}"
-        result_details_list.append(group_details)
+        group_details_list.append(group_details)
 
-    result_details = "\n\n".join(result_details_list)
+    result_details = "\n\n".join(group_details_list)
 
     yield Result(
         state=State.CRIT,
-        summary=result_summary,
+        summary=f"Groups with errors: {len(groups)}",
         details=result_details,
     )
 

m365/agent_based/m365_licenses.py

@@ -97,7 +97,7 @@ def discover_m365_licenses(section: Section) -> DiscoveryResult:
 
 def check_m365_licenses(item: str, params: Mapping[str, Any], section: Section) -> CheckResult:
     license = section.get(item)
-    if not license:
+    if license is None:
         return
 
     lic_units_total = license.lic_units_enabled + license.lic_units_warning
@@ -148,14 +148,15 @@ def check_m365_licenses(item: str, params: Mapping[str, Any], section: Section)
         f", License state: {license.lic_state}"
     )
 
-    result_details = (
-        f"License ID: {license.lic_sku_id}"
-        f"\n - Enabled (Active): {license.lic_units_enabled}"
-        f"\n - Consumed (Used): {license.lic_units_consumed}"
-        f"\n - LockedOut (Canceled): {license.lic_units_lockedout}"
-        f"\n - Suspended (Inactive): {license.lic_units_suspended}"
-        f"\n - Warning (In grace period): {license.lic_units_warning}"
-    )
+    license_details_list = [
+        f"License ID: {license.lic_sku_id}",
+        f" - Enabled (Active): {license.lic_units_enabled}",
+        f" - Consumed (Used): {license.lic_units_consumed}",
+        f" - LockedOut (Canceled): {license.lic_units_lockedout}",
+        f" - Suspended (Inactive): {license.lic_units_suspended}",
+        f" - Warning (In grace period): {license.lic_units_warning}",
+    ]
+    result_details = "\n".join(license_details_list)
 
     yield Result(
         state=result_state,

m365/agent_based/m365_service_health.py

@@ -101,7 +101,7 @@ def check_m365_service_health(
     item: str, params: Mapping[str, Any], section: Section
 ) -> CheckResult:
     m365_service = section.get(item)
-    if not m365_service:
+    if m365_service is None:
         return
 
     service_issues = m365_service.service_issues
@@ -129,20 +129,22 @@ def check_m365_service_health(
             issue_start_datetime = datetime.fromisoformat(issue_start)
             issue_start_timestamp = issue_start_datetime.timestamp()
             issue_classification = issue["issue_classification"].capitalize()
-            issue_details = (
-                f"Start time: {render.datetime(issue_start_timestamp)}"
-                f"\n - Type: {issue_classification}"
-                f"\n - Feature: {issue.get('issue_feature')}"
-                f"\n - Title: {issue.get('issue_title')} ({issue.get('issue_id')})"
-            )
+            issue_details_list = [
+                f"Start time: {render.datetime(issue_start_timestamp)}",
+                f" - Type: {issue_classification}",
+                f" - Feature: {issue.get('issue_feature')}",
+                f" - Title: {issue.get('issue_title')} ({issue.get('issue_id')})",
+            ]
+            issue_details = "\n".join(issue_details_list)
+
             result_details_list.append(issue_details)
 
         result_details = "\n\n".join(result_details_list)
 
         yield Result(
             state=State.worst(*severity_list),
-            summary=f"{result_summary}",
-            details=f"{result_details}",
+            summary=result_summary,
+            details=result_details,
         )
 
     else: