qontract-reconcile 0.10.1rc821__py3-none-any.whl → 0.10.1rc823__py3-none-any.whl

{qontract_reconcile-0.10.1rc821.dist-info → qontract_reconcile-0.10.1rc823.dist-info}/METADATA

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

@@ -13,7 +13,7 @@ reconcile/checkpoint.py,sha256=R2WFXUXLTB4sWMi4GeA4eegsuf_1-Q4vH8M0Toh3Ij4,5036
 reconcile/cli.py,sha256=UnVVYcG6lqGAhUcXXCUsxw-eVlU4AyHjI5fAE4E_4DQ,101994
 reconcile/closedbox_endpoint_monitoring_base.py,sha256=SMhkcQqprWvThrIJa3U_3uh5w1h-alleW1QnCJFY4Qw,4909
 reconcile/cluster_deployment_mapper.py,sha256=2Ah-nu-Mdig0pjuiZl_XLrmVAjYzFjORR3dMlCgkmw0,2352
-reconcile/dashdotdb_base.py,sha256=a5aPLVxyqPSbjdB0Ty-uliOtxwvEbbEljHJKxdK3-Zk,4813
+reconcile/dashdotdb_base.py,sha256=R2JuwiXAEYAFiCtnztM_IIr1rtVzPpaWAmgxuDa2FgY,4813
 reconcile/dashdotdb_cso.py,sha256=FoXrWGpOwXG5jf0eklN84tjJVUAYzKat7rtq_28JMlQ,3672
 reconcile/dashdotdb_dora.py,sha256=bqQtgTmOmQnjwvOon5YS3py8rrkwP5frUpCgOIQkz8k,17743
 reconcile/dashdotdb_dvo.py,sha256=YXqpI6fBQAql-ybGI0grj9gWMzmKiAvPE__pNju6obk,8996
@@ -784,7 +784,7 @@ tools/app_interface_metrics_exporter.py,sha256=zkwkxdAUAxjdc-pzx2_oJXG25fo0Fnyd5
 tools/app_interface_reporter.py,sha256=upA-J-n-HXHKVDINRuMR7vTt-iJvQORKUVi9D3leQto,17738
 tools/glitchtip_access_reporter.py,sha256=oPBnk_YoDuljU3v0FaChzOwwnk4vap1xEE67QEjzdqs,2948
 tools/glitchtip_access_revalidation.py,sha256=8kbBJk04mkq28kWoRDDkfCGIF3GRg3pJrFAh1sW0dbk,2821
-tools/qontract_cli.py,sha256=_hap0giaBiU0o7SbHRmFsZ3yqXq7ULjK_omuifKBUqo,117165
+tools/qontract_cli.py,sha256=_-ianEfVdOU8ZCDjZ-jLfkNMtQT2qw3uwjO-XnTRsKw,117904
 tools/sd_app_sre_alert_report.py,sha256=e9vAdyenUz2f5c8-z-5WY0wv-SJ9aePKDH2r4IwB6pc,5063
 tools/template_validation.py,sha256=-U-lTGeLaci8yWPEblCJeev2DOlY1jM9QOOh-O1zts8,3376
 tools/cli_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -811,8 +811,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=_D61RFGAN5x44CY1tYbouhlGXXABwYfxKSWSQx3Jrss,4941
 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.1rc821.dist-info/METADATA,sha256=9YwIJk3JplE2wqgGPe54l4-pdaFStcLWcb9UK5jCSdI,2314
-qontract_reconcile-0.10.1rc821.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc821.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc821.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc821.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc823.dist-info/METADATA,sha256=BZQWX3LX2zeeorNJTNU98S3I_tQ-5Uj3YTxrECoi25g,2314
+qontract_reconcile-0.10.1rc823.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc823.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc823.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc823.dist-info/RECORD,,

reconcile/dashdotdb_base.py

@@ -153,7 +153,7 @@ class DashdotdbBase:
                 f"Basic {b64encode(f'{username}:{password}'.encode()).decode('utf-8')}"
             )
         response = requests.get(
-            url, params=params, headers=headers, verify=ssl_verify, timeout=(5, 120)
+            url, params=params, headers=headers, verify=ssl_verify, timeout=(5, 300)
         )
         response.raise_for_status()
 

tools/qontract_cli.py

@@ -2619,17 +2619,57 @@ def maintenances(ctx):
     print_output(ctx.obj["options"], data, columns)
 
 
+class MigrationStatusCount:
+    def __init__(self, app: str) -> None:
+        self.app = app
+        self._source = 0
+        self._target = 0
+
+    def inc(self, source_or_target: str) -> None:
+        match source_or_target:
+            case "source":
+                self._source += 1
+            case "target":
+                self._target += 1
+            case _:
+                raise ValueError("hcp migration label must be source or target")
+
+    @property
+    def classic(self) -> int:
+        return self._source
+
+    @property
+    def hcp(self) -> int:
+        return self._target
+
+    @property
+    def total(self) -> int:
+        return self.classic + self.hcp
+
+    @property
+    def progress(self) -> float:
+        return round(self.hcp / self.total * 100, 0)
+
+    @property
+    def item(self) -> dict[str, Any]:
+        return {
+            "app": self.app,
+            "classic": self.classic or "0",
+            "hcp": self.hcp or "0",
+            "progress": self.progress or "0",
+        }
+
+
 @get.command()
 @click.pass_context
 def hcp_migration_status(ctx):
-    counts: dict[str, dict[str, int]] = {}
+    counts: dict[str, MigrationStatusCount] = {}
+    total_count = MigrationStatusCount("total")
     saas_files = get_saas_files()
     for sf in saas_files:
         if sf.publish_job_logs:
             # ignore post deployment test saas files
             continue
-        app = sf.app.parent_app.name if sf.app.parent_app else sf.app.name
-        counts.setdefault(app, {"source": 0, "target": 0})
         for rt in sf.resource_templates:
             if rt.provider == "directory" or "dashboard" in rt.name:
                 # ignore grafana dashboards
@@ -2644,26 +2684,15 @@ def hcp_migration_status(ctx):
                 if t.delete:
                     continue
                 if hcp_migration := t.namespace.cluster.labels.get("hcp_migration"):
-                    counts[app][hcp_migration] += 1
-
-    data = []
-    for a, c in counts.items():
-        source = c["source"]
-        target = c["target"]
-        item = {}
-        item["app"] = a
-        item["classic"] = source or "0"
-        item["hcp"] = target or "0"
-        total = source + target
-        if total == 0:
-            continue
-        progress = round(target / total * 100, 2) or "0"
-        item["progress"] = progress
-        data.append(item)
-
-    summary_completed = len([d for d in data if d["progress"] == 100])
-    print(f"SUMMARY: {summary_completed} / {len(data)} COMPLETED")
+                    app = sf.app.parent_app.name if sf.app.parent_app else sf.app.name
+                    counts.setdefault(app, MigrationStatusCount(app))
+                    counts[app].inc(hcp_migration)
+                    total_count.inc(hcp_migration)
 
+    data = [c.item for c in counts.values()]
+    print(
+        f"SUMMARY: {total_count.hcp} / {total_count.total} COMPLETED ({total_count.progress}%)"
+    )
     columns = ["app", "classic", "hcp", "progress"]
     print_output(ctx.obj["options"], data, columns)