qontract-reconcile 0.10.1rc812__py3-none-any.whl → 0.10.1rc814__py3-none-any.whl

{qontract_reconcile-0.10.1rc812.dist-info → qontract_reconcile-0.10.1rc814.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc812
+Version: 0.10.1rc814
 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.1rc812.dist-info → qontract_reconcile-0.10.1rc814.dist-info}/RECORD

@@ -319,7 +319,7 @@ reconcile/gql_definitions/ldap_groups/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCe
 reconcile/gql_definitions/ldap_groups/roles.py,sha256=goGDnkBBFy0mdLsXqL9qlSLPCFd9rwiD1rrsIH-6nZQ,2888
 reconcile/gql_definitions/ldap_groups/settings.py,sha256=KR6eKqXQWVYZAUEdatL1RCARaTOWl9X-QmxEMVjVNDE,2227
 reconcile/gql_definitions/maintenance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/maintenance/maintenances.py,sha256=0fTy0SiRjtnSrUwm2qcPtU3RSFJ1ox1eQuC9v8l94dY,2666
+reconcile/gql_definitions/maintenance/maintenances.py,sha256=ObAoOHUrTxL1l8CUhdOACc1s49Pt5j1fsErXE49fs1g,3042
 reconcile/gql_definitions/membershipsources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/membershipsources/roles.py,sha256=d3nv3GLsj_eKgwB1glsiK6smpC4i16WO3dU5rIdRg94,3678
 reconcile/gql_definitions/ocm_labels/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -354,7 +354,7 @@ reconcile/gql_definitions/slo_documents/slo_documents.py,sha256=pOrm9NXAonlo6Lxq
 reconcile/gql_definitions/status_board/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/status_board/status_board.py,sha256=vHEzncabujkqbjJ-ibMYNJTODgTc4DMf4y6TW3I_7II,4700
 reconcile/gql_definitions/statuspage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/statuspage/statuspages.py,sha256=RybRGzA8LiQ4yKct_IarI_i_ExQi8Q-jjW5y7J6AZKE,4564
+reconcile/gql_definitions/statuspage/statuspages.py,sha256=fCTJCcXQkIuoSDLcW_kj85qioaEuk2mygiDcggakYUw,5171
 reconcile/gql_definitions/templating/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/templating/template_collection.py,sha256=lS0vzEKV2ZrzOqOEriqpy0yBgKjb2Ftrzgx6PIH46_4,3310
 reconcile/gql_definitions/templating/templates.py,sha256=ejAvQ13zfNMQTz3FWtRUic6dSvio3aAgBKEqt600hbk,2821
@@ -436,14 +436,14 @@ 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=m8tRECVD_9KnIvqWs6pUocAnmfj2w_eDTFE4il7hkH8,15335
+reconcile/statuspage/atlassian.py,sha256=odYbYX8l3oST7AYm66Q4MiaxSbvDzsqEO6VBYJggxkc,17420
 reconcile/statuspage/integration.py,sha256=hsazrQMceJbr61nEkJLxJbHhudTGtFuH0mlCo66-2ug,711
-reconcile/statuspage/page.py,sha256=DB69C6yAfwZIdo4HBQi8BTUZXL8l9yOPnjnt3k_HZgk,3177
+reconcile/statuspage/page.py,sha256=WHDwV2PXEo4WwI2EgPOkS6j_T7geZEDXTgSaqpDo75U,5101
 reconcile/statuspage/state.py,sha256=HD9EOoKm_nEqCMLIwW809En3cq5VhyzKJPUbsh-bae8,1617
 reconcile/statuspage/status.py,sha256=mfRJ_tW7jM4_Vy_1cc8C0fKJEoA2GwrA3gJeV1KImAw,2834
 reconcile/statuspage/integrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/statuspage/integrations/components.py,sha256=49KHd_E9AdRvcEA6n75q1McZv2LfN-hRsW-WA7dgw9g,2651
