Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions elementary/messages/messaging_integrations/file_system.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import json
from datetime import datetime
from datetime import datetime, timezone
from pathlib import Path
from typing import Any

Expand Down Expand Up @@ -55,7 +55,7 @@ def send_message(
f"Channel directory {channel_dir} does not exist and create_if_missing is False"
)

filename = datetime.utcnow().strftime("%Y%m%dT%H%M%S_%fZ.json")
filename = datetime.now(tz=timezone.utc).strftime("%Y%m%dT%H%M%S_%fZ.json")
file_path = channel_dir / filename

try:
Expand All @@ -71,7 +71,7 @@ def send_message(
) from exc

return MessageSendResult(
timestamp=datetime.utcnow(),
timestamp=datetime.now(tz=timezone.utc),
message_format="json",
message_context=EmptyMessageContext(),
)
4 changes: 2 additions & 2 deletions elementary/messages/messaging_integrations/slack_webhook.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from datetime import datetime
from datetime import datetime, timezone
from http import HTTPStatus
from typing import Any, Optional

Expand Down Expand Up @@ -65,7 +65,7 @@ def send_message(
self._send_message(formatted_message)
return MessageSendResult(
message_context=EmptyMessageContext(),
timestamp=datetime.utcnow(),
timestamp=datetime.now(tz=timezone.utc),
message_format="block_kit",
)

Expand Down
4 changes: 2 additions & 2 deletions elementary/messages/messaging_integrations/teams_webhook.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from datetime import datetime
from datetime import datetime, timezone
from http import HTTPStatus
from typing import Any, Optional

Expand Down Expand Up @@ -94,7 +94,7 @@ def send_message(
)
return MessageSendResult(
message_context=EmptyMessageContext(),
timestamp=datetime.utcnow(),
timestamp=datetime.now(tz=timezone.utc),
message_format="adaptive_cards",
)
except requests.HTTPError as e:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import json
from collections import defaultdict
from datetime import datetime
from datetime import datetime, timezone
from typing import DefaultDict, Dict, List, Optional, Union

from alive_progress import alive_bar
Expand Down Expand Up @@ -201,7 +201,7 @@ def _get_suppressed_alerts(
alerts_last_sent_times: Dict[str, datetime],
) -> List[str]:
suppressed_alerts = []
current_time_utc = convert_time_to_timezone(datetime.utcnow())
current_time_utc = convert_time_to_timezone(datetime.now(tz=timezone.utc))
for alert in alerts:
alert_class_id = alert.alert_class_id
suppression_interval = alert.data.get_suppression_interval(
Expand Down
4 changes: 2 additions & 2 deletions elementary/monitor/fetchers/alerts/schema/pending_alerts.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from datetime import datetime
from datetime import datetime, timezone
from enum import Enum
from typing import Optional, Union

Expand Down Expand Up @@ -54,7 +54,7 @@ class Config:
def validate_times(cls, values: dict) -> dict:
new_values = {**values}

current_datetime = datetime.utcnow()
current_datetime = datetime.now(tz=timezone.utc)
if not values.get("detected_at"):
new_values["detected_at"] = current_datetime
if not values.get("created_at"):
Expand Down
2 changes: 1 addition & 1 deletion elementary/utils/time.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def convert_time_to_timezone(


def get_now_utc_str(format: str = DATETIME_FORMAT) -> str:
return datetime.utcnow().strftime(format)
return datetime.now(timezone.utc).strftime(format)


def get_now_utc_iso_format() -> str:
Expand Down
4 changes: 2 additions & 2 deletions tests/mocks/fetchers/alerts_fetcher_mock.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from datetime import datetime, timedelta
from datetime import datetime, timedelta, timezone
from typing import List

from elementary.config.config import Config
Expand All @@ -10,7 +10,7 @@
from elementary.utils.time import DATETIME_FORMAT
from tests.mocks.dbt_runner_mock import MockDbtRunner

CURRENT_DATETIME_UTC = datetime.utcnow()
CURRENT_DATETIME_UTC = datetime.now(tz=timezone.utc)
CURRENT_TIMESTAMP_UTC = CURRENT_DATETIME_UTC.strftime(DATETIME_FORMAT)

PENDDING_TEST_ALERTS_MOCK_DATA = [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import json
from datetime import datetime
from datetime import datetime, timezone

import pytest

Expand All @@ -9,7 +9,7 @@
)
from elementary.utils.time import DATETIME_FORMAT

CURRENT_DATETIME_UTC = datetime.utcnow()
CURRENT_DATETIME_UTC = datetime.now(tz=timezone.utc)
CURRENT_TIMESTAMP_UTC = CURRENT_DATETIME_UTC.strftime(DATETIME_FORMAT)

BASE_ALERT = dict(
Expand Down