qontract-reconcile 0.10.2.dev104__py3-none-any.whl → 0.10.2.dev106__py3-none-any.whl

{qontract_reconcile-0.10.2.dev104.dist-info → qontract_reconcile-0.10.2.dev106.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev104
+Version: 0.10.2.dev106
 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.dev104.dist-info → qontract_reconcile-0.10.2.dev106.dist-info}/RECORD

@@ -195,7 +195,7 @@ reconcile/endpoints_discovery/integration.py,sha256=ecjIZK_h6JO2wUhUmJlZ9pjOh60n
 reconcile/endpoints_discovery/merge_request.py,sha256=_yLb4tnvoZMCko8rta2C_CvOInJa9pa3HzSmHNtjgGU,2978
 reconcile/endpoints_discovery/merge_request_manager.py,sha256=a8zTIQIpRrUwXexZClwpQnnkEoS6XNZLJziI9x7ly0s,6389
 reconcile/external_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/external_resources/aws.py,sha256=q9ub1vI4meG8YzM6A88Q422XkTu6Y3ja12GuMjCwISs,11631
+reconcile/external_resources/aws.py,sha256=KAZo-PcreAJ8gMPJU4d5ZaN2lo2OXvOfIF1kN1x8F38,11932
 reconcile/external_resources/factories.py,sha256=C0QHT0soEv6z99-ELAAE19S5MaMHhV0t1fSiQn0Coc4,5970
 reconcile/external_resources/integration.py,sha256=WF6O4rT0oUHbNaWEemjLLzCqdNSQIUaymUuj08VsIl8,7034
 reconcile/external_resources/integration_secrets_sync.py,sha256=CImwt_tyS3MMGpkjI_0gZqYt4XgqIw4BtdJiDH2xrCk,1700
@@ -208,10 +208,10 @@ reconcile/external_resources/secrets_sync.py,sha256=ZDxzGZ6wC4zxLhA7-L39xDRH6rzU
 reconcile/external_resources/state.py,sha256=gF3ACdl7YiUlbQ4uEGrD6i_Txxqr6mT9f8IFlTQ-8dY,13176
 reconcile/fleet_labeler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/fleet_labeler/dependencies.py,sha256=MFiSfT25Ks0X3iQxwayNvFX_l6bQi97f3IiaNR1wtHc,3173
-reconcile/fleet_labeler/integration.py,sha256=ckmVga18DgidA2u50mFnp87oDAa2pKpnuORW-PMCKVY,14157
+reconcile/fleet_labeler/integration.py,sha256=HGlUJe5BCfAgk7YCxxsIteB8LH1pL8led-KfaIVh214,14614
 reconcile/fleet_labeler/merge_request.py,sha256=SfGxXInxeJzVnsTtO0ZC9-PesUJMdpKxKY9eCB6ms-g,1538
 reconcile/fleet_labeler/meta.py,sha256=lWnpH2U0PHCPXu9Ok_CPmO494qQJQ5pOuqo28s0jzIQ,146
-reconcile/fleet_labeler/metrics.py,sha256=zhcp06woGaZywTqWZf3znh6C2S2u7OHBLXalXYKuTzQ,1934
+reconcile/fleet_labeler/metrics.py,sha256=n2GkaEEIgIrwMy85Ztm_x34YrrKXKLIPlerxVXExzdE,3255
 reconcile/fleet_labeler/ocm.py,sha256=qcg1_p7nKlZG7-MQeOZos3rz6YSPAPh-HKxE3OVJwe0,4165
 reconcile/fleet_labeler/validate.py,sha256=Ch4fe7jXQZKl4pnvl5IxWS-dKSIuuiwdH2B7mivZoco,1654
 reconcile/fleet_labeler/vcs.py,sha256=6UHUQ08AGAHXF7629I6X-T_E1pvx96LxjS66EeOzve4,1108
