qontract-reconcile 0.10.1rc807__py3-none-any.whl → 0.10.1rc809__py3-none-any.whl

{qontract_reconcile-0.10.1rc807.dist-info → qontract_reconcile-0.10.1rc809.dist-info}/METADATA

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

@@ -10,7 +10,7 @@ reconcile/aws_iam_password_reset.py,sha256=NwErtrqgBiXr7eGCAHdtGGOx0S7-4JnSc29Ie
 reconcile/aws_support_cases_sos.py,sha256=Jk6_XjDeJSYxgRGqcEAOcynt9qJF2r5HPIPcSKmoBv8,2974
 reconcile/blackbox_exporter_endpoint_monitoring.py,sha256=W_VJagnsJR1v5oqjlI3RJJE0_nhtJ0m81RS8zWA5u5c,3538
 reconcile/checkpoint.py,sha256=R2WFXUXLTB4sWMi4GeA4eegsuf_1-Q4vH8M0Toh3Ij4,5036
-reconcile/cli.py,sha256=n64KqkdnqF_H2WHoqlSxQ2PP0uYuY9THPGeyiLP9zJA,101154
+reconcile/cli.py,sha256=q0DYN65kPT_4GmnE4tb-VczkNwEDqfAQq7d9lJ6AM-I,101474
 reconcile/closedbox_endpoint_monitoring_base.py,sha256=SMhkcQqprWvThrIJa3U_3uh5w1h-alleW1QnCJFY4Qw,4909
 reconcile/cluster_deployment_mapper.py,sha256=2Ah-nu-Mdig0pjuiZl_XLrmVAjYzFjORR3dMlCgkmw0,2352
 reconcile/dashdotdb_base.py,sha256=a5aPLVxyqPSbjdB0Ty-uliOtxwvEbbEljHJKxdK3-Zk,4813
@@ -390,7 +390,7 @@ reconcile/ocm/types.py,sha256=ibJYvzfAZyyMFkcF1bP8u3rkXciYJRplt_7Z1pKHFh0,2484
 reconcile/ocm_internal_notifications/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/ocm_internal_notifications/integration.py,sha256=Gw2oB1Oe1Vvbj-fN_undhkQ2y5tCVhUfW5DenKu9ybM,4395
 reconcile/ocm_labels/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/ocm_labels/integration.py,sha256=JmqjY_8QI8lgnCgXroiEfj58wkd98fOe5mTiKvkLeOQ,14946
+reconcile/ocm_labels/integration.py,sha256=aOfQqZj6ftwyzm6DoV3dOpmJvfxwAdJM_nveVDN5aBQ,15212
 reconcile/oum/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/oum/base.py,sha256=gw5qDx3VKtIk-VW_g0j5iPdM4qAweqy0YROHJhKHt0M,13596
 reconcile/oum/labelset.py,sha256=MTOMEyBMbge3JOq0mOKWja-kV3cs0ZId9Ozxv7FJ9Kw,2185
@@ -794,8 +794,8 @@ tools/saas_metrics_exporter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
 tools/saas_metrics_exporter/main.py,sha256=piocx6meMdJxoxeNz52gQGUjt5n7Fma4kgqYamszPrM,3180
 tools/saas_metrics_exporter/commit_distance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/saas_metrics_exporter/commit_distance/channel.py,sha256=XEAh3eL8TmgMe7V2BsyxuXYWgvBBVdSJETd6Ec7cI04,2171
-tools/saas_metrics_exporter/commit_distance/commit_distance.py,sha256=snkcHKS7zxSIomS7psEQ13efN-j9MxKZHe0nLw55dAk,4042
-tools/saas_metrics_exporter/commit_distance/metrics.py,sha256=rQTcinrv3uGLnHFumS37NN3QyVv1z6HGqy8MtfOwcxM,544
+tools/saas_metrics_exporter/commit_distance/commit_distance.py,sha256=nyw9N1ESrcxweWfESI-zlldDdSQGLtiuC6x7DXIjtDw,3074
+tools/saas_metrics_exporter/commit_distance/metrics.py,sha256=5-y6n-sGACAS3eJ5ndY-2BFxcd0fxLfhvZmmBHu4JuA,426
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y,894
 tools/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -804,8 +804,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.1rc807.dist-info/METADATA,sha256=2hjumgGnpdb2xNCQjgY_-ihI36Osy4S-xLrUaas-wDk,2314
-qontract_reconcile-0.10.1rc807.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc807.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc807.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc807.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc809.dist-info/METADATA,sha256=ZiXxi9rVJ5nR4cgVYg1t46b3cdGvOuDfoPlDESF-bA8,2314
+qontract_reconcile-0.10.1rc809.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc809.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc809.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc809.dist-info/RECORD,,

reconcile/cli.py

