+
Sockets (NIF)
+
+ Showing: {length(@sockets)}
+
No `socket` module sockets on this service.
@@ -306,8 +314,12 @@ defmodule Observer.Web.Network.Page do
%{form: form, previous_counters: previous_counters, details: details} = socket.assigns
sort_by = sort_by_atom(form.params["sort_by"])
+ search = String.downcase(form.params["search"] || "")
- rows = Network.rank_ports(ports, sort_by, 250, previous_counters)
+ rows =
+ ports
+ |> filter_ports(search)
+ |> Network.rank_ports(sort_by, 250, previous_counters)
details =
if details do
@@ -316,12 +328,39 @@ defmodule Observer.Web.Network.Page do
socket
|> assign(:rows, rows)
- |> assign(:sockets, Enum.sort_by(sockets, &(&1.read_bytes + &1.write_bytes), :desc))
+ |> assign(
+ :sockets,
+ sockets |> filter_sockets(search) |> Enum.sort_by(&(&1.read_bytes + &1.write_bytes), :desc)
+ )
|> assign(:previous_counters, Network.counters_by_port(ports))
|> assign(:details, details)
|> assign(:sample_error, nil)
end
+ defp filter_ports(ports, ""), do: ports
+
+ defp filter_ports(ports, search) do
+ Enum.filter(ports, fn row ->
+ String.contains?(String.downcase(row.name), search) or
+ String.contains?(String.downcase(row.owner_label), search) or
+ String.contains?(String.downcase(row.local), search) or
+ String.contains?(String.downcase(row.remote), search) or
+ String.contains?(String.downcase(inspect(row.port)), search)
+ end)
+ end
+
+ defp filter_sockets(sockets, ""), do: sockets
+
+ defp filter_sockets(sockets, search) do
+ Enum.filter(sockets, fn row ->
+ String.contains?(String.downcase(row.id_str), search) or
+ String.contains?(String.downcase(inspect(row.kind)), search) or
+ String.contains?(String.downcase(inspect(row.domain)), search) or
+ String.contains?(String.downcase(inspect(row.type)), search) or
+ String.contains?(String.downcase(inspect(row.protocol)), search)
+ end)
+ end
+
defp details_rows(details) do
[
{"owner", details.owner_label},
@@ -363,10 +402,13 @@ defmodule Observer.Web.Network.Page do
%{
"service" => to_string(Node.self()),
"sort_by" => "total",
- "refresh_seconds" => "5"
+ "refresh_seconds" => "5",
+ "search" => ""
}
end
+ defp search_active?(form), do: (form.params["search"] || "") != ""
+
defp format_bytes(bytes) when bytes >= 1_073_741_824,
do: "#{Float.round(bytes / 1_073_741_824, 1)} GB"
diff --git a/lib/web/pages/processes/page.ex b/lib/web/pages/processes/page.ex
index 9eae462..8ccfc3e 100644
--- a/lib/web/pages/processes/page.ex
+++ b/lib/web/pages/processes/page.ex
@@ -64,6 +64,8 @@ defmodule Observer.Web.Processes.Page do
label="Refresh"
options={[{"Paused", "0"}, {"2s", "2"}, {"5s", "5"}, {"10s", "10"}]}
/>
+
+
@@ -314,8 +319,11 @@ defmodule Observer.Web.Processes.Page do
sort_by = sort_by_atom(form.params["sort_by"])
limit = positive_int(form.params["limit"], 50)
+ search = String.downcase(form.params["search"] || "")
- rows = Processes.rank(sample, sort_by, limit, previous_reductions)
+ filtered_sample = %{sample | processes: filter_processes(sample.processes, search)}
+
+ rows = Processes.rank(filtered_sample, sort_by, limit, previous_reductions)
details =
if details do
@@ -353,6 +361,16 @@ defmodule Observer.Web.Processes.Page do
|> Enum.find(Node.self(), &(to_string(&1) == service))
end
+ defp filter_processes(processes, ""), do: processes
+
+ defp filter_processes(processes, search) do
+ Enum.filter(processes, fn row ->
+ String.contains?(String.downcase(row.name), search) or
+ String.contains?(String.downcase(inspect(row.pid)), search) or
+ String.contains?(String.downcase(row.current_function), search)
+ end)
+ end
+
defp sort_by_atom("memory"), do: :memory
defp sort_by_atom("message_queue_len"), do: :message_queue_len
defp sort_by_atom(_reductions), do: :reductions
@@ -369,10 +387,13 @@ defmodule Observer.Web.Processes.Page do
"service" => to_string(Node.self()),
"sort_by" => "reductions",
"limit" => "50",
- "refresh_seconds" => "5"
+ "refresh_seconds" => "5",
+ "search" => ""
}
end
+ defp search_active?(form), do: (form.params["search"] || "") != ""
+
defp reductions_label("reductions"), do: "REDUCTIONS (Δ)"
defp reductions_label(_other), do: "REDUCTIONS"
diff --git a/lib/web/pages/system/page.ex b/lib/web/pages/system/page.ex
index 7789e8a..e3c065f 100644
--- a/lib/web/pages/system/page.ex
+++ b/lib/web/pages/system/page.ex
@@ -73,132 +73,140 @@ defmodule Observer.Web.System.Page do
-
-
- Limits
-
-
- <:col :let={limit} label="RESOURCE">{limit.name}
- <:col :let={limit} label="COUNT">{limit.count}
- <:col :let={limit} label="LIMIT">{limit.limit}
- <:col :let={limit} label="USED">
-
-
-
-
-
-
- Operating system data (load averages, CPU, OS memory and disks) requires the
- :os_mon
- application on the selected service. Add
- :os_mon
- to your extra_applications
- to enable it.
-
+
+
+
+
+ Limits
+
+
+ <:col :let={limit} label="RESOURCE">{limit.name}
+ <:col :let={limit} label="COUNT">{limit.count}
+ <:col :let={limit} label="LIMIT">{limit.limit}
+ <:col :let={limit} label="USED">
+
+
+
+
-
-
- Operating System
-
+
+
+ Memory Allocators
+
+
+ <:col :let={alloc} label="ALLOCATOR">{alloc.name}
+ <:col :let={alloc} label="BLOCKS SIZE">{format_bytes(alloc.blocks_size)}
+ <:col :let={alloc} label="CARRIERS SIZE">{format_bytes(alloc.carriers_size)}
+ <:col :let={alloc} label="UTILIZATION">
+ {alloc.utilization_percent}%
+ -
+
+
+
+
-
-
- OS: {@os_data.os}
-
-
- {label}: {value}
-
+
+ Operating system data (load averages, CPU, OS memory and disks) requires the
+ :os_mon
+ application on the selected service. Add
+ :os_mon
+ to your extra_applications
+ to enable it.
-
-
-
OS Memory
-
-
- {@os_data.memory.used_percent}% of {format_bytes(@os_data.memory.total_bytes)} used ({format_bytes(
- @os_data.memory.available_bytes
- )} available)
+
+
+ Operating System
+
+
+
+
+ OS: {@os_data.os}
+
+
+ {label}: {value}
-
-
- <:col :let={cpu} label="CPU">{cpu.id}
- <:col :let={cpu} label="UTILIZATION">
+
+
OS Memory
-
{cpu.busy_percent}%
+
+ {@os_data.memory.used_percent}% of {format_bytes(@os_data.memory.total_bytes)} used ({format_bytes(
+ @os_data.memory.available_bytes
+ )} available)
+
-
-
+
-
- <:col :let={disk} label="DISK">{disk.mount}
- <:col :let={disk} label="SIZE">{format_bytes(disk.total_kbytes * 1_024)}
- <:col :let={disk} label="USED">
-
-
-
+
+ <:col :let={cpu} label="CPU">{cpu.id}
+ <:col :let={cpu} label="UTILIZATION">
+
- {disk.capacity_percent}%
-
-
-
-
+
+
-
-
- Memory Allocators
-
-
- <:col :let={alloc} label="ALLOCATOR">{alloc.name}
- <:col :let={alloc} label="BLOCKS SIZE">{format_bytes(alloc.blocks_size)}
- <:col :let={alloc} label="CARRIERS SIZE">{format_bytes(alloc.carriers_size)}
- <:col :let={alloc} label="UTILIZATION">
- {alloc.utilization_percent}%
- -
-
-
+
+ <:col :let={disk} label="DISK">{disk.mount}
+ <:col :let={disk} label="SIZE">{format_bytes(disk.total_kbytes * 1_024)}
+ <:col :let={disk} label="USED">
+
+
+
{disk.capacity_percent}%
+
+
+
+
diff --git a/test/observer_web/web/live/network/page_test.exs b/test/observer_web/web/live/network/page_test.exs
index 38df059..b4f986a 100644
--- a/test/observer_web/web/live/network/page_test.exs
+++ b/test/observer_web/web/live/network/page_test.exs
@@ -43,6 +43,62 @@ defmodule Observer.Web.Network.PageLiveTest do
end)
end
+ test "Search filters the Inet Ports and Sockets tables independently", %{conn: conn} do
+ RpcStubber.defaults()
+ TelemetryStubber.defaults()
+
+ {:ok, listen} = :gen_tcp.listen(0, [:binary, active: false, reuseaddr: true])
+ {:ok, listen_port_number} = :inet.port(listen)
+ {:ok, client} = :gen_tcp.connect(~c"localhost", listen_port_number, [:binary, active: false])
+ {:ok, accepted} = :gen_tcp.accept(listen, 1_000)
+
+ {:ok, nif_socket} = :socket.open(:inet, :stream, :tcp)
+
+ :ok =
+ :socket.connect(nif_socket, %{family: :inet, addr: {127, 0, 0, 1}, port: listen_port_number})
+
+ {:ok, index_live, _html} = live(conn, "/observer/network")
+
+ :timer.sleep(50)
+ render(index_live)
+
+ # Matches the Inet Ports table (driver name) but no socket's kind/domain/type/protocol
+ index_live
+ |> element("#network-update-form")
+ |> render_change(%{
+ service: to_string(Node.self()),
+ sort_by: "total",
+ refresh_seconds: "0",
+ search: "tcp_inet"
+ })
+
+ :timer.sleep(50)
+
+ html = render(index_live)
+ assert html =~ "Showing:"
+ assert html =~ "127.0.0.1:#{listen_port_number}"
+ assert html =~ "No `socket` module sockets on this service."
+
+ # Matches the Sockets table (domain) but no port's name/owner/local/remote/port
+ index_live
+ |> element("#network-update-form")
+ |> render_change(%{
+ service: to_string(Node.self()),
+ sort_by: "total",
+ refresh_seconds: "0",
+ search: ":inet"
+ })
+
+ :timer.sleep(50)
+
+ assert render(index_live) =~ "No inet ports on this service."
+
+ :socket.close(nif_socket)
+ :gen_tcp.close(client)
+ :gen_tcp.close(accepted)
+ :gen_tcp.close(listen)
+ end
+
test "DETAILS opens and closes the port drill-down panel", %{conn: conn} do
RpcStubber.defaults()
TelemetryStubber.defaults()
diff --git a/test/observer_web/web/live/processes/page_test.exs b/test/observer_web/web/live/processes/page_test.exs
index af1425a..a2e3be8 100644
--- a/test/observer_web/web/live/processes/page_test.exs
+++ b/test/observer_web/web/live/processes/page_test.exs
@@ -29,6 +29,32 @@ defmodule Observer.Web.Processes.PageLiveTest do
assert html =~ "CURRENT FUNCTION"
end
+ test "Search filters rows by name and shows the Showing badge", %{conn: conn} do
+ RpcStubber.defaults()
+ TelemetryStubber.defaults()
+
+ {:ok, index_live, _html} = live(conn, "/observer/processes")
+
+ :timer.sleep(50)
+ render(index_live)
+
+ index_live
+ |> element("#processes-update-form")
+ |> render_change(%{
+ service: to_string(Node.self()),
+ sort_by: "reductions",
+ limit: "250",
+ refresh_seconds: "0",
+ search: "code_server"
+ })
+
+ :timer.sleep(50)
+
+ html = render(index_live)
+ assert html =~ "code_server"
+ assert html =~ "Showing:"
+ end
+
test "Changing sort and limit re-ranks the table", %{conn: conn} do
RpcStubber.defaults()
TelemetryStubber.defaults()