diff --git a/flask_monitoringdashboard/database/custom_graph.py b/flask_monitoringdashboard/database/custom_graph.py index d3953bbb..8dae8c66 100644 --- a/flask_monitoringdashboard/database/custom_graph.py +++ b/flask_monitoringdashboard/database/custom_graph.py @@ -1,4 +1,4 @@ -from datetime import timedelta +from datetime import timedelta, datetime, timezone from sqlalchemy.orm.exc import NoResultFound @@ -23,7 +23,9 @@ def get_graph_id_from_name(session, name): def add_value(session, graph_id, value): - data = CustomGraphData(graph_id=graph_id, value=value) + data = CustomGraphData(graph_id=graph_id, + value=value, + time=datetime.now(timezone.utc)) session.add(data) diff --git a/flask_monitoringdashboard/database/request.py b/flask_monitoringdashboard/database/request.py index 90ca48ba..40a4faee 100644 --- a/flask_monitoringdashboard/database/request.py +++ b/flask_monitoringdashboard/database/request.py @@ -2,7 +2,7 @@ Contains all functions that access a Request object. """ import time - +from datetime import datetime, timezone from sqlalchemy import and_, func from flask_monitoringdashboard.database import Request @@ -42,6 +42,7 @@ def add_request(session, duration, endpoint_id, ip, group_by, status_code): ip=ip, group_by=group_by, status_code=status_code, + time_requested=datetime.now(timezone.utc) ) session.add(request) session.commit()