qontract-reconcile 0.10.1rc157__py3-none-any.whl → 0.10.1rc159__py3-none-any.whl

{qontract_reconcile-0.10.1rc157.dist-info → qontract_reconcile-0.10.1rc159.dist-info}/METADATA

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

@@ -270,18 +270,18 @@ reconcile/oum/standalone.py,sha256=tMR2-njle_Mqm2nxewkm9kQKZDqZ_Aqd4rL_Ltm4SRs,7
 reconcile/prometheus_rules_tester/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/prometheus_rules_tester/integration.py,sha256=Sn6mjzC2lJQVcETS1J2Z3tOwm8M3DDW-1GVT-5ccNuA,8860
 reconcile/rhidp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/rhidp/common.py,sha256=Btx7mRsSe3MOG0d7PqT2kyKVpw1-xiTDUIDDXje-iV4,5531
-reconcile/rhidp/metrics.py,sha256=ope0a78IekJQkLcLRSC5878fGsuLohyZJAA_hWINHnQ,392
+reconcile/rhidp/common.py,sha256=g_5OlPkdgXf6ioC6DKMXxVN5K8epJikhSVk8nWAPWA0,5606
+reconcile/rhidp/metrics.py,sha256=Yp0GtpjhieEdru0qkG3osBTJiKUzg6CAjwPoFTQDnCg,417
 reconcile/rhidp/ocm_oidc_idp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/rhidp/ocm_oidc_idp/base.py,sha256=Y1kDC0NEfUT1pxkL9VtK2Aecy8eGymDOcvYUE41Rpgw,7001
-reconcile/rhidp/ocm_oidc_idp/integration.py,sha256=zdJdxVE1EUzwwQT3iQ8-hEic8AFKywIPj_yE4QnTVxY,1790
-reconcile/rhidp/ocm_oidc_idp/metrics.py,sha256=D2g8GRC-EfbhTIiQ2HtfOJ_fDJTI03DnHAiW3uFnJE8,539
-reconcile/rhidp/ocm_oidc_idp/standalone.py,sha256=gPJ2Bvab_ro0wdNuRk8wiLQRXNmykTdpn0h3kGIaeBQ,3485
+reconcile/rhidp/ocm_oidc_idp/base.py,sha256=RP0tox_p3HL-LftUtyTcwqKPF9STQ99EjVyXoFunOsM,7200
+reconcile/rhidp/ocm_oidc_idp/integration.py,sha256=YXhvTLDQr1GoAja6plXg1LXWDJ_YAFbmpoMGuN2omME,1789
+reconcile/rhidp/ocm_oidc_idp/metrics.py,sha256=mfk4grSmH8zfA6Oz5Q4L76Uh1Ip6HlqUl23ap2vWlRE,591
+reconcile/rhidp/ocm_oidc_idp/standalone.py,sha256=DZA2m7se5vG3m05DFtUTRjD0lSfY1OQx2evG2kXi9Zc,3494
 reconcile/rhidp/sso_client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/rhidp/sso_client/base.py,sha256=Ig-Atk2im851hTgWC8XN398ybaI9R7Y36SgExa7Q1j8,8158
-reconcile/rhidp/sso_client/integration.py,sha256=vk70unZ26VK2fykkegS5LMl9aGwVOF7gxJ6OBWVa7sQ,2024
+reconcile/rhidp/sso_client/base.py,sha256=QpQKrphmlyMT3EQUHj2RmCDjSQNTrBPKoi9fKrL09Mg,8463
+reconcile/rhidp/sso_client/integration.py,sha256=oXpO2G4vM74pr0NS4XSUJb1vRKRDOyXmWAhG5v3-IHE,2023
 reconcile/rhidp/sso_client/metrics.py,sha256=Tq7tSOsqL3XdcPUdozxqzSPIodUeOV87UCTqpuuqqhw,1013
-reconcile/rhidp/sso_client/standalone.py,sha256=SZkZtZ9N3xV4VoE17fNkIdq78AIoc3utDdVr7JkBS6U,3106
+reconcile/rhidp/sso_client/standalone.py,sha256=Iv3HA0RdUn8WIs4XVlb0ZVjJ_H2zrXJMts_RILdvGqE,3115
 reconcile/saas_auto_promotions_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/saas_auto_promotions_manager/integration.py,sha256=hmRWva3_ZEO845wMkttEt4X6Izl5p8ZKs09NXWp8mkY,5609
 reconcile/saas_auto_promotions_manager/publisher.py,sha256=Oi7QMlxY56NXO2W4NnB7kSeL-7Ef3oY75mIccoLWBwg,1980
