Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing bug reported that graphics were displaying information in the reverse order #12

Merged
merged 2 commits into from
Mar 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* None

### Bug fixes
* None
* [[`PR-12`](https://github.com/thiagoesteves/observer_web/pull/12)] Fixing bug fix reporting that graphics were displaying information in the reverse order

### Enhancements
* [[`PR-10`](https://github.com/thiagoesteves/observer_web/pull/10)] Adding iframe configuration to allow Observer Web to run with embedded pages
Expand Down
9 changes: 5 additions & 4 deletions lib/web/components/metrics/phx_lv_socket.ex
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ defmodule Observer.Web.Components.Metrics.PhxLvSocket do
"""
end

# NOTE: Streams are retrieved in the reverse order
defp normalize(metrics) do
empty_series_data = %{
total: [],
Expand All @@ -63,10 +64,10 @@ defmodule Observer.Web.Components.Metrics.PhxLvSocket do
|> DateTime.to_string()

{%{
total: series_data.total ++ [metric.measurements.total],
supervisors: series_data.supervisors ++ [metric.measurements.supervisors],
connected: series_data.connected ++ [metric.measurements.connected]
}, categories_data ++ [timestamp]}
total: [metric.measurements.total] ++ series_data.total,
supervisors: [metric.measurements.supervisors] ++ series_data.supervisors,
connected: [metric.measurements.connected] ++ series_data.connected
}, [timestamp] ++ categories_data}
end)

datasets =
Expand Down
21 changes: 11 additions & 10 deletions lib/web/components/metrics/vm_memory.ex
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ defmodule Observer.Web.Components.Metrics.VmMemory do
total: []
}

# NOTE: Streams are retrieved in the reverse order
{series_data, categories_data} =
Enum.reduce(metrics, {empty_series_data, []}, fn metric, {series_data, categories_data} ->
timestamp =
Expand All @@ -66,16 +67,16 @@ defmodule Observer.Web.Components.Metrics.VmMemory do
|> DateTime.to_string()

{%{
atom: series_data.atom ++ [metric.measurements.atom],
atom_used: series_data.atom_used ++ [metric.measurements.atom_used],
binary: series_data.binary ++ [metric.measurements.binary],
code: series_data.code ++ [metric.measurements.code],
ets: series_data.ets ++ [metric.measurements.ets],
processes: series_data.processes ++ [metric.measurements.processes],
processes_used: series_data.processes_used ++ [metric.measurements.processes_used],
system: series_data.system ++ [metric.measurements.system],
total: series_data.total ++ [metric.measurements.total]
}, categories_data ++ [timestamp]}
atom: [metric.measurements.atom] ++ series_data.atom,
atom_used: [metric.measurements.atom_used] ++ series_data.atom_used,
binary: [metric.measurements.binary] ++ series_data.binary,
code: [metric.measurements.code] ++ series_data.code,
ets: [metric.measurements.ets] ++ series_data.ets,
processes: [metric.measurements.processes] ++ series_data.processes,
processes_used: [metric.measurements.processes_used] ++ series_data.processes_used,
system: [metric.measurements.system] ++ series_data.system,
total: [metric.measurements.total] ++ series_data.total
}, [timestamp] ++ categories_data}
end)

datasets =
Expand Down
3 changes: 2 additions & 1 deletion lib/web/components/metrics/vm_run_queue.ex
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ defmodule Observer.Web.Components.Metrics.VmRunQueue do
"""
end

# NOTE: Streams are retrieved in the reverse order
defp normalize(metrics) do
{series_data, categories_data} =
Enum.reduce(metrics, {[], []}, fn metric, {series_data, categories_data} ->
Expand All @@ -60,7 +61,7 @@ defmodule Observer.Web.Components.Metrics.VmRunQueue do
|> DateTime.from_unix!(:millisecond)
|> DateTime.to_string()

{series_data ++ [metric.value], categories_data ++ [timestamp]}
{[metric.value] ++ series_data, [timestamp] ++ categories_data}
end)

datasets =
Expand Down