qontract-reconcile 0.10.1rc1138__py3-none-any.whl → 0.10.1rc1140__py3-none-any.whl

{qontract_reconcile-0.10.1rc1138.dist-info → qontract_reconcile-0.10.1rc1140.dist-info}/METADATA

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

@@ -194,11 +194,11 @@ reconcile/endpoints_discovery/merge_request_manager.py,sha256=wUMsumxv8RnWaRatta
 reconcile/external_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/external_resources/aws.py,sha256=7W-6d-lXO6JGwaxtO1Uc3Lw0p8csJ1EVgz__O1YWUOc,4793
 reconcile/external_resources/factories.py,sha256=nhdTqf1WEfRfgd5-70KAUJVz0ZvZ19C3Pz7wmotSdrs,4857
-reconcile/external_resources/integration.py,sha256=Ne_D5eXtR2a4kFg2Us5h7Zc_WIRgOBxaKbVPic0c6uw,6619
+reconcile/external_resources/integration.py,sha256=gBVO5dE8JyZ3xYcYik-MTIp_18oU7_hpYc_oztyfElQ,6753
 reconcile/external_resources/integration_secrets_sync.py,sha256=dX09O3r6KURziUYYfiki10orNjOGVma-XojhVqd0ww4,1667
 reconcile/external_resources/manager.py,sha256=cs6QEirz9EaLiuxybZ_1ugUn61vNWlKAC4NKouqpd5I,16148
 reconcile/external_resources/meta.py,sha256=noaytFzmShpzLA_ebGh7wuP45mOfHIOnnoUxivjDa1I,672
-reconcile/external_resources/metrics.py,sha256=jsN3IF78Su23d3Qp4BTKXkgZPN6AKjdS8sZFEXmYCek,863
+reconcile/external_resources/metrics.py,sha256=ORZStR2Hg5dYSXpPnM_ZLz48d3VSbN_WY0TcNogvcWk,1003
 reconcile/external_resources/model.py,sha256=UuQgrnv-SSkvSEQQGeCE2IZkhXjLTCVkP_mw8zBZsIQ,8349
 reconcile/external_resources/reconciler.py,sha256=3KFmkHsN7YAwJUSBpN1Xd_D2zM9Ea5_c2uMGWsfruZo,9707
 reconcile/external_resources/secrets_sync.py,sha256=6n0oDPLjd9Ql0lf6zsr1AZw8A6EEe3yCzl20XodtgkE,16229
@@ -655,7 +655,7 @@ reconcile/unleash_feature_toggles/integration.py,sha256=nx7BhtzCsTfPbOp60vI5MkNw
 reconcile/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/aggregated_list.py,sha256=km0xadW0jO4G_CqZPsXmoBURQ8c90FaTu5x4X1K1cZs,3357
 reconcile/utils/amtool.py,sha256=ngtBuVPETH6oAy5RnKzvreVbjwQCaATS_PYYwBprzjQ,2288
-reconcile/utils/aws_api.py,sha256=1EC9l2cxMW2IvnhsXaIcq6iohZ4rRgqyHJsXPs9Vtes,67398
+reconcile/utils/aws_api.py,sha256=Mp5-euZUfKfnVzgMZd3LoWbegm1OrNjzpP1A-n2EiF0,67640
 reconcile/utils/aws_helper.py,sha256=MDbv5jrNdqqJ5pfBxniGdJXBBO_EYc2_Uf2w9ZzeMNs,2854
 reconcile/utils/batches.py,sha256=TtEm64a8lWhFuNbUVpFEmXVdU2Q0sTBrP_I0Cjbgh7g,320
 reconcile/utils/binary.py,sha256=7MaAFBpzuBUTJ_aA6G6-eult_BPMVyiXbBLD0Y6F-DM,2301
@@ -674,7 +674,7 @@ reconcile/utils/exceptions.py,sha256=DwfnWUpVOotpP79RWZ2pycmG6nKCL00RBIeZLYkQPW4
 reconcile/utils/expiration.py,sha256=3JaXH4psksR7z262k7FmdyREjCLqm66OpVMEbcfdWRo,1213
 reconcile/utils/extended_early_exit.py,sha256=QSktrmfw37zSRMNk930tDbQsVeKxaPPPD43e79DGwZw,6754
 reconcile/utils/external_resource_spec.py,sha256=bhH_xneFwATdFumTPkiQmcVKYI0gcaWuqV6FpFdf_P0,7006
