qontract-reconcile 0.10.2.dev94__py3-none-any.whl → 0.10.2.dev96__py3-none-any.whl

{qontract_reconcile-0.10.2.dev94.dist-info → qontract_reconcile-0.10.2.dev96.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev94
+Version: 0.10.2.dev96
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Project-URL: homepage, https://github.com/app-sre/qontract-reconcile
 Project-URL: repository, https://github.com/app-sre/qontract-reconcile

{qontract_reconcile-0.10.2.dev94.dist-info → qontract_reconcile-0.10.2.dev96.dist-info}/RECORD

@@ -207,11 +207,11 @@ reconcile/external_resources/reconciler.py,sha256=-0trp1K-iUgOQn3mm1ZUSmfaReRrUT
 reconcile/external_resources/secrets_sync.py,sha256=ZDxzGZ6wC4zxLhA7-L39xDRH6rzUM285gytuzmRQdlw,16208
 reconcile/external_resources/state.py,sha256=gF3ACdl7YiUlbQ4uEGrD6i_Txxqr6mT9f8IFlTQ-8dY,13176
 reconcile/fleet_labeler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/fleet_labeler/dependencies.py,sha256=ZOpmtwgxEPBWU2yHRc6rhPwlvqhwYSsNMJQ_jVq1dLI,2993
-reconcile/fleet_labeler/integration.py,sha256=IeDUDlIIZREQRbsODB9xsCMoNrMk5738OF_fP7lUGFs,13128
+reconcile/fleet_labeler/dependencies.py,sha256=6vD9dC1pXOztWQpQCZa2ZLbXrTf50kzjtpqewRybuJ4,3169
+reconcile/fleet_labeler/integration.py,sha256=vMvDnQW1NXv2qWeG8ab_gguBq45UtmYErSXy6XR83d8,14149
 reconcile/fleet_labeler/merge_request.py,sha256=SfGxXInxeJzVnsTtO0ZC9-PesUJMdpKxKY9eCB6ms-g,1538
 reconcile/fleet_labeler/meta.py,sha256=lWnpH2U0PHCPXu9Ok_CPmO494qQJQ5pOuqo28s0jzIQ,146
-reconcile/fleet_labeler/metrics.py,sha256=wx9BmXLsN67m-aSsf81iB7Ehj5SzUsS2WB75isUReZg,662
+reconcile/fleet_labeler/metrics.py,sha256=zhcp06woGaZywTqWZf3znh6C2S2u7OHBLXalXYKuTzQ,1934
 reconcile/fleet_labeler/ocm.py,sha256=qcg1_p7nKlZG7-MQeOZos3rz6YSPAPh-HKxE3OVJwe0,4165
 reconcile/fleet_labeler/validate.py,sha256=gzc2tt7h9F60h7dcyJfEmsnjnfuux5Jtc_WzrIqr-5k,2541
 reconcile/fleet_labeler/vcs.py,sha256=6UHUQ08AGAHXF7629I6X-T_E1pvx96LxjS66EeOzve4,1108
@@ -224,7 +224,7 @@ reconcile/glitchtip_project_alerts/integration.py,sha256=BgMx-NyV9mTuv7Sotb2OioC
 reconcile/glitchtip_project_dsn/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/glitchtip_project_dsn/integration.py,sha256=2iugub-kHYkHNK33n0v9_TeWonuxCPah_VkoTPvaajE,8077
 reconcile/gql_definitions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/introspection.json,sha256=nBoWZM_ilrKlbCUF9cbRe7D1jsTqHqfGkLQW2gbleBM,2239254
+reconcile/gql_definitions/introspection.json,sha256=xA_cHhSy0wr9PG9y_Nwk75MbnjtHQjOEMd48nLZMK8E,2239784
 reconcile/gql_definitions/acs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/acs/acs_instances.py,sha256=L91WW9LbhJbBSrECqShQpFtjoBOsmNIYLRpMbx1io5o,2181
 reconcile/gql_definitions/acs/acs_policies.py,sha256=bN5i4mks10Z23KJSj7jqp966Osq2dps4d-sPH9gjxEA,7008
@@ -314,7 +314,7 @@ reconcile/gql_definitions/external_resources/external_resources_settings.py,sha2
 reconcile/gql_definitions/external_resources/fragments/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/external_resources/fragments/external_resources_module_overrides.py,sha256=T_qWCRtzU8F9frebBXG9TkeQdrKGt3R9YinSngPoFqM,1262
 reconcile/gql_definitions/fleet_labeler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/fleet_labeler/fleet_labels.py,sha256=rII_VzEfjGibY1lJXMBMKdCeV7kaNyRXk9-J9-neBoU,4412
+reconcile/gql_definitions/fleet_labeler/fleet_labels.py,sha256=ow9LTm376Y5rCVMWgRtrj2yWKK7_aBC5AM7svLN7pKo,4546
 reconcile/gql_definitions/fragments/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/fragments/aus_organization.py,sha256=uBKbTuBa3CZmTXR5HOcGhRcu2U9kM93KbYmoWTxcpB0,4767
 reconcile/gql_definitions/fragments/aws_account_common.py,sha256=3-7ZAP6GSff7Z2Syz2VQCLY4IySqBOSVmceaRiVNQpw,2385
@@ -786,7 +786,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=UfwwRLS5Ya4_Nh1w5n1dvoYtchQvYE9yj1VANt2IKqI,3925
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y,894
-qontract_reconcile-0.10.2.dev94.dist-info/METADATA,sha256=6jF1IpkimS99Wf-hXeOV8tYFGl0GGQgVl_p9Ax-YDG4,24565
-qontract_reconcile-0.10.2.dev94.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev94.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev94.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev96.dist-info/METADATA,sha256=HAWau-mbdGSxEIuXiVqfR00bMYmkHZPCrQn2jcTzmmU,24565
+qontract_reconcile-0.10.2.dev96.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev96.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev96.dist-info/RECORD,,

reconcile/fleet_labeler/dependencies.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 from collections.abc import Mapping
 
+from reconcile.fleet_labeler.metrics import FleetLabelerMetrics
 from reconcile.fleet_labeler.ocm import OCMClient, OCMClientConfig
 from reconcile.fleet_labeler.vcs import VCS
 from reconcile.gql_definitions.fleet_labeler.fleet_labels import FleetLabelsSpecV1
@@ -26,12 +27,14 @@ class Dependencies:
         self,
         label_specs_by_name: Mapping[str, FleetLabelsSpecV1],
         ocm_clients_by_label_spec_name: Mapping[str, OCMClient],
+        metrics: FleetLabelerMetrics,
         vcs: VCS,
         dry_run: bool,
     ):
         self.label_specs_by_name = label_specs_by_name
         self.ocm_clients_by_label_spec_name = ocm_clients_by_label_spec_name
         self.vcs = vcs
