hcs-cli 0.1.341__tar.gz → 0.1.342__tar.gz

{hcs_cli-0.1.341 → hcs_cli-0.1.342}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hcs-cli
-Version: 0.1.341
+Version: 0.1.342
 Summary: Horizon Cloud Service CLI.
 Project-URL: Homepage, https://github.com/euc-eng/hcs-cli
 Project-URL: Bug Tracker, https://github.com/euc-eng/hcs-cli/issues
@@ -14,7 +14,7 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.9
-Requires-Dist: hcs-core>=0.1.341
+Requires-Dist: hcs-core>=0.1.342
 Requires-Dist: inquirerpy>=0.3.4
 Requires-Dist: matplotlib>=3.8.0
 Requires-Dist: paho-mqtt>=2.1.0

{hcs_cli-0.1.341 → hcs_cli-0.1.342}/hcs_cli/__init__.py

@@ -1,3 +1,3 @@
-__version__ = "0.1.341"
+__version__ = "0.1.342"
 
 from . import service as service  # noqa: F401

hcs_cli-0.1.342/hcs_cli/cmds/edge/log.py

@@ -0,0 +1,145 @@
+"""
+Copyright © 2025-2026 Omnissa, LLC.
+"""
+
+import json
+import os
+import time
+from datetime import datetime, timezone
+
+import click
+import httpx
+import hcs_core.sglib.cli_options as cli
+from hcs_core.ctxp import recent
+from hcs_core.util import duration
+
+from hcs_cli.service import edge
+
+# Confirmed non-terminal value seen in practice; treat anything else that
+# isn't AVAILABLE/FAILED as non-terminal too, since the API may add more.
+_TERMINAL = frozenset({"AVAILABLE", "FAILED"})
+
+
+@click.command()
+@click.option(
+    "--recreate",
+    is_flag=True,
+    default=False,
+    help="Force a new log collection even if a recent one already exists.",
+)
+@click.option(
+    "--max-age",
+    default="1D",
+    show_default=True,
+    help="Reuse the latest AVAILABLE log if it's newer than this (e.g. 1D, 12H). Ignored with --recreate.",
+)
+@click.option(
+    "--wait/--no-wait",
+    default=True,
+    help="Wait for log collection to finish. Collection can take 10+ minutes; --no-wait triggers/checks and returns immediately.",
+)
+@click.option(
+    "--wait-timeout",
+    default="20M",
+    show_default=True,
+    help="Max time to wait for log collection to complete.",
+)
+@click.option(
+    "--verbose", is_flag=True, default=False, help="Whether to print progress messages. By default, it will print progress messages."
+)
+@click.option(
+    "--save-as",
+    "save_path",
+    type=click.Path(),
+    default=None,
+    help="Path to save the edge log archive. Defaults to <org_id>_<edge_id>_edge_logs.tgz in the current directory.",
+)
+@click.argument("id", type=str, required=False)
+@cli.org_id
+def log(recreate: bool, max_age: str, wait: bool, wait_timeout: str, verbose: bool, save_path, id: str, org: str):
+    """Download edge log"""
+    org_id = cli.get_org_id(org)
+    id = recent.require("edge", id)
+
+    latest = edge.latest_log(id, org_id)
+
+    need_new = True
+    if latest and not recreate:
+        status = latest.get("logStatus")
+        if status == "AVAILABLE" and _is_fresh(latest.get("createdAt"), max_age):
+            need_new = False
+        elif status not in _TERMINAL:
+            need_new = False  # already in flight, just wait on it below
+
+    if need_new:
+        if verbose:
+            click.secho(f"Requesting new edge log for {id}...", fg="bright_black")
+        info = edge.request_log(id, org_id)
+        if verbose:
+            click.secho(f"Edge log requested: {json.dumps(info)}", fg="bright_black")
+        latest = edge.latest_log(id, org_id)
+
+    status = latest.get("logStatus") if latest else None
+
+    if status != "AVAILABLE":
+        if not wait:
+            return latest
+        latest, error = _wait_for_log(id, org_id, wait_timeout, verbose)
+        if error:
+            return error, 1
+
+    uri = latest.get("readAccessUri")
+    if not uri:
+        return "No readAccessUri found on the log entry.", 1
+
+    if save_path:
+        file_path = os.path.abspath(os.path.expanduser(save_path))
+    else:
+        file_path = os.path.abspath(f"{org_id}_{id}_edge_logs.tgz")
+
+    if verbose:
+        click.secho(f"Downloading edge log from {uri} to {file_path}", fg="bright_black")
+    try:
+        with httpx.stream("GET", uri, timeout=60) as r:
+            r.raise_for_status()
+            with open(file_path, "wb") as f:
+                for chunk in r.iter_bytes(chunk_size=8192):
+                    f.write(chunk)
+    except Exception as e:
+        return f"Failed to download archive: {e}", 1
+
+    latest["file_path"] = file_path
+
+    if verbose:
+        click.secho("----- Edge log downloaded -----", fg="bright_black")
+    return latest
+
+
+def _is_fresh(created_at: str, max_age: str) -> bool:
+    if not created_at:
+        return False
+    try:
+        # createdAt example: "Mon Jul 20 23:51:44 UTC 2026"
+        dt = datetime.strptime(created_at.replace(" UTC ", " "), "%a %b %d %H:%M:%S %Y").replace(tzinfo=timezone.utc)
+    except ValueError:
+        return False
+    age_seconds = (datetime.now(timezone.utc) - dt).total_seconds()
+    return age_seconds <= duration.to_seconds(max_age)
+
+
+def _wait_for_log(id: str, org_id: str, timeout: str, verbose: bool):
+    deadline = time.time() + duration.to_seconds(timeout)
+    while time.time() < deadline:
+        info = edge.latest_log(id, org_id)
+        if not info:
+            return None, "No edge log entry found."
+        status = info.get("logStatus")
+        if status == "AVAILABLE":
+            return info, None
+        if status == "FAILED":
+            msg = info.get("errorDetail") or "Unknown error"
+            return info, f"Edge log collection failed: {msg}"
+        if verbose:
+            click.secho(f"Edge log status: {status}, waiting...", fg="bright_black")
+        time.sleep(20)
+    return None, "Timed out waiting for edge log to be ready."