-reconcile/statuspage/integrations/maintenances.py,sha256=pwt3WHymfkqP7ox1GB-D6Wn0crmcrDE_p4SW9wRaqWE,2651
+reconcile/statuspage/integrations/maintenances.py,sha256=7gmMS9HwORMWMMBtib6pNGLXR6sAH2aW-HXKHJn6BN4,3083
 reconcile/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/templates/aws_access_key_email.j2,sha256=2MUr1ERmyISzKgHqsWYLd-1Wbl-peUa-FsGUS-JLUFc,238
 reconcile/templates/email.yml.j2,sha256=OZgczNRgXPj2gVYTgwQyHAQrMGu7xp-e4W1rX19GcrU,690
@@ -779,7 +779,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=GduWl9WzfSmOmWjZfyoyR9U6oP8uf8ckF0iHf78tHvE,114858
+tools/qontract_cli.py,sha256=PiT1dKAegpt_S-rALEQNEG7CKcgY5sPOY6haZEnxBzs,114860
 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
@@ -806,8 +806,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.1rc812.dist-info/METADATA,sha256=QXU980PcvIHdOFuelv2B6GonzS6eVILVn804A1venVA,2314
-qontract_reconcile-0.10.1rc812.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc812.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc812.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc812.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc814.dist-info/METADATA,sha256=izBuRBYFxzthBAfeBBKkMgqw9MspsZkQJ5HzbfT5tRA,2314
+qontract_reconcile-0.10.1rc814.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc814.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc814.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc814.dist-info/RECORD,,

reconcile/gql_definitions/maintenance/maintenances.py

@@ -34,6 +34,9 @@ query Maintenances {
         page {
           name
         }
+        remindSubscribers
+        notifySubscribersOnStart
+        notifySubscribersOnCompletion
       }
     }
   }
@@ -61,6 +64,9 @@ class StatusPageV1(ConfiguredBaseModel):
 
 class MaintenanceStatuspageAnnouncementV1(MaintenanceAnnouncementV1):
     page: StatusPageV1 = Field(..., alias="page")
+    remind_subscribers: Optional[bool] = Field(..., alias="remindSubscribers")
+    notify_subscribers_on_start: Optional[bool] = Field(..., alias="notifySubscribersOnStart")
+    notify_subscribers_on_completion: Optional[bool] = Field(..., alias="notifySubscribersOnCompletion")
 
 
 class MaintenanceV1(ConfiguredBaseModel):

reconcile/gql_definitions/statuspage/statuspages.py

@@ -61,12 +61,18 @@ query StatusPages {
       message
       scheduledStart
       scheduledEnd
+      affectedServices {
+        name
+      }
       announcements {
         provider
         ... on MaintenanceStatuspageAnnouncement_v1 {
           page {
             name
           }
+          remindSubscribers
+          notifySubscribersOnStart
+          notifySubscribersOnCompletion
         }
       }
     }
@@ -109,6 +115,10 @@ class StatusPageComponentV1(ConfiguredBaseModel):
     status_config: Optional[list[Union[ManualStatusProviderV1, StatusProviderV1]]] = Field(..., alias="status_config")
 
 
+class MaintenanceV1_AppV1(ConfiguredBaseModel):
+    name: str = Field(..., alias="name")
+
+
 class MaintenanceAnnouncementV1(ConfiguredBaseModel):
     provider: str = Field(..., alias="provider")
 
@@ -119,6 +129,9 @@ class MaintenanceStatuspageAnnouncementV1_StatusPageV1(ConfiguredBaseModel):
 
 class MaintenanceStatuspageAnnouncementV1(MaintenanceAnnouncementV1):
     page: MaintenanceStatuspageAnnouncementV1_StatusPageV1 = Field(..., alias="page")
