phlo-clickstack 0.3.0__tar.gz → 0.3.1__tar.gz

{phlo_clickstack-0.3.0 → phlo_clickstack-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: phlo-clickstack
-Version: 0.3.0
+Version: 0.3.1
 Summary: clickstack service plugin for Phlo
 Author-email: Phlo Team <team@phlo.dev>
 License: MIT

{phlo_clickstack-0.3.0 → phlo_clickstack-0.3.1}/README.md

@@ -5,8 +5,7 @@ ClickStack observability service for Phlo.
 ## Overview
 
 `phlo-clickstack` packages the official ClickStack all-in-one image so Phlo can
-ship a single OpenTelemetry-native observability target with logs, metrics, and
-traces in one UI.
+query ClickHouse-backed observability data and link to the HyperDX UI.
 
 ## Installation
 
@@ -27,11 +26,6 @@ phlo services start --service clickstack
 phlo clickstack query "SELECT count() FROM default.otel_logs"
 ```
 
-Point `phlo-otel` at ClickStack:
-
-```bash
-export OTEL_EXPORTER_OTLP_ENDPOINT=http://localhost:4317
-export OTEL_TRACES_EXPORTER=otlp
-export OTEL_METRICS_EXPORTER=otlp
-export OTEL_LOGS_EXPORTER=otlp
-```
+The bundled all-in-one image exposes the HyperDX UI and ClickHouse query ports.
+Use Alloy or another collector for OTLP ingest; this service does not publish
+OTLP ports by default because the image does not listen on those ports.

{phlo_clickstack-0.3.0 → phlo_clickstack-0.3.1}/pyproject.toml

@@ -13,7 +13,7 @@ dependencies = [
 description = "clickstack service plugin for Phlo"
 name = "phlo-clickstack"
 requires-python = ">=3.11"
-version = "0.3.0"
+version = "0.3.1"
 
 [[project.authors]]
 email = "team@phlo.dev"

{phlo_clickstack-0.3.0 → phlo_clickstack-0.3.1}/src/phlo_clickstack/cli.py

@@ -17,6 +17,13 @@ from phlo.cli.commands.services import utils as services_utils
 from phlo.cli.infrastructure.command import CommandError, run_command
 from phlo.cli.infrastructure.compose import compose_base_cmd
 from phlo.cli.infrastructure.utils import get_project_name
+from phlo.cli.output import (
+    empty_file_error,
+    exclusive_options_error,
+    file_read_error,
+    missing_phlo_project_error,
+    missing_query_error,
+)
 from phlo.logging import get_logger
 
 logger = get_logger(__name__)
@@ -44,18 +51,18 @@ def _read_query(*, query: str | None, file: Path | None) -> str:
 
     """
     if query and file:
-        raise click.ClickException("Use either an inline query or --file, not both.")
+        raise exclusive_options_error("an inline query", "--file")
     if file is not None:
         try:
             sql = file.read_text(encoding="utf-8")
         except OSError as exc:
-            raise click.ClickException(f"Failed to read SQL file: {file}") from exc
+            raise file_read_error(file) from exc
         if sql.strip():
             return sql
-        raise click.ClickException(f"SQL file is empty: {file}")
+        raise empty_file_error(file)
     if query and query.strip():
         return query
-    raise click.ClickException("Provide a SQL query argument or --file.")
+    raise missing_query_error(command_hint='phlo clickstack query "SELECT 1"')
 
 
 def _ensure_phlo_dir() -> Path:
@@ -74,7 +81,7 @@ def _ensure_phlo_dir() -> Path:
     phlo_dir = Path.cwd() / ".phlo"
     if phlo_dir.exists():
         return phlo_dir
-    raise click.ClickException(".phlo directory not found. Run 'phlo services init' first.")
+    raise missing_phlo_project_error()
 
 
 def _require_container_backend() -> None:

{phlo_clickstack-0.3.0 → phlo_clickstack-0.3.1}/src/phlo_clickstack/service.yaml

@@ -12,13 +12,11 @@ compose:
   environment:
     FRONTEND_URL: ${CLICKSTACK_PUBLIC_URL:-}
   ports:
-    - "${CLICKSTACK_PORT:-8080}:8080"
-    - "${CLICKSTACK_HTTP_PORT:-8123}:8123"
-    - "${CLICKSTACK_OTLP_GRPC_PORT:-4317}:4317"
-    - "${CLICKSTACK_OTLP_HTTP_PORT:-4318}:4318"
-    - "${CLICKSTACK_NATIVE_PORT:-9000}:9000"
+    - "${CLICKSTACK_PORT:-18080}:8080"
+    - "${CLICKSTACK_HTTP_PORT:-18123}:8123"
+    - "${CLICKSTACK_NATIVE_PORT:-19002}:9000"
   volumes:
-    - ./volumes/clickstack:/var/lib/clickhouse
+    - clickstack-data:/var/lib/clickhouse
   healthcheck:
     test:
       [
@@ -38,19 +36,13 @@ env_vars:
     default: "docker.hyperdx.io/hyperdx/hyperdx-all-in-one"
     description: Official ClickStack all-in-one image reference
   CLICKSTACK_PORT:
-    default: 8080
+    default: 18080
     description: ClickStack UI port
   CLICKSTACK_HTTP_PORT:
-    default: 8123
+    default: 18123
     description: ClickHouse HTTP query port used by phlo-api trace endpoints
-  CLICKSTACK_OTLP_GRPC_PORT:
-    default: 4317
-    description: ClickStack OTLP gRPC ingest port
-  CLICKSTACK_OTLP_HTTP_PORT:
-    default: 4318
-    description: ClickStack OTLP HTTP ingest port
   CLICKSTACK_NATIVE_PORT:
-    default: 9000
+    default: 19002
     description: ClickHouse native port exposed by the all-in-one image
   CLICKSTACK_PUBLIC_URL:
     default: ""

{phlo_clickstack-0.3.0 → phlo_clickstack-0.3.1}/src/phlo_clickstack.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: phlo-clickstack
-Version: 0.3.0
+Version: 0.3.1
 Summary: clickstack service plugin for Phlo
 Author-email: Phlo Team <team@phlo.dev>
 License: MIT

{phlo_clickstack-0.3.0 → phlo_clickstack-0.3.1}/tests/test_clickstack_cli.py

@@ -148,7 +148,9 @@ def test_clickstack_query_rejects_missing_input(monkeypatch) -> None:
     result = CliRunner().invoke(clickstack_group, ["query"])
 
     assert result.exit_code != 0
-    assert "Provide a SQL query argument or --file." in result.output
+    assert "Error: no SQL query provided" in result.output
+    assert "Provide an inline query argument or pass --file." in result.output
+    assert 'Run: phlo clickstack query "SELECT 1"' in result.output
 
 
 def test_clickstack_query_surfaces_timeout(monkeypatch) -> None:

{phlo_clickstack-0.3.0 → phlo_clickstack-0.3.1}/tests/test_clickstack_plugin.py

@@ -10,6 +10,12 @@ def test_clickstack_service_definition() -> None:
 
     assert defn["name"] == "clickstack"
     assert defn["profile"] == "observability"
+    assert "${CLICKSTACK_PORT:-18080}:8080" in defn["compose"]["ports"]
+    assert "${CLICKSTACK_HTTP_PORT:-18123}:8123" in defn["compose"]["ports"]
+    assert "${CLICKSTACK_NATIVE_PORT:-19002}:9000" in defn["compose"]["ports"]
+    assert not any("4317" in port or "4318" in port for port in defn["compose"]["ports"])
+    assert "clickstack-data:/var/lib/clickhouse" in defn["compose"]["volumes"]
+    assert "./volumes/clickstack:/var/lib/clickhouse" not in defn["compose"]["volumes"]
 
 
 def test_clickstack_plugin_metadata() -> None: