diff --git a/metrics/conf.sample.py b/metrics/conf.sample.py index 522d66983ba5024f9a88115be6f7c89f3d5f8a87..a4ab1bb2092e6d40aff9d549e43c9378a24a3329 100644 --- a/metrics/conf.sample.py +++ b/metrics/conf.sample.py @@ -9,7 +9,8 @@ vidjil_servers = [ "url": "https://localhost/vidjil/", "certificat": "./certs/cert_localhost.pem", "user":"metrics@vidjil.org", - "password": "foobartest" + "password": "foobartest", + "metrics_user_id":2, } ] diff --git a/metrics/main.py b/metrics/main.py index 01c814712656d9ac6a439f326ee2194d2332f76e..517dfe0155d024f4ab7a9f3118923e87d88cae59 100644 --- a/metrics/main.py +++ b/metrics/main.py @@ -65,7 +65,7 @@ def metrics(): if dev_mode: print(f"# Raw metrics received") # print(f"{metrics=}") - formated_response += formated_metrics(metrics,cleanUrlServer(url_server)) + formated_response += formated_metrics(metrics,cleanUrlServer(url_server), vidjil_server["metrics_user_id"]) except Exception as e: print( f"{e=}" ) formated_response += unavailableServer(url_server) @@ -74,7 +74,7 @@ def metrics(): return response -def formated_metrics(metrics, url_server): +def formated_metrics(metrics, url_server, metrics_user_id): formater = { 'users_count': {"type": "counter", "description": "The count of users."}, 'group_count': {"type": "counter", "description": "The count of groups."}, @@ -121,7 +121,7 @@ def formated_metrics(metrics, url_server): for metrics_key in formater.keys(): if metrics_key in metrics.keys(): if 'function' in formater[metrics_key].keys(): - string += formater[metrics_key]["function"](metrics_key, formater[metrics_key], metrics[metrics_key], url_server) + string += formater[metrics_key]["function"](metrics_key, formater[metrics_key], metrics[metrics_key], url_server, metrics_user_id) else: string += f"\ # HELP vidjil_api_request_{metrics_key} {formater[metrics_key]['description']}\n\ @@ -136,7 +136,7 @@ vidjil_api_request_{metrics_key}{{server=\"{url_server}\"}} {metrics[metrics_key string += f"# Not converted: {not_converted}\n" return string -def convert_directories_sizes(metrics_key, formater, data, url_server): +def convert_directories_sizes(metrics_key, formater, data, url_server, metrics_user_id): # {"size": size_directory("/mnt/result/results"), "path": "/mnt/result/results", "name": "results"} string = f"\ # HELP vidjil_api_request_directories_sizes {formater['description']}\n\ @@ -148,7 +148,7 @@ vidjil_api_request_directories_sizes\ {elt['size']}\n" return string -def convert_disk_usage(metrics_key, formater, data, url_server): +def convert_disk_usage(metrics_key, formater, data, url_server, metrics_user_id): # {"name": "total", "size": xxx} string = f"\ # HELP vidjil_api_request_disk_usage {formater['description']}\n\ @@ -160,7 +160,7 @@ vidjil_api_request_disk_usage\ {elt['size']}\n" return string -def convert_configs_analysis(metrics_key, formater, data, url_server): +def convert_configs_analysis(metrics_key, formater, data, url_server, metrics_user_id): # "configs_analysis": [{ # "_extra": {"COUNT(`results_file`.`id`)": 12 }, # "config": {"name": "multi+inc+xxx", "program": "vidjil"}, @@ -178,7 +178,7 @@ vidjil_api_request_config_analysis\ {elt['_extra']['COUNT(`results_file`.`id`)']}\n" return string -def convert_configs_analysis_by_groups(metrics_key, formater, data, url_server): +def convert_configs_analysis_by_groups(metrics_key, formater, data, url_server, metrics_user_id): # "configs_analysis": [{ # "_extra": {"COUNT(`results_file`.`id`)": 12 }, # "config": {"name": "multi+inc+xxx", "program": "vidjil"}, @@ -194,7 +194,7 @@ vidjil_api_request_config_analysis_by_groups\ {elt['_extra']['COUNT(`results_file`.`id`)']}\n" return string -def convert_login_count(metrics_key, formater, data, url_server): +def convert_login_count(metrics_key, formater, data, url_serve, metrics_user_id): # "login_count": [{ # "_extra": {"COUNT(`auth_event`.`id`)": 14 }, # "auth_event": {"user_id": 1 }, @@ -212,7 +212,7 @@ vidjil_api_request_login_count\ return string -def convert_status_analysis(metrics_key, formater, data, url_server): +def convert_status_analysis(metrics_key, formater, data, url_server, metrics_user_id): # "status_analysis": [{ # "_extra": {"COUNT(`scheduler_task`.`status`)": 6 }, # "scheduler_task": {"status": "COMPLETED", "task_name": "process"} @@ -231,7 +231,7 @@ vidjil_api_request_status_analysis\ -def convert_set_generics_by_group(metrics_key, formater, data, url_server): +def convert_set_generics_by_group(metrics_key, formater, data, url_server, metrics_user_id): # return f"\n\n=*=*= set_generics_by_group ==> {data[:2]}\n\n\n" # 'count': 1, 'group_id': 1 string = f"\ # HELP vidjil_api_request_set_generics_by_group {formater['description']}\n\ @@ -243,7 +243,7 @@ vidjil_api_request_set_generics_by_group\ return string -def convert_set_runs_by_group(metrics_key, formater, data, url_server): +def convert_set_runs_by_group(metrics_key, formater, data, url_server, metrics_user_id): # return f"\n\n=*=*= set_runs_by_group ==> {data[:2]}\n\n\n" # string = f"\ # HELP vidjil_api_request_set_runs_by_group {formater['description']}\n\ @@ -255,7 +255,7 @@ vidjil_api_request_set_runs_by_group\ return string -def convert_set_patients_by_group(metrics_key, formater, data, url_server): +def convert_set_patients_by_group(metrics_key, formater, data, url_server, metrics_user_id): # return f"\n\n=*=*= set_patients_by_group ==> {data[:2]}\n\n\n" # string = f"\ # HELP vidjil_api_request_set_patients_by_group {formater['description']}\n\ @@ -267,7 +267,7 @@ vidjil_api_request_set_patients_by_group\ return string -def convert_sequence_by_user(metrics_key, formater, data, url_server): +def convert_sequence_by_user(metrics_key, formater, data, url_server, metrics_user_id): # return f"\n\n=*=*= convert_sequence_by_user ==> {data[:2]}\n\n\n" # string = f"\ # HELP vidjil_api_request_sequence_by_user {formater['description']}\n\ @@ -279,7 +279,7 @@ vidjil_api_request_sequence_by_user\ return string -def convert_set_generics_by_user(metrics_key, formater, data, url_server): +def convert_set_generics_by_user(metrics_key, formater, data, url_server, metrics_user_id): # return f"=*=*= convert_set_generics_by_user ==> {data[:2]}" # 'count': 1, 'user_id': 1 string = f"\ # HELP vidjil_api_request_set_generics_by_user {formater['description']}\n\ @@ -291,7 +291,7 @@ vidjil_api_request_set_generics_by_user\ return string -def convert_config_analysis_by_users_runs(metrics_key, formater, data, url_server): +def convert_config_analysis_by_users_runs(metrics_key, formater, data, url_server, metrics_user_id): # return f"convert_config_analysis_by_users_runs ==> {data[:2]}" # 'config_id': 2, 'config_name': 'multi+inc+xxx', 'count': 1, 'user_id': 1 string = f"\ @@ -304,7 +304,7 @@ vidjil_api_request_config_analysis_by_users_runs\ return string -def convert_sequence_size_by_user(metrics_key, formater, data, url_server): +def convert_sequence_size_by_user(metrics_key, formater, data, url_server, metrics_user_id): string = f"\ # HELP vidjil_api_request_sequence_size_by_user {formater['description']}\n\ # TYPE vidjil_api_request_sequence_size_by_user {formater['type']}\n" @@ -317,7 +317,7 @@ vidjil_api_request_sequence_size_by_user\ return string -def convert_config_analysis_by_users_generic(metrics_key, formater, data, url_server): +def convert_config_analysis_by_users_generic(metrics_key, formater, data, url_server, metrics_user_id): # "status_analysis": [{ # 'config_id': 9, 'config_name': 'spikes', 'count': 4, 'user_id': 1 # }, ...] @@ -333,7 +333,7 @@ vidjil_api_request_config_analysis_by_users_generic\ return string -def convert_set_runs_by_user(metrics_key, formater, data, url_server): +def convert_set_runs_by_user(metrics_key, formater, data, url_server, metrics_user_id): # "status_analysis": [{ # '_extra': {'COUNT(`run`.`id`) AS count': 2, '`run`.`creator` AS user_id': 1}, # 'count': 2, @@ -351,7 +351,7 @@ vidjil_api_request_set_runs_by_user\ return string -def convert_set_generics_count(metrics_key, formater, data, url_server): +def convert_set_generics_count(metrics_key, formater, data, url_server, metrics_user_id): print("convert_set_generics_count") print(f"{data=}") string = f"\ @@ -371,7 +371,7 @@ vidjil_api_request_set_generics_count\ # return string -def convert_config_analysis_by_users_patients(metrics_key, formater, data, url_server): +def convert_config_analysis_by_users_patients(metrics_key, formater, data, url_server, metrics_user_id): # return f"=*=*= convert_config_analysis_by_users_patients ==> {data[:2]}" string = f"\ # HELP vidjil_api_request_config_analysis_by_users_patients {formater['description']}\n\ @@ -383,7 +383,7 @@ vidjil_api_request_config_analysis_by_users_patients\ return string -def convert_set_patients_by_user(metrics_key, formater, data, url_server): +def convert_set_patients_by_user(metrics_key, formater, data, url_server, metrics_user_id): # "status_analysis": [{ # '_extra': {'COUNT(`patient`.`id`) AS count': 49, '`patient`.`creator` AS user_id': 14}, # 'count': 49,