-reconcile/utils/external_resources.py,sha256=GC4wYuSXwk2ifr3aDEwnEiumaYqWhzgKK-hXp6pXemA,7516
+reconcile/utils/external_resources.py,sha256=n3c7GyFb0o5sgQ67dAsGWV40ELHJH0vMKyJMkvMHEok,7659
 reconcile/utils/filtering.py,sha256=S4PbMHuFr3ED0P2Q_ea5CAaB7FimI62B-F5YTaKrphA,402
 reconcile/utils/git.py,sha256=wzVIYAeKlMGW538U1mkJWUI6h_mFRUY4lawh2AR8hw4,2345
 reconcile/utils/github_api.py,sha256=R8OvqyPdnRqvP-Efnv9RvIcbBlb4M0KC4RlbnJMD0Tg,2426
@@ -838,7 +838,7 @@ tools/app_interface_metrics_exporter.py,sha256=zkwkxdAUAxjdc-pzx2_oJXG25fo0Fnyd5
 tools/app_interface_reporter.py,sha256=oZPib4HPq0aZ2Zui1QGJGk6qQdfpeihujGDBnSdKyGE,17627
 tools/glitchtip_access_reporter.py,sha256=oPBnk_YoDuljU3v0FaChzOwwnk4vap1xEE67QEjzdqs,2948
 tools/glitchtip_access_revalidation.py,sha256=8kbBJk04mkq28kWoRDDkfCGIF3GRg3pJrFAh1sW0dbk,2821
-tools/qontract_cli.py,sha256=PV2tqOqpFqAQh1_ZGNNf7up4OTBSPZmpGjN7eHxlQ0s,136187
+tools/qontract_cli.py,sha256=3k3cPk2ohxpOipQiV9gcsooYR0DZmnwr6xwiRZ9t2dk,139124
 tools/sd_app_sre_alert_report.py,sha256=e9vAdyenUz2f5c8-z-5WY0wv-SJ9aePKDH2r4IwB6pc,5063
 tools/template_validation.py,sha256=qpKYaTgk0GOPGa2Ct5_5sKdwIHtCAKIBGzsMPuJU5fw,3371
 tools/cli_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -871,8 +871,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.1rc1138.dist-info/METADATA,sha256=MdJI51HuCxKlzbbtp160xeQgzXkWQTaujR5wEInmxZQ,2213
-qontract_reconcile-0.10.1rc1138.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-qontract_reconcile-0.10.1rc1138.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1138.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1138.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1140.dist-info/METADATA,sha256=ni5-15CF_5tDAFjlb69EjjEQDKwnhaP6RD6VMA4P2cg,2213
+qontract_reconcile-0.10.1rc1140.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+qontract_reconcile-0.10.1rc1140.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1140.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1140.dist-info/RECORD,,

reconcile/external_resources/integration.py

@@ -30,6 +30,7 @@ from reconcile.typed_queries.external_resources import (
 )
 from reconcile.utils import gql
 from reconcile.utils.aws_api_typed.api import AWSApi, AWSStaticCredentials
+from reconcile.utils.external_resources import publish_metrics
 from reconcile.utils.jobcontroller.controller import (
     build_job_controller,
 )
