From bf8029269a8c0490175047792b7c348de77a5316 Mon Sep 17 00:00:00 2001 From: Mitch Ross Date: Tue, 28 Feb 2023 21:18:03 -0500 Subject: [PATCH] refactor+lint --- docker-compose.yml | 20 +++++++++---------- frigate/app.py | 2 +- frigate/http.py | 4 ++-- .../prometheus.py} | 4 +++- frigate/{ => monitoring}/stats.py | 0 5 files changed, 16 insertions(+), 14 deletions(-) rename frigate/{prometheus_exporter.py => monitoring/prometheus.py} (98%) rename frigate/{ => monitoring}/stats.py (100%) diff --git a/docker-compose.yml b/docker-compose.yml index e050840ab..044a60dbc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,15 +13,15 @@ services: context: . # Use target devcontainer-trt for TensorRT dev target: devcontainer - deploy: - resources: - reservations: - devices: - - driver: nvidia - count: 1 - capabilities: [gpu] - devices: - - /dev/bus/usb:/dev/bus/usb + # deploy: + # resources: + # reservations: + # devices: + # - driver: nvidia + # count: 1 + # capabilities: [gpu] + # devices: + # - /dev/bus/usb:/dev/bus/usb # - /dev/dri:/dev/dri # for intel hwaccel, needs to be updated for your hardware volumes: - .:/workspace/frigate:cached @@ -31,7 +31,7 @@ services: - ./debug:/media/frigate # Create the trt-models folder using the documented method of generating TRT models # - ./debug/trt-models:/trt-models - - /dev/bus/usb:/dev/bus/usb + # - /dev/bus/usb:/dev/bus/usb mqtt: container_name: mqtt image: eclipse-mosquitto:1.6 diff --git a/frigate/app.py b/frigate/app.py index df89dd8b6..ef98cbc32 100644 --- a/frigate/app.py +++ b/frigate/app.py @@ -28,7 +28,7 @@ from frigate.object_processing import TrackedObjectProcessor from frigate.output import output_frames from frigate.plus import PlusApi from frigate.record import RecordingCleanup, RecordingMaintainer -from frigate.stats import StatsEmitter, stats_init +from frigate.monitoring.stats import StatsEmitter, stats_init from frigate.storage import StorageMaintainer from frigate.version import VERSION from frigate.video import capture_camera, track_camera diff --git a/frigate/http.py b/frigate/http.py index 5b9b0cd4f..77c435ffd 100644 --- a/frigate/http.py +++ b/frigate/http.py @@ -37,9 +37,9 @@ from frigate.config import FrigateConfig from frigate.const import CLIPS_DIR, MAX_SEGMENT_DURATION, RECORD_DIR from frigate.models import Event, Recordings from frigate.object_processing import TrackedObject -from frigate.prometheus_exporter import setupRegistry +from frigate.monitoring.prometheus import setupRegistry -from frigate.stats import stats_snapshot +from frigate.monitoring.stats import stats_snapshot from frigate.util import ( clean_camera_user_pass, ffprobe_stream, diff --git a/frigate/prometheus_exporter.py b/frigate/monitoring/prometheus.py similarity index 98% rename from frigate/prometheus_exporter.py rename to frigate/monitoring/prometheus.py index cb727765d..94b162d28 100644 --- a/frigate/prometheus_exporter.py +++ b/frigate/monitoring/prometheus.py @@ -29,7 +29,9 @@ class CustomCollector: # camera stats ffmpeg_up = GaugeMetricFamily( - "frigate_ffmpeg_up", "Whether the ffmpeg process for a camera is up", labels=["camera"] + "frigate_ffmpeg_up", + "Whether the ffmpeg process for a camera is up", + labels=["camera"], ) capture_pid = GaugeMetricFamily( "frigate_capture_pid", diff --git a/frigate/stats.py b/frigate/monitoring/stats.py similarity index 100% rename from frigate/stats.py rename to frigate/monitoring/stats.py