fireinfo: Fix kernel stats

The kernel field has different names.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/backend/fireinfo.py b/src/backend/fireinfo.py
index e13517cb4bcdb00ccbdbb9b9d682d1e456322493..ff672043e1db103558e3bd8b30f3533d98cd1d13 100644 (file)
--- 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 }