From 1f3231b7227f994ccde937848a32fe6ea79a96ba Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 4 Mar 2024 13:07:43 +0000 Subject: [PATCH] fireinfo: Fix CPU map with empty vendors Signed-off-by: Michael Tremer --- src/backend/fireinfo.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/backend/fireinfo.py b/src/backend/fireinfo.py index 831b8b4e..702739bd 100644 --- 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 } -- 2.47.2