logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: da4af72180cca2a7b7c4f4a9e8066b77c67586a0
parent: 6f5a0cc14e99cb26ef009cf8cf16f38902d5e11b
Author: rinpatch <rinpatch@sdf.org>
Date:   Thu, 13 Jun 2019 18:37:12 +0000

Merge branch 'remove-prometheus-nif' into 'develop'

Prometheus: Remove flaky process collection NIF.

See merge request pleroma/pleroma!1281

Diffstat:

Mlib/pleroma/application.ex1-
Mmix.exs1-
2 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex @@ -174,7 +174,6 @@ defmodule Pleroma.Application do Pleroma.Repo.Instrumenter.setup() end - Prometheus.Registry.register_collector(:prometheus_process_collector) Pleroma.Web.Endpoint.MetricsExporter.setup() Pleroma.Web.Endpoint.PipelineInstrumenter.setup() Pleroma.Web.Endpoint.Instrumenter.setup() diff --git a/mix.exs b/mix.exs @@ -136,7 +136,6 @@ defmodule Pleroma.Mixfile do {:prometheus_plugs, "~> 1.1"}, {:prometheus_phoenix, "~> 1.2"}, {:prometheus_ecto, "~> 1.4"}, - {:prometheus_process_collector, "~> 1.4"}, {:recon, github: "ferd/recon", tag: "2.4.0"}, {:quack, "~> 0.1.1"}, {:benchee, "~> 1.0"},