qontract-reconcile 0.10.1rc827__py3-none-any.whl → 0.10.1rc829__py3-none-any.whl

{qontract_reconcile-0.10.1rc827.dist-info → qontract_reconcile-0.10.1rc829.dist-info}/METADATA

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

@@ -53,7 +53,7 @@ reconcile/mr_client_gateway.py,sha256=WhjMd-sIXDFCV8-rt8CEjurJ5OYB1pOD0K3o0tZRXQ
 reconcile/ocm_additional_routers.py,sha256=KfcFDVbNoc6n5dHWjYdAf1_DiVqVG6Tw23WLKoV8cdg,3306
 reconcile/ocm_addons.py,sha256=qqAyqRBRbdZQvAcjb-QlSVyRAyQBZk6iVlgnI4jyi7s,3353
 reconcile/ocm_addons_upgrade_tests_trigger.py,sha256=L1ktYynIR7pmHiYtdCTdLGJRKX72B54KUAuPLOccXzo,3995
-reconcile/ocm_aws_infrastructure_access.py,sha256=kDnJP6aOFO263LSbdCxJMmUwVsM3LgdzebtIUOoIhH8,7130
+reconcile/ocm_aws_infrastructure_access.py,sha256=SghVWdmgliPVo_xHsp-e64_iC3mqDiia2ANSHb-g5G8,6891
 reconcile/ocm_clusters.py,sha256=ZUW4aqZuRDNzNS_Ojx-sjWIxemdgiJUIJn51YaQa_7k,16733
 reconcile/ocm_external_configuration_labels.py,sha256=imEpDv1RBpCSj8tHDv0R76hmNCFtcUzVNgS1yOVl8vs,3870
 reconcile/ocm_github_idp.py,sha256=glwXMsIBcl38-OmDDQCpe0YoLLXfoRgVQmqwXMEXjds,3946
@@ -178,8 +178,8 @@ reconcile/cna/assets/asset.py,sha256=1v51uYSaD1NOc9cI_YxG7h0NOcR1ng-mkmD2UzQ8PXE
 reconcile/cna/assets/asset_factory.py,sha256=7T7X_J6xIsoGETqBRI45_EyIKEdQcnRPt_GAuVuLQcc,785
 reconcile/cna/assets/null.py,sha256=Fby1Fbn7oNRIGNasdyhRDvXJ0ktpxv-pUAPN0lZWSzk,1684
 reconcile/dynatrace_token_provider/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/dynatrace_token_provider/integration.py,sha256=d13ulyEYD9U32D6s641o_Oibx1g4f6jr1vHQL_KbZts,16257
-reconcile/dynatrace_token_provider/metrics.py,sha256=F92Vh8CQBFs-bCF3pNpd8ZqsBwqgyK-A6pOCu_eAI1s,1074
+reconcile/dynatrace_token_provider/integration.py,sha256=NZOwk6t5X8p5fUo2FNsBgGHhAXq4vXsj3GCowiu0UWk,16531
+reconcile/dynatrace_token_provider/metrics.py,sha256=xiKkl8fTEBQaXJelGCPNTZhHAWdO1M3pCXNr_Tei63c,1285
 reconcile/external_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/external_resources/aws.py,sha256=JvjKaABy2Pg8u8Lq82Acv4zMvpE3_qGKes7OG-zlHOM,2956
 reconcile/external_resources/factories.py,sha256=bLboXX5Dq0xN60mtDGNjCOLC6HlKofXMWQxVbRwMMwo,4485
@@ -812,8 +812,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.1rc827.dist-info/METADATA,sha256=u5Eopi8oHyBimPZUq-Bc7QvHZttOUWrLGXF2f7raVV4,2314
-qontract_reconcile-0.10.1rc827.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc827.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc827.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc827.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc829.dist-info/METADATA,sha256=8jspD3vzw80R29pQxWjY5gVkjY9vOssyh89GY6k4TIE,2314
+qontract_reconcile-0.10.1rc829.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc829.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc829.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc829.dist-info/RECORD,,

reconcile/dynatrace_token_provider/integration.py

@@ -12,6 +12,7 @@ from dynatrace import Dynatrace
 from dynatrace.environment_v2.tokens_api import ApiTokenCreated
 
 from reconcile.dynatrace_token_provider.metrics import (
+    DTPClustersManagedGauge,
     DTPOrganizationErrorRate,
 )
 from reconcile.gql_definitions.common.ocm_environments import (
@@ -93,6 +94,13 @@ class DynatraceTokenProviderIntegration(
                         "key", dtp_label_key("%")
                     ),
                 )
+                metrics.set_gauge(
+                    DTPClustersManagedGauge(
+                        integration=self.name,
+                        ocm_env=env.name,
+                    ),
+                    len(clusters),
+                )
                 if not clusters:
                     continue
                 if self.params.ocm_organization_ids:

reconcile/dynatrace_token_provider/metrics.py

@@ -3,6 +3,7 @@ from pydantic import BaseModel
 from reconcile.utils.metrics import (
     CounterMetric,
     ErrorRateMetricSet,
+    GaugeMetric,
 )
 
 
@@ -41,3 +42,11 @@ class DTPOrganizationErrorRate(ErrorRateMetricSet):
                 org_id=org_id,
             ),
         )
+
+
+class DTPClustersManagedGauge(DTPBaseMetric, GaugeMetric):
+    "Gauge for the number of clusters DTP manages"
+
+    @classmethod
+    def name(cls) -> str:
+        return "dtp_clusters_managed"

reconcile/ocm_aws_infrastructure_access.py

@@ -52,17 +52,9 @@ def fetch_current_state(clusters):
     return ocm_map, current_state, current_failed, current_deleting
 
 
-def fetch_desired_state():
+def fetch_desired_state(clusters):
     desired_state = []
 
-    # get desired state defined in awsInfrastructureAccess
-    # or awsInfrastructureManagementAccounts
-    # sections of cluster files
-    clusters = [
-        c
-        for c in queries.get_clusters(aws_infrastructure_access=True)
-        if c.get("ocm") is not None and c["spec"]["product"] in SUPPORTED_OCM_PRODUCTS
-    ]
     for cluster_info in clusters:
         cluster = cluster_info["name"]
         aws_infra_access_items = cluster_info.get("awsInfrastructureAccess") or []
@@ -181,12 +173,16 @@ def _cluster_is_compatible(cluster: Mapping[str, Any]) -> bool:
     )
 
 
-def run(dry_run):
-    clusters = [
+def get_clusters():
+    return [
         c
         for c in queries.get_clusters(aws_infrastructure_access=True)
         if integration_is_enabled(QONTRACT_INTEGRATION, c) and _cluster_is_compatible(c)
     ]
+
+
+def run(dry_run):
+    clusters = get_clusters()
     if not clusters:
         logging.debug(
             "No OCM Aws infrastructure access definitions found in app-interface"
@@ -196,11 +192,11 @@ def run(dry_run):
     ocm_map, current_state, current_failed, current_deleting = fetch_current_state(
         clusters
     )
-    desired_state = fetch_desired_state()
+    desired_state = fetch_desired_state(clusters)
     act(
         dry_run, ocm_map, current_state, current_failed, desired_state, current_deleting
     )
 
 
 def early_exit_desired_state(*args: Any, **kwargs: Any) -> dict[str, Any]:
-    return {"state": fetch_desired_state()}
+    return {"state": fetch_desired_state(clusters=get_clusters())}