+    remind_subscribers: Optional[bool] = Field(..., alias="remindSubscribers")
+    notify_subscribers_on_start: Optional[bool] = Field(..., alias="notifySubscribersOnStart")
+    notify_subscribers_on_completion: Optional[bool] = Field(..., alias="notifySubscribersOnCompletion")
 
 
 class MaintenanceV1(ConfiguredBaseModel):
@@ -126,6 +139,7 @@ class MaintenanceV1(ConfiguredBaseModel):
     message: str = Field(..., alias="message")
     scheduled_start: str = Field(..., alias="scheduledStart")
     scheduled_end: str = Field(..., alias="scheduledEnd")
+    affected_services: list[MaintenanceV1_AppV1] = Field(..., alias="affectedServices")
     announcements: Optional[list[Union[MaintenanceStatuspageAnnouncementV1, MaintenanceAnnouncementV1]]] = Field(..., alias="announcements")
 
 

reconcile/statuspage/atlassian.py

@@ -15,6 +15,7 @@ from reconcile.gql_definitions.statuspage.statuspages import StatusPageV1
 from reconcile.statuspage.page import (
     StatusComponent,
     StatusMaintenance,
+    StatusMaintenanceAnnouncement,
     StatusPage,
 )
 from reconcile.statuspage.state import ComponentBindingState
@@ -54,6 +55,10 @@ class AtlassianRawMaintenance(BaseModel):
     scheduled_for: str
     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
 
 
 class AtlassianAPI:
@@ -121,6 +126,11 @@ class AtlassianAPI:
         all_scheduled_incidents = self._list_items(url)
         return [AtlassianRawMaintenance(**i) for i in all_scheduled_incidents]
 
+    def list_active_maintenances(self) -> list[AtlassianRawMaintenance]:
+        url = f"{self.api_url}/v1/pages/{self.page_id}/incidents/active_maintenance"
+        all_active_incidents = self._list_items(url)
+        return [AtlassianRawMaintenance(**i) for i in all_active_incidents]
+
     def create_incident(self, data: dict[str, Any]) -> str:
         url = f"{self.api_url}/v1/pages/{self.page_id}/incidents"
         response = requests.post(
@@ -190,6 +200,26 @@ class AtlassianStatusPageProvider:
             components=[c for c in components if c is not None],
         )
 
+    def _raw_component_to_status_component(
+        self, raw_component: AtlassianRawComponent, name_override: Optional[str] = None
+    ) -> StatusComponent:
+        group_name = (
+            self._group_id_to_name.get(raw_component.group_id)
+            if raw_component.group_id
+            else None
+        )
+        return StatusComponent(
+            name=name_override or raw_component.name,
+            display_name=raw_component.name,
+            description=raw_component.description,
+            group_name=group_name,
+            status_provider_configs=[
+                ManualStatusProvider(
+                    component_status=raw_component.status,
+                )
+            ],
+        )
+
     def _bound_raw_component_to_status_component(
         self, raw_component: AtlassianRawComponent
     ) -> Optional[StatusComponent]:
@@ -197,21 +227,8 @@ class AtlassianStatusPageProvider:
             raw_component.id
         )
         if bound_component_name:
