From 24b6cfe8c9632612cb9e6b898108b113f39da649 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 16 Feb 2024 17:22:54 +0000 Subject: [PATCH] fireinfo: Fix kernel stats The kernel field has different names. Signed-off-by: Michael Tremer --- src/backend/fireinfo.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/backend/fireinfo.py b/src/backend/fireinfo.py index e13517cb..ff672043 100644 --- a/src/backend/fireinfo.py +++ b/src/backend/fireinfo.py @@ -1280,7 +1280,10 @@ class Fireinfo(Object): else: res = self.db.query(""" SELECT - blob->'system'->'kernel' AS kernel, + COALESCE( + blob->'system'->'kernel_release', + blob->'system'->'kernel' + ) AS kernel, fireinfo_percentage( COUNT(*), SUM(COUNT(*)) OVER () ) AS p @@ -1291,9 +1294,16 @@ class Fireinfo(Object): AND blob IS NOT NULL AND - blob->'system'->'kernel' IS NOT NULL + ( + blob->'system'->'kernel_release' IS NOT NULL + OR + blob->'system'->'kernel' IS NOT NULL + ) GROUP BY - blob->'system'->'kernel' + COALESCE( + blob->'system'->'kernel_release', + blob->'system'->'kernel' + ) """) return { row.kernel : row.p for row in res } -- 2.47.2