Revert "Backend: Integrate prometheus-django library and add django as scrape target for prometheus(#3446)" (#3510)

This reverts commit 4ac30ef.

Author: burnerlee

.gitignore

@@ -71,5 +71,3 @@ out/
 monitoring/prometheus/prometheus_db/*
 !monitoring/prometheus/prometheus_db/.gitkeep
 monitoring/grafana/grafana_db/grafana.db
-monitoring/prometheus/django/*
-!monitoring/prometheus/django/.gitkeep

docker/dev/django/uwsgi.ini

@@ -8,4 +8,3 @@ vaccum = true
 python-autoreload = 1
 buffer-size=32768
 chmod-socket = 777
-lazy-apps = true

docker/dev/docker.env

@@ -35,5 +35,3 @@ SERVICE_DNS=localhost
 
 GF_SECURITY_ADMIN_USER=admin    
 GF_SECURITY_ADMIN_PASSWORD=password
-
-prometheus_multiproc_dir=/code/monitoring/prometheus/django

evalai/urls.py

@@ -92,7 +92,6 @@
         schema_view.with_ui("redoc", cache_timeout=0),
         name="schema-redoc",
     ),
-    url(r"^api/prometheus/", include("django_prometheus.urls")),
 ]
 
 # DJANGO-SPAGHETTI-AND-MEATBALLS URLs available during development only.

monitoring/prometheus/django/.gitkeep

@@ -2,13 +2,7 @@ global:
   scrape_interval: 30s
   external_labels:
     monitor: 'evalai-monitor'
-
 scrape_configs:
   - job_name: 'prometheus' 
     static_configs: 
       - targets: ['localhost:9090']
-
-  - job_name: 'django-prometheus'
-    metrics_path: '/api/prometheus/metrics'
-    static_configs:
-      - targets: ['django:8000']

monitoring/prometheus/prometheus.yml

@@ -8,7 +8,6 @@ django==2.2.20
 django-allauth==0.43.0
 django-filter==2.4.0
 django-import-export==2.4.0
-django-prometheus==2.1.0
 djangorestframework==3.10.3
 djangorestframework-expiring-authtoken==0.1.4
 djangorestframework-simplejwt==4.6.0

requirements/common.txt

@@ -82,7 +82,6 @@
 INSTALLED_APPS = DEFAULT_APPS + OUR_APPS + THIRD_PARTY_APPS
 
 MIDDLEWARE = [
-    "django_prometheus.middleware.PrometheusBeforeMiddleware",
     "corsheaders.middleware.CorsMiddleware",
     "django.middleware.security.SecurityMiddleware",
     "django.contrib.sessions.middleware.SessionMiddleware",
@@ -91,7 +90,6 @@
     "django.contrib.auth.middleware.AuthenticationMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
-    "django_prometheus.middleware.PrometheusAfterMiddleware",
 ]
 
 ROOT_URLCONF = "evalai.urls"

settings/common.py

@@ -11,7 +11,7 @@
 
 DATABASES = {
     "default": {
-        "ENGINE": "settings.custom_databases.postgres_psycopg2",
+        "ENGINE": "django.db.backends.postgresql_psycopg2",
         "NAME": os.environ.get("POSTGRES_NAME", "evalai"),  # noqa: ignore=F405
         "USER": os.environ.get(  # noqa: ignore=F405
             "POSTGRES_USER", "postgres"
@@ -35,7 +35,6 @@
 
 # DJANGO-SPAGHETTI-AND-MEATBALLS SETTINGS
 INSTALLED_APPS += [  # noqa: ignore=F405
-    "django_prometheus",
     "django_spaghetti",
     "autofixture",
     "debug_toolbar",

settings/custom_databases/postgres_psycopg2/base.py

@@ -20,7 +20,7 @@
 
 DATABASES = {
     "default": {
-        "ENGINE": "settings.custom_databases.postgres_psycopg2",
+        "ENGINE": "django.db.backends.postgresql_psycopg2",
         "NAME": os.environ.get("RDS_DB_NAME"),
         "USER": os.environ.get("RDS_USERNAME"),
         "PASSWORD": os.environ.get("RDS_PASSWORD"),
@@ -35,11 +35,7 @@
 
 MIDDLEWARE += ["middleware.metrics.DatadogMiddleware"]  # noqa
 
-INSTALLED_APPS += (  # noqa
-    "storages",
-    "raven.contrib.django.raven_compat",
-    "django_prometheus",
-)
+INSTALLED_APPS += ("storages", "raven.contrib.django.raven_compat")  # noqa
 
 AWS_STORAGE_BUCKET_NAME = os.environ.get("AWS_STORAGE_BUCKET_NAME")
 AWS_ACCESS_KEY_ID = os.environ.get("AWS_ACCESS_KEY_ID")