qontract-reconcile 0.10.2.dev282__py3-none-any.whl → 0.10.2.dev283__py3-none-any.whl

{qontract_reconcile-0.10.2.dev282.dist-info → qontract_reconcile-0.10.2.dev283.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev282
+Version: 0.10.2.dev283
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Project-URL: homepage, https://github.com/app-sre/qontract-reconcile
 Project-URL: repository, https://github.com/app-sre/qontract-reconcile

{qontract_reconcile-0.10.2.dev282.dist-info → qontract_reconcile-0.10.2.dev283.dist-info}/RECORD

@@ -152,7 +152,7 @@ reconcile/aws_saml_idp/integration.py,sha256=rop8ahl7v0WUheSgVLb-4MU3Ldy6Eb3LknF
 reconcile/aws_saml_roles/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/aws_saml_roles/integration.py,sha256=mLRCnSfClp2ia8UynSmY5HZe5YmrJTc1RwxyMeU2yBw,11319
 reconcile/aws_version_sync/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/aws_version_sync/integration.py,sha256=YeqvWMfMtTqTMG6_2iL8-wLds8Lb3CAbSQcR6ebeSlA,17863
+reconcile/aws_version_sync/integration.py,sha256=7D76Zy5TLndLgLdKJEnDl1OWex148dMEvtNkSDjnijo,19461
 reconcile/aws_version_sync/utils.py,sha256=x-45QT7zAwdNvCg7w_qJNwLaksFcfz1_6KQoD_0IVuA,1727
 reconcile/aws_version_sync/merge_request_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/aws_version_sync/merge_request_manager/merge_request.py,sha256=2FbqLLdqxycWNvX1eNbwMjWSVBb7q0p-8t5Db0m7b4Q,4842
@@ -797,7 +797,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=uQv2QJAmUXP1g2GPIH30WTlvL9soY6m9lefpZEVDM5w,3965
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y,894
-qontract_reconcile-0.10.2.dev282.dist-info/METADATA,sha256=IkB4oW__-NStwFmVIV9PRV2K-Qy4ZLukxlyyCPdKwzI,24501
-qontract_reconcile-0.10.2.dev282.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev282.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev282.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev283.dist-info/METADATA,sha256=plAePHyXgp_rSR6hB9kj87UzYykbvH_PZ0NsTM0VgUw,24501
+qontract_reconcile-0.10.2.dev283.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev283.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev283.dist-info/RECORD,,

reconcile/aws_version_sync/integration.py

@@ -9,6 +9,7 @@ from typing import Any
 import semver
 from pydantic import (
     BaseModel,
+    ValidationError,
     root_validator,
     validator,
 )
@@ -168,6 +169,7 @@ AwsExternalResources = list[ExternalResource]
 AppInterfaceExternalResources = list[ExternalResource]
 UidAndReplicationGroupId = tuple[str, str]
 ReplicationGroupIdToIdentifier = dict[UidAndReplicationGroupId, str]
+EXTENDED_SUPPORT_VERSION_INDICATOR = "-rds."
 
 
 class AVSIntegration(QontractReconcileIntegration[AVSIntegrationParams]):
@@ -228,56 +230,85 @@ class AVSIntegration(QontractReconcileIntegration[AVSIntegrationParams]):
                 if cluster.automation_token
                 else None
             )
+
+            # RDS resources
             try:
