qontract-reconcile 0.10.1rc535__py3-none-any.whl → 0.10.1rc536__py3-none-any.whl

{qontract_reconcile-0.10.1rc535.dist-info → qontract_reconcile-0.10.1rc536.dist-info}/METADATA

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

@@ -350,9 +350,10 @@ reconcile/saas_auto_promotions_manager/publisher.py,sha256=4_M9Oykhj-kEZPUn05E2D
 reconcile/saas_auto_promotions_manager/subscriber.py,sha256=cLhPlkT71J2LIice3SLmH1WpsqzV46gd0peMxrnqyRw,7452
 reconcile/saas_auto_promotions_manager/merge_request_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request.py,sha256=BeAJWLow7b4HQyZ9zz398sQkPeIz8chpMkCts2NU27c,1282
-reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request_manager_v2.py,sha256=Efl4PBOt78UgB-NL_j3_FXabtpQvkJhCEXaHwyspVcE,6006
+reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request_manager_v2.py,sha256=mU6csC1-2WjEHhYNCeEDDmN63QQIprp0zkqQ5UH5xNM,6817
+reconcile/saas_auto_promotions_manager/merge_request_manager/metrics.py,sha256=mI9yYwCiNePmtox16yKH1mU5ijsMeQYjQBgRiZq101A,878
 reconcile/saas_auto_promotions_manager/merge_request_manager/mr_parser.py,sha256=x8Gg-YjEFWEeDPJH3Y8SrfcJbwhLuAqCz4kIhfEyaaA,7060
-reconcile/saas_auto_promotions_manager/merge_request_manager/reconciler.py,sha256=lxQUJgpwfnzvGZTNpmLOeTSiXzzJta1aSezMF9HRTwg,7734
+reconcile/saas_auto_promotions_manager/merge_request_manager/reconciler.py,sha256=nst5ZynEQs9Hy9Z2DAjN8_ALIS_5XnrbJh7KG4YVRrE,7789
 reconcile/saas_auto_promotions_manager/merge_request_manager/renderer.py,sha256=huslpgeXNf_VmEVmWHIYYSwEcT67zsbuubYMk2P9ezc,6959
 reconcile/saas_auto_promotions_manager/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/saas_auto_promotions_manager/utils/saas_files_inventory.py,sha256=mihuWynroB1Cea1Lsvf6V8Nb8PGiBdcLC0uhCX_52Y0,6966
@@ -458,9 +459,9 @@ reconcile/test/saas_auto_promotions_manager/merge_request_manager/__init__.py,sh
 reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/conftest.py,sha256=7O3lbk1EmEtUofqGncfiwMYvDPXrkQNPB59zlQ_zXkM,4588
 reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/data_keys.py,sha256=Z1IV51OUuzhd-3S8W-k7ixC-fkaglCokn0eakK0Z73s,606
-reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/test_merge_request_manager.py,sha256=ryROiiQNtZvuG820CB-RQ9FMmLAGshezyMDNDiJNA_E,2369
+reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/test_merge_request_manager.py,sha256=h8lnorFPZIxTtbaaXGLoiEsBbB4Qj-Mg9BKV62ZqEBQ,2389
 reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/test_mr_parser.py,sha256=dcGHzxuafKSxmswSO1qF2WlKaqsmEvtERC6Lb8kDAN0,10019
-reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/test_reconciler.py,sha256=to7lRzKTqN1cwEcnzDUKPWbIAzffI9jD870en0-zif8,17868
+reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/test_reconciler.py,sha256=_bzfJzjFJgubu--7wyXIiusUrdbmLtFbHmkbat4SX_M,17828
 reconcile/test/saas_auto_promotions_manager/merge_request_manager/renderer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/test/saas_auto_promotions_manager/merge_request_manager/renderer/conftest.py,sha256=2rCSstewp4LPoEJHm5N7dGJexEtY8ndLHvoGZYjmpsc,1678
 reconcile/test/saas_auto_promotions_manager/merge_request_manager/renderer/data_keys.py,sha256=beHYQ9kgDLeBZgC2FvxQA3tHx1PO-RAMN8_kVcSdikI,90
@@ -667,8 +668,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=d18KrdhtUGqoC7_kWZU128U0-VJEj-0rjFkLVufcI6I,2755
 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.1rc535.dist-info/METADATA,sha256=mnMNUfrE1xFYJmiIcrSIdaiF0EYFAOaEH494u33aBcw,2349
-qontract_reconcile-0.10.1rc535.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-qontract_reconcile-0.10.1rc535.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
-qontract_reconcile-0.10.1rc535.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc535.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc536.dist-info/METADATA,sha256=BZPcvTsEmz0tR4NJmj-JZM7l_J2qAMSglos5FuteOCo,2349
+qontract_reconcile-0.10.1rc536.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+qontract_reconcile-0.10.1rc536.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
+qontract_reconcile-0.10.1rc536.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc536.dist-info/RECORD,,

reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request_manager_v2.py

