artin/API-Manager
1
0
Fork 0
mirror of https://github.com/OpenBankProject/API-Manager.git synced 2026-02-06 16:46:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'hongwei/develop' into develop

Browse Source
This commit is contained in:
Hongwei 2024-06-18 09:22:25 +02:00
commit 64fc457b1e
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/local_settings_container.py vendored
View File

@ -16,6 +16,8 @@ if os.getenv('API_HOST'):
API_HOST = os.getenv('API_HOST')
if os.getenv('API_PORTAL'):
API_PORTAL = os.getenv('API_PORTAL')
if os.getenv('CALLBACK_BASE_URL'):
CALLBACK_BASE_URL = os.getenv('CALLBACK_BASE_URL')
if os.getenv('ALLOWED_HOSTS'):
ALLOWED_HOSTS = os.getenv('ALLOWED_HOSTS').split(',')
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))

2
apimanager/metrics/forms.py
View File

@ -75,7 +75,7 @@ class APIMetricsForm(MetricsForm):
('PUT', 'PUT'),
)
consumer_id = forms.ChoiceField(
consumer_id = forms.CharField(
label=_('Consumer ID'),
widget=forms.TextInput(
attrs={

8
apimanager/metrics/views.py
View File

@ -320,21 +320,17 @@ class MonthlyMetricsSummaryView(LoginRequiredMixin, TemplateView):
only_show_api_explorer_metrics has the default value False, because it is just used for app = API_Explorer.
"""
try:
api_calls_total = 0
average_response_time = 0
url_path = '/management/aggregate-metrics?from_date={}&to_date={}&include_app_names={}'.format(from_date, to_date, self.get_app_name_parameters(include_app_names))
api = API(self.request.session.get('obp'))
metrics = api.get(url_path)
api_calls_total, average_calls_per_day, average_response_time = self.get_internal_api_call_metrics(
api_calls_total, average_response_time, from_date, metrics, to_date, url_path)
api_calls_total, average_calls_per_day, average_response_time = self.get_internal_api_call_metrics(from_date, metrics, to_date)
return api_calls_total, average_response_time, int(average_calls_per_day)
except APIError as err:
error_once_only(self.request, err)
except Exception as err:
error_once_only(self.request, err)
def get_internal_api_call_metrics(self, api_calls_total, average_response_time, from_date, metrics,
to_date, urlpath):
def get_internal_api_call_metrics(self,from_date, metrics,to_date):
api_calls_total = metrics[0]["count"]
average_response_time = metrics[0]["average_response_time"]
to_date = datetime.datetime.strptime(to_date, API_DATE_FORMAT_WITH_MILLISECONDS)