From 0c7f7bb24df0a9f3603fc2617097f3bbaebaa086 Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Wed, 14 Oct 2020 16:06:02 -0500 Subject: Hack to disable Prometheus metrics by default --- config/config.exs | 4 +++- lib/pleroma/application.ex | 34 ++++++++++++++++++---------------- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/config/config.exs b/config/config.exs index 2c6142360..b1a0a2f49 100644 --- a/config/config.exs +++ b/config/config.exs @@ -636,7 +636,9 @@ config :pleroma, Pleroma.Emails.NewUsersDigestEmail, enabled: false -config :prometheus, Pleroma.Web.Endpoint.MetricsExporter, path: "/api/pleroma/app_metrics" +config :prometheus, Pleroma.Web.Endpoint.MetricsExporter, + enabled: false, + path: "/api/pleroma/app_metrics" config :pleroma, Pleroma.ScheduledActivity, daily_user_limit: 25, diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex index 301b4e273..92096e112 100644 --- a/lib/pleroma/application.ex +++ b/lib/pleroma/application.ex @@ -135,23 +135,25 @@ def load_custom_modules do end defp setup_instrumenters do - require Prometheus.Registry - - if Application.get_env(:prometheus, Pleroma.Repo.Instrumenter) do - :ok = - :telemetry.attach( - "prometheus-ecto", - [:pleroma, :repo, :query], - &Pleroma.Repo.Instrumenter.handle_event/4, - %{} - ) - - Pleroma.Repo.Instrumenter.setup() - end + if Application.get_env(:prometheus, Pleroma.Web.Endpoint.MetricsExporter)[:enabled] do + require Prometheus.Registry + + if Application.get_env(:prometheus, Pleroma.Repo.Instrumenter) do + :ok = + :telemetry.attach( + "prometheus-ecto", + [:pleroma, :repo, :query], + &Pleroma.Repo.Instrumenter.handle_event/4, + %{} + ) + + Pleroma.Repo.Instrumenter.setup() + end - Pleroma.Web.Endpoint.MetricsExporter.setup() - Pleroma.Web.Endpoint.PipelineInstrumenter.setup() - Pleroma.Web.Endpoint.Instrumenter.setup() + Pleroma.Web.Endpoint.MetricsExporter.setup() + Pleroma.Web.Endpoint.PipelineInstrumenter.setup() + Pleroma.Web.Endpoint.Instrumenter.setup() + end end defp cachex_children do -- cgit v1.2.3