diff --git a/agent/lib/proxmox_agent/collectors/zfs.ex b/agent/lib/proxmox_agent/collectors/zfs.ex index 4e8b4da..89dfdd2 100644 --- a/agent/lib/proxmox_agent/collectors/zfs.ex +++ b/agent/lib/proxmox_agent/collectors/zfs.ex @@ -176,7 +176,15 @@ defmodule ProxmoxAgent.Collectors.Zfs do end defp to_int(v) when is_integer(v), do: v - defp to_int(v) when is_binary(v), do: String.to_integer(v) + + defp to_int(v) when is_binary(v) do + case Integer.parse(v) do + {n, _} -> n + :error -> 0 + end + end + + defp to_int(_), do: 0 defp max_or_nil([]), do: nil defp max_or_nil(list), do: Enum.max(list) diff --git a/agent/test/proxmox_agent/collectors/zfs_test.exs b/agent/test/proxmox_agent/collectors/zfs_test.exs index 122d48c..cceda66 100644 --- a/agent/test/proxmox_agent/collectors/zfs_test.exs +++ b/agent/test/proxmox_agent/collectors/zfs_test.exs @@ -104,6 +104,43 @@ defmodule ProxmoxAgent.Collectors.ZfsTest do # log vdev is retained in the per-pool vdevs list even though it's ignored for layout classification assert Enum.any?(by_name["mirror_with_log"].vdevs, &(&1.type == "log")) end + + test "tolerates nil and non-integer error counters" do + list_json = + Jason.encode!(%{ + "pools" => %{ + "weird" => %{"name" => "weird", "size" => 1, "alloc" => 0, "free" => 1, + "frag" => 0, "cap" => 0, "health" => "ONLINE"} + } + }) + + status_json = + Jason.encode!(%{ + "pools" => %{ + "weird" => %{ + "name" => "weird", "state" => "ONLINE", "error_count" => nil, + "vdevs" => %{ + "disk-0" => %{"name" => "disk-0", "vdev_type" => "disk", "state" => "ONLINE", + "read_errors" => nil, "write_errors" => "abc", + "checksum_errors" => "0"} + } + } + } + }) + + runner = fn + "zpool", ["list" | _] -> {:ok, list_json} + "zpool", ["status" | _] -> {:ok, status_json} + end + + sample = Zfs.collect_pools(runner: runner) + [pool] = sample.pools + assert pool.error_count == 0 + [vdev] = pool.vdevs + assert vdev.read_errors == 0 + assert vdev.write_errors == 0 + assert vdev.checksum_errors == 0 + end end describe "collect_datasets/1" do diff --git a/server/assets/css/app.css b/server/assets/css/app.css index 75d9155..3af2171 100644 --- a/server/assets/css/app.css +++ b/server/assets/css/app.css @@ -246,17 +246,6 @@ hr { border: 0; border-top: 1px solid var(--border); margin: 0; } .kv dt { color: var(--muted); } .kv dd { margin: 0; font-family: var(--mono); color: var(--fg-bright); } -.pool-row { - display: flex; - justify-content: space-between; - padding: 0.45rem 0; - border-bottom: 1px solid var(--border); - gap: 0.8rem; - font-size: 0.85rem; -} -.pool-row:last-child { border-bottom: none; } -.pool-row .details { color: var(--muted); font-family: var(--mono); font-size: 0.78rem; } - .capbar { height: 4px; background: var(--panel-2); diff --git a/server/lib/server_web/live/host_detail_live.ex b/server/lib/server_web/live/host_detail_live.ex index 1b032a8..4a8b5e2 100644 --- a/server/lib/server_web/live/host_detail_live.ex +++ b/server/lib/server_web/live/host_detail_live.ex @@ -76,7 +76,7 @@ defmodule ServerWeb.HostDetailLive do