{hcs_cli-0.1.341 → hcs_cli-0.1.342}/hcs_cli/cmds/hoc/stats.py

@@ -8,13 +8,13 @@ from hcs_cli.service import tsctl
 
 
 @click.command(name="stats-aggregate-connects")
-@click.argument("from_", type=int)
-@click.argument("to", type=int)
+@click.argument("from_", type=str)
+@click.argument("to", type=str)
 @click.option("--wait", type=bool, required=False, is_flag=True, default=False)
 @click.option("--verbose", type=bool, required=False, is_flag=True, default=False)
-def aggregate_connects(from_: int, to: int, wait: bool, verbose: bool):
+def aggregate_connects(from_: str, to: str, wait: bool, verbose: bool):
     """
-    Aggregate connect events between FROM_ and TO unix timestamps.
+    Aggregate connect events between FROM_ and TO unix timestamps in milliseconds.
     """
     payload = {"from": from_, "to": to}
     result = diagnostic.aggregateConnects(payload, verbose=verbose)
@@ -36,8 +36,8 @@ def aggregate_connects_day_before(wait: bool, verbose: bool):
     dt_1_day_ago = dt - datetime.timedelta(days=1)
 
     print(f"Aggregating connect events from {dt_2_days_ago} to {dt_1_day_ago}")
-    from_ = int(dt_2_days_ago.timestamp())
-    to = int(dt_1_day_ago.timestamp())
+    from_ = str(int(dt_2_days_ago.timestamp() * 1000))
+    to = str(int(dt_1_day_ago.timestamp() * 1000))
     payload = {"from": from_, "to": to}
     result = diagnostic.aggregateConnects(payload, verbose=verbose)
     click.echo(result)

{hcs_cli-0.1.341 → hcs_cli-0.1.342}/hcs_cli/cmds/log.py

@@ -16,10 +16,11 @@ from hcs_cli.support import predefined_payload
 from hcs_cli.support.log.message_parser import parse_message
 from hcs_cli.support.log.query_builder import update_query
 