@@ -224,7 +224,7 @@ reconcile/glitchtip_project_alerts/integration.py,sha256=BgMx-NyV9mTuv7Sotb2OioC
 reconcile/glitchtip_project_dsn/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/glitchtip_project_dsn/integration.py,sha256=2iugub-kHYkHNK33n0v9_TeWonuxCPah_VkoTPvaajE,8077
 reconcile/gql_definitions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/introspection.json,sha256=-3s2bAXc064r3TJEHURAQX7_brHpdV72c-BR5_rXzpw,2239798
+reconcile/gql_definitions/introspection.json,sha256=kY3f6I33Qo8h3ie2YiUWIXCNnlAe6_Ct-MVDuewmegQ,2246801
 reconcile/gql_definitions/acs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/acs/acs_instances.py,sha256=L91WW9LbhJbBSrECqShQpFtjoBOsmNIYLRpMbx1io5o,2181
 reconcile/gql_definitions/acs/acs_policies.py,sha256=bN5i4mks10Z23KJSj7jqp966Osq2dps4d-sPH9gjxEA,7008
@@ -309,7 +309,7 @@ reconcile/gql_definitions/endpoints_discovery/apps.py,sha256=aBWRAwDUJQ32ghJS4cP
 reconcile/gql_definitions/external_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/external_resources/aws_accounts.py,sha256=XR69j9dpTQ0gv8y-AZN7AJ0dPvO-wbHscyCDgrax6Bk,2046
 reconcile/gql_definitions/external_resources/external_resources_modules.py,sha256=JViHtDWEBwjStBUo_bUdm_sxdpjCHcoATeFvwFRLQpU,3009
-reconcile/gql_definitions/external_resources/external_resources_namespaces.py,sha256=GLkKeODZ4_wJ2WxuYXitfq3TTcISv5XF9w5JOKSzNjg,43187
+reconcile/gql_definitions/external_resources/external_resources_namespaces.py,sha256=qGslq_4LdKd0jt8-TYySBU9c6rTTPVxG613xLSDFxBQ,44622
 reconcile/gql_definitions/external_resources/external_resources_settings.py,sha256=WBkJqnoyYCe1Vimwbp_Pa0RdyTdmWNf6oEWyA749QzA,3589
 reconcile/gql_definitions/external_resources/fragments/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/external_resources/fragments/external_resources_module_overrides.py,sha256=T_qWCRtzU8F9frebBXG9TkeQdrKGt3R9YinSngPoFqM,1262
@@ -786,7 +786,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=UfwwRLS5Ya4_Nh1w5n1dvoYtchQvYE9yj1VANt2IKqI,3925
 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.dev104.dist-info/METADATA,sha256=9v7ZHcP0L3QPNkpFKt5otqVTbrmy-UdvbWu2r3hFwzM,24566
-qontract_reconcile-0.10.2.dev104.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev104.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev104.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev106.dist-info/METADATA,sha256=3p7qkhmRv3Ygggl73B74hFVQvPufuOTlfoiDQVNnDWU,24566
+qontract_reconcile-0.10.2.dev106.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev106.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev106.dist-info/RECORD,,

reconcile/external_resources/aws.py

@@ -166,6 +166,12 @@ class AWSRdsFactory(AWSDefaultResourceFactory):
         if "old_parameter_group" in data:
             old_pg_data = rvr._get_values(data["old_parameter_group"])
             data["old_parameter_group"] = old_pg_data
+        if (
+            (blue_green_deployment := data.get("blue_green_deployment"))
+            and (target := blue_green_deployment.get("target"))
+            and (parameter_group := target.get("parameter_group"))
+        ):
+            target["parameter_group"] = rvr._get_values(parameter_group)
         if "replica_source" in data:
             sourcedb_spec = self._get_source_db_spec(
                 spec.provisioner_name, data["replica_source"]

reconcile/fleet_labeler/integration.py

@@ -66,11 +66,11 @@ class FleetLabelerIntegration(QontractReconcileIntegration[NoParams]):
             secret_reader=self.secret_reader,
             dry_run=dry_run,
         )
-        self._metrics = dependencies.metrics
         self.reconcile(dependencies=dependencies)
 
     def reconcile(self, dependencies: Dependencies) -> None:
         validate_label_specs(specs=dependencies.label_specs_by_name)
