Merge pull request #37 from unicef/staging

Staging

.gitignore

@@ -87,3 +87,4 @@ rabbitmq
 
 postgres_data/
 docker/docker-compose.dev.yml
+proco/assets/*.db

config/settings/base.py

@@ -1,5 +1,3 @@
-import json
-import os
 import sys
 import warnings
 
@@ -33,6 +31,7 @@
 
 AUTH_USER_MODEL = 'custom_auth.ApplicationUser'
 
+ENABLED_BACKEND_PROMETHEUS_METRICS = env.bool('ENABLED_BACKEND_PROMETHEUS_METRICS', default=True)
 # Application definition
 # --------------------------------------------------------------------------
 
@@ -87,7 +86,6 @@
 # --------------------------------------------------------------------------
 
 MIDDLEWARE = [
-    'django_prometheus.middleware.PrometheusBeforeMiddleware',
     'django.middleware.gzip.GZipMiddleware',
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
@@ -101,9 +99,12 @@
     # 'drf_secure_token.middleware.UpdateTokenMiddleware',
     'admin_reorder.middleware.ModelAdminReorder',
     'proco.utils.middleware.CustomCorsMiddleware',
-    'django_prometheus.middleware.PrometheusAfterMiddleware',
 ]
 
+if ENABLED_BACKEND_PROMETHEUS_METRICS:
+    MIDDLEWARE.insert(0, 'django_prometheus.middleware.PrometheusBeforeMiddleware')
+    MIDDLEWARE.insert(len(MIDDLEWARE), 'django_prometheus.middleware.PrometheusAfterMiddleware')
+
 # Custom authentication backend
 AUTHENTICATION_BACKENDS = ['proco.custom_auth.backends.RemoteAndModelBackend']
 
@@ -433,9 +434,6 @@
 
 INVALIDATE_CACHE_HARD = env('INVALIDATE_CACHE_HARD', default='false')
 
-with open(os.path.join(BASE_DIR, 'proco', 'core', 'resources', 'filters.json')) as filters_json_file:
-    FILTERS_DATA = json.load(filters_json_file)
-
 # DATABASE_ROUTERS = ["proco.utils.read_db_router.StandbyRouter"]
 
 GIGAMAPS_LOG_LEVEL = env('GIGAMAPS_LOG_LEVEL', default='INFO')
@@ -457,8 +455,7 @@
     },
     'formatters': {
         'verbose': {
-            'format': '%(hostname)s %(hostip)s %(asctime)s %(levelname)s %(pathname)s %(process)d '
-                      '%(processName)s %(thread)d: %(message)s'
+            'format': '%(hostname)s %(hostip)s %(asctime)s %(levelname)s %(pathname)s: %(message)s'
         },
     },
     'handlers': {

config/urls.py

@@ -46,7 +46,6 @@ def trigger_error(request):
     path('test/', TestView.as_view()),
     path('health/', PingAPIView.as_view()),
     path('sentry-debug/', trigger_error),
-    path('', include('django_prometheus.urls')),
 ]
 
 if settings.DEBUG:
@@ -56,3 +55,9 @@ def trigger_error(request):
     urlpatterns += [
         path('__debug__/', include(debug_toolbar.urls)),
     ]
+
+
+if settings.ENABLED_BACKEND_PROMETHEUS_METRICS:
+    urlpatterns += [
+        path('', include('django_prometheus.urls')),
+    ]

hello.py

@@ -1,3 +1,6 @@
+import os
+import requests
+
 from flask import Flask
 
 app = Flask(__name__)
@@ -6,3 +9,8 @@
 @app.route('/')
 def hello_world():
     return 'Hello, World!'
+
+@app.route("/metrics")
+def metrics():
+    response = requests.get('http://localhost:{port}/metrics'.format(port=os.environ.get('FLOWER_PORT', 6543)))
+    return response.text