cctv-stack 0.5.0__tar.gz → 0.5.1__tar.gz

{cctv_stack-0.5.0 → cctv_stack-0.5.1}/.gitignore

@@ -42,10 +42,6 @@ data/
 # is the site's file, not the repository's. `cameras.example.yml` is committed; this is not.
 config/cameras.yml
 
-# The generated monitoring config. It carries the heartbeat token and is derived from
-# cameras.yml at start-up, so editing it by hand is wasted work as well.
-config/gatus/
-
 # Generated by install.sh from probes of this machine (lld/07 §5).
 config/host.yml
 

{cctv_stack-0.5.0 → cctv_stack-0.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: cctv-stack
-Version: 0.5.0
+Version: 0.5.1
 Summary: A packaging-first self-hosted CCTV stack built on Frigate.
 Project-URL: Homepage, https://github.com/aravindmyd/cctv-stack
 Project-URL: Repository, https://github.com/aravindmyd/cctv-stack
@@ -252,7 +252,7 @@ adds the four pieces it leaves to the operator:
 
 It is not a replacement for Frigate. It is the missing layer around it.
 
-**Current release: `0.5.0`.** Clips, B2 upload, local retention, the aggregate status page
+**Current release: `0.5.1`.** Clips, B2 upload, local retention, the aggregate status page
 and alerting through Gatus/ntfy are implemented. Cloud retention and the one-command
 installer are not — see [`CONTRIBUTING.md`](CONTRIBUTING.md) for the exact state and roadmap.
 
@@ -281,10 +281,10 @@ pip install "cctv-stack[mqtt,storage]"
 ### Container image
 
 ```bash
-docker pull ghcr.io/aravindmyd/cctv-stack:0.5.0
+docker pull ghcr.io/aravindmyd/cctv-stack:0.5.1
 ```
 
-Tags published per release: `:0.5.0`, `:0.5`, and the commit tag `:sha-<short>`.
+Tags published per release: `:0.5.1`, `:0.5`, and the commit tag `:sha-<short>`.
 A moving `:edge` tag follows `master`. If the registry package is private, run
 `docker login ghcr.io` first. The image includes `ffmpeg`/`ffprobe`.
 

{cctv_stack-0.5.0 → cctv_stack-0.5.1}/README.md

@@ -18,7 +18,7 @@ adds the four pieces it leaves to the operator:
 
 It is not a replacement for Frigate. It is the missing layer around it.
 
-**Current release: `0.5.0`.** Clips, B2 upload, local retention, the aggregate status page
+**Current release: `0.5.1`.** Clips, B2 upload, local retention, the aggregate status page
 and alerting through Gatus/ntfy are implemented. Cloud retention and the one-command
 installer are not — see [`CONTRIBUTING.md`](CONTRIBUTING.md) for the exact state and roadmap.
 
@@ -47,10 +47,10 @@ pip install "cctv-stack[mqtt,storage]"
 ### Container image
 
 ```bash
-docker pull ghcr.io/aravindmyd/cctv-stack:0.5.0
+docker pull ghcr.io/aravindmyd/cctv-stack:0.5.1
 ```
 
-Tags published per release: `:0.5.0`, `:0.5`, and the commit tag `:sha-<short>`.
+Tags published per release: `:0.5.1`, `:0.5`, and the commit tag `:sha-<short>`.
 A moving `:edge` tag follows `master`. If the registry package is private, run
 `docker login ghcr.io` first. The image includes `ffmpeg`/`ffprobe`.
 

{cctv_stack-0.5.0 → cctv_stack-0.5.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "cctv-stack"
-version = "0.5.0"
+version = "0.5.1"
 description = "A packaging-first self-hosted CCTV stack built on Frigate."
 readme = "README.md"
 requires-python = ">=3.12"

{cctv_stack-0.5.0 → cctv_stack-0.5.1}/src/cctv/__init__.py

@@ -16,4 +16,4 @@ from __future__ import annotations
 
 __all__ = ["__version__"]
 
-__version__ = "0.5.0"
+__version__ = "0.5.1"

{cctv_stack-0.5.0 → cctv_stack-0.5.1}/src/cctv/monitoring.py

@@ -137,7 +137,7 @@ def monitors_for(
             interval_s=collect_interval_s,
         )
     ]
-    for name in ("clip-worker", "uploader", "cleanup"):
+    for name in ("uploader", "cleanup"):
         url = component_urls.get(name)
         if url:
             probes.append(
@@ -203,7 +203,7 @@ class GatusAdapter:
         ingests = [monitor for monitor in monitors if isinstance(monitor, IngestMonitor)]
 
         config: dict[str, Any] = {
-            "storage": {"type": "sqlite", "path": "/data/gatus.db"},
+            "storage": {"type": "sqlite", "path": "/gatus-data/gatus.db"},
             "alerting": {
                 "ntfy": {
                     "url": self.ntfy_url,
@@ -281,7 +281,10 @@ def heartbeats_for(summary: StatusSummary) -> dict[str, tuple[bool, str]]:
     )
 
     cleanup = summary.component("cleanup")
-    retention_ok = cleanup is not None and cleanup.state in {health.HEALTHY, health.DISABLED}
+    retention_ok = cleanup is not None and cleanup.state in {
+        health.HEALTHY,
+        health.DISABLED,
+    }
     out[heartbeat_key("retention")] = (
         retention_ok,
         "unobserved" if cleanup is None else cleanup.state,

{cctv_stack-0.5.0 → cctv_stack-0.5.1}/src/cctv/status.py

@@ -66,10 +66,14 @@ logger = logging.getLogger(__name__)
 #: The collector's own component name, in logs, health and `system_events`.
 COMPONENT = "status-collector"
 
-#: Everything the collector expects to hear from, in the order the page lists them. Frigate and
-#: storage are not here: neither speaks our `/health` contract, and both are observed
-#: differently.
-COMPONENT_NAMES: tuple[str, ...] = ("clip-worker", "uploader", "cleanup")
+#: Everything the collector expects to hear from over HTTP, in the order the page lists it.
+#: Frigate and storage are not here: neither speaks our `/health` contract, and both are
+#: observed differently. **`clip-worker` is not here either** — it has no health endpoint by
+#: design (`docs/health.md`): it keeps no state beyond the database, so there is nothing for
+#: it to report. Probing a URL that does not exist made a healthy stack look `UNKNOWN`
+#: forever, which is the opposite of what a status page is for. Its contribution is derived
+#: from the clip history below.
+COMPONENT_NAMES: tuple[str, ...] = ("uploader", "cleanup")
 
 #: Camera states. Separate from the component states on purpose: a camera is `ONLINE`,
 #: `OFFLINE` or `QUIET`, and calling it `HEALTHY` would invite somebody to alert on the wrong
@@ -485,6 +489,11 @@ def answer(summary: StatusSummary) -> str:
             else f"Recording is working. Cloud backup stalled {_human_age(stale)} ago."
         )
 
+    if summary.cameras_quiet:
+        names = ", ".join(c.name for c in summary.cameras_quiet)
+        verb = "has" if len(summary.cameras_quiet) == 1 else "have"
+        return f"Recording is working, but {names} {verb} produced no clips recently."
+
     worker = summary.component("clip-worker")
     if worker is not None and worker.state in {health.UNHEALTHY, health.UNKNOWN}:
         return "Cameras are recording, but clips are not being created."
@@ -663,6 +672,33 @@ def camera_status(
     )
 
 
+def _clip_worker_component(cameras: tuple[CameraStatus, ...]) -> ComponentStatus:
+    """Clip production, judged from the database rather than from an endpoint it lacks.
+
+    A fresh install with no clips is healthy: there is nothing to judge, and the documented
+    silent-camera rule exempts cameras without history. Once a camera *has* produced clips,
+    "every camera with history has gone QUIET" is what a broken clip-worker looks like from
+    outside — and it is also what a stopped camera looks like, which the camera's own state
+    already reports.
+    """
+    with_history = [camera for camera in cameras if camera.last_clip_at is not None]
+    if not with_history:
+        return ComponentStatus(name="clip-worker", state=health.HEALTHY, summary="no clips yet")
+    if all(camera.state == QUIET for camera in with_history):
+        return ComponentStatus(
+            name="clip-worker",
+            state=health.DEGRADED,
+            code="CAMERA_QUIET",
+            summary="no clips are being produced",
+        )
+    producing = sum(1 for camera in with_history if camera.state == ONLINE)
+    return ComponentStatus(
+        name="clip-worker",
+        state=health.HEALTHY,
+        summary=f"{producing} camera(s) producing clips",
+    )
+
+
 def _retention_days(config: CamerasConfig, *, key: str) -> int:
     """The strictest retention window across the cameras, for the page's one-line summary.
 
@@ -927,6 +963,7 @@ class Collector:
             for name in sorted(self.config.enabled_cameras())
         )
         self._track_offline(cameras, now=now, stats=frigate)
+        components.append(_clip_worker_component(cameras))
 
         return StatusSummary(
             site=self.config.site.location,

{cctv_stack-0.5.0 → cctv_stack-0.5.1}/src/cctv/uploader.py

@@ -392,6 +392,7 @@ class Uploader:
         self._rng = rng
         self._lock = threading.Lock()
         self._unverified = 0
+        self._size_verified = 0
         self._uploaded = 0
         self._failed_permanent = 0
 
@@ -399,9 +400,15 @@ class Uploader:
 
     @property
     def unverified_uploads(self) -> int:
+        """Uploads with no provider confirmation at all — the only case that degrades."""
         with self._lock:
             return self._unverified
 
+    @property
+    def size_verified_uploads(self) -> int:
+        with self._lock:
+            return self._size_verified
+
     @property
     def uploaded_uploads(self) -> int:
         with self._lock:
@@ -517,8 +524,14 @@ class Uploader:
 
         with self._lock:
             self._uploaded += 1
-            if result.verified_by != "sha256":
+            # `size` is not a failure. Multipart uploads return a composite digest, so the
+            # adapter compares size plus our own sha256 metadata instead — documented in
+            # `cloud-object-layout` §4.2 and expected above 100 MB. Only `none`, where no
+            # confirmation exists at all, is the condition worth degrading over.
+            if result.verified_by == "none":
                 self._unverified += 1
+            elif result.verified_by == "size":
+                self._size_verified += 1
 
         logger.info(
             "uploaded clip",
@@ -910,11 +923,22 @@ class UploaderHealth:
                     code="UPLOAD_UNVERIFIED",
                     detail=(
                         f"{self._uploader.unverified_uploads} upload(s) since start could not "
-                        f"be verified against a provider checksum. An unverified backup is not "
-                        f"a backup"
+                        f"be verified at all. An unverified backup is not a backup"
                     ),
                 )
             )
+        else:
+            # Reported rather than hidden: size verification is the documented outcome for
+            # multipart uploads, but the operator should still be able to see it happened.
+            size_verified = self._uploader.size_verified_uploads
+            detail = (
+                "all verified by provider checksum"
+                if size_verified == 0
+                else f"{size_verified} multipart upload(s) verified by size and local sha256"
+            )
+            checks.append(
+                health.Check(name="upload_verification", state=health.HEALTHY, detail=detail)
+            )
         return checks
 
     def _backlog_age_check(self, queue: db.QueueSummary) -> health.Check: