Merge pull request #169 from neuroforgede/wip/fix-plumbing-for-bucket…

…-names/main

Remove django prometheus as it caused connection leakage in the postgres pool

skipper/Pipfile

@@ -24,7 +24,6 @@ django-guardian = "==2.4.0"
 django-multitenant = "==3.0.0"
 django-cors-headers = "==4.3.1"
 pip-licenses = "==4.3.4"
-django-prometheus = "==2.3.1"
 tblib = "==3.0.0"
 jsonschema = {version = "==4.21.0"}
 gevent = "==24.2.1"

skipper/skipper/flow/apps.py

@@ -6,12 +6,13 @@
 
 from django.apps import AppConfig
 
-from skipper.flow import healthcheck
 
 
 class FlowConfig(AppConfig):
     name = 'skipper.flow'
     default_auto_field = 'django.db.models.BigAutoField'
 
     def ready(self) -> None:
+        from skipper.flow import healthcheck
+
         healthcheck.register_health_checks()

skipper/skipper/settings_env.py

@@ -58,12 +58,6 @@
 
 SQL_LINT = environment.SKIPPER_SQL_LINT
 
-if os.environ.get("RUN_MAIN") != "true":
-    PROMETHEUS_METRICS_EXPORT_PORT_RANGE = range(8001, 8050)
-
-PROMETHEUS_EXPORT_MIGRATIONS = True
-PROMETHEUS_METRIC_NAMESPACE = environment.SKIPPER_INSTALLATION_NAME
-
 LOGIN_REDIRECT_URL = ('..')
 
 URL_FIELD_NAME='url'
@@ -222,7 +216,6 @@ def task_upstream_dashboard(tenant: Tenant, user: Optional[Union[User, Anonymous
     'pgq',
     'corsheaders',
     'rest_framework.authtoken',
-    'django_prometheus',
     'rest_framework_simplejwt',
     'rest_framework_simplejwt.token_blacklist',
 
@@ -244,7 +237,6 @@ def task_upstream_dashboard(tenant: Tenant, user: Optional[Union[User, Anonymous
 ]
 
 MIDDLEWARE = [
-    'django_prometheus.middleware.PrometheusBeforeMiddleware',
     'skipper.core.middleware.TrackCurrentRequestMiddleware',
     'django.middleware.security.SecurityMiddleware',
     'csp.middleware.CSPMiddleware',
@@ -257,7 +249,6 @@ def task_upstream_dashboard(tenant: Tenant, user: Optional[Union[User, Anonymous
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'skipper.core.middleware.TenantFromUserMiddleware',
-    'django_prometheus.middleware.PrometheusAfterMiddleware',
 ]
 
 X_FRAME_OPTIONS = 'SAMEORIGIN'

skipper/skipper/urls.py

@@ -105,7 +105,6 @@ def get(self, request: Request, format: Optional[str] = None) -> response.Respon
 urlpatterns += [
     path(settings.ROOT_API_PATH, Overview.as_view()),
     path('admin/', admin.site.urls),
-    path('', include('django_prometheus.urls'))
 ]
 # for non production environments, we directly serve static files
 urlpatterns += cast(Any, static(settings.STATIC_URL, document_root=settings.STATIC_ROOT))