qontract-reconcile 0.10.1rc1117__py3-none-any.whl → 0.10.1rc1119__py3-none-any.whl

{qontract_reconcile-0.10.1rc1117.dist-info → qontract_reconcile-0.10.1rc1119.dist-info}/METADATA

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

@@ -10,7 +10,7 @@ reconcile/aws_iam_password_reset.py,sha256=q96mwr2KeEQ5bpNniGlgIMZTxiuLSodcYfX-t
 reconcile/aws_support_cases_sos.py,sha256=hl_9L53yQYRQxKs3IWrd69Cc60XK067g_bJRM9B0udo,2975
 reconcile/blackbox_exporter_endpoint_monitoring.py,sha256=O1wFp52EyF538c6txaWBs8eMtUIy19gyHZ6VzJ6QXS8,3512
 reconcile/checkpoint.py,sha256=_JhMxrye5BgkRMxWYuf7Upli6XayPINKSsuo3ynHTRc,5010
-reconcile/cli.py,sha256=ipCFQNRFmaoo_DoeAvMY3bTYfaovOgWhRvL6TYuk1G8,107605
+reconcile/cli.py,sha256=-RT8biWI5mY9o6gYZ7HxXowePxmxbnfGKKqhMeUdiDc,107720
 reconcile/closedbox_endpoint_monitoring_base.py,sha256=rLh16BOlBOxTmJ8Si3wWyyEpmMlhh4Znx1Gc36qsmOc,4865
 reconcile/cluster_deployment_mapper.py,sha256=5gumAaRCcFXsabUJ1dnuUy9WrP_FEEM5JnOnE8ch9sE,2326
 reconcile/dashdotdb_base.py,sha256=l34QDu1G96_Ctnh7ZXdxXgSeCE93GQMdLAkWxmN6vDA,4775
@@ -161,7 +161,7 @@ reconcile/aws_version_sync/merge_request_manager/merge_request_manager.py,sha256
 reconcile/change_owners/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/change_owners/approver.py,sha256=Z3_11vnK2WNOxjEEXVDh0224-_-qbt9d6mBeVE-7fsc,2259
 reconcile/change_owners/bundle.py,sha256=h30fU-JmLH5a-rCAovpzTeTkkkgZztsZ5A2raee0YuU,5355
-reconcile/change_owners/change_log_tracking.py,sha256=qEGSH3C6FUxmz-rPNyQCqwM8kYK3tNtHVgQHzQjIWh0,7814
+reconcile/change_owners/change_log_tracking.py,sha256=3cIS-evZbU1SGkFzKDa7y9GL6uvSBZ0xbTl_qiqp4ss,7937
 reconcile/change_owners/change_owners.py,sha256=0HRJhDm0oW3uYJFgzynqA1gA0lbhalhSkmWOiQmr-NM,17062
 reconcile/change_owners/change_types.py,sha256=HEsoBduhcczAXZHwT26mr5sVPxtf8J6tsvjSDDI1ceI,32077
 reconcile/change_owners/changes.py,sha256=YblT-JPFagctTphzd38SjVmj3k1YsgMzN48zGpnLYKM,18222
@@ -196,9 +196,9 @@ reconcile/external_resources/aws.py,sha256=7W-6d-lXO6JGwaxtO1Uc3Lw0p8csJ1EVgz__O
 reconcile/external_resources/factories.py,sha256=nhdTqf1WEfRfgd5-70KAUJVz0ZvZ19C3Pz7wmotSdrs,4857
 reconcile/external_resources/integration.py,sha256=y1gJ16woMBC3J9qniMmS5y3lCkAs7V_ETZRUwjKqaO0,6628
 reconcile/external_resources/integration_secrets_sync.py,sha256=cMEZhgCvABAMf-DWF051L6CRnJQdfbsISA_b1xuS940,1670
-reconcile/external_resources/manager.py,sha256=AvBYpC4p2BaGrxYEV1ut3V2FtJfs1h2z0Vk8Px6dCaQ,15641
+reconcile/external_resources/manager.py,sha256=cs6QEirz9EaLiuxybZ_1ugUn61vNWlKAC4NKouqpd5I,16148
 reconcile/external_resources/meta.py,sha256=noaytFzmShpzLA_ebGh7wuP45mOfHIOnnoUxivjDa1I,672
-reconcile/external_resources/metrics.py,sha256=Ihhe39BX0h2w7eLvvdijJuCXjj-f7w1E3MfDL0YiGNU,668
+reconcile/external_resources/metrics.py,sha256=jsN3IF78Su23d3Qp4BTKXkgZPN6AKjdS8sZFEXmYCek,863
 reconcile/external_resources/model.py,sha256=UuQgrnv-SSkvSEQQGeCE2IZkhXjLTCVkP_mw8zBZsIQ,8349
 reconcile/external_resources/reconciler.py,sha256=3KFmkHsN7YAwJUSBpN1Xd_D2zM9Ea5_c2uMGWsfruZo,9707
 reconcile/external_resources/secrets_sync.py,sha256=6n0oDPLjd9Ql0lf6zsr1AZw8A6EEe3yCzl20XodtgkE,16229
@@ -869,8 +869,8 @@ tools/test/test_qontract_cli.py,sha256=_D61RFGAN5x44CY1tYbouhlGXXABwYfxKSWSQx3Jr
 tools/test/test_saas_promotion_state.py,sha256=dy4kkSSAQ7bC0Xp2CociETGN-2aABEfL6FU5D9Jl00Y,6056
 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.1rc1117.dist-info/METADATA,sha256=eFQI6iom-hmLWzKt9WhHMix-S8ijZ1vRdMmH0hVXCjw,2213
-qontract_reconcile-0.10.1rc1117.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-qontract_reconcile-0.10.1rc1117.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1117.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1117.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1119.dist-info/METADATA,sha256=1GY523CTqDMLC8c80r56VSDiAn0dyKrkGnIH4b81HlE,2213
+qontract_reconcile-0.10.1rc1119.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+qontract_reconcile-0.10.1rc1119.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1119.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1119.dist-info/RECORD,,

reconcile/change_owners/change_log_tracking.py

@@ -50,6 +50,7 @@ class ChangeLog:
 class ChangeLogIntegrationParams(PydanticRunParams):
     gitlab_project_id: str
     process_existing: bool = False
+    commit: str | None = None
 
 
 class ChangeLogIntegration(QontractReconcileIntegration[ChangeLogIntegrationParams]):
@@ -105,6 +106,8 @@ class ChangeLogIntegration(QontractReconcileIntegration[ChangeLogIntegrationPara
         for item in diff_state.ls():
             key = item.lstrip("/")
             commit = key.rstrip(".json")
+            if self.params.commit and self.params.commit != commit:
+                continue
             if not self.params.process_existing:
                 existing_change_log_item = next(
                     (i for i in existing_change_log_items if i.commit == commit), None

reconcile/cli.py

@@ -3564,8 +3564,9 @@ def change_owners(
     default=False,
     help="wait for pending/running pipelines before acting.",
 )
+@click.option("--commit", help="Reconcile just this commit.", default=None)
 @click.pass_context
-def change_log_tracking(ctx, gitlab_project_id, process_existing):
+def change_log_tracking(ctx, gitlab_project_id, process_existing, commit):
     from reconcile.change_owners.change_log_tracking import (
         ChangeLogIntegration,
         ChangeLogIntegrationParams,
@@ -3576,6 +3577,7 @@ def change_log_tracking(ctx, gitlab_project_id, process_existing):
             ChangeLogIntegrationParams(
                 gitlab_project_id=gitlab_project_id,
                 process_existing=process_existing,
+                commit=commit,
             )
         ),
         ctx=ctx.obj,

reconcile/external_resources/manager.py

@@ -16,6 +16,7 @@ from reconcile.external_resources.factories import (
 from reconcile.external_resources.metrics import (
     ExternalResourcesReconcileErrorsCounter,
     ExternalResourcesReconcileTimeGauge,
+    ExternalResourcesResourceStatus,
 )
 from reconcile.external_resources.model import (
     Action,
@@ -212,7 +213,7 @@ class ExternalResourcesManager:
         return to_reconcile
 
     def _update_in_progress_state(
-        self, r: Reconciliation, state: ExternalResourceState
+        self, r: Reconciliation, state: ExternalResourceState, job_name: str
     ) -> bool:
         """Gets the resource reconciliation state from the Job and updates the
         Resource state accordingly. It also returns if the target outputs secret needs
@@ -238,7 +239,6 @@ class ExternalResourcesManager:
 
         # Need to check the reconciliation set in the state, not the desired one
         # as the reconciliation object might be from a previous desired state
-        job_name = ReconciliationK8sJob(reconciliation=r).name()
         error = False
         match self.reconciler.get_resource_reconcile_status(state.reconciliation):
             case ReconcileStatus.SUCCESS:
@@ -291,7 +291,6 @@ class ExternalResourcesManager:
                     job_name=job_name,
                 )
             )
-
         return need_secret_sync
 
     def _update_state(self, r: Reconciliation, state: ExternalResourceState) -> None:
@@ -353,7 +352,8 @@ class ExternalResourcesManager:
         to_sync_keys: set[ExternalResourceKey] = set()
         for r in desired_r.union(deleted_r):
             state = self.state_mgr.get_external_resource_state(r.key)
-            need_sync = self._update_in_progress_state(r, state)
+            job_name = ReconciliationK8sJob(reconciliation=r).name()
+            need_sync = self._update_in_progress_state(r, state, job_name)
             if need_sync:
                 to_sync_keys.add(r.key)
 
@@ -361,6 +361,18 @@ class ExternalResourcesManager:
                 self.reconciler.reconcile_resource(reconciliation=r)
                 self._update_state(r, state)
 
+            metrics.set_gauge(
+                ExternalResourcesResourceStatus(
+                    provision_provider=r.key.provision_provider,
+                    provisioner_name=r.key.provisioner_name,
+                    provider=r.key.provider,
+                    identifier=r.key.identifier,
+                    job_name=job_name,
+                    status=state.resource_status,
+                ),
+                1,
+            )
+
         pending_sync_keys = self.state_mgr.get_keys_by_status(
             ResourceStatus.PENDING_SECRET_SYNC
         )

reconcile/external_resources/metrics.py

@@ -24,3 +24,11 @@ class ExternalResourcesReconcileTimeGauge(ExternalResourcesBaseMetric, GaugeMetr
     @classmethod
     def name(cls) -> str:
         return "external_resources_reconcile_time"
+
+
+class ExternalResourcesResourceStatus(ExternalResourcesBaseMetric, GaugeMetric):
+    status: str
+
+    @classmethod
+    def name(cls) -> str:
+        return "external_resources_resource_status"