fix bandwidth stats

bairhys · Mar 11, 2024 · 9b4af20 · 9b4af20
1 parent 54bec9c
commit 9b4af20
Showing 1 changed file with 25 additions and 26 deletions.
diff --git a/prometheus_frigate_exporter.py b/prometheus_frigate_exporter.py
@@ -108,6 +108,31 @@ def collect(self):
         yield detection_fps
         yield process_fps
         yield skipped_fps
+
+        # bandwidth stats
+        bandwidth_usages = GaugeMetricFamily('frigate_bandwidth_usages_kBps', 'bandwidth usages kilobytes per second', labels=['pid', 'name', 'process', 'cmdline'])
+
+        try:
+            for b_pid, b_stats in stats['bandwidth_usages'].items():
+                label = [b_pid]  # pid label
+                try:
+                    n = stats['cpu_usages'][b_pid]['cmdline']
+                    for p_name, p_stats in stats['processes'].items():
+                        if str(p_stats['pid']) == b_pid:
+                            n = p_name
+                            break
+
+                    # new frigate:0.13.0-beta3 stat 'cmdline'
+                    label.append(n)  # name label
+                    label.append(stats['cpu_usages'][b_pid]['cmdline'])  # process label
+                    label.append(stats['cpu_usages'][b_pid]['cmdline'])  # cmdline label
+                    add_metric(bandwidth_usages, label, b_stats, 'bandwidth')
+                except KeyError:
+                    pass
+        except KeyError:
+            pass
+
+        yield bandwidth_usages
 
         # detector stats
         try:
@@ -260,32 +285,6 @@ def collect(self):
         yield storage_total
         yield storage_used
 
-        # bandwidth stats
-        bandwidth_usages = GaugeMetricFamily('frigate_bandwidth_usages_kBps', 'bandwidth usages kilobytes per second', labels=['pid', 'name', 'process', 'type', 'cmdline'])
-
-        try:
-            for b_pid, b_stats in stats['bandwidth_usages'].items():
-                label = [b_pid]  # pid label
-                try:
-                    n = stats['cpu_usages'][b_pid]['cmdline']
-                    for p_name, p_stats in stats['processes'].items():
-                        if str(p_stats['pid']) == b_pid:
-                            n = p_name
-                            break
-
-                    # new frigate:0.13.0-beta3 stat 'cmdline'
-                    label.append(n)  # name label
-                    label.append(stats['cpu_usages'][b_pid]['cmdline'])  # process label
-                    label.append('Other')  # type label
-                    label.append(stats['cpu_usages'][b_pid]['cmdline'])  # cmdline label
-                    add_metric(bandwidth_usages, label, b_stats, 'bandwidth')
-                except KeyError:
-                    pass
-        except KeyError:
-            pass
-
-        yield bandwidth_usages
-
         # count events
         events = []
         try: