qontract-reconcile 0.10.1rc703__py3-none-any.whl → 0.10.1rc705__py3-none-any.whl

{qontract_reconcile-0.10.1rc703.dist-info → qontract_reconcile-0.10.1rc705.dist-info}/METADATA

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

@@ -92,7 +92,7 @@ reconcile/quay_mirror.py,sha256=9NzbNoxl-NdD8CwImcXNG5xTdHmUJxBfeVk5XHH41J8,1488
 reconcile/quay_mirror_org.py,sha256=Oq-t3kSkgfeSAOUDjLCDRBeEvOIEBacfX38qrX_s0oc,10801
 reconcile/quay_permissions.py,sha256=9KOutS1w4RFQqkvMSy54VtsKNx56-phzP6yI_rEW-B8,4244
 reconcile/quay_repos.py,sha256=cuEYG0HUe0ut5yvLdEwOF5-CmccpXQHRb_wDazvDrvQ,6895
-reconcile/queries.py,sha256=NFYbAkPkffZDU6rW1tn9r16jjLSmqWLPKBO6FkSbUWg,50829
+reconcile/queries.py,sha256=hgQizeUT5_a1ZI9i8wH-ajr7e956u5ynIp90zKMeRCA,50560
 reconcile/query_validator.py,sha256=BAjGrU8_VhzTOv5k0-uz0hY9ziZyconv8VAhgre1Auc,1497
 reconcile/requests_sender.py,sha256=914iluuF4UVgG3VyxxtnHOu4yf6YKS2fIy6PViSsFTQ,3875
 reconcile/resource_scraper.py,sha256=vo1N9vLJCYWvXlTwFRIpEuWjx_39ZV9zxJlpoPq4g3U,2330
@@ -136,8 +136,9 @@ reconcile/aus/version_gates/ingress_gate_handler.py,sha256=ZCtyggBzzcb0prtdbMpJs
 reconcile/aus/version_gates/ocp_gate_handler.py,sha256=RW1ppDaCZXVegV9AzzqYXxDUu_Z_7d43Z5h2Pk_piKc,716
 reconcile/aus/version_gates/sts_version_gate_handler.py,sha256=PhJ7yBh2q-rv9CJcfFhc0H11nyDyG7NAryNS3F74xdY,3697
 reconcile/aws_account_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/aws_account_manager/integration.py,sha256=TLlhxnHXRCVz2GYJQei-dBdSpeLseEkoVUwHhgi41fk,13804
+reconcile/aws_account_manager/integration.py,sha256=eYWP5zrLwSOYcAN8ym0RxU1Gri_Fwovho_X1AxUQMXc,15049
 reconcile/aws_account_manager/merge_request_manager.py,sha256=zZct3NxWMBQupl4QfD7ULxnt4ipt_2FBoH_NusboIuw,3781
+reconcile/aws_account_manager/metrics.py,sha256=YB10ea4kIGwJfs5N14RF-RoXPb-QQWaDBz1jLZ3YWE0,917
 reconcile/aws_account_manager/reconciler.py,sha256=AqAA3TIEfuYzIogHSBgwYTebxbTy1D6JhcxdLiOfCsc,13588
 reconcile/aws_account_manager/utils.py,sha256=K4rAjEMK-eQ_Sv4lOf6dPynQy97xZ4h-n6cJn5Z6zVw,1248
 reconcile/aws_ami_cleanup/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -145,7 +146,7 @@ reconcile/aws_ami_cleanup/integration.py,sha256=IW95cpMj2P5ffs-AxsR_TDQCJnYFBhLI
 reconcile/aws_cloudwatch_log_retention/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/aws_cloudwatch_log_retention/integration.py,sha256=0UcSZIrGvnGY4m9fj87oejIolIP_qTxtJInpmW9jrQ0,7772
 reconcile/aws_saml_idp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/aws_saml_idp/integration.py,sha256=q0usjBp79aydlcD8kAq-5T2NKhZgEblGLvBBPHiJdKw,4956
+reconcile/aws_saml_idp/integration.py,sha256=uqec-EnxnfGOgQtg33S-Q1wTCv0sVBHNo02aT94hXrw,4807
 reconcile/aws_saml_roles/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/aws_saml_roles/integration.py,sha256=kC4Rnbuy07TMvZO4rjUEcQkJev10M0Ro6r7YXcB7j_c,9530
 reconcile/aws_version_sync/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -753,8 +754,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=UEwAW7PA_GIrbqzaLxpkCxbuVjEFLNvnVG-6VyoCGIc,4147
 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.1rc703.dist-info/METADATA,sha256=yoAayu5zHJZhZK0IqR21e6WKXEMXcnLSXPoQ9gd52a8,2382
-qontract_reconcile-0.10.1rc703.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc703.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
-qontract_reconcile-0.10.1rc703.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc703.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc705.dist-info/METADATA,sha256=YtGSBbEgiTX-KjpVXGWDJUurUpGAlTHRnByM79rRMd4,2382
+qontract_reconcile-0.10.1rc705.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc705.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
+qontract_reconcile-0.10.1rc705.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc705.dist-info/RECORD,,

reconcile/aws_account_manager/integration.py

@@ -5,6 +5,11 @@ from typing import Any
 import jinja2
 
 from reconcile.aws_account_manager.merge_request_manager import MergeRequestManager
+from reconcile.aws_account_manager.metrics import (
+    NonOrgAccountCounter,
+    OrgAccountCounter,
+    PayerAccountCounter,
+)
 from reconcile.aws_account_manager.reconciler import AWSReconciler
 from reconcile.aws_account_manager.utils import validate
 from reconcile.gql_definitions.aws_account_manager.aws_accounts import (
@@ -18,7 +23,7 @@ from reconcile.gql_definitions.aws_account_manager.aws_accounts import (
 from reconcile.typed_queries.app_interface_repo_url import get_app_interface_repo_url
 from reconcile.typed_queries.github_orgs import get_github_orgs
 from reconcile.typed_queries.gitlab_instances import get_gitlab_instances
-from reconcile.utils import gql
+from reconcile.utils import gql, metrics
 from reconcile.utils.aws_api_typed.api import AWSApi, AWSStaticCredentials
 from reconcile.utils.aws_api_typed.iam import AWSAccessKey
 from reconcile.utils.defer import defer
@@ -297,6 +302,31 @@ class AwsAccountMgmtIntegration(
             ) as account_aws_api:
                 self.reconcile_account(account_aws_api, reconciler, account)
 
+    def expose_metrics(
+        self,
+        payer_accounts: list[AWSAccountV1],
+        non_organization_accounts: list[AWSAccountV1],
+    ) -> None:
+        """Expose metrics."""
+        with metrics.transactional_metrics(self.name) as metrics_container:
+            metrics_container.set_gauge(
+                PayerAccountCounter(flavor=self.params.flavor),
+                value=len(payer_accounts),
+            )
+
+            for payer_account in payer_accounts:
+                metrics_container.set_gauge(
+                    OrgAccountCounter(
+                        flavor=self.params.flavor,
+                        payer_account=payer_account.name,
+                    ),
+                    value=sum([len(payer_account.organization_accounts or [])]),
+                )
+            metrics_container.set_gauge(
+                NonOrgAccountCounter(flavor=self.params.flavor),
+                value=len(non_organization_accounts),
+            )
+
     @defer
     def run(self, dry_run: bool, defer: Callable | None = None) -> None:
         """Run the integration."""
@@ -328,6 +358,11 @@ class AwsAccountMgmtIntegration(
         account_template = gql_api.get_resource(path=self.params.account_tmpl_resource)[
             "content"
         ]
+
+        self.expose_metrics(
+            payer_accounts=payer_accounts,
+            non_organization_accounts=non_organization_accounts,
+        )
         self.reconcile_payer_accounts(
             reconciler=reconciler,
             merge_request_manager=merge_request_manager,

reconcile/aws_account_manager/metrics.py

@@ -0,0 +1,39 @@
+from pydantic import BaseModel
+
+from reconcile.utils.metrics import GaugeMetric
+
+
+class BaseMetric(BaseModel):
+    """Base class for all AWS account manager metrics."""
+
+    flavor: str
+
+    @classmethod
+    def name(cls) -> str:
+        return "aws_account_manager"
+
+
+class PayerAccountCounter(BaseMetric, GaugeMetric):
+    """Number of managed payer accounts."""
+
+    @classmethod
+    def name(cls) -> str:
+        return super().name() + "_payer_account_count"
+
+
+class OrgAccountCounter(BaseMetric, GaugeMetric):
+    """Number of managed organization accounts per payer account."""
+
+    payer_account: str
+
+    @classmethod
+    def name(cls) -> str:
+        return super().name() + "_org_account_count"
+
+
+class NonOrgAccountCounter(BaseMetric, GaugeMetric):
+    """Number of managed non-organization accounts."""
+
+    @classmethod
+    def name(cls) -> str:
+        return super().name() + "_non_org_account_count"

reconcile/aws_saml_idp/integration.py

@@ -76,8 +76,6 @@ class AwsSamlIdpIntegration(QontractReconcileIntegration[AwsSamlIdpIntegrationPa
             for account in data.accounts or []
             if integration_is_enabled(self.name, account)
             and (not account_name or account.name == account_name)
-            # a new account does not have a terraform state yet, ignore it until terraform-init does its job
-            and account.terraform_state
         ]
 
     def build_saml_idp_config(

reconcile/queries.py

@@ -583,13 +583,7 @@ def get_aws_accounts(
         ecrs=ecrs,
         cleanup=cleanup,
     )
-    accounts = gqlapi.query(query)["accounts"]
-    if terraform_state:
-        # a new account does not have a terraform state yet, ignore it until terraform-init does its job
-        return [
-            account for account in accounts if account.get("terraformState") is not None
-        ]
-    return accounts
+    return gqlapi.query(query)["accounts"]
 
 
 def get_state_aws_accounts(reset_passwords=False):