qontract-reconcile 0.10.1rc1036__py3-none-any.whl → 0.10.1rc1038__py3-none-any.whl

{qontract_reconcile-0.10.1rc1036.dist-info → qontract_reconcile-0.10.1rc1038.dist-info}/METADATA

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

@@ -181,8 +181,8 @@ reconcile/cna/assets/asset_factory.py,sha256=7T7X_J6xIsoGETqBRI45_EyIKEdQcnRPt_G
 reconcile/cna/assets/null.py,sha256=85mVh97atCoC0aLuX47poTZiyOthmziJeBsUw0c924w,1658
 reconcile/dynatrace_token_provider/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/dynatrace_token_provider/dependencies.py,sha256=FuRUnK18EyJIIgFwQBZSskIG08mN2VQAcAcaJFTf8zc,2812
-reconcile/dynatrace_token_provider/integration.py,sha256=OaRX5B8KiBvXQ57U8dLchlY2pqep5OM1p8HUNJGKGkc,23196
-reconcile/dynatrace_token_provider/metrics.py,sha256=xiKkl8fTEBQaXJelGCPNTZhHAWdO1M3pCXNr_Tei63c,1285
+reconcile/dynatrace_token_provider/integration.py,sha256=kECEWCIU_rTX7BeFm85Hjpx76GRm3Y54BFUwxQcLW7E,24682
+reconcile/dynatrace_token_provider/metrics.py,sha256=oP-6NTZENFdvWiS0krnmX6tq3xyOzQ8e6vS0CZWYUuw,1496
 reconcile/dynatrace_token_provider/model.py,sha256=gkpqo5rRRueBXnIMjp4EEHqBUBuU65TRI8zpdb8GJ0A,241
 reconcile/dynatrace_token_provider/ocm.py,sha256=iHMsgbsLs-dlrB9UXmWNDF7E4UDe49JOsLa9rnowKfo,4282
 reconcile/dynatrace_token_provider/validate.py,sha256=40_9QmHoB3-KBc0k_0D4QO00PpNNPS-gU9Z6cIcWga8,1920
@@ -447,7 +447,7 @@ reconcile/saas_auto_promotions_manager/publisher.py,sha256=IZGu-PMffyk3fNL8QcZ2V
 reconcile/saas_auto_promotions_manager/s3_exporter.py,sha256=IKlVWZmiPnvl7sKeF6JgAlhXZe5CovKTxQc0SNkNSx4,2583
 reconcile/saas_auto_promotions_manager/subscriber.py,sha256=kIJKT1Xg5FF7EGT5ayK5ROyu_S7FbsYK91WBqrtYjfA,10030
 reconcile/saas_auto_promotions_manager/merge_request_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/saas_auto_promotions_manager/merge_request_manager/batcher.py,sha256=CP392gq0yntzEkqpMJl2j-N4CGfFDFbBfK77J7Oo5Pg,7817
+reconcile/saas_auto_promotions_manager/merge_request_manager/batcher.py,sha256=R2CRtjdOggY5lSqt-A5qz2ymqomx4opVeVV_oqBAW0A,7804
 reconcile/saas_auto_promotions_manager/merge_request_manager/desired_state.py,sha256=isY8frVsL3PlcdZmdZ4O0qyp76oczl4DUMX9uMArs5Y,1222
 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=-zWK-cqr_8o9ZEnNfD3cfkv3hrrU4HJ4UMzi4J2Hjhw,6223
@@ -867,8 +867,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.1rc1036.dist-info/METADATA,sha256=ktF4TYAZVpjXuuOeLeuVYjfer0sgF70DsmjPpSkZ26Y,2213
-qontract_reconcile-0.10.1rc1036.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-qontract_reconcile-0.10.1rc1036.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1036.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1036.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1038.dist-info/METADATA,sha256=GKt0eKtaXZaF1JTo6RGwQ5MhvxO9N9wMH69a2Z3Th2o,2213
+qontract_reconcile-0.10.1rc1038.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+qontract_reconcile-0.10.1rc1038.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1038.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1038.dist-info/RECORD,,