+        all_cluster_ids: set[str] = set()
         for spec_name, ocm in dependencies.ocm_clients_by_label_spec_name.items():
             spec = dependencies.label_specs_by_name[spec_name]
             discovered_clusters = self._discover_desired_clusters(
@@ -99,6 +99,16 @@ class FleetLabelerIntegration(QontractReconcileIntegration[NoParams]):
                 ocm=ocm,
                 dry_run=synch_labels,
             )
+            num_labels = 0
+            for cluster in spec.clusters:
+                all_cluster_ids.add(cluster.cluster_id)
+                num_labels += len(cluster.subscription_labels)
+            dependencies.metrics.set_managed_labels_gauge(
+                ocm_name=spec.ocm_env.name,
+                spec_name=spec_name,
+                value=num_labels,
+            )
+        dependencies.metrics.set_managed_clusters_gauge(value=len(all_cluster_ids))
 
     def _discover_desired_clusters(
         self, spec: FleetLabelsSpecV1, ocm: OCMClient

reconcile/fleet_labeler/metrics.py

@@ -36,14 +36,34 @@ class FleetLabelerMetrics:
             value,
         )
 
+    def set_managed_labels_gauge(
+        self, ocm_name: str, spec_name: str, value: int
+    ) -> None:
+        metrics.set_gauge(
+            FleetLabelerManagedLabelsGauge(
+                ocm_name=ocm_name,
+                spec=spec_name,
+            ),
+            value,
+        )
+
+    def set_managed_clusters_gauge(self, value: int) -> None:
+        metrics.set_gauge(
+            FleetLabelerManagedClustersGauge(),
+            value,
+        )
+
 
 class FleetLabelerBaseMetric(BaseModel):
     integration: str = QONTRACT_INTEGRATION
+
+
+class FleetLabelerSpecBaseMetric(FleetLabelerBaseMetric):
     ocm_name: str
     spec: str
 
 
-class FleetLabelerDuplicateClusterMatchesGauge(FleetLabelerBaseMetric, GaugeMetric):
+class FleetLabelerDuplicateClusterMatchesGauge(FleetLabelerSpecBaseMetric, GaugeMetric):
     """
     Gauge for the number of clusters that have duplicate matches. Clusters with
     duplicate matches are being ignored by fleet labeler, as it cannot clearly
@@ -56,7 +76,7 @@ class FleetLabelerDuplicateClusterMatchesGauge(FleetLabelerBaseMetric, GaugeMetr
         return "fleet_labeler_duplicate_cluster_matches"
 
 
-class FleetLabelerLabelRenderingErrorGauge(FleetLabelerBaseMetric, GaugeMetric):
+class FleetLabelerLabelRenderingErrorGauge(FleetLabelerSpecBaseMetric, GaugeMetric):
     """
     Gauge for the number of clusters that have label render errors. This
     happens when the fleet labeler is unable to render the subscription labels
@@ -66,3 +86,28 @@ class FleetLabelerLabelRenderingErrorGauge(FleetLabelerBaseMetric, GaugeMetric):
     @classmethod
     def name(cls) -> str:
         return "fleet_labeler_label_rendering_error"
+
+
+class FleetLabelerManagedLabelsGauge(FleetLabelerSpecBaseMetric, GaugeMetric):
+    """
+    Gauge for the current number of labels under management.
+    Note, that label<->cluster combination must be unique across all
+    specs, hence we can give the spec as a label here.
+    """
+
+    @classmethod
+    def name(cls) -> str:
+        return "fleet_labeler_managed_labels"
+
+
+class FleetLabelerManagedClustersGauge(FleetLabelerBaseMetric, GaugeMetric):
+    """
+    Gauge for the current number of clusters under management.
+    Note, that a cluster can be part of multiple spec inventories.
+    This metric only cares about the total number of unique clusters,
+    thus the spec is not a label here.
+    """
+
+    @classmethod
+    def name(cls) -> str:
+        return "fleet_labeler_managed_clusters"

reconcile/gql_definitions/external_resources/external_resources_namespaces.py

