From cd1d1b440296a4c15059b4ec1c2adeec797ff220 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Fri, 29 Apr 2022 10:53:47 +0200 Subject: [PATCH] root: don't force multiprocess prometheus registry Signed-off-by: Jens Langhammer --- authentik/root/monitoring.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/authentik/root/monitoring.py b/authentik/root/monitoring.py index 5fd50f89d..5ff02e0d6 100644 --- a/authentik/root/monitoring.py +++ b/authentik/root/monitoring.py @@ -1,15 +1,14 @@ """Metrics view""" from base64 import b64encode -import prometheus_client from django.conf import settings from django.db import connections from django.db.utils import OperationalError from django.dispatch import Signal from django.http import HttpRequest, HttpResponse from django.views import View +from django_prometheus.exports import ExportToDjangoView from django_redis import get_redis_connection -from prometheus_client import multiprocess from redis.exceptions import RedisError monitoring_set = Signal() @@ -32,12 +31,9 @@ class MetricsView(View): monitoring_set.send_robust(self) - registry = prometheus_client.CollectorRegistry() - multiprocess.MultiProcessCollector(registry) try: - metrics_page = prometheus_client.generate_latest(registry) - return HttpResponse(metrics_page, content_type=prometheus_client.CONTENT_TYPE_LATEST) - except (UnicodeDecodeError, KeyError): + return ExportToDjangoView(request) + except (UnicodeDecodeError, KeyError, ValueError): return HttpResponse(status_code=500)