Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

Fix realtime dashboard

Uku Taht0fe053e106cc
diff --git a/lib/plausible/stats/query.ex b/lib/plausible/stats/query.ex
index c933b3a2f5..1a0befe053 100644
--- a/lib/plausible/stats/query.ex
+++ b/lib/plausible/stats/query.ex
@@ -41,7 +41,7 @@ defmodule Plausible.Stats.Query do
date = today(tz)
%__MODULE__{
- period: "30m",
+ period: "realtime",
interval: "minute",
date_range: Date.range(date, date),
filters: parse_filters(params),
diff --git a/lib/plausible_web/controllers/api/stats_controller.ex b/lib/plausible_web/controllers/api/stats_controller.ex
index 0fe26b8ed8..92b5b1cb47 100644
--- a/lib/plausible_web/controllers/api/stats_controller.ex
+++ b/lib/plausible_web/controllers/api/stats_controller.ex
@@ -15,7 +15,14 @@ defmodule PlausibleWeb.Api.StatsController do
_ -> query
end
- timeseries = Task.async(fn -> Stats.timeseries(site, query, ["visitors"]) end)
+ timeseries_query =
+ if query.period == "realtime" do
+ %Query{query | period: "30m"}
+ else
+ query
+ end
+
+ timeseries = Task.async(fn -> Stats.timeseries(site, timeseries_query, ["visitors"]) end)
{top_stats, sample_percent} = fetch_top_stats(site, query)
timeseries_result = Task.await(timeseries)
@@ -62,11 +69,13 @@ defmodule PlausibleWeb.Api.StatsController do
end
end
- defp fetch_top_stats(site, %Query{period: "30m"} = query) do
+ defp fetch_top_stats(site, %Query{period: "realtime"} = query) do
+ query_30m = %Query{query | period: "30m"}
+
%{
"visitors" => %{"value" => visitors},
"pageviews" => %{"value" => pageviews}
- } = Stats.aggregate(site, query, ["visitors", "pageviews"])
+ } = Stats.aggregate(site, query_30m, ["visitors", "pageviews"])
stats = [
%{
@@ -482,6 +491,14 @@ defmodule PlausibleWeb.Api.StatsController do
def conversions(conn, params) do
site = conn.assigns[:site]
query = Query.from(site.timezone, params) |> Filters.add_prefix()
+
+ query =
+ if query.period == "realtime" do
+ %Query{query | period: "30m"}
+ else
+ query
+ end
+
pagination = parse_pagination(params)
total_q = Query.remove_goal(query)
diff --git a/test/plausible/stats/query_test.exs b/test/plausible/stats/query_test.exs
index 7d26c49db6..71830ea8b2 100644
--- a/test/plausible/stats/query_test.exs
+++ b/test/plausible/stats/query_test.exs
@@ -25,7 +25,7 @@ defmodule Plausible.Stats.QueryTest do
assert q.date_range.first == Timex.today()
assert q.date_range.last == Timex.today()
- assert q.period == "30m"
+ assert q.period == "realtime"
end
test "parses month format" do