Merge branch 'CH-193-CH-Django-add-Prometheus-custom-metrics' of github.com:MetaCell/cloud-harness into develop

Author: filippomc

infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/settings.py

@@ -15,16 +15,20 @@
     []) + ['admin_extra_buttons', ]
 
 # add the local apps
-INSTALLED_APPS += ['cloudharness_django', ]
+INSTALLED_APPS += ['cloudharness_django', 'django_prometheus']
 
 # add the CloudHarness Django auto login middleware
-MIDDLEWARE = getattr(
-    settings,
-    'MIDDLEWARE',
-    []
-) + [
-    'cloudharness_django.middleware.BearerTokenMiddleware',
-]
+MIDDLEWARE = \
+    ['django_prometheus.middleware.PrometheusBeforeMiddleware'] + \
+    getattr(
+        settings,
+        'MIDDLEWARE',
+        []
+    ) + \
+    [
+        'cloudharness_django.middleware.BearerTokenMiddleware',
+        'django_prometheus.middleware.PrometheusAfterMiddleware'
+    ]
 
 USER_CHANGE_ENABLED = False
 
@@ -92,3 +96,7 @@
         },
     },
 }
+
+if settings.ROOT_URLCONF:
+    APP_URLCONF = settings.ROOT_URLCONF
+    ROOT_URLCONF = "cloudharness_django.urls"

infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/urls.py

@@ -0,0 +1,8 @@
+from django.conf import settings
+from django.urls import include, path
+
+
+urlpatterns = []
+
+urlpatterns.append(path('prometheus/', include('django_prometheus.urls')))
+urlpatterns.append(path('', include(settings.APP_URLCONF)))

infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/setup.cfg

@@ -9,7 +9,7 @@ license = BSD-3-Clause
 classifiers =
     Environment :: Web Environment
     Framework :: Django
-    Framework :: Django :: 3.2
+    Framework :: Django :: 3.0.7
     Intended Audience :: Developers
     License :: OSI Approved :: BSD License
     Operating System :: OS Independent
@@ -34,3 +34,4 @@ install_requires =
     psycopg2-binary>=2.9.3
     Pillow>=9.2.0
     python-keycloak
+    django-prometheus