-            group_name = (
-                self._group_id_to_name.get(raw_component.group_id)
-                if raw_component.group_id
-                else None
-            )
-            return StatusComponent(
-                name=bound_component_name,
-                display_name=raw_component.name,
-                description=raw_component.description,
-                group_name=group_name,
-                status_provider_configs=[
-                    ManualStatusProvider(
-                        component_status=raw_component.status,
-                    )
-                ],
+            return self._raw_component_to_status_component(
+                raw_component, name_override=bound_component_name
             )
         return None
 
@@ -332,7 +349,13 @@ class AtlassianStatusPageProvider:
         # resolve status
         desired_component_status = desired.desired_component_status()
         if desired_component_status:
-            component_update["status"] = desired_component_status
+            active_maintenance_affecting_component = [
+                m
+                for m in self.active_maintenances
+                if desired.display_name in [c.name for c in m.components]
+            ]
+            if not active_maintenance_affecting_component:
+                component_update["status"] = desired_component_status
 
         if current_component:
             logging.info(f"update component {desired.name}: {component_update}")
@@ -377,6 +400,27 @@ class AtlassianStatusPageProvider:
         if not dry_run:
             self._binding_state.bind_component(component_name, component_id)
 
+    def _raw_maintenance_to_status_maintenance(
+        self,
+        raw_maintenance: AtlassianRawMaintenance,
+        name_override: Optional[str] = None,
+    ) -> StatusMaintenance:
+        return StatusMaintenance(
+            name=name_override or raw_maintenance.name,
+            message=raw_maintenance.incident_updates[0].body,
+            schedule_start=raw_maintenance.scheduled_for,
+            schedule_end=raw_maintenance.scheduled_until,
+            components=[
+                self._raw_component_to_status_component(c)
+                for c in raw_maintenance.components
+            ],
+            announcements=StatusMaintenanceAnnouncement(
+                remind_subscribers=raw_maintenance.scheduled_remind_prior,
+                notify_subscribers_on_start=raw_maintenance.auto_transition_deliver_notifications_at_start,
+                notify_subscribers_on_completion=raw_maintenance.auto_transition_deliver_notifications_at_end,
+            ),
+        )
+
     @classmethod
     def init_from_page(
         cls,
@@ -398,17 +442,19 @@ class AtlassianStatusPageProvider:
         )
 
     @property
-    def maintenances(self) -> list[StatusMaintenance]:
+    def scheduled_maintenances(self) -> list[StatusMaintenance]:
         return [
-            StatusMaintenance(
-                name=m.name,
-                message=m.incident_updates[0].body,
-                schedule_start=m.scheduled_for,
-                schedule_end=m.scheduled_until,
-            )
+            self._raw_maintenance_to_status_maintenance(m)
             for m in self._api.list_scheduled_maintenances()
         ]
 
+    @property
+    def active_maintenances(self) -> list[StatusMaintenance]:
+        return [
+            self._raw_maintenance_to_status_maintenance(m)
+            for m in self._api.list_active_maintenances()
+        ]
+
     def create_maintenance(self, maintenance: StatusMaintenance) -> None:
         data = {
             "name": maintenance.name,

reconcile/statuspage/integrations/maintenances.py

@@ -1,5 +1,6 @@
 import logging
 import sys
+from datetime import datetime, timezone
 
 from reconcile.statuspage.atlassian import AtlassianStatusPageProvider
 from reconcile.statuspage.integration import get_binding_state, get_status_pages
@@ -46,23 +47,32 @@ class StatusPageMaintenancesIntegration(QontractReconcileIntegration[NoParams]):
     def run(self, dry_run: bool = False) -> None:
         binding_state = get_binding_state(self.name, self.secret_reader)
         pages = get_status_pages()
+        now = datetime.now(timezone.utc)
 
         error = False
         for p in pages:
             try:
                 desired_state = [
-                    StatusMaintenance.init_from_maintenance(m)
+                    StatusMaintenance.init_from_maintenance(
+                        m, page_components=p.components or []
+                    )
                     for m in p.maintenances or []
+                    if datetime.fromisoformat(m.scheduled_start) > now
                 ]
                 page_provider = AtlassianStatusPageProvider.init_from_page(
                     page=p,
                     token=self.secret_reader.read_secret(p.credentials),
                     component_binding_state=binding_state,
                 )
+                current_state = [
+                    m
+                    for m in page_provider.scheduled_maintenances
+                    if page_provider.has_component_binding_for(m.name)
+                ]
                 self.reconcile(
                     dry_run=dry_run,
                     desired_state=desired_state,
-                    current_state=page_provider.maintenances,
+                    current_state=current_state,
                     provider=page_provider,
                 )
             except Exception:

reconcile/statuspage/page.py

@@ -1,7 +1,10 @@
-from typing import Optional, Self
+from typing import Optional, Self, cast
 
 from pydantic import BaseModel
 
+from reconcile.gql_definitions.maintenance.maintenances import (
+    MaintenanceStatuspageAnnouncementV1,
+)
 from reconcile.gql_definitions.statuspage.statuspages import (
     MaintenanceV1,
     StatusPageComponentV1,
@@ -12,6 +15,8 @@ from reconcile.statuspage.status import (
     build_status_provider_config,
 )
 
+PROVIDER_NAME = "statuspage"
+
 
 class StatusComponent(BaseModel):
     """
@@ -47,12 +52,14 @@ class StatusComponent(BaseModel):
         arbitrary_types_allowed = True
 
     @classmethod
-    def init_from_page_component(cls, component: StatusPageComponentV1) -> Self:
+    def init_from_page_component(
+        cls, component: StatusPageComponentV1, name_override: Optional[str] = None
+    ) -> Self:
         status_configs = [
             build_status_provider_config(cfg) for cfg in component.status_config or []
         ]
         return cls(
-            name=component.name,
+            name=name_override or component.name,
             display_name=component.display_name,
             description=component.description,
             group_name=component.group_name,
@@ -94,6 +101,26 @@ class StatusPage(BaseModel):
         )
 
 
+class StatusMaintenanceAnnouncement(BaseModel):
+    """
+    Represents the desired state of a status maintenance.
+    """
+
+    remind_subscribers: Optional[bool] = None
+    notify_subscribers_on_start: Optional[bool] = None
+    notify_subscribers_on_completion: Optional[bool] = None
+
+    @classmethod
+    def init_from_announcement(
+        cls, announcement: MaintenanceStatuspageAnnouncementV1
+    ) -> Self:
+        return cls(
+            remind_subscribers=announcement.remind_subscribers,
+            notify_subscribers_on_start=announcement.notify_subscribers_on_start,
+            notify_subscribers_on_completion=announcement.notify_subscribers_on_completion,
+        )
+
+
 class StatusMaintenance(BaseModel):
     """
     Represents the desired state of a status maintenance.
@@ -103,12 +130,37 @@ class StatusMaintenance(BaseModel):
     message: str
     schedule_start: str
     schedule_end: str
+    components: list[StatusComponent]
+    announcements: StatusMaintenanceAnnouncement
 
     @classmethod
-    def init_from_maintenance(cls, maintenance: MaintenanceV1) -> Self:
+    def init_from_maintenance(
+        cls,
+        maintenance: MaintenanceV1,
+        page_components: list[StatusPageComponentV1],
+    ) -> Self:
+        affected_services = [a.name for a in maintenance.affected_services]
+        affected_components = [
+            StatusComponent.init_from_page_component(c, name_override=c.display_name)
+            for c in page_components
+            if c.app.name in affected_services
+        ]
+        statuspage_announcements = [
+            StatusMaintenanceAnnouncement.init_from_announcement(
+                cast(MaintenanceStatuspageAnnouncementV1, m)
+            )
+            for m in maintenance.announcements or []
+            if m.provider == PROVIDER_NAME
+        ]
+        if len(statuspage_announcements) != 1:
+            raise ValueError(
+                f"Maintenanace announcements must include exactly one item of provider {PROVIDER_NAME}"
+            )
         return cls(
             name=maintenance.name,
             message=maintenance.message.rstrip("\n"),
             schedule_start=maintenance.scheduled_start,
             schedule_end=maintenance.scheduled_end,
+            components=affected_components,
+            announcements=statuspage_announcements[0],
         )

tools/qontract_cli.py

@@ -2597,7 +2597,7 @@ def maintenances(ctx):
             "services": ", ".join(a.name for a in m.affected_services),
         }
         for m in maintenances
-        if datetime.fromisoformat(m.scheduled_end) > now
+        if datetime.fromisoformat(m.scheduled_start) > now
     ]
     columns = [
         "name",