-_hdcs = ["US", "EU", "JP"]
+_hdcs = ["US", "EU", "JP", "JP2"]
 
 _regions = [
     "any",  # magic flag. Search log of all regional clusters related to the selected HDC. [default]
+    "all",  # Alias of 'any'
     "eastus2",
     "westus2",
     "centralus",
@@ -39,8 +40,6 @@ _regions = [
 
 
 # US
-PROD_US_HDC_WESTUS2 = "prod110-hdc-westus2-cp102-*"  # primary
-PROD_US_HDC_CENTRALUS = "prod110-hdc-centralus-cp102-*"
 
 PROD_US_R_WESTUS2 = "prod110-r-westus2-cp102-*"  # primary
 PROD_US_R_EASTUS2 = "prod110-r-eastus2-cp102-*"  # primary
@@ -48,8 +47,6 @@ PROD_US_R_CENTRALUS = "prod110-r-centralus-cp102-*"  # standby
 PROD_US_R_WESTCENTRALUS = "prod110-r-westcentralus-cp102-*"  # standby
 
 # EU
-PROD_EU_HDC_NORTHEUROPE = "prod110-hdc-northeurope-cp102-*"  # primary
-PROD_EU_HDC_WESTEUROPE = "prod110-hdc-westeurope-cp102-*"
 
 PROD_EU_R_GERMANYNORTH = "prod110-r-germanynorth-cp102-*"  # primary
 PROD_EU_R_GERMANYWESTCENTRAL = "prod110-r-germanywestcentral-cp102-*"
@@ -59,7 +56,9 @@ PROD_EU_R_WESTEUROPE = "prod110-r-westeurope-cp102-*"
 
 # JP
 PROD_JP_HDC_JAPANEAST = "prod110-hdc-japaneast-cp102-*"  # primary
-PROD_JP_HDC_JAPANWEST = "prod110-hdc-japanwest-cp102-*"
+# PROD_JP_HDC_JAPANWEST = "prod110-hdc-japanwest-cp102-*"    # DR. no longer in use
+
+PROD_JP_HDC_JAPANEAST_CP103 = "prod110-hdc-japaneast-cp103-*"  # JP2
 
 PROD_JP_R_JAPANEAST = "prod110-r-japaneast-cp102-*"
 PROD_JP_R_JAPANWEST = "prod110-r-japanwest-cp102-*"
@@ -68,6 +67,14 @@ PROD_AUS_R_AUSSOUTHEAST = "prod110-r-aussoutheast-cp102-*"
 PROD_IND_R_CENTRALINDIA = "prod110-r-centralindia-cp102-*"
 PROD_IND_R_SOUTHINDIA = "prod110-r-southindia-cp102-*"
 
+HDC_INDEX_MAPPING = {
+    "US": "prod110-hdc-westus2-cp102-*",  # primary
+    # "US_DR": "prod110-hdc-centralus-cp102-*",
+    "EU": "prod110-hdc-northeurope-cp102-*",  # primary
+    # "EU_DR": "prod110-hdc-westeurope-cp102-*",
+    "JP": PROD_JP_HDC_JAPANEAST,
+    "JP2": PROD_JP_HDC_JAPANEAST_CP103,
+}
 
 ANY_HDC_AND_REGION = "prod110-*-*-cp102-*"
 
@@ -138,28 +145,23 @@ def log(
     if index:
         es_logs_search_index = index
     elif region:
-        if region == "any":
-            # search any HDC and region. still scoped to datasource.
+        if region == "any" or region == "all":
+            # search any HDC and region. still scoped to datasource so only limited HDC indexes are searched.
             es_logs_search_index = ANY_HDC_AND_REGION
         else:
             # search only specific region
             es_logs_search_index = f"prod110-r-{region.lower()}-cp102-*"
     else:
         # hdc only
-        if hdc == "US":
-            es_logs_search_index = PROD_US_HDC_WESTUS2
-        elif hdc == "EU":
-            es_logs_search_index = PROD_EU_HDC_NORTHEUROPE
-        elif hdc == "JP":
-            es_logs_search_index = PROD_JP_HDC_JAPANEAST
-        else:
+        es_logs_search_index = HDC_INDEX_MAPPING.get(hdc)
+        if not es_logs_search_index:
             raise ValueError("Unknown HDC")
 
     text = predefined_payload.load("hoc/logs.jsont")
     replacements = {
         "from": int(yumako.time.of(from_param, tz=timezone.utc).timestamp() * 1000),
         "to": int(yumako.time.of(to, tz=timezone.utc).timestamp() * 1000),
-        "query": query or "",
+        "query": query or "*",
         "es_logs_search_index": es_logs_search_index,
     }
     try:
@@ -197,6 +199,7 @@ def log(
         "US": "US_APM",
         "EU": "EU_APM",
         "JP": "JP_APM",
+        "JP2": "JP_APM",
     }
 
     # print(payload_jsonp)

{hcs_cli-0.1.341 → hcs_cli-0.1.342}/hcs_cli/service/admin/edge.py

@@ -10,7 +10,10 @@ from ..edge import delete as delete
 from ..edge import get as get
 from ..edge import get_connection_string as get_connection_string
 from ..edge import items as items
+from ..edge import latest_log as latest_log
 from ..edge import list as list
+from ..edge import list_logs as list_logs
+from ..edge import request_log as request_log
 from ..edge import safe_delete as safe_delete
 from ..edge import wait_for as wait_for
 from ..edge import wait_for_deleted as wait_for_deleted

{hcs_cli-0.1.341 → hcs_cli-0.1.342}/hcs_cli/service/edge.py

@@ -155,3 +155,19 @@ def _wait_for_terminal_state(id, org_id, timeout):
 def get_connection_string(id: str, org_id: str):
     url = f"{base_context}/{id}/device-connection-string?org_id={org_id}"
     return _client.get(url)
+
+
+def request_log(id: str, org_id: str):
+    url = f"{base_context}/{id}/logs?org_id={org_id}"
+    return _client.post(url, {})
+
+
+def list_logs(id: str, org_id: str, page: int = 0, size: int = 10):
+    url = f"{base_context}/{id}/logs?page={page}&size={size}&sort=createdAt,desc&org_id={org_id}&edgeDeploymentId={id}"
+    return _client.get(url)
+
+
+def latest_log(id: str, org_id: str):
+    content = list_logs(id, org_id, page=0, size=1).get("content") or []
+    return content[0] if content else None
+    # logStatus: ACCEPTED -> AVAILABLE (readAccessUri present) | FAILED (errorDetail present)

{hcs_cli-0.1.341 → hcs_cli-0.1.342}/pyproject.toml

@@ -21,7 +21,7 @@ keywords = [
 ]
 dynamic = ["version"]
 dependencies = [
-    "hcs-core>=0.1.341",
+    "hcs-core>=0.1.342",
     "reportlab>=4.0.0",
     "matplotlib>=3.8.0",
     "InquirerPy>=0.3.4",