From b91e671c0d7cdca6b1ddf753f2017b15f366695f Mon Sep 17 00:00:00 2001 From: FloatingGhost Date: Fri, 16 Dec 2022 17:22:26 +0000 Subject: [PATCH] add remote user count for the heck of it --- lib/pleroma/stats.ex | 12 +++++++++++- lib/pleroma/web/telemetry.ex | 4 +++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/lib/pleroma/stats.ex b/lib/pleroma/stats.ex index 3e3f24c2c..cda1fb9a6 100644 --- a/lib/pleroma/stats.ex +++ b/lib/pleroma/stats.ex @@ -85,14 +85,24 @@ def calculate_stat_data do where: not u.invisible ) + remote_users_query = + from(u in User, + where: u.is_active == true, + where: u.local == false, + where: not is_nil(u.nickname), + where: not u.invisible + ) + user_count = Repo.aggregate(users_query, :count, :id) + remote_user_count = Repo.aggregate(remote_users_query, :count, :id) %{ peers: peers, stats: %{ domain_count: domain_count, status_count: status_count || 0, - user_count: user_count + user_count: user_count, + remote_user_count: remote_user_count } } end diff --git a/lib/pleroma/web/telemetry.ex b/lib/pleroma/web/telemetry.ex index 5b01ee14d..acb649421 100644 --- a/lib/pleroma/web/telemetry.ex +++ b/lib/pleroma/web/telemetry.ex @@ -109,7 +109,8 @@ defp summary_metrics do summary("vm.total_run_queue_lengths.io"), last_value("pleroma.local_users.total"), last_value("pleroma.domains.total"), - last_value("pleroma.local_statuses.total") + last_value("pleroma.local_statuses.total"), + last_value("pleroma.remote_users.total") ] end @@ -127,5 +128,6 @@ def instance_stats do :telemetry.execute([:pleroma, :local_users], %{total: stats.user_count}, %{}) :telemetry.execute([:pleroma, :domains], %{total: stats.domain_count}, %{}) :telemetry.execute([:pleroma, :local_statuses], %{total: stats.status_count}, %{}) + :telemetry.execute([:pleroma, :remote_users], %{total: stats.remote_user_count}, %{}) end end