@@ -167,6 +168,7 @@ def run(
                 for k, e in er_mgr.errors.items():
                     logging.error("ExternalResourceKey: %s, Error: %s" % (k, e))
         else:
+            publish_metrics(er_mgr.er_inventory, QONTRACT_INTEGRATION)
             er_mgr.handle_resources()
 
 

reconcile/external_resources/metrics.py

@@ -1,10 +1,15 @@
 from pydantic import BaseModel
 
-from reconcile.utils.metrics import CounterMetric, GaugeMetric
+from reconcile.external_resources.meta import QONTRACT_INTEGRATION
+from reconcile.utils.metrics import (
+    CounterMetric,
+    GaugeMetric,
+    normalize_integration_name,
+)
 
 
 class ExternalResourcesBaseMetric(BaseModel):
-    integration = "external_resources"
+    integration = normalize_integration_name(QONTRACT_INTEGRATION)
     provision_provider: str
     provisioner_name: str
     provider: str

reconcile/utils/aws_api.py

@@ -1598,6 +1598,14 @@ class AWSApi:  # pylint: disable=too-many-public-methods
         rds = self._account_rds_client(account_name, **optional_kwargs)
         return rds.describe_db_instances(DBInstanceIdentifier=db_instance_name)
 
+    def describe_rds_recommendations(
+        self,
+        account_name: str,
+        region_name: str | None = None,
+    ):
+        rds = self._account_rds_client(account_name, region_name)
+        return rds.describe_db_recommendations()
+
     def get_db_valid_upgrade_target(
         self,
         account_name: str,

reconcile/utils/external_resources.py

@@ -8,6 +8,7 @@ from typing import Any
 
 import anymarkup
 
+from reconcile.external_resources.model import ExternalResourcesInventory
 from reconcile.utils import (
     gql,
     metrics,
@@ -66,14 +67,17 @@ def managed_external_resources(namespace_info: Mapping[str, Any]) -> bool:
 
 
 def get_inventory_count_combinations(
-    inventory: ExternalResourceSpecInventory,
+    inventory: ExternalResourceSpecInventory | ExternalResourcesInventory,
 ) -> Counter[tuple]:
     return Counter(
         (k.provision_provider, k.provisioner_name, k.provider) for k in inventory
     )
 
 
-def publish_metrics(inventory: ExternalResourceSpecInventory, integration: str) -> None:
+def publish_metrics(
+    inventory: ExternalResourceSpecInventory | ExternalResourcesInventory,
+    integration: str,
+) -> None:
     count_combinations = get_inventory_count_combinations(inventory)
     integration_name = metrics.normalize_integration_name(integration)
     for combination, count in count_combinations.items():

tools/qontract_cli.py

@@ -1749,6 +1749,85 @@ You can view the source of this Markdown to extract the JSON data.
         print_output(ctx.obj["options"], results, columns)
 
 
+@get.command
+@click.pass_context
+def rds_recommendations(ctx):
+    IGNORED_STATUSES = ("resolved",)
+    IGNORED_SEVERITIES = ("informational",)
+
+    settings = queries.get_app_interface_settings()
+
+    # Only check AWS accounts for which we have RDS resources defined
+    targetted_accounts = []
+    namespaces = queries.get_namespaces()
+    for namespace_info in namespaces:
+        if not managed_external_resources(namespace_info):
+            continue
+        for spec in get_external_resource_specs(namespace_info):
+            if spec.provider == "rds":
+                targetted_accounts.append(spec.provisioner_name)
+
+    accounts = [
+        a for a in queries.get_aws_accounts() if a["name"] in targetted_accounts
+    ]
+    accounts.sort(key=lambda a: a["name"])
+
+    columns = [
+        # 'RecommendationId',
+        # 'TypeId',
+        # 'ResourceArn',
+        "ResourceName",  # Non-AWS field
+        "Severity",
+        "Category",
+        "Impact",
+        "Status",
+        "Detection",
+        "Recommendation",
+        "Description",
+        # 'Source',
+        # 'TypeDetection',
+        # 'TypeRecommendation',
+        # 'AdditionalInfo'
+    ]
+
+    ctx.obj["options"]["sort"] = False
+
+    print("[TOC]")
+    for account in accounts:
+        account_name = account.get("name")
+        account_deployment_regions = account.get("supportedDeploymentRegions")
+        for region in account_deployment_regions or []:
+            with AWSApi(1, [account], settings=settings, init_users=False) as aws:
+                try:
+                    data = aws.describe_rds_recommendations(account_name, region)
+                    recommendations = data.get("DBRecommendations", [])
+                except Exception as e:
+                    logging.error(f"Error describing RDS recommendations: {e}")
+                    continue
+
+                # Add field ResourceName infered from ResourceArn
+                recommendations = [
+                    {**rec, "ResourceName": rec["ResourceArn"].split(":")[-1]}
+                    for rec in recommendations
+                    if rec.get("Status") not in IGNORED_STATUSES
+                    and rec.get("Severity") not in IGNORED_SEVERITIES
+                ]
+                # The Description field has \n that are causing issues with the markdown table
+                recommendations = [
+                    {**rec, "Description": rec["Description"].replace("\n", " ")}
+                    for rec in recommendations
+                ]
+                # If we have no recommendations to show, skip
+                if not recommendations:
+                    continue
+                # Sort by ResourceName
+                recommendations.sort(key=lambda r: r["ResourceName"])
+
+                print(f"# {account_name} - {region}")
+                print("Note: Severity informational is not shown.")
+                print_output(ctx.obj["options"], recommendations, columns)
+
+
 @get.command()
 @click.pass_context
 def products(ctx):