reconcile/dynatrace_token_provider/integration.py

@@ -1,14 +1,17 @@
 import base64
 import hashlib
 import logging
+from collections import Counter, defaultdict
 from collections.abc import Iterable, Mapping, MutableMapping
 from datetime import timedelta
+from threading import Lock
 from typing import Any
 
 from reconcile.dynatrace_token_provider.dependencies import Dependencies
 from reconcile.dynatrace_token_provider.metrics import (
     DTPClustersManagedGauge,
     DTPOrganizationErrorRate,
+    DTPTokensManagedGauge,
 )
 from reconcile.dynatrace_token_provider.model import DynatraceAPIToken, K8sSecret
 from reconcile.dynatrace_token_provider.ocm import (
@@ -56,6 +59,11 @@ class ReconcileErrorSummary(Exception):
 class DynatraceTokenProviderIntegration(
     QontractReconcileIntegration[DynatraceTokenProviderIntegrationParams]
 ):
+    def __init__(self, params: DynatraceTokenProviderIntegrationParams) -> None:
+        super().__init__(params=params)
+        self._lock = Lock()
+        self._managed_tokens_cnt: dict[str, Counter[str]] = defaultdict(Counter)
+
     @property
     def name(self) -> str:
         return QONTRACT_INTEGRATION
@@ -70,6 +78,22 @@ class DynatraceTokenProviderIntegration(
         dependencies.populate_all()
         self.reconcile(dry_run=dry_run, dependencies=dependencies)
 
+    def _token_cnt(self, dt_tenant_id: str, ocm_env_name: str) -> None:
+        with self._lock:
+            self._managed_tokens_cnt[ocm_env_name][dt_tenant_id] += 1
+
+    def _expose_token_metrics(self) -> None:
+        for ocm_env_name, counter_by_tenant_id in self._managed_tokens_cnt.items():
+            for dt_tenant_id, cnt in counter_by_tenant_id.items():
+                metrics.set_gauge(
+                    DTPTokensManagedGauge(
+                        integration=self.name,
+                        ocm_env=ocm_env_name,
+                        dt_tenant_id=dt_tenant_id,
+                    ),
+                    cnt,
+                )
+
     def reconcile(self, dry_run: bool, dependencies: Dependencies) -> None:
         token_specs = list(dependencies.token_spec_by_name.values())
         validate_token_specs(specs=token_specs)
@@ -86,13 +110,6 @@ class DynatraceTokenProviderIntegration(
                     )
                 except Exception as e:
                     unhandled_exceptions.append(f"{ocm_env_name}: {e}")
-                metrics.set_gauge(
-                    DTPClustersManagedGauge(
-                        integration=self.name,
-                        ocm_env=ocm_env_name,
-                    ),
-                    len(clusters),
-                )
                 if not clusters:
                     continue
                 if self.params.ocm_organization_ids:
@@ -101,8 +118,16 @@ class DynatraceTokenProviderIntegration(
                         for cluster in clusters
                         if cluster.organization_id in self.params.ocm_organization_ids
                     ]
+
                 existing_dtp_tokens: dict[str, dict[str, str]] = {}
 
+                metrics.set_gauge(
+                    DTPClustersManagedGauge(
+                        integration=self.name,
+                        ocm_env=ocm_env_name,
+                    ),
+                    len(clusters),
+                )
                 for cluster in clusters:
                     try:
                         with DTPOrganizationErrorRate(
@@ -162,11 +187,13 @@ class DynatraceTokenProviderIntegration(
                                 existing_dtp_tokens=existing_dtp_tokens[tenant_id],
                                 tenant_id=tenant_id,
                                 token_spec=token_spec,
+                                ocm_env_name=ocm_env_name,
                             )
                     except Exception as e:
                         unhandled_exceptions.append(
                             f"{ocm_env_name}/{cluster.organization_id}/{cluster.external_id}: {e}"
                         )
+                self._expose_token_metrics()
 
         if unhandled_exceptions:
             raise ReconcileErrorSummary(unhandled_exceptions)
@@ -180,6 +207,7 @@ class DynatraceTokenProviderIntegration(
         existing_dtp_tokens: MutableMapping[str, str],
         tenant_id: str,
         token_spec: DynatraceTokenProviderTokenSpecV1,
+        ocm_env_name: str,
     ) -> None:
         if cluster.organization_id not in token_spec.ocm_org_ids:
             logging.info(
@@ -247,6 +275,8 @@ class DynatraceTokenProviderIntegration(
                 existing_dtp_tokens=existing_dtp_tokens,
                 dt_client=dt_client,
                 cluster_uuid=cluster.external_id,
+                dt_tenant_id=tenant_id,
+                ocm_env_name=ocm_env_name,
             )
             if has_diff:
                 if not dry_run:
@@ -302,6 +332,8 @@ class DynatraceTokenProviderIntegration(
         cluster_uuid: str,
         dt_client: DynatraceClient,
         token_name_in_dt_api: str,
+        ocm_env_name: str,
+        dt_tenant_id: str,
         dry_run: bool,
     ) -> None:
         """
@@ -311,6 +343,7 @@ class DynatraceTokenProviderIntegration(
         A list query on the tokens does not return each tokens configuration.
         We encode the token configuration in the token name to save API calls.
         """
+        self._token_cnt(dt_tenant_id=dt_tenant_id, ocm_env_name=ocm_env_name)
         expected_name = self.dynatrace_token_name(spec=spec, cluster_uuid=cluster_uuid)
         if token_name_in_dt_api != expected_name:
             logging.info(
@@ -329,6 +362,8 @@ class DynatraceTokenProviderIntegration(
         existing_dtp_tokens: MutableMapping[str, str],
         dt_client: DynatraceClient,
         cluster_uuid: str,
+        ocm_env_name: str,
+        dt_tenant_id: str,
     ) -> tuple[bool, Iterable[K8sSecret]]:
         has_diff = False
         desired: list[K8sSecret] = []
@@ -362,6 +397,8 @@ class DynatraceTokenProviderIntegration(
                         dt_client=dt_client,
                         dry_run=dry_run,
                         token_name_in_dt_api=existing_dtp_tokens[cur_token.id],
+                        dt_tenant_id=dt_tenant_id,
+                        ocm_env_name=ocm_env_name,
                     )
                     desired_tokens.append(cur_token)
             desired.append(

reconcile/dynatrace_token_provider/metrics.py

@@ -50,3 +50,13 @@ class DTPClustersManagedGauge(DTPBaseMetric, GaugeMetric):
     @classmethod
     def name(cls) -> str:
         return "dtp_clusters_managed"
+
+
+class DTPTokensManagedGauge(DTPBaseMetric, GaugeMetric):
+    "Gauge for the number of tokens DTP manages"
+
+    dt_tenant_id: str
+
+    @classmethod
+    def name(cls) -> str:
+        return "dtp_tokens_managed"

reconcile/saas_auto_promotions_manager/merge_request_manager/batcher.py

@@ -8,7 +8,7 @@ from reconcile.saas_auto_promotions_manager.merge_request_manager.open_merge_req
 
 
 class Reason(Enum):
-    MISSING_UNBATCHING = "Closing this MR because it failed MR check and isn't marked as un-batchable yet. cc @kfischer"
+    MISSING_UNBATCHING = "Closing this MR because it failed MR check and isn't marked as un-batchable yet."
     OUTDATED_CONTENT = "Closing this MR because it has out-dated content."
     NEW_BATCH = "Closing this MR in favor of a new batch MR."