@@ -7,6 +7,15 @@ from gitlab.exceptions import GitlabGetError
 from reconcile.saas_auto_promotions_manager.merge_request_manager.merge_request import (
     SAPMMR,
 )
+from reconcile.saas_auto_promotions_manager.merge_request_manager.metrics import (
+    SAPMClosedMRsCounter as MRClosedCounter,
+)
+from reconcile.saas_auto_promotions_manager.merge_request_manager.metrics import (
+    SAPMOpenedMRsCounter as MROpenedCounter,
+)
+from reconcile.saas_auto_promotions_manager.merge_request_manager.metrics import (
+    SAPMParallelOpenMRsGauge as ParallelOpenMRGauge,
+)
 from reconcile.saas_auto_promotions_manager.merge_request_manager.mr_parser import (
     MRParser,
 )
@@ -19,6 +28,7 @@ from reconcile.saas_auto_promotions_manager.merge_request_manager.renderer impor
     Renderer,
 )
 from reconcile.saas_auto_promotions_manager.subscriber import Subscriber
+from reconcile.utils import metrics
 from reconcile.utils.mr.labels import AUTO_MERGE
 from reconcile.utils.vcs import VCS
 
@@ -138,19 +148,32 @@ class MergeRequestManagerV2:
 
     def reconcile(self, subscribers: Iterable[Subscriber]) -> None:
         current_state = self._mr_parser.retrieve_open_mrs(label=SAPM_LABEL)
+        metrics.set_gauge(ParallelOpenMRGauge(), len(current_state))
+
         desired_state = self._aggregate_desired_state(subscribers=subscribers)
+
         diff = self._reconciler.reconcile(
             batch_limit=BATCH_SIZE_LIMIT,
             desired_promotions=desired_state,
             open_mrs=current_state,
         )
         for deletion in diff.deletions:
+            metrics.inc_counter(
+                MRClosedCounter(
+                    reason=deletion.reason.name,
+                ),
+            )
             self._vcs.close_app_interface_mr(
                 mr=deletion.mr.raw,
-                comment=deletion.reason,
+                comment=deletion.reason.value,
             )
 
         for addition in diff.additions:
+            metrics.inc_counter(
+                MROpenedCounter(
+                    is_batchable=addition.batchable,
+                ),
+            )
             self._render_mr(addition=addition)
 
         for rendered_mr in self._sapm_mrs:

reconcile/saas_auto_promotions_manager/merge_request_manager/metrics.py

@@ -0,0 +1,40 @@
+from pydantic import BaseModel
+
+from reconcile.utils.metrics import (
+    CounterMetric,
+    GaugeMetric,
+)
+
+
+class SAPMBaseMetric(BaseModel):
+    "Base class for SAPM MR metrics"
+
+    integration: str = "saas_auto_promotions_manager"
+
+
+class SAPMOpenedMRsCounter(SAPMBaseMetric, CounterMetric):
+    "Counter for the number of opened auto-promotion MRs"
+
+    is_batchable: bool
+
+    @classmethod
+    def name(cls) -> str:
+        return "sapm_opened_mrs"
+
+
+class SAPMClosedMRsCounter(SAPMBaseMetric, CounterMetric):
+    "Counter for the number of closed auto-promotion MRs"
+
+    reason: str
+
+    @classmethod
+    def name(cls) -> str:
+        return "sapm_closed_mrs"
+
+
+class SAPMParallelOpenMRsGauge(SAPMBaseMetric, GaugeMetric):
+    "Gauge for the number of parallel open auto-promotion MRs"
+
+    @classmethod
+    def name(cls) -> str:
+        return "sapm_parallel_open_mrs"

reconcile/saas_auto_promotions_manager/merge_request_manager/reconciler.py

@@ -1,14 +1,17 @@
 from collections.abc import Iterable
 from dataclasses import dataclass
+from enum import Enum
 from typing import Optional
 
 from reconcile.saas_auto_promotions_manager.merge_request_manager.mr_parser import (
     OpenMergeRequest,
 )
 
-MSG_MISSING_UNBATCHING = "Closing this MR because it failed MR check and isn't marked as un-batchable yet. cc @kfischer"
-MSG_OUTDATED_CONTENT = "Closing this MR because it has out-dated content."
-MSG_NEW_BATCH = "Closing this MR in favor of a new batch MR."
+
+class Reason(Enum):
+    MISSING_UNBATCHING = "Closing this MR because it failed MR check and isn't marked as un-batchable yet. cc @kfischer"
+    OUTDATED_CONTENT = "Closing this MR because it has out-dated content."
+    NEW_BATCH = "Closing this MR in favor of a new batch MR."
 
 
 @dataclass
@@ -20,7 +23,7 @@ class Promotion:
 @dataclass
 class Deletion:
     mr: OpenMergeRequest
-    reason: str
+    reason: Reason
 
 
 @dataclass