@@ -3489,8 +3489,15 @@ def skupper_network(ctx, thread_pool_size, internal, use_jump_host):
     envvar="OL_MANAGED_LABEL_PREFIXES",
     default="sre-capabilities",
 )
+@click.option(
+    "--ignored-label-prefixes",
+    help="A comma list of label prefixes that must be ignored.",
+    required=True,
+    envvar="OL_IGNORED_LABEL_PREFIXES",
+    default="sre-capabilities.rhidp",
+)
 @click.pass_context
-def ocm_labels(ctx, managed_label_prefixes):
+def ocm_labels(ctx, managed_label_prefixes, ignored_label_prefixes):
     from reconcile.ocm_labels.integration import (
         OcmLabelsIntegration,
         OcmLabelsIntegrationParams,
@@ -3500,6 +3507,7 @@ def ocm_labels(ctx, managed_label_prefixes):
         integration=OcmLabelsIntegration(
             OcmLabelsIntegrationParams(
                 managed_label_prefixes=list(set(managed_label_prefixes.split(","))),
+                ignored_label_prefixes=list(set(ignored_label_prefixes.split(","))),
             )
         ),
         ctx=ctx.obj,

reconcile/ocm_labels/integration.py

@@ -63,8 +63,9 @@ QONTRACT_INTEGRATION = "ocm-labels"
 
 class OcmLabelsIntegrationParams(PydanticRunParams):
     managed_label_prefixes: list[str] = []
+    ignored_label_prefixes: list[str] = []
 
-    @validator("managed_label_prefixes")
+    @validator("managed_label_prefixes", "ignored_label_prefixes")
     def must_end_with_dot(  # pylint: disable=no-self-argument
         cls, v: list[str]
     ) -> list[str]:
@@ -250,7 +251,9 @@ class OcmLabelsIntegration(QontractReconcileIntegration[OcmLabelsIntegrationPara
         e.g. if a cluster can't be found in OCM or is not considered ready yet.
         """
         current_state = self.fetch_subscription_label_current_state(
-            clusters, self.params.managed_label_prefixes
+            clusters,
+            self.params.managed_label_prefixes,
+            self.params.ignored_label_prefixes,
         )
         desired_state = self.fetch_desired_state(
             self.subscription_label_sources(clusters, query_func)
@@ -258,7 +261,10 @@ class OcmLabelsIntegration(QontractReconcileIntegration[OcmLabelsIntegrationPara
         return current_state, desired_state
 
     def fetch_subscription_label_current_state(
-        self, clusters: Iterable[ClusterV1], managed_label_prefixes: list[str]
+        self,
+        clusters: Iterable[ClusterV1],
+        managed_label_prefixes: list[str],
+        ignored_label_prefixes: list[str],
     ) -> LabelState:
         """
         Fetches the current state of subscription labels for the given clusters.
@@ -287,6 +293,7 @@ class OcmLabelsIntegration(QontractReconcileIntegration[OcmLabelsIntegrationPara
                     label: value
                     for label, value in cluster_details.subscription_labels.get_values_dict().items()
                     if label.startswith(tuple(managed_label_prefixes))
+                    and not label.startswith(tuple(ignored_label_prefixes))
                 }
                 states[
                     ClusterRef(

tools/saas_metrics_exporter/commit_distance/commit_distance.py

@@ -7,124 +7,97 @@ from reconcile.typed_queries.saas_files import SaasFile
 from reconcile.utils.secret_reader import HasSecret
 from reconcile.utils.vcs import VCS
 from tools.saas_metrics_exporter.commit_distance.channel import (
-    Channel,
     SaasTarget,
     build_channels,
 )
 from tools.saas_metrics_exporter.commit_distance.metrics import SaasCommitDistanceGauge
 
 
-@dataclass
-class Distance:
-    publisher: SaasTarget
-    subscriber: SaasTarget
-    channel: Channel
-    distance: int = 0
-
-
 @dataclass
 class CommitDistanceMetric:
     value: float
     metric: SaasCommitDistanceGauge
 
 
-@dataclass
-class ThreadData:
+@dataclass(frozen=True)
+class DistanceKey:
     repo_url: str
     auth_code: HasSecret | None
     ref_from: str
     ref_to: str
-    distance: int = 0
-
-    def __hash__(self) -> int:
-        return hash((self.repo_url, self.ref_from, self.ref_to))
 
 
 class CommitDistanceFetcher:
     def __init__(self, vcs: VCS):
         self._vcs = vcs
 
-    def _data_key(self, repo_url: str, ref_from: str, ref_to: str) -> str:
-        return f"{repo_url}/{ref_from}/{ref_to}"
-
-    def _calculate_commit_distance(self, data: ThreadData) -> None:
-        if data.ref_from == data.ref_to:
-            data.distance = 0
-            return
+    def _calculate_commit_distance(self, key: DistanceKey) -> tuple[DistanceKey, int]:
+        if key.ref_from == key.ref_to:
+            return key, 0
 
         commits = self._vcs.get_commits_between(
-            repo_url=data.repo_url,
-            auth_code=data.auth_code,
-            commit_from=data.ref_from,
-            commit_to=data.ref_to,
+            repo_url=key.repo_url,
+            auth_code=key.auth_code,
+            commit_from=key.ref_from,
+            commit_to=key.ref_to,
+        )
+        return key, len(commits)
+
+    @staticmethod
+    def _build_distance_key(
+        publisher: SaasTarget, subscriber: SaasTarget
+    ) -> DistanceKey:
+        return DistanceKey(
+            repo_url=publisher.repo_url,
+            auth_code=publisher.auth_code,
+            ref_from=subscriber.ref,
+            ref_to=publisher.ref,
         )
-        data.distance = len(commits)
-
-    def _populate_distances(
-        self, distances: Iterable[Distance], thread_data: Iterable[ThreadData]
-    ) -> None:
-        m = {
-            self._data_key(
-                repo_url=d.repo_url, ref_from=d.ref_from, ref_to=d.ref_to
-            ): d.distance
-            for d in thread_data
-        }
-        for distance in distances:
-            distance.distance = m[
-                self._data_key(
-                    repo_url=distance.publisher.repo_url,
-                    ref_from=distance.subscriber.ref,
-                    ref_to=distance.publisher.ref,
-                )
-            ]
 
     def fetch(
-        self, saas_files: Iterable[SaasFile], thread_pool_size: int
+        self,
+        saas_files: Iterable[SaasFile],
+        thread_pool_size: int,
     ) -> list[CommitDistanceMetric]:
         channels = build_channels(saas_files=saas_files)
-        distances: list[Distance] = []
-        thread_data: set[ThreadData] = set()
-
-        for channel in channels:
-            for subscriber in channel.subscribers:
-                for publisher in channel.publishers:
-                    thread_data.add(
-                        ThreadData(
-                            repo_url=publisher.repo_url,
-                            auth_code=publisher.auth_code,
-                            ref_from=subscriber.ref,
-                            ref_to=publisher.ref,
-                        )
-                    )
-                    distances.append(
-                        Distance(
-                            publisher=publisher,
-                            subscriber=subscriber,
-                            channel=channel,
-                        )
-                    )
 
-        threaded.run(
-            self._calculate_commit_distance,
-            thread_data,
-            thread_pool_size=thread_pool_size,
-        )
+        distance_keys = {
+            self._build_distance_key(publisher=publisher, subscriber=subscriber)
+            for channel in channels
+            for subscriber in channel.subscribers
+            for publisher in channel.publishers
+        }
 
-        self._populate_distances(distances=distances, thread_data=thread_data)
+        distance_by_key = dict(
+            threaded.run(
+                self._calculate_commit_distance,
+                distance_keys,
+                thread_pool_size=thread_pool_size,
+            )
+        )
 
         commit_distance_metrics = [
             CommitDistanceMetric(
-                value=float(distance.distance),
+                value=float(
+                    distance_by_key[
+                        self._build_distance_key(
+                            publisher=publisher,
+                            subscriber=subscriber,
+                        )
+                    ]
+                ),
                 metric=SaasCommitDistanceGauge(
-                    channel=distance.channel.name,
-                    app=distance.publisher.app_name,
-                    publisher=distance.publisher.target_name,
-                    publisher_namespace=distance.publisher.namespace_name,
-                    subscriber=distance.subscriber.target_name,
-                    subscriber_namespace=distance.subscriber.namespace_name,
+                    channel=channel.name,
+                    app=publisher.app_name,
+                    publisher=publisher.target_name,
+                    publisher_namespace=publisher.namespace_name,
+                    subscriber=subscriber.target_name,
+                    subscriber_namespace=subscriber.namespace_name,
                 ),
             )
-            for distance in distances
+            for channel in channels
+            for subscriber in channel.subscribers
+            for publisher in channel.publishers
         ]
 
         return commit_distance_metrics

tools/saas_metrics_exporter/commit_distance/metrics.py

@@ -1,19 +1,12 @@
-from pydantic import BaseModel
-
 from reconcile.utils.metrics import (
     GaugeMetric,
 )
 
 
-class SaasBaseMetric(BaseModel):
-    "Base class for Saas metrics"
-
-    integration: str = "saas_metrics_exporter"
-
-
-class SaasCommitDistanceGauge(SaasBaseMetric, GaugeMetric):
+class SaasCommitDistanceGauge(GaugeMetric):
     "Gauge for the commit distance between saas targets in a channel"
 
+    integration: str = "saas_metrics_exporter"
     channel: str
     publisher: str
     publisher_namespace: str