-                # RDS resources
-                metrics += [
-                    ExternalResource(
-                        provider="aws",
-                        provisioner=ExternalResourceProvisioner(
-                            uid=m["aws_account_id"]
-                        ),
-                        resource_provider=SupportedResourceProvider.RDS,
-                        resource_identifier=m["dbinstance_identifier"],
-                        resource_engine=m["engine"],
-                        resource_engine_version=m["engine_version"],
-                    )
-                    for m in prom_get_func(
-                        url=cluster.prometheus_url,
-                        params={"query": "aws_resources_exporter_rds_engineversion"},
-                        token=token,
-                        timeout=timeout,
-                    )
-                ]
-                # ElastiCache resources
-                metrics += [
-                    ExternalResource(
-                        provider="aws",
-                        provisioner=ExternalResourceProvisioner(
-                            uid=m["aws_account_id"]
-                        ),
-                        resource_provider=SupportedResourceProvider.ELASTICACHE,
-                        # replication_group_id != resource_identifier!
-                        resource_identifier=elasticache_replication_group_id_to_identifier.get(
-                            (
-                                m["aws_account_id"],
-                                m["replication_group_id"],
-                            ),
-                            m["replication_group_id"],
-                        ),
-                        resource_engine=m["engine"],
-                        resource_engine_version=m["engine_version"],
-                    )
-                    for m in prom_get_func(
-                        url=cluster.prometheus_url,
-                        params={
-                            "query": "aws_resources_exporter_elasticache_redisversion"
-                        },
-                        token=token,
-                        timeout=timeout,
-                    )
-                ]
+                rds_metrics = prom_get_func(
+                    url=cluster.prometheus_url,
+                    params={"query": "aws_resources_exporter_rds_engineversion"},
+                    token=token,
+                    timeout=timeout,
+                )
+
+                for m in rds_metrics:
+                    try:
+                        metrics.append(
+                            ExternalResource(
+                                provider="aws",
+                                provisioner=ExternalResourceProvisioner(
+                                    uid=m["aws_account_id"]
+                                ),
+                                resource_provider=SupportedResourceProvider.RDS,
+                                resource_identifier=m["dbinstance_identifier"],
+                                resource_engine=m["engine"],
+                                resource_engine_version=m["engine_version"],
+                            )
+                        )
+                    except ValidationError:
+                        # don't try to parse AWS extended support version numbers
+                        # See https://aws.amazon.com/about-aws/whats-new/2025/04/amazon-rds-postgresql-extended-support-11-22-rds-20250220-12-22-rds-20250220/ for more info
+                        if (
+                            EXTENDED_SUPPORT_VERSION_INDICATOR
+                            not in m["engine_version"]
+                        ):
+                            raise
+                    except Exception as e:
+                        logging.error(
+                            f"Failed to parse RDS metric for {m['dbinstance_identifier']}: {e}"
+                        )
             except Exception as e:
-                logging.error(f"Failed to get metrics for cluster {cluster.name}: {e}")
+                logging.error(
+                    f"Failed to get 'aws_resources_exporter_rds_engineversion' metrics for cluster {cluster.name}: {e}"
+                )
+
+            # ElastiCache resources
+            try:
+                elasticache_metrics = prom_get_func(
+                    url=cluster.prometheus_url,
+                    params={"query": "aws_resources_exporter_elasticache_redisversion"},
+                    token=token,
+                    timeout=timeout,
+                )
+                for m in elasticache_metrics:
+                    try:
+                        metrics.append(
+                            ExternalResource(
+                                provider="aws",
+                                provisioner=ExternalResourceProvisioner(
+                                    uid=m["aws_account_id"]
+                                ),
+                                resource_provider=SupportedResourceProvider.ELASTICACHE,
+                                # replication_group_id != resource_identifier!
+                                resource_identifier=elasticache_replication_group_id_to_identifier.get(
+                                    (
+                                        m["aws_account_id"],
+                                        m["replication_group_id"],
+                                    ),
+                                    m["replication_group_id"],
+                                ),
+                                resource_engine=m["engine"],
+                                resource_engine_version=m["engine_version"],
+                            )
+                        )
+                    except Exception as e:
+                        logging.error(
+                            f"Failed to parse ElastiCache metrics for {m['replication_group_id']}: {e}"
+                        )
+            except Exception as e:
+                logging.error(
+                    f"Failed to get 'aws_resources_exporter_elasticache_redisversion' metrics for cluster {cluster.name}: {e}"
+                )
+
         return metrics
 
     def get_external_resource_specs(