qontract-reconcile 0.10.1rc411__py3-none-any.whl → 0.10.1rc413__py3-none-any.whl

{qontract_reconcile-0.10.1rc411.dist-info → qontract_reconcile-0.10.1rc413.dist-info}/METADATA

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

@@ -119,10 +119,10 @@ reconcile/aus/advanced_upgrade_service.py,sha256=lKNWrKrHTjgyDVJaR7cx9Mgk5hULkEv
 reconcile/aus/aus_label_source.py,sha256=X6FD4NYcX27llMUSmmBcCh-pG7U5FnBd0zl-0zwCj2U,4118
 reconcile/aus/base.py,sha256=bLJWyH8JrGx_g4OVLF9Swu2gig_57Fz5kbY3ETDrTH4,37788
 reconcile/aus/cluster_version_data.py,sha256=j4UyEBi5mQuvPq5Lo7a_L_0blxvH790wJV07uAiikFU,7126
-reconcile/aus/metrics.py,sha256=r59PvqF8UZT4QhlcMJx2jqmeDtxRrIy_lrEgQg2buSM,2682
+reconcile/aus/metrics.py,sha256=-9aYydrUU2IZH0siyck8BciQpDSv6-wMTQDmrgl-4FU,2955
 reconcile/aus/models.py,sha256=oBSVZ-3JTngxKg_bH1vAfREpz55t8K-Y3eC9TA4pOTw,6849
 reconcile/aus/ocm_addons_upgrade_scheduler_org.py,sha256=60DLXtcP9UdwLStrBJ3kJ8avkrL2onEl3LY2Wj1FYBc,7158
-reconcile/aus/ocm_upgrade_scheduler.py,sha256=-vO1mbAxOm2n2CtYctzP3W1FG7oJKFoZmHApPpmTamg,8083
+reconcile/aus/ocm_upgrade_scheduler.py,sha256=m77mqE8Bn_t49u3piHDE9Rc55X3K_KwBBCKpZyaASQk,8897
 reconcile/aus/ocm_upgrade_scheduler_org.py,sha256=OBgE5mnVdQQV4tMH0AE2V_PDt9Gy6d-LyuPceqjORts,2331
 reconcile/aus/upgrades.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/aws_ami_cleanup/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -622,8 +622,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=dmEcNwZltP1rd_4DbxIYakO
 tools/test/test_qontract_cli.py,sha256=awwTHEc2DWlykuqGIYM0WOBoSL0KRnOraCLk3C7izis,1401
 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.1rc411.dist-info/METADATA,sha256=gGAN5ubHTdK5ErbE9Pmh22AhTirgqUUMFHOKMYso2RI,2347
-qontract_reconcile-0.10.1rc411.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-qontract_reconcile-0.10.1rc411.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
-qontract_reconcile-0.10.1rc411.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc411.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc413.dist-info/METADATA,sha256=yZBYg41VAqZ7HIoyngiivJHrq_Jsnk1fDtAurAMNuFI,2347
+qontract_reconcile-0.10.1rc413.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
+qontract_reconcile-0.10.1rc413.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
+qontract_reconcile-0.10.1rc413.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc413.dist-info/RECORD,,

reconcile/aus/metrics.py

@@ -108,3 +108,15 @@ class AUSOrganizationErrorRate(ErrorRateMetricSet):
                 org_id=org_id,
             ),
         )
+
+
+class AUSOrganizationVersionDataGauge(AUSBaseMetric, GaugeMetric):
+    """Gauge for the version data for an OCM organization"""
+
+    org_id: str
+    version: str
+    workload: str
+
+    @classmethod
+    def name(cls) -> str:
+        return "aus_organization_version_data"

reconcile/aus/ocm_upgrade_scheduler.py

@@ -10,6 +10,7 @@ from reconcile.aus.metrics import (
     UPGRADE_SCHEDULED_METRIC_VALUE,
     UPGRADE_STARTED_METRIC_VALUE,
     AUSClusterVersionRemainingSoakDaysGauge,
+    AUSOrganizationVersionDataGauge,
 )
 from reconcile.aus.models import (
     ClusterUpgradeSpec,
@@ -56,12 +57,15 @@ class OCMClusterUpgradeSchedulerIntegration(
             org_upgrade_spec.org.environment.name, org_upgrade_spec.org.org_id
         )
 
+        self.expose_version_data_metrics(
+            ocm_env=org_upgrade_spec.org.environment.name,
+            org_id=org_upgrade_spec.org.org_id,
+            version_data=version_data,
+        )
         self.expose_remaining_soak_day_metrics(
             ocm_env=org_upgrade_spec.org.environment.name,
             org_upgrade_spec=org_upgrade_spec,
-            version_data=version_data_map.get(
-                org_upgrade_spec.org.environment.name, org_upgrade_spec.org.org_id
-            ),
+            version_data=version_data,
             current_state=current_state,
         )
 
@@ -79,6 +83,25 @@ class OCMClusterUpgradeSchedulerIntegration(
             "* advanced-upgrade-service to drive upgrade policies based on OCM subscription labels"
         )
 
+    def expose_version_data_metrics(
+        self,
+        ocm_env: str,
+        org_id: str,
+        version_data: VersionData,
+    ) -> None:
+        for version, version_history in version_data.versions.items():
+            for workload, workload_history in version_history.workloads.items():
+                metrics.set_gauge(
+                    AUSOrganizationVersionDataGauge(
+                        integration=self.name,
+                        ocm_env=ocm_env,
+                        org_id=org_id,
+                        version=version,
+                        workload=workload,
+                    ),
+                    workload_history.soak_days,
+                )
+
     def expose_remaining_soak_day_metrics(
         self,
         ocm_env: str,