From 0a4af50935c71a0c57c888968748061bb872a8ca Mon Sep 17 00:00:00 2001 From: Rhys Bailey Date: Sun, 26 Nov 2023 13:21:10 +1100 Subject: [PATCH] camera cpu and mem usage work for 0.12 and 0.13 --- prometheus_frigate_exporter.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/prometheus_frigate_exporter.py b/prometheus_frigate_exporter.py index 2ebcd8f..e6d3610 100644 --- a/prometheus_frigate_exporter.py +++ b/prometheus_frigate_exporter.py @@ -23,9 +23,9 @@ class CustomCollector(object): self.stats_url = _url self.process_stats = {} - def add_metric_process(self, metric, stats, camera_name, pid_name, process_name, cpu_or_memory, process_type): + def add_metric_process(self, metric, camera_stats, camera_name, pid_name, process_name, cpu_or_memory, process_type): try: - pid = str(stats[camera_name][pid_name]) + pid = str(camera_stats[pid_name]) label_values = [pid, camera_name, process_name, process_type] metric.add_metric(label_values, self.process_stats[pid][cpu_or_memory]) del self.process_stats[pid][cpu_or_memory] @@ -69,13 +69,13 @@ class CustomCollector(object): add_metric(skipped_fps, camera_name, camera_stats, 'skipped_fps') add_metric(detection_enabled, camera_name, camera_stats, 'detection_enabled') - self.add_metric_process(cpu_usages, stats, camera_name, 'ffmpeg_pid', 'ffmpeg', 'cpu', 'Camera') - self.add_metric_process(cpu_usages, stats, camera_name, 'capture_pid', 'capture', 'cpu', 'Camera') - self.add_metric_process(cpu_usages, stats, camera_name, 'pid', 'detect', 'cpu', 'Camera') + self.add_metric_process(cpu_usages, camera_stats, camera_name, 'ffmpeg_pid', 'ffmpeg', 'cpu', 'Camera') + self.add_metric_process(cpu_usages, camera_stats, camera_name, 'capture_pid', 'capture', 'cpu', 'Camera') + self.add_metric_process(cpu_usages, camera_stats, camera_name, 'pid', 'detect', 'cpu', 'Camera') - self.add_metric_process(mem_usages, stats, camera_name, 'ffmpeg_pid', 'ffmpeg', 'mem', 'Camera') - self.add_metric_process(mem_usages, stats, camera_name, 'capture_pid', 'capture', 'mem', 'Camera') - self.add_metric_process(mem_usages, stats, camera_name, 'pid', 'detect', 'mem', 'Camera') + self.add_metric_process(mem_usages, camera_stats, camera_name, 'ffmpeg_pid', 'ffmpeg', 'mem', 'Camera') + self.add_metric_process(mem_usages, camera_stats, camera_name, 'capture_pid', 'capture', 'mem', 'Camera') + self.add_metric_process(mem_usages, camera_stats, camera_name, 'pid', 'detect', 'mem', 'Camera') yield camera_fps yield detection_fps