+        self.metrics = metrics
         self.dry_run = dry_run
 
     @classmethod
@@ -45,6 +48,7 @@ class Dependencies:
             ocm_clients_by_label_spec_name=_ocm_clients(secret_reader=secret_reader),
             vcs=_vcs(secret_reader=secret_reader, dry_run=dry_run),
             dry_run=dry_run,
+            metrics=FleetLabelerMetrics(),
         )
 
 

reconcile/fleet_labeler/integration.py

@@ -13,7 +13,9 @@ from reconcile.fleet_labeler.meta import (
     QONTRACT_INTEGRATION,
     QONTRACT_INTEGRATION_VERSION,
 )
-from reconcile.fleet_labeler.metrics import FleetLabelerDuplicateClusterMatchesGauge
+from reconcile.fleet_labeler.metrics import (
+    FleetLabelerMetrics,
+)
 from reconcile.fleet_labeler.ocm import OCMClient
 from reconcile.fleet_labeler.validate import validate_label_specs
 from reconcile.fleet_labeler.vcs import VCS, Gitlab404Error
@@ -23,9 +25,6 @@ from reconcile.gql_definitions.fleet_labeler.fleet_labels import (
     FleetSubscriptionLabelTemplateV1,
 )
 from reconcile.typed_queries.fleet_labels import get_fleet_label_specs
