X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Ftelemetry.ex;h=b0385060004cebed9b1083adec11e626d9feccea;hb=522221f7fb76859b23840bb0c9de0018dae41cbf;hp=435f557992c233fbdfa0bcb4ff8db3032e705bae;hpb=e2320f870e6ef4e8fc9f63282cbd459e819d740a;p=akkoma

diff --git a/lib/pleroma/web/telemetry.ex b/lib/pleroma/web/telemetry.ex
index 435f55799..b03850600 100644
--- a/lib/pleroma/web/telemetry.ex
+++ b/lib/pleroma/web/telemetry.ex
@@ -2,6 +2,7 @@ defmodule Pleroma.Web.Telemetry do
   use Supervisor
   import Telemetry.Metrics
   alias Pleroma.Stats
+  alias Pleroma.Config
 
   def start_link(arg) do
     Supervisor.start_link(__MODULE__, arg, name: __MODULE__)
@@ -9,18 +10,29 @@ defmodule Pleroma.Web.Telemetry do
 
   @impl true
   def init(_arg) do
-    children = [
-      {:telemetry_poller, measurements: periodic_measurements(), period: 10_000},
-      {TelemetryMetricsPrometheus, metrics: prometheus_metrics(), plug_cowboy_opts: [ip: {127, 0, 0, 1}]}
-    ]
+    children =
+      [
+        {:telemetry_poller, measurements: periodic_measurements(), period: 10_000}
+      ] ++
+        prometheus_children()
 
     Supervisor.init(children, strategy: :one_for_one)
   end
 
-  @doc """
-  A seperate set of metrics for distributions because phoenix dashboard does NOT handle
-  them well
-  """
+  defp prometheus_children do
+    config = Config.get([:instance, :export_prometheus_metrics], true)
+
+    if config do
+      [
+        {TelemetryMetricsPrometheus.Core, metrics: prometheus_metrics()},
+        Pleroma.PrometheusExporter
+      ]
+    else
+      []
+    end
+  end
+
+  # A seperate set of metrics for distributions because phoenix dashboard does NOT handle them well
   defp distribution_metrics do
     [
       distribution(
@@ -110,11 +122,10 @@ defmodule Pleroma.Web.Telemetry do
       summary("vm.total_run_queue_lengths.total"),
       summary("vm.total_run_queue_lengths.cpu"),
       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
 
@@ -132,5 +143,6 @@ defmodule Pleroma.Web.Telemetry 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