diff --git a/client/simple/src/less/stats.less b/client/simple/src/less/stats.less index 1e823f7c9..f6c76b870 100644 --- a/client/simple/src/less/stats.less +++ b/client/simple/src/less/stats.less @@ -32,6 +32,10 @@ .engine-reliability { text-align: right; } + + .engine-request-count { + text-align: right; + } } table.engine-error th.engine-error-type, diff --git a/searx/metrics/__init__.py b/searx/metrics/__init__.py index 00a811635..1e734b70d 100644 --- a/searx/metrics/__init__.py +++ b/searx/metrics/__init__.py @@ -92,6 +92,9 @@ def initialize(engine_names=None, enabled=True): histogram_width = 0.1 histogram_size = int(1.5 * max_timeout / histogram_width) + # global + counter_storage.configure('search', 'count', 'sent') + # engines for engine_name in engine_names or engines: # search count @@ -209,6 +212,7 @@ def get_engines_stats(engine_name_list): 'score': 0, 'score_per_result': 0, 'result_count': result_count, + 'request_count': sent_count, } if successful_count and result_count_sum: @@ -244,6 +248,11 @@ def get_engines_stats(engine_name_list): list_time.append(stats) + # request_count (per engine) is a percentage of the total number of requests + total_request_count = counter('search', 'count', 'sent') + for stats in list_time: + stats['request_count'] = int(round(stats['request_count'] * 100 / total_request_count, 0)) + return { 'time': list_time, 'max_time': math.ceil(max_time_total or 0), diff --git a/searx/search/__init__.py b/searx/search/__init__.py index 36903b194..659f0853b 100644 --- a/searx/search/__init__.py +++ b/searx/search/__init__.py @@ -83,6 +83,8 @@ class Search: # max of all selected engine timeout default_timeout = 0 + counter_inc('search', 'count', 'sent') + # start search-request for all selected engines for engineref in self.search_query.engineref_list: processor = PROCESSORS[engineref.name] diff --git a/searx/templates/simple/stats.html b/searx/templates/simple/stats.html index 575f6adb1..f00c1a5d5 100644 --- a/searx/templates/simple/stats.html +++ b/searx/templates/simple/stats.html @@ -27,6 +27,7 @@