-from reconcile.utils import (
-    metrics,
-)
 from reconcile.utils.differ import diff_mappings
 from reconcile.utils.jinja2.utils import process_jinja2_template
 from reconcile.utils.ruamel import create_ruamel_instance
@@ -67,6 +66,7 @@ class FleetLabelerIntegration(QontractReconcileIntegration[NoParams]):
             secret_reader=self.secret_reader,
             dry_run=dry_run,
         )
+        self._metrics = dependencies.metrics
         self.reconcile(dependencies=dependencies)
 
     def reconcile(self, dependencies: Dependencies) -> None:
@@ -89,13 +89,15 @@ class FleetLabelerIntegration(QontractReconcileIntegration[NoParams]):
                 vcs=dependencies.vcs,
                 all_desired_clusters=all_desired_clusters,
                 clusters_with_duplicate_matches=clusters_with_duplicate_matches,
+                metrics=dependencies.metrics,
                 dry_run=dependencies.dry_run,
             )
+            synch_labels = spec.dry_run_label_synchronization or dependencies.dry_run
             self._sync_subscription_labels(
                 spec=spec,
                 desired_clusters=all_desired_clusters,
                 ocm=ocm,
-                dry_run=dependencies.dry_run,
+                dry_run=synch_labels,
             )
 
     def _discover_desired_clusters(
@@ -243,6 +245,7 @@ class FleetLabelerIntegration(QontractReconcileIntegration[NoParams]):
         vcs: VCS,
         clusters_with_duplicate_matches: dict[str, list[ClusterData]],
         all_desired_clusters: dict[str, ClusterData],
+        metrics: FleetLabelerMetrics,
         dry_run: bool,
     ) -> None:
         all_current_cluster_ids = {cluster.cluster_id for cluster in spec.clusters}
@@ -253,28 +256,46 @@ class FleetLabelerIntegration(QontractReconcileIntegration[NoParams]):
             logging.error(
                 f"[{spec.name}] Cluster ID {cluster_id} is matched multiple times by different label matchers:\n{label_matches}"
             )