@@ -114,6 +114,20 @@ query ExternalResourcesNamespaces {
                 availability_zone
                 parameter_group
                 old_parameter_group
+                blue_green_deployment {
+                    enabled
+                    switchover
+                    delete
+                    target {
+                        allocated_storage
+                        engine_version
+                        instance_class
+                        iops
+                        parameter_group
+                        storage_throughput
+                        storage_type
+                    }
+                }
                 overrides
                 output_resource_name
                 enhanced_monitoring
@@ -571,6 +585,23 @@ class NamespaceTerraformResourceAWSV1(ConfiguredBaseModel):
     provider: str = Field(..., alias="provider")
 
 
+class RDSBlueGreenDeploymentTargetV1(ConfiguredBaseModel):
+    allocated_storage: Optional[int] = Field(..., alias="allocated_storage")
+    engine_version: Optional[str] = Field(..., alias="engine_version")
+    instance_class: Optional[str] = Field(..., alias="instance_class")
+    iops: Optional[int] = Field(..., alias="iops")
+    parameter_group: Optional[str] = Field(..., alias="parameter_group")
+    storage_throughput: Optional[str] = Field(..., alias="storage_throughput")
+    storage_type: Optional[str] = Field(..., alias="storage_type")
+
+
+class RDSBlueGreenDeploymentV1(ConfiguredBaseModel):
+    enabled: Optional[bool] = Field(..., alias="enabled")
+    switchover: Optional[bool] = Field(..., alias="switchover")
+    delete: Optional[bool] = Field(..., alias="delete")
+    target: Optional[RDSBlueGreenDeploymentTargetV1] = Field(..., alias="target")
+
+
 class AWSRDSEventNotificationV1(ConfiguredBaseModel):
     destination: str = Field(..., alias="destination")
     source_type: Optional[str] = Field(..., alias="source_type")
@@ -588,6 +619,7 @@ class NamespaceTerraformResourceRDSV1(NamespaceTerraformResourceAWSV1):
     availability_zone: Optional[str] = Field(..., alias="availability_zone")
     parameter_group: Optional[str] = Field(..., alias="parameter_group")
     old_parameter_group: Optional[str] = Field(..., alias="old_parameter_group")
+    blue_green_deployment: Optional[RDSBlueGreenDeploymentV1] = Field(..., alias="blue_green_deployment")
     overrides: Optional[str] = Field(..., alias="overrides")
     output_resource_name: Optional[str] = Field(..., alias="output_resource_name")
     enhanced_monitoring: Optional[bool] = Field(..., alias="enhanced_monitoring")

reconcile/gql_definitions/introspection.json

@@ -43531,6 +43531,18 @@
                             "isDeprecated": false,
                             "deprecationReason": null
                         },
+                        {
+                            "name": "blue_green_deployment",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "OBJECT",
+                                "name": "RDSBlueGreenDeployment_v1",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
                         {
                             "name": "overrides",
                             "description": null,
@@ -43751,6 +43763,160 @@
                     "enumValues": null,
                     "possibleTypes": null
                 },
+                {
+                    "kind": "OBJECT",
+                    "name": "RDSBlueGreenDeployment_v1",
+                    "description": null,
+                    "fields": [
+                        {
+                            "name": "enabled",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "Boolean",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "switchover",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "Boolean",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "delete",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "Boolean",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "target",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "OBJECT",
+                                "name": "RDSBlueGreenDeploymentTarget_v1",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        }
+                    ],
+                    "inputFields": null,
+                    "interfaces": [],
+                    "enumValues": null,
+                    "possibleTypes": null
+                },
+                {
+                    "kind": "OBJECT",
+                    "name": "RDSBlueGreenDeploymentTarget_v1",
+                    "description": null,
+                    "fields": [
+                        {
+                            "name": "parameter_group",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "String",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "engine_version",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "String",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "instance_class",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "String",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "allocated_storage",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "Int",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "storage_type",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "String",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "iops",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "Int",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "storage_throughput",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "String",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        }
+                    ],
+                    "inputFields": null,
+                    "interfaces": [],
+                    "enumValues": null,
+                    "possibleTypes": null
+                },
                 {
                     "kind": "OBJECT",
                     "name": "NamespaceTerraformResourceS3_v1",