fireinfo: Fix CPU map with empty vendors

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

diff --git a/src/backend/fireinfo.py b/src/backend/fireinfo.py
index 831b8b4edce28cf00a5f3ceaa15e6bccf9e83aa2..702739bd6dfe10eeeab7a98aeabc95a793dd05cd 100644 (file)
--- a/src/backend/fireinfo.py
+++ b/src/backend/fireinfo.py
@@ -1067,7 +1067,7 @@ class Fireinfo(Object):
                else:
                        res = self.db.query("""
                                SELECT
-                                       blob->'cpu'->'vendor' AS vendor,
+                                       NULLIF(blob->'cpu'->'vendor', '""'::jsonb) AS vendor,
                                        fireinfo_percentage(
                                                COUNT(*), SUM(COUNT(*)) OVER ()
                                        ) AS p
@@ -1077,10 +1077,8 @@ class Fireinfo(Object):
                                        expired_at IS NULL
                                AND
                                        blob IS NOT NULL
-                               AND
-                                       blob->'cpu'->'vendor' IS NOT NULL
                                GROUP BY
-                                       blob->'cpu'->'vendor'
+                                       NULLIF(blob->'cpu'->'vendor', '""'::jsonb)
                        """)
 
                return { CPU_VENDORS.get(row.vendor, row.vendor) : row.p for row in res }