@@ -70,7 +73,7 @@ class Reconciler:
                 diff.deletions.append(
                     Deletion(
                         mr=mr,
-                        reason=MSG_MISSING_UNBATCHING,
+                        reason=Reason.MISSING_UNBATCHING,
                     )
                 )
             else:
@@ -112,7 +115,7 @@ class Reconciler:
             diff.deletions.append(
                 Deletion(
                     mr=mr,
-                    reason=MSG_OUTDATED_CONTENT,
+                    reason=Reason.OUTDATED_CONTENT,
                 )
             )
         self._open_mrs = open_mrs_after_deletion
@@ -163,7 +166,7 @@ class Reconciler:
             diff.deletions.append(
                 Deletion(
                     mr=batch_with_capacity,
-                    reason=MSG_NEW_BATCH,
+                    reason=Reason.NEW_BATCH,
                 )
             )
 

reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/test_merge_request_manager.py

@@ -14,6 +14,7 @@ from reconcile.saas_auto_promotions_manager.merge_request_manager.reconciler imp
     Addition,
     Deletion,
     Diff,
+    Reason,
     Reconciler,
 )
 from reconcile.saas_auto_promotions_manager.merge_request_manager.renderer import (
@@ -48,7 +49,7 @@ def test_reconcile(
             failed_mr_check=False,
             is_batchable=True,
         ),
-        reason="some reason.",
+        reason=Reason.NEW_BATCH,
     )
 
     additions = [
@@ -76,7 +77,7 @@ def test_reconcile(
 
     assert len(manager._sapm_mrs) == len(additions)
     vcs.close_app_interface_mr.assert_has_calls([
-        call(deletion.mr.raw, deletion.reason),
+        call(deletion.mr.raw, deletion.reason.value),
     ])
     vcs.open_app_interface_merge_request.assert_has_calls([
         call(mr) for mr in manager._sapm_mrs

reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/test_reconciler.py

@@ -8,13 +8,11 @@ from reconcile.saas_auto_promotions_manager.merge_request_manager.mr_parser impo
     OpenMergeRequest,
 )
 from reconcile.saas_auto_promotions_manager.merge_request_manager.reconciler import (
-    MSG_MISSING_UNBATCHING,
-    MSG_NEW_BATCH,
-    MSG_OUTDATED_CONTENT,
     Addition,
     Deletion,
     Diff,
     Promotion,
+    Reason,
     Reconciler,
 )
 
@@ -110,7 +108,7 @@ def _aggregate_channels(items: Sequence[Addition | Deletion]) -> set[str]:
                             failed_mr_check=True,
                             is_batchable=True,
                         ),
-                        reason=MSG_MISSING_UNBATCHING,
+                        reason=Reason.MISSING_UNBATCHING,
                     ),
                     Deletion(
                         mr=OpenMergeRequest(
@@ -120,7 +118,7 @@ def _aggregate_channels(items: Sequence[Addition | Deletion]) -> set[str]:
                             failed_mr_check=False,
                             is_batchable=True,
                         ),
-                        reason=MSG_OUTDATED_CONTENT,
+                        reason=Reason.OUTDATED_CONTENT,
                     ),
                     Deletion(
                         mr=OpenMergeRequest(
@@ -130,7 +128,7 @@ def _aggregate_channels(items: Sequence[Addition | Deletion]) -> set[str]:
                             failed_mr_check=False,
                             is_batchable=False,
                         ),
-                        reason=MSG_OUTDATED_CONTENT,
+                        reason=Reason.OUTDATED_CONTENT,
                     ),
                     Deletion(
                         mr=OpenMergeRequest(
@@ -140,7 +138,7 @@ def _aggregate_channels(items: Sequence[Addition | Deletion]) -> set[str]:
                             failed_mr_check=True,
                             is_batchable=False,
                         ),
-                        reason=MSG_OUTDATED_CONTENT,
+                        reason=Reason.OUTDATED_CONTENT,
                     ),
                 ],
                 additions=[],
@@ -181,7 +179,7 @@ def _aggregate_channels(items: Sequence[Addition | Deletion]) -> set[str]:
                             failed_mr_check=True,
                             is_batchable=True,
                         ),
-                        reason=MSG_MISSING_UNBATCHING,
+                        reason=Reason.MISSING_UNBATCHING,
                     )
                 ],
                 additions=[
@@ -263,7 +261,7 @@ def _aggregate_channels(items: Sequence[Addition | Deletion]) -> set[str]:
                             failed_mr_check=False,
                             is_batchable=True,
                         ),
-                        reason=MSG_NEW_BATCH,
+                        reason=Reason.NEW_BATCH,
                     )
                 ],
                 additions=[
@@ -321,7 +319,7 @@ def _aggregate_channels(items: Sequence[Addition | Deletion]) -> set[str]:
                             failed_mr_check=False,
                             is_batchable=True,
                         ),
-                        reason=MSG_NEW_BATCH,
+                        reason=Reason.NEW_BATCH,
                     )
                 ],
                 additions=[