-        metrics.set_gauge(
-            FleetLabelerDuplicateClusterMatchesGauge(
-                integration=self.name,
-                ocm_name=spec.ocm.name,
-            ),
-            len(clusters_with_duplicate_matches),
+        metrics.set_duplicate_cluster_matches_gauge(
+            ocm_name=spec.ocm.name,
+            spec_name=spec.name,
+            value=len(clusters_with_duplicate_matches),
         )
 
-        clusters_to_add = [
-            YamlCluster(
-                cluster_id=cluster_id,
-                subscription_id=cluster_info.subscription_id,
-                name=cluster_info.name,
-                server_url=cluster_info.server_url,
-                subscription_labels_content=self._render_default_labels(
+        clusters_to_add: list[YamlCluster] = []
+        label_rendering_errors_cnt = 0
+        for cluster_id, cluster_info in all_desired_clusters.items():
+            if cluster_id in all_current_cluster_ids:
+                continue
+            try:
+                default_labels = self._render_default_labels(
                     template=cluster_info.desired_label_default.subscription_label_template,
                     labels=ocm.get_cluster_labels(cluster_id=cluster_id),
-                ),
-            )
-            for cluster_id, cluster_info in all_desired_clusters.items()
-            if cluster_id not in all_current_cluster_ids
-        ]
+                )
+            except Exception as e:
+                logging.error(
+                    f"[{spec.name}] Error while rendering default labels for {cluster_id=} {cluster_info.subscription_id=} - skipping cluster: {e}"
+                )
+                default_labels = None
+                label_rendering_errors_cnt += 1
+
+            if default_labels:
+                # Note, we are skipping this cluster if there are no default_labels rendered
+                clusters_to_add.append(
+                    YamlCluster(
+                        cluster_id=cluster_id,
+                        subscription_id=cluster_info.subscription_id,
+                        name=cluster_info.name,
+                        server_url=cluster_info.server_url,
+                        subscription_labels_content=default_labels,
+                    )
+                )
+        metrics.set_label_rendering_error_gauge(
+            ocm_name=spec.ocm.name,
+            spec_name=spec.name,
+            value=label_rendering_errors_cnt,
+        )
+
         cluster_ids_to_delete = all_current_cluster_ids - all_desired_clusters.keys()
 
         if not (cluster_ids_to_delete or clusters_to_add):
@@ -282,7 +303,7 @@ class FleetLabelerIntegration(QontractReconcileIntegration[NoParams]):
 
         for yaml_cluster in clusters_to_add:
             logging.info(
-                f"[{spec.name}] Adding cluster '{yaml_cluster.name}' with id '{yaml_cluster.cluster_id}' to inventory with default labels {yaml_cluster.subscription_labels_content}."
+                f"[{spec.name}] Adding cluster '{yaml_cluster.name}' with id '{yaml_cluster.cluster_id}' and subscription id '{yaml_cluster.subscription_id}' to inventory with default labels {yaml_cluster.subscription_labels_content}."
             )
         for cluster_id in cluster_ids_to_delete:
             logging.info(

reconcile/fleet_labeler/metrics.py

@@ -1,13 +1,46 @@
 from pydantic import BaseModel
 
+from reconcile.fleet_labeler.meta import QONTRACT_INTEGRATION
+from reconcile.utils import (
+    metrics,
+)
 from reconcile.utils.metrics import (
     GaugeMetric,
 )
 
 
+class FleetLabelerMetrics:
+    """
+    Thin OOP wrapper for tests
+    """
+
+    def set_label_rendering_error_gauge(
+        self, ocm_name: str, spec_name: str, value: int
+    ) -> None:
+        metrics.set_gauge(
+            FleetLabelerDuplicateClusterMatchesGauge(
+                ocm_name=ocm_name,
+                spec=spec_name,
+            ),
+            value,
+        )
+
+    def set_duplicate_cluster_matches_gauge(
+        self, ocm_name: str, spec_name: str, value: int
+    ) -> None:
+        metrics.set_gauge(
+            FleetLabelerLabelRenderingErrorGauge(
+                ocm_name=ocm_name,
+                spec=spec_name,
+            ),
+            value,
+        )
+
+
 class FleetLabelerBaseMetric(BaseModel):
-    integration: str
+    integration: str = QONTRACT_INTEGRATION
     ocm_name: str
+    spec: str
 
 
 class FleetLabelerDuplicateClusterMatchesGauge(FleetLabelerBaseMetric, GaugeMetric):
@@ -21,3 +54,15 @@ class FleetLabelerDuplicateClusterMatchesGauge(FleetLabelerBaseMetric, GaugeMetr
     @classmethod
     def name(cls) -> str:
         return "fleet_labeler_duplicate_cluster_matches"
+
+
+class FleetLabelerLabelRenderingErrorGauge(FleetLabelerBaseMetric, GaugeMetric):
+    """
+    Gauge for the number of clusters that have label render errors. This
+    happens when the fleet labeler is unable to render the subscription labels
+    template for a cluster. Check the logs to identify the clusters with label render errors.
+    """
+
+    @classmethod
+    def name(cls) -> str:
+        return "fleet_labeler_label_rendering_error"

reconcile/gql_definitions/fleet_labeler/fleet_labels.py

@@ -33,6 +33,7 @@ query FleetLabelSpecs {
         name
         path
         managedSubscriptionLabelPrefix
+        dryRunLabelSynchronization
         ocm {
             name
             environment {
@@ -113,6 +114,7 @@ class FleetLabelsSpecV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
     path: str = Field(..., alias="path")
     managed_subscription_label_prefix: str = Field(..., alias="managedSubscriptionLabelPrefix")
+    dry_run_label_synchronization: Optional[bool] = Field(..., alias="dryRunLabelSynchronization")
     ocm: OpenShiftClusterManagerV1 = Field(..., alias="ocm")
     label_defaults: list[FleetLabelDefaultV1] = Field(..., alias="labelDefaults")
     clusters: list[FleetClusterV1] = Field(..., alias="clusters")

reconcile/gql_definitions/introspection.json

@@ -34397,6 +34397,18 @@
                             "isDeprecated": false,
                             "deprecationReason": null
                         },
+                        {
+                            "name": "dryRunLabelSynchronization",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "Boolean",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
                         {
                             "name": "managedSubscriptionLabelPrefix",
                             "description": null,