- Improve Monitoring Request Filter Logging

GeoNode · Jul 9, 2019 · 068ac0b · 068ac0b
1 parent 4c7ac25
commit 068ac0b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/geonode/monitoring/middleware.py b/geonode/monitoring/middleware.py
@@ -28,7 +28,15 @@
 from django.http import HttpResponse
 
 
-FILTER_URLS = (settings.MEDIA_URL, settings.STATIC_URL, '/admin/jsi18n/',)
+FILTER_URLS = (settings.MEDIA_URL,
+               settings.STATIC_URL,
+               '/gs/',
+               '/api/',
+               '/security/',
+               '/lang.js',
+               '/jsi18n/',
+               '/h_keywords_api',
+               '/admin/jsi18n/',)
 
 
 class MonitoringMiddleware(object):

diff --git a/geonode/monitoring/probes.py b/geonode/monitoring/probes.py
@@ -80,6 +80,7 @@ def get_cpu():
         cpu = psutil.cpu_times()
         return {
             'usage': cpu.user + cpu.system,
+            'usage.percent': psutil.cpu_percent()
         }
 
     @staticmethod

diff --git a/geonode/monitoring/utils.py b/geonode/monitoring/utils.py
@@ -49,6 +49,7 @@
 
 
 class MonitoringFilter(logging.Filter):
+
     def __init__(self, service, skip_urls=tuple(), *args, **kwargs):
         super(MonitoringFilter, self).__init__(*args, **kwargs)
         self.service = service

diff --git a/geonode/settings.py b/geonode/settings.py
@@ -641,6 +641,7 @@
     '%s/api/adminRole' % FORCE_SCRIPT_NAME,
     '%s/api/users' % FORCE_SCRIPT_NAME,
     '%s/api/layers' % FORCE_SCRIPT_NAME,
+    '%s/monitoring' % FORCE_SCRIPT_NAME,
 )
 
 ANONYMOUS_USER_ID = os.getenv('ANONYMOUS_USER_ID', '-1')