@@ -607,8 +607,8 @@ tools/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/test/test_qontract_cli.py,sha256=awwTHEc2DWlykuqGIYM0WOBoSL0KRnOraCLk3C7izis,1401
 tools/test/test_sd_app_sre_alert_report.py,sha256=JeLhgzpKCPgLvptwg_4ZvJHLVWKNG1T5845HXTkMBxA,1826
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc157.dist-info/METADATA,sha256=rVw_r3e244-qMSSHqRsrRqLk_s7YZa7rTKcm13WLn0Q,2320
-qontract_reconcile-0.10.1rc157.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-qontract_reconcile-0.10.1rc157.dist-info/entry_points.txt,sha256=Af70EWPJxsTiCNF6gA-pWdw1A0Heqn-PZF-oBc5NmiU,302
-qontract_reconcile-0.10.1rc157.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc157.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc159.dist-info/METADATA,sha256=tzOkoQAZ_OVFLtEUa2h4bnNm5zKcN-ELZAD6VCU5G3I,2320
+qontract_reconcile-0.10.1rc159.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+qontract_reconcile-0.10.1rc159.dist-info/entry_points.txt,sha256=Af70EWPJxsTiCNF6gA-pWdw1A0Heqn-PZF-oBc5NmiU,302
+qontract_reconcile-0.10.1rc159.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc159.dist-info/RECORD,,

reconcile/rhidp/common.py

