qontract-reconcile 0.10.1rc822__py3-none-any.whl → 0.10.1rc824__py3-none-any.whl

{qontract_reconcile-0.10.1rc822.dist-info → qontract_reconcile-0.10.1rc824.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc822
+Version: 0.10.1rc824
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Home-page: https://github.com/app-sre/qontract-reconcile
 Author: Red Hat App-SRE Team

{qontract_reconcile-0.10.1rc822.dist-info → qontract_reconcile-0.10.1rc824.dist-info}/RECORD

@@ -438,7 +438,7 @@ reconcile/skupper_network/models.py,sha256=DNTI7HZv-rqY42GIIxyRuvroHLvdH6rJerjIq
 reconcile/skupper_network/reconciler.py,sha256=XS-1oKBr_1l3dYUAVqUH6gCHg1G5ZuOfY_7fgGVAiFA,9996
 reconcile/skupper_network/site_controller.py,sha256=A3K-62BjJ5HiFVydV0ouGoD1NwrO7XhAH15BHAcS9fk,1550
 reconcile/statuspage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/statuspage/atlassian.py,sha256=odYbYX8l3oST7AYm66Q4MiaxSbvDzsqEO6VBYJggxkc,17420
+reconcile/statuspage/atlassian.py,sha256=5awxH9ovbtgis_N4aabBvrlo2ZyLNLaO6ezIYDgVq0Y,18571
 reconcile/statuspage/integration.py,sha256=hsazrQMceJbr61nEkJLxJbHhudTGtFuH0mlCo66-2ug,711
 reconcile/statuspage/page.py,sha256=WHDwV2PXEo4WwI2EgPOkS6j_T7geZEDXTgSaqpDo75U,5101
 reconcile/statuspage/state.py,sha256=HD9EOoKm_nEqCMLIwW809En3cq5VhyzKJPUbsh-bae8,1617
@@ -784,7 +784,7 @@ tools/app_interface_metrics_exporter.py,sha256=zkwkxdAUAxjdc-pzx2_oJXG25fo0Fnyd5
 tools/app_interface_reporter.py,sha256=upA-J-n-HXHKVDINRuMR7vTt-iJvQORKUVi9D3leQto,17738
 tools/glitchtip_access_reporter.py,sha256=oPBnk_YoDuljU3v0FaChzOwwnk4vap1xEE67QEjzdqs,2948
 tools/glitchtip_access_revalidation.py,sha256=8kbBJk04mkq28kWoRDDkfCGIF3GRg3pJrFAh1sW0dbk,2821
-tools/qontract_cli.py,sha256=_hap0giaBiU0o7SbHRmFsZ3yqXq7ULjK_omuifKBUqo,117165
+tools/qontract_cli.py,sha256=_-ianEfVdOU8ZCDjZ-jLfkNMtQT2qw3uwjO-XnTRsKw,117904
 tools/sd_app_sre_alert_report.py,sha256=e9vAdyenUz2f5c8-z-5WY0wv-SJ9aePKDH2r4IwB6pc,5063
 tools/template_validation.py,sha256=-U-lTGeLaci8yWPEblCJeev2DOlY1jM9QOOh-O1zts8,3376
 tools/cli_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -811,8 +811,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=_D61RFGAN5x44CY1tYbouhlGXXABwYfxKSWSQx3Jrss,4941
 tools/test/test_sd_app_sre_alert_report.py,sha256=v363r9zM7__0kR5K6mvJoGFcM9BvE33fWAayrqkpojA,2116
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc822.dist-info/METADATA,sha256=PmZRp4zeELlKOlfpqmgMwLrUqzMhI0QPLN_a4rgFDyY,2314
-qontract_reconcile-0.10.1rc822.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc822.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc822.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc822.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc824.dist-info/METADATA,sha256=BuGUQL722lQm08tOKAkp1LW3RG0QP8YMMcot9jZ4DIM,2314
+qontract_reconcile-0.10.1rc824.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc824.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc824.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc824.dist-info/RECORD,,

reconcile/statuspage/atlassian.py

@@ -56,9 +56,9 @@ class AtlassianRawMaintenance(BaseModel):
     scheduled_until: str
     incident_updates: list[AtlassianRawMaintenanceUpdate]
     components: list[AtlassianRawComponent]
-    auto_transition_deliver_notifications_at_end: bool
-    auto_transition_deliver_notifications_at_start: bool
-    scheduled_remind_prior: bool
+    auto_transition_deliver_notifications_at_end: Optional[bool]
+    auto_transition_deliver_notifications_at_start: Optional[bool]
+    scheduled_remind_prior: Optional[bool]
 
 
 class AtlassianAPI:
@@ -301,8 +301,15 @@ class AtlassianStatusPageProvider:
 
         # component status
         desired_component_status = desired.desired_component_status()
-        status_update_required = desired_component_status is not None and (
-            not current or desired_component_status != current.status
+        active_maintenance_affecting_component = [
+            m
+            for m in self.active_maintenances
+            if desired.display_name in [c.name for c in m.components]
+        ]
+        status_update_required = (
+            desired_component_status is not None
+            and (not current or desired_component_status != current.status)
+            and not active_maintenance_affecting_component
         )
 
         # shortcut execution if there is nothing to do
@@ -326,7 +333,7 @@ class AtlassianStatusPageProvider:
                 component_id=current_component.id,
             )
 
-        # validte the component and check if the current state needs to be updated
+        # validate the component and check if the current state needs to be updated
         needs_update = self.should_apply(desired, current_component)
         if not needs_update:
             return
@@ -456,12 +463,26 @@ class AtlassianStatusPageProvider:
         ]
 
     def create_maintenance(self, maintenance: StatusMaintenance) -> None:
+        component_ids: list[str] = []
+        for sc in maintenance.components:
+            current_component, _ = self.lookup_component(sc)
+            if current_component:
+                component_ids.append(current_component.id)
         data = {
             "name": maintenance.name,
             "status": "scheduled",
             "scheduled_for": maintenance.schedule_start,
             "scheduled_until": maintenance.schedule_end,
             "body": maintenance.message,
+            "scheduled_remind_prior": maintenance.announcements.remind_subscribers,
+            "scheduled_auto_transition": True,
+            "scheduled_auto_in_progress": True,
+            "scheduled_auto_completed": True,
+            "component_ids": component_ids,
+            "auto_transition_to_maintenance_state": True,
+            "auto_transition_to_operational_state": True,
+            "auto_transition_deliver_notifications_at_start": maintenance.announcements.notify_subscribers_on_start,
+            "auto_transition_deliver_notifications_at_end": maintenance.announcements.notify_subscribers_on_completion,
         }
         incident_id = self._api.create_incident(data)
         self._bind_component(

tools/qontract_cli.py

@@ -2619,17 +2619,57 @@ def maintenances(ctx):
     print_output(ctx.obj["options"], data, columns)
 
 
+class MigrationStatusCount:
+    def __init__(self, app: str) -> None:
+        self.app = app
+        self._source = 0
+        self._target = 0
+
+    def inc(self, source_or_target: str) -> None:
+        match source_or_target:
+            case "source":
+                self._source += 1
+            case "target":
+                self._target += 1
+            case _:
+                raise ValueError("hcp migration label must be source or target")
+
+    @property
+    def classic(self) -> int:
+        return self._source
+
+    @property
+    def hcp(self) -> int:
+        return self._target
+
+    @property
+    def total(self) -> int:
+        return self.classic + self.hcp
+
+    @property
+    def progress(self) -> float:
+        return round(self.hcp / self.total * 100, 0)
+
+    @property
+    def item(self) -> dict[str, Any]:
+        return {
+            "app": self.app,
+            "classic": self.classic or "0",
+            "hcp": self.hcp or "0",
+            "progress": self.progress or "0",
+        }
+
+
 @get.command()
 @click.pass_context
 def hcp_migration_status(ctx):
-    counts: dict[str, dict[str, int]] = {}
+    counts: dict[str, MigrationStatusCount] = {}
+    total_count = MigrationStatusCount("total")
     saas_files = get_saas_files()
     for sf in saas_files:
         if sf.publish_job_logs:
             # ignore post deployment test saas files
             continue
-        app = sf.app.parent_app.name if sf.app.parent_app else sf.app.name
-        counts.setdefault(app, {"source": 0, "target": 0})
         for rt in sf.resource_templates:
             if rt.provider == "directory" or "dashboard" in rt.name:
                 # ignore grafana dashboards
@@ -2644,26 +2684,15 @@ def hcp_migration_status(ctx):
                 if t.delete:
                     continue
                 if hcp_migration := t.namespace.cluster.labels.get("hcp_migration"):
-                    counts[app][hcp_migration] += 1
-
-    data = []
-    for a, c in counts.items():
-        source = c["source"]
-        target = c["target"]
-        item = {}
-        item["app"] = a
-        item["classic"] = source or "0"
-        item["hcp"] = target or "0"
-        total = source + target
-        if total == 0:
-            continue
-        progress = round(target / total * 100, 2) or "0"
-        item["progress"] = progress
-        data.append(item)
-
-    summary_completed = len([d for d in data if d["progress"] == 100])
-    print(f"SUMMARY: {summary_completed} / {len(data)} COMPLETED")
+                    app = sf.app.parent_app.name if sf.app.parent_app else sf.app.name
+                    counts.setdefault(app, MigrationStatusCount(app))
+                    counts[app].inc(hcp_migration)
+                    total_count.inc(hcp_migration)
 
+    data = [c.item for c in counts.values()]
+    print(
+        f"SUMMARY: {total_count.hcp} / {total_count.total} COMPLETED ({total_count.progress}%)"
+    )
     columns = ["app", "classic", "hcp", "progress"]
     print_output(ctx.obj["options"], data, columns)