@@ -154,6 +154,7 @@ def cluster_vault_secret(
 def expose_base_metrics(
     metrics_container: MetricsContainer,
     integration_name: str,
+    ocm_environment: str,
     clusters: Iterable[ClusterV1],
 ) -> None:
     clusters_per_org: Counter[str] = Counter()
@@ -168,6 +169,7 @@ def expose_base_metrics(
         metrics_container.set_gauge(
             RhIdpClusterCounter(
                 integration=integration_name,
+                ocm_environment=ocm_environment,
                 org_id=org_id,
             ),
             value=count,

reconcile/rhidp/metrics.py

@@ -7,6 +7,7 @@ class RhIdpBaseMetric(BaseModel):
     """Base class for RhIdp metrics"""
 
     integration: str
+    ocm_environment: str
 
 
 class RhIdpClusterCounter(RhIdpBaseMetric, GaugeMetric):

reconcile/rhidp/ocm_oidc_idp/base.py

@@ -33,16 +33,18 @@ DEFAULT_GROUPS_CLAIMS: list[str] = []
 
 def run(
     integration_name: str,
-    flavor: str,
+    ocm_environment: str,
     clusters: Iterable[ClusterV1],
     secret_reader: SecretReaderBase,
     vault_input_path: str,
     dry_run: bool,
     managed_idps: Optional[list[str]] = None,
 ) -> None:
-    with metrics.transactional_metrics(flavor) as metrics_container:
+    with metrics.transactional_metrics(ocm_environment) as metrics_container:
         # metrics
-        expose_base_metrics(metrics_container, integration_name, clusters)
+        expose_base_metrics(
+            metrics_container, integration_name, ocm_environment, clusters
+        )
 
         # APIs
         settings = queries.get_app_interface_settings()
@@ -66,11 +68,15 @@ def run(
                 managed_idps=managed_idps or [],
             )
             metrics_container.inc_counter(
-                RhIdpOCMOidcIdpReconcileCounter(integration=integration_name)
+                RhIdpOCMOidcIdpReconcileCounter(
+                    integration=integration_name, ocm_environment=ocm_environment
+                )
             )
         except Exception:
             metrics_container.inc_counter(
-                RhIdpOCMOidcIdpReconcileErrorCounter(integration=integration_name)
+                RhIdpOCMOidcIdpReconcileErrorCounter(
+                    integration=integration_name, ocm_environment=ocm_environment
+                )
             )
             raise
 

reconcile/rhidp/ocm_oidc_idp/integration.py

@@ -45,7 +45,7 @@ class OCMOidcIdpIntegration(
 
         run(
             integration_name=self.name,
-            flavor="app-interface",
+            ocm_environment="all",
             clusters=clusters,
             secret_reader=self.secret_reader,
             vault_input_path=self.params.vault_input_path,

reconcile/rhidp/ocm_oidc_idp/metrics.py

@@ -5,6 +5,8 @@ from reconcile.utils.metrics import CounterMetric
 class RhIdpOCMOidcIdpReconcileErrorCounter(RhIdpBaseMetric, CounterMetric):
     """Counter for the failed reconcile runs."""
 
+    ocm_environment: str
+
     @classmethod
     def name(cls) -> str:
         return "rhidp_ocm_oidc_idp_reconcile_errors"
@@ -13,6 +15,8 @@ class RhIdpOCMOidcIdpReconcileErrorCounter(RhIdpBaseMetric, CounterMetric):
 class RhIdpOCMOidcIdpReconcileCounter(RhIdpBaseMetric, CounterMetric):
     """Counter for successful reconcile runs."""
 
+    ocm_environment: str
+
     @classmethod
     def name(cls) -> str:
         return "rhidp_ocm_oidc_idp_reconciled"

reconcile/rhidp/ocm_oidc_idp/standalone.py

@@ -66,7 +66,7 @@ class OCMOidcIdpStandalone(QontractReconcileIntegration[OCMOidcIdpStandalonePara
 
             run(
                 integration_name=self.name,
-                flavor=ocm_env.name,
+                ocm_environment=ocm_env.name,
                 clusters=clusters,
                 secret_reader=self.secret_reader,
                 vault_input_path=f"{self.params.vault_input_path}/{ocm_env.name}",

reconcile/rhidp/sso_client/base.py

@@ -43,7 +43,7 @@ def console_url_to_oauth_url(console_url: str, auth_name: str) -> str:
 
 def run(
     integration_name: str,
-    flavor: str,
+    ocm_environment: str,
     clusters: Iterable[ClusterV1],
     secret_reader: VaultSecretReader,
     keycloak_vault_paths: Iterable[str],
@@ -51,9 +51,11 @@ def run(
     contacts: Sequence[str],
     dry_run: bool,
 ) -> None:
-    with metrics.transactional_metrics(flavor) as metrics_container:
+    with metrics.transactional_metrics(ocm_environment) as metrics_container:
         # metrics
-        expose_base_metrics(metrics_container, integration_name, clusters)
+        expose_base_metrics(
+            metrics_container, integration_name, ocm_environment, clusters
+        )
 
         # APIs
         keycloak_instances: list[KeycloakInstance] = []
@@ -69,6 +71,7 @@ def run(
             metrics_container.set_gauge(
                 RhIdpSSOClientIatExpiration(
                     integration=integration_name,
+                    ocm_environment=ocm_environment,
                     path=path,
                 ),
                 value=token["exp"],
@@ -89,6 +92,7 @@ def run(
             metrics_container.set_gauge(
                 RhIdpSSOClientCounter(
                     integration=integration_name,
+                    ocm_environment=ocm_environment,
                 ),
                 value=len(existing_sso_client_ids),
             )
@@ -103,11 +107,15 @@ def run(
                 dry_run=dry_run,
             )
             metrics_container.inc_counter(
-                RhIdpSSOClientReconcileCounter(integration=integration_name)
+                RhIdpSSOClientReconcileCounter(
+                    integration=integration_name, ocm_environment=ocm_environment
+                )
             )
         except Exception:
             metrics_container.inc_counter(
-                RhIdpSSOClientReconcileErrorCounter(integration=integration_name)
+                RhIdpSSOClientReconcileErrorCounter(
+                    integration=integration_name, ocm_environment=ocm_environment
+                )
             )
             raise
 

reconcile/rhidp/sso_client/integration.py

@@ -48,7 +48,7 @@ class SSOClientIntegration(
 
         run(
             integration_name=self.name,
-            flavor="app-interface",
+            ocm_environment="all",
             clusters=clusters,
             secret_reader=VaultSecretReader(),
             keycloak_vault_paths=self.params.keycloak_vault_paths,

reconcile/rhidp/sso_client/standalone.py

@@ -50,7 +50,7 @@ class SSOClientStandalone(QontractReconcileIntegration[SSOClientStandaloneParams
 
             run(
                 integration_name=self.name,
-                flavor=ocm_env.name,
+                ocm_environment=ocm_env.name,
                 clusters=clusters,
                 secret_reader=secret_reader,
                 keycloak_vault_paths=self.params.keycloak_vault_paths,