-{{ title }} -{% if message %} - {{ message|linebreaks }} -{% endif %} -{#
#} -{#
-Alert channel: {{ alert_channel }} -
-Check Incident -
-Your Amixr.IO -{% if limit_notification %} -
- {{ emails_left }} mail(s) left for this week. Contact your admin. -{% endif %} - - - \ No newline at end of file diff --git a/engine/apps/sendgridapp/templates/email_verification.html b/engine/apps/sendgridapp/templates/email_verification.html deleted file mode 100644 index 468daf41..00000000 --- a/engine/apps/sendgridapp/templates/email_verification.html +++ /dev/null @@ -1,15 +0,0 @@ - - - -Welcome to OnCall! -
-To verify your email address, please click the button below. If you did not sign up for OnCall, please ignore this email. -
-Confirm email -
-Thanks, -
-OnCall Team - - - \ No newline at end of file diff --git a/engine/apps/sendgridapp/tests/factories.py b/engine/apps/sendgridapp/tests/factories.py deleted file mode 100644 index e27fd458..00000000 --- a/engine/apps/sendgridapp/tests/factories.py +++ /dev/null @@ -1,8 +0,0 @@ -# import factory -# -# from apps.sendgridapp.models import EmailMessage -# -# -# class EmailMessageFactory(factory.DjangoModelFactory): -# class Meta: -# model = EmailMessage diff --git a/engine/apps/sendgridapp/tests/test_emails.py b/engine/apps/sendgridapp/tests/test_emails.py deleted file mode 100644 index 7d29c428..00000000 --- a/engine/apps/sendgridapp/tests/test_emails.py +++ /dev/null @@ -1,135 +0,0 @@ -# from unittest.mock import patch -# -# import pytest -# from django.urls import reverse -# from django.utils import timezone -# from rest_framework.test import APIClient -# -# from apps.sendgridapp.constants import SendgridEmailMessageStatuses -# from apps.sendgridapp.verification_token import email_verification_token_generator -# -# -# @pytest.mark.skip(reason="email disabled") -# @pytest.mark.django_db -# def test_email_verification( -# make_team, -# make_user_for_team, -# make_email_message, -# make_alert_receive_channel, -# make_alert_group, -# ): -# amixr_team = make_team() -# admin = make_user_for_team(amixr_team, role=ROLE_ADMIN) -# alert_receive_channel = make_alert_receive_channel(amixr_team) -# alert_group = make_alert_group(alert_receive_channel) -# make_email_message( -# receiver=admin, status=SendgridEmailMessageStatuses.ACCEPTED, represents_alert_group=alert_group -# ), -# client = APIClient() -# correct_token = email_verification_token_generator.make_token(admin) -# url = reverse("sendgridapp:verify_email", kwargs={"token": correct_token, "uid": admin.pk, "slackteam": None}) -# response = client.get(url, content_type="application/json") -# assert response.status_code == 200 -# admin.refresh_from_db() -# assert admin.email_verified is True -# -# -# @pytest.mark.skip(reason="email disabled") -# @pytest.mark.django_db -# def test_email_verification_incorrect_token( -# make_team, -# make_user_for_team, -# make_email_message, -# make_alert_receive_channel, -# make_alert_group, -# ): -# amixr_team = make_team() -# admin = make_user_for_team(amixr_team, role=ROLE_ADMIN) -# alert_receive_channel = make_alert_receive_channel(amixr_team) -# alert_group = make_alert_group(alert_receive_channel) -# make_email_message( -# receiver=admin, status=SendgridEmailMessageStatuses.ACCEPTED, represents_alert_group=alert_group -# ), -# -# client = APIClient() -# url = reverse("sendgridapp:verify_email", kwargs={"token": "incorrect_token", "uid": admin.pk, "slackteam": None}) -# -# response = client.get(path=url, content_type="application/json") -# assert response.status_code == 403 -# admin.refresh_from_db() -# assert admin.email_verified is False -# -# -# @pytest.mark.skip(reason="email disabled") -# @pytest.mark.django_db -# def test_email_verification_incorrect_uid( -# make_team, -# make_user_for_team, -# make_email_message, -# make_alert_receive_channel, -# make_alert_group, -# ): -# amixr_team = make_team() -# admin = make_user_for_team(amixr_team, role=ROLE_ADMIN) -# alert_receive_channel = make_alert_receive_channel(amixr_team) -# alert_group = make_alert_group(alert_receive_channel) -# make_email_message( -# receiver=admin, status=SendgridEmailMessageStatuses.ACCEPTED, represents_alert_group=alert_group -# ), -# client = APIClient() -# -# correct_token = email_verification_token_generator.make_token(admin) -# url = reverse( -# "sendgridapp:verify_email", kwargs={"token": correct_token, "uid": 100, "slackteam": None} # incorrect user uid -# ) -# response = client.get(path=url, content_type="application/json") -# assert response.status_code == 403 -# admin.refresh_from_db() -# assert admin.email_verified is False -# -# -# @pytest.mark.skip(reason="email disabled") -# @patch("apps.integrations.helpers.inbound_emails.AllowOnlySendgrid.has_permission", return_value=True) -# @patch( -# "apps.slack.helpers.slack_client.SlackClientWithErrorHandling.api_call", -# return_value={"ok": True, "ts": timezone.now().timestamp()}, -# ) -# @pytest.mark.django_db -# @pytest.mark.parametrize("status", ["delivered", "bounce", "dropped"]) -# def test_update_email_status( -# mocked_slack_api_call, -# mocked_sendgrid_permission, -# make_team, -# make_user_for_team, -# make_email_message, -# make_alert_receive_channel, -# make_alert_group, -# status, -# ): -# """The test for Email message status update via api""" -# amixr_team = make_team() -# admin = make_user_for_team(amixr_team, role=ROLE_ADMIN) -# alert_receive_channel = make_alert_receive_channel(amixr_team) -# alert_group = make_alert_group(alert_receive_channel) -# email_message = make_email_message( -# receiver=admin, status=SendgridEmailMessageStatuses.ACCEPTED, represents_alert_group=alert_group -# ) -# client = APIClient() -# url = reverse("sendgridapp:email_status_event") -# -# data = [ -# { -# "message_uuid": str(email_message.message_uuid), -# "event": status, -# } -# ] -# response = client.post( -# url, -# data, -# format="json", -# ) -# -# assert response.status_code == 204 -# assert response.data == "" -# email_message.refresh_from_db() -# assert email_message.status == SendgridEmailMessageStatuses.DETERMINANT[status] diff --git a/engine/apps/sendgridapp/urls.py b/engine/apps/sendgridapp/urls.py deleted file mode 100644 index 1419df32..00000000 --- a/engine/apps/sendgridapp/urls.py +++ /dev/null @@ -1,9 +0,0 @@ -from django.urls import path - -from apps.sendgridapp.views import EmailStatusCallback - -app_name = "sendgridapp" - -urlpatterns = [ - path(r"email_status_event/", EmailStatusCallback.as_view(), name="email_status_event"), -] diff --git a/engine/apps/sendgridapp/verification_token.py b/engine/apps/sendgridapp/verification_token.py deleted file mode 100644 index 3efc97c7..00000000 --- a/engine/apps/sendgridapp/verification_token.py +++ /dev/null @@ -1,20 +0,0 @@ -"""Based on example https://simpleisbetterthancomplex.com/tutorial/2016/08/24/how-to-create-one-time-link.html""" - -from django.conf import settings -from django.contrib.auth.tokens import PasswordResetTokenGenerator - - -class EmailVerificationTokenGenerator(PasswordResetTokenGenerator): - # There are the default setting of PASSWORD_RESET_TIMEOUT_DAYS = 3 (days) - - key_salt = "EmailVerificationTokenGenerator" + settings.TOKEN_SALT - secret = settings.TOKEN_SECRET - - def _make_hash_value(self, user, timestamp): - team_datetime_timestamp = ( - "" if user.teams.first() is None else user.teams.first().datetime.replace(microsecond=0, tzinfo=None) - ) - return str(user.pk) + str(timestamp) + str(team_datetime_timestamp) + str(user.email_verified) - - -email_verification_token_generator = EmailVerificationTokenGenerator() diff --git a/engine/apps/sendgridapp/views.py b/engine/apps/sendgridapp/views.py deleted file mode 100644 index 538df2d8..00000000 --- a/engine/apps/sendgridapp/views.py +++ /dev/null @@ -1,29 +0,0 @@ -import logging - -from django.apps import apps -from rest_framework import status -from rest_framework.response import Response -from rest_framework.views import APIView - -from apps.sendgridapp.permissions import AllowOnlySendgrid - -logger = logging.getLogger(__name__) - - -# Receive Email Status Update from Sendgrid -class EmailStatusCallback(APIView): - # https://sendgrid.com/docs/for-developers/tracking-events/event/#delivery-events - permission_classes = [AllowOnlySendgrid] - - def post(self, request): - for data in request.data: - message_uuid = data.get("message_uuid") - message_status = data.get("event") - if message_status is not None and "type" in message_status: - message_status = message_status["type"] - logger.info(f"UUID: {message_uuid}, Status: {message_status}") - - EmailMessage = apps.get_model("sendgridapp", "EmailMessage") - EmailMessage.objects.update_status(message_uuid=message_uuid, message_status=message_status) - - return Response(data="", status=status.HTTP_204_NO_CONTENT) diff --git a/engine/apps/slack/scenarios/alertgroup_appearance.py b/engine/apps/slack/scenarios/alertgroup_appearance.py index 8a335fcd..7526843f 100644 --- a/engine/apps/slack/scenarios/alertgroup_appearance.py +++ b/engine/apps/slack/scenarios/alertgroup_appearance.py @@ -90,7 +90,7 @@ class OpenAlertAppearanceDialogStep( blocks.append(block) blocks.append({"type": "divider"}) - for notification_channel in ["slack", "web", "sms", "phone_call", "email", "telegram"]: + for notification_channel in ["slack", "web", "sms", "phone_call", "telegram"]: blocks.append( { "type": "header", @@ -236,7 +236,7 @@ class UpdateAppearanceStep(scenario_step.ScenarioStep): prev_state = alert_receive_channel.insight_logs_serialized for templatizable_attr in ["title", "message", "image_url"]: - for notification_channel in ["slack", "web", "sms", "phone_call", "email", "telegram"]: + for notification_channel in ["slack", "web", "sms", "phone_call", "telegram"]: attr_name = f"{notification_channel}_{templatizable_attr}_template" try: old_value = getattr(alert_receive_channel, attr_name) diff --git a/engine/apps/slack/scenarios/resolution_note.py b/engine/apps/slack/scenarios/resolution_note.py index c22a14ad..e7ee417d 100644 --- a/engine/apps/slack/scenarios/resolution_note.py +++ b/engine/apps/slack/scenarios/resolution_note.py @@ -358,7 +358,7 @@ class UpdateResolutionNoteStep(scenario_step.ScenarioStep): author_verbal = resolution_note.author_verbal(mention=True) resolution_note_text_block = { "type": "section", - "text": {"type": "plain_text", "text": resolution_note.text, "emoji": True}, + "text": {"type": "mrkdwn", "text": resolution_note.text}, } blocks.append(resolution_note_text_block) context_block = { diff --git a/engine/apps/telegram/models/verification/channel.py b/engine/apps/telegram/models/verification/channel.py index ef8e8b77..8d80f03a 100644 --- a/engine/apps/telegram/models/verification/channel.py +++ b/engine/apps/telegram/models/verification/channel.py @@ -23,26 +23,39 @@ class TelegramChannelVerificationCode(models.Model): def is_active(self) -> bool: return self.datetime + timezone.timedelta(days=1) < timezone.now() + @property + def uuid_with_org_id(self) -> str: + return f"{self.organization.public_primary_key}_{self.uuid}" + + @classmethod + def uuid_without_org_id(cls, verification_code: str) -> str: + try: + return verification_code.split("_")[1] + except IndexError: + raise ValidationError("Invalid verification code format") + @classmethod def verify_channel_and_discussion_group( cls, - uuid_code: str, + verification_code: str, channel_chat_id: int, channel_name: str, discussion_group_chat_id: int, discussion_group_name: str, ) -> Tuple[Optional[TelegramToOrganizationConnector], bool]: try: - verification_code = cls.objects.get(uuid=uuid_code) + uuid_code = cls.uuid_without_org_id(verification_code) + + code_instance = cls.objects.get(uuid=uuid_code) # see if a organization has other channels connected # if it is the first channel, make it default for the organization - connector_exists = verification_code.organization.telegram_channel.exists() + connector_exists = code_instance.organization.telegram_channel.exists() connector, created = TelegramToOrganizationConnector.objects.get_or_create( channel_chat_id=channel_chat_id, defaults={ - "organization": verification_code.organization, + "organization": code_instance.organization, "channel_name": channel_name, "discussion_group_chat_id": discussion_group_chat_id, "discussion_group_name": discussion_group_name, @@ -51,14 +64,14 @@ class TelegramChannelVerificationCode(models.Model): ) write_chatops_insight_log( - author=verification_code.author, + author=code_instance.author, event_name=ChatOpsEvent.CHANNEL_CONNECTED, chatops_type=ChatOpsType.TELEGRAM, channel_name=channel_name, ) if not connector_exists: write_chatops_insight_log( - author=verification_code.author, + author=code_instance.author, event_name=ChatOpsEvent.DEFAULT_CHANNEL_CHANGED, chatops_type=ChatOpsType.TELEGRAM, prev_channel=None, diff --git a/engine/apps/telegram/models/verification/personal.py b/engine/apps/telegram/models/verification/personal.py index 43823312..299c9993 100644 --- a/engine/apps/telegram/models/verification/personal.py +++ b/engine/apps/telegram/models/verification/personal.py @@ -21,13 +21,26 @@ class TelegramVerificationCode(models.Model): def is_active(self) -> bool: return self.datetime + timezone.timedelta(days=1) < timezone.now() + @property + def uuid_with_org_id(self) -> str: + return f"{self.user.organization.public_primary_key}_{self.uuid}" + + @classmethod + def uuid_without_org_id(cls, verification_code: str) -> str: + try: + return verification_code.split("_")[1] + except IndexError: + raise ValidationError("Invalid verification code format") + @classmethod def verify_user( - cls, uuid_code: str, telegram_chat_id: int, telegram_nick_name: str + cls, verification_code: str, telegram_chat_id: int, telegram_nick_name: str ) -> Tuple[Optional[TelegramToUserConnector], bool]: try: - verification_code = cls.objects.get(uuid=uuid_code) - user = verification_code.user + uuid_code = cls.uuid_without_org_id(verification_code) + code_instance = cls.objects.get(uuid=uuid_code) + + user = code_instance.user connector, created = TelegramToUserConnector.objects.get_or_create( user=user, defaults={"telegram_nick_name": telegram_nick_name, "telegram_chat_id": telegram_chat_id} diff --git a/engine/apps/telegram/renderers/keyboard.py b/engine/apps/telegram/renderers/keyboard.py index ed13cd9f..997f5473 100644 --- a/engine/apps/telegram/renderers/keyboard.py +++ b/engine/apps/telegram/renderers/keyboard.py @@ -83,7 +83,10 @@ class TelegramKeyboardRenderer: callback_data_args = [self.alert_group.pk, action.value] if action_data is not None: callback_data_args.append(action_data) - + # Add org id with 'x-oncall-org-id' prefix to callback data. + # It's a workaroung to pass org_id to the oncall-gateway while proxying requests. + # TODO: switch to json str instead of ':' separated string. + callback_data_args.append(f"x-oncall-org-id{self.alert_group.channel.organization.public_primary_key}") button = InlineKeyboardButton(text=text, callback_data=CallbackQueryFactory.encode_data(*callback_data_args)) return button diff --git a/engine/apps/telegram/tests/test_keyboard_renderer.py b/engine/apps/telegram/tests/test_keyboard_renderer.py index a3e614be..50d769d8 100644 --- a/engine/apps/telegram/tests/test_keyboard_renderer.py +++ b/engine/apps/telegram/tests/test_keyboard_renderer.py @@ -46,12 +46,31 @@ def test_actions_keyboard_alerting(make_organization, make_alert_receive_channel keyboard = renderer.render_actions_keyboard() expected_keyboard = [ - [InlineKeyboardButton(text="Acknowledge", callback_data=f"{alert_group.pk}:acknowledge")], - [InlineKeyboardButton(text="Resolve", callback_data=f"{alert_group.pk}:resolve")], [ - InlineKeyboardButton(text="🔕 forever", callback_data=f"{alert_group.pk}:silence"), - InlineKeyboardButton(text="... for 1h", callback_data=f"{alert_group.pk}:silence:3600"), - InlineKeyboardButton(text="... for 4h", callback_data=f"{alert_group.pk}:silence:14400"), + InlineKeyboardButton( + text="Acknowledge", + callback_data=f"{alert_group.pk}:acknowledge:x-oncall-org-id{organization.public_primary_key}", + ) + ], + [ + InlineKeyboardButton( + text="Resolve", + callback_data=f"{alert_group.pk}:resolve:x-oncall-org-id{organization.public_primary_key}", + ) + ], + [ + InlineKeyboardButton( + text="🔕 forever", + callback_data=f"{alert_group.pk}:silence:x-oncall-org-id{organization.public_primary_key}", + ), + InlineKeyboardButton( + text="... for 1h", + callback_data=f"{alert_group.pk}:silence:3600:x-oncall-org-id{organization.public_primary_key}", + ), + InlineKeyboardButton( + text="... for 4h", + callback_data=f"{alert_group.pk}:silence:14400:x-oncall-org-id{organization.public_primary_key}", + ), ], ] @@ -75,8 +94,18 @@ def test_actions_keyboard_acknowledged( keyboard = renderer.render_actions_keyboard() expected_keyboard = [ - [InlineKeyboardButton(text="Unacknowledge", callback_data=f"{alert_group.pk}:unacknowledge")], - [InlineKeyboardButton(text="Resolve", callback_data=f"{alert_group.pk}:resolve")], + [ + InlineKeyboardButton( + text="Unacknowledge", + callback_data=f"{alert_group.pk}:unacknowledge:x-oncall-org-id{organization.public_primary_key}", + ) + ], + [ + InlineKeyboardButton( + text="Resolve", + callback_data=f"{alert_group.pk}:resolve:x-oncall-org-id{organization.public_primary_key}", + ) + ], ] assert are_keyboards_equal(keyboard.inline_keyboard, expected_keyboard) is True @@ -99,7 +128,12 @@ def test_actions_keyboard_resolved( keyboard = renderer.render_actions_keyboard() expected_keyboard = [ - [InlineKeyboardButton(text="Unresolve", callback_data=f"{alert_group.pk}:unresolve")], + [ + InlineKeyboardButton( + text="Unresolve", + callback_data=f"{alert_group.pk}:unresolve:x-oncall-org-id{organization.public_primary_key}", + ) + ], ] assert are_keyboards_equal(keyboard.inline_keyboard, expected_keyboard) is True @@ -122,9 +156,24 @@ def test_actions_keyboard_silenced( keyboard = renderer.render_actions_keyboard() expected_keyboard = [ - [InlineKeyboardButton(text="Acknowledge", callback_data=f"{alert_group.pk}:acknowledge")], - [InlineKeyboardButton(text="Resolve", callback_data=f"{alert_group.pk}:resolve")], - [InlineKeyboardButton(text="Unsilence", callback_data=f"{alert_group.pk}:unsilence")], + [ + InlineKeyboardButton( + text="Acknowledge", + callback_data=f"{alert_group.pk}:acknowledge:x-oncall-org-id{organization.public_primary_key}", + ) + ], + [ + InlineKeyboardButton( + text="Resolve", + callback_data=f"{alert_group.pk}:resolve:x-oncall-org-id{organization.public_primary_key}", + ) + ], + [ + InlineKeyboardButton( + text="Unsilence", + callback_data=f"{alert_group.pk}:unsilence:x-oncall-org-id{organization.public_primary_key}", + ) + ], ] assert are_keyboards_equal(keyboard.inline_keyboard, expected_keyboard) is True diff --git a/engine/apps/telegram/tests/test_message_renderer.py b/engine/apps/telegram/tests/test_message_renderer.py index 44c1248e..7d800975 100644 --- a/engine/apps/telegram/tests/test_message_renderer.py +++ b/engine/apps/telegram/tests/test_message_renderer.py @@ -71,9 +71,8 @@ def test_alert_group_message(make_organization, make_alert_receive_channel, make renderer = TelegramMessageRenderer(alert_group=alert_group) text = renderer.render_alert_group_message() - assert text == ( - f"🔴 #{alert_group.inside_organization_number}, {alert_receive_channel.config.tests['telegram']['title']}\n" + f"🔴 #{alert_group.inside_organization_number}, {alert_receive_channel.config.tests['telegram']['title']}\n" "Alerting, alerts: 1\n" "Source: Test integration - Grafana\n" f"{alert_group.web_link}\n\n" @@ -157,7 +156,7 @@ def test_personal_message( text = renderer.render_personal_message() assert text == ( - f"🟠 #{alert_group.inside_organization_number}, {alert_receive_channel.config.tests['telegram']['title']}\n" + f"🟠 #{alert_group.inside_organization_number}, {alert_receive_channel.config.tests['telegram']['title']}\n" f"Acknowledged by {user_name}, alerts: 1\n" "Source: Test integration - Grafana\n" f"{alert_group.web_link}\n\n" diff --git a/engine/apps/telegram/tests/test_models.py b/engine/apps/telegram/tests/test_models.py index 173ac1a1..0a9497e4 100644 --- a/engine/apps/telegram/tests/test_models.py +++ b/engine/apps/telegram/tests/test_models.py @@ -17,7 +17,7 @@ def test_user_verification_handler_process_update_another_account_already_linked user_2 = make_user_for_organization(organization) code = make_telegram_verification_code(user_2) - connector, created = TelegramVerificationCode.verify_user(code.uuid, chat_id, "nickname") + connector, created = TelegramVerificationCode.verify_user(code.uuid_with_org_id, chat_id, "nickname") assert created assert connector.telegram_chat_id == chat_id @@ -38,7 +38,7 @@ def test_user_verification_handler_process_update_user_already_linked( other_chat_id = 321 code = make_telegram_verification_code(user_1) - connector, created = TelegramVerificationCode.verify_user(code.uuid, other_chat_id, "nickname") + connector, created = TelegramVerificationCode.verify_user(code.uuid_with_org_id, other_chat_id, "nickname") assert created is False assert connector.user == user_1 diff --git a/engine/apps/telegram/updates/update_handlers/button_press.py b/engine/apps/telegram/updates/update_handlers/button_press.py index 55a8580e..6afa11a5 100644 --- a/engine/apps/telegram/updates/update_handlers/button_press.py +++ b/engine/apps/telegram/updates/update_handlers/button_press.py @@ -70,7 +70,7 @@ class ButtonPressHandler(UpdateHandler): action_name = args[1] action = Action(action_name) - action_data = args[2] if len(args) >= 3 else None + action_data = args[2] if len(args) >= 3 and not args[2].startswith("x-oncall-org-id") else None return ActionContext(alert_group=alert_group, action=action, action_data=action_data) diff --git a/engine/apps/telegram/updates/update_handlers/start_message.py b/engine/apps/telegram/updates/update_handlers/start_message.py index f70ead7d..9acd0be6 100644 --- a/engine/apps/telegram/updates/update_handlers/start_message.py +++ b/engine/apps/telegram/updates/update_handlers/start_message.py @@ -1,15 +1,10 @@ from apps.telegram.client import TelegramClient -from apps.telegram.models import TelegramToUserConnector from apps.telegram.updates.update_handlers.update_handler import UpdateHandler START_TEXT = """Hi! This is Grafana OnCall notification bot. You can connect your Grafana OnCall account to Telegram on user settings page. """ -START_TEXT_FOR_CONNECTED_USER = """Hi! -This is Grafana OnCall notification bot. Your Telegram account is connected to user {username} -""" - class StartMessageHandler(UpdateHandler): def matches(self) -> bool: @@ -24,12 +19,5 @@ class StartMessageHandler(UpdateHandler): return is_from_private_chat and is_start_message def process_update(self) -> None: - connector = TelegramToUserConnector.objects.filter(telegram_chat_id=self.update.effective_user.id).first() telegram_client = TelegramClient() - - if connector is not None: - user = connector.user - text = START_TEXT_FOR_CONNECTED_USER.format(username=user.username) - telegram_client.send_raw_message(chat_id=self.update.effective_user.id, text=text) - else: - telegram_client.send_raw_message(chat_id=self.update.effective_user.id, text=START_TEXT) + telegram_client.send_raw_message(chat_id=self.update.effective_user.id, text=START_TEXT) diff --git a/engine/apps/telegram/updates/update_handlers/verification/channel.py b/engine/apps/telegram/updates/update_handlers/verification/channel.py index edd9f787..07debaa5 100644 --- a/engine/apps/telegram/updates/update_handlers/verification/channel.py +++ b/engine/apps/telegram/updates/update_handlers/verification/channel.py @@ -73,7 +73,7 @@ class ChannelVerificationCodeHandler(UpdateHandler): return connector, created = TelegramChannelVerificationCode.verify_channel_and_discussion_group( - uuid_code=verification_code, + verification_code=verification_code, channel_chat_id=channel_chat_id, channel_name=channel_name, discussion_group_chat_id=discussion_group_chat_id, diff --git a/engine/apps/telegram/updates/update_handlers/verification/personal.py b/engine/apps/telegram/updates/update_handlers/verification/personal.py index 6f17603f..0f30dfc5 100644 --- a/engine/apps/telegram/updates/update_handlers/verification/personal.py +++ b/engine/apps/telegram/updates/update_handlers/verification/personal.py @@ -33,7 +33,7 @@ class PersonalVerificationCodeHandler(UpdateHandler): verification_code = text if is_verification_message(text) else text.split()[1] connector, created = TelegramVerificationCode.verify_user( - uuid_code=verification_code, telegram_chat_id=user.id, telegram_nick_name=nickname + verification_code=verification_code, telegram_chat_id=user.id, telegram_nick_name=nickname ) if created: diff --git a/engine/apps/telegram/utils.py b/engine/apps/telegram/utils.py index 9568666e..18640c58 100644 --- a/engine/apps/telegram/utils.py +++ b/engine/apps/telegram/utils.py @@ -1,11 +1,11 @@ import re from typing import List, Union -UUID4_REGEX = "^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$" +TELEGRAM_VERIFICATION_CODE_REGEX = "^[A-Z0-9]*_[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$" def is_verification_message(text: str) -> bool: - return bool(re.match(UUID4_REGEX, text)) + return bool(re.match(TELEGRAM_VERIFICATION_CODE_REGEX, text)) class CallbackQueryFactory: diff --git a/engine/apps/user_management/apps.py b/engine/apps/user_management/apps.py new file mode 100644 index 00000000..2dd0c259 --- /dev/null +++ b/engine/apps/user_management/apps.py @@ -0,0 +1,16 @@ +from django.apps import AppConfig +from django.db import models + + +# enable a __lower field lookup for email fields +# https://docs.djangoproject.com/en/4.1/howto/custom-lookups/#a-bilateral-transformer-example +class LowerCase(models.Transform): + lookup_name = "lower" + function = "LOWER" + + +class UserManagementConfig(AppConfig): + name = "apps.user_management" + + def ready(self): + models.EmailField.register_lookup(LowerCase) diff --git a/engine/apps/user_management/models/organization.py b/engine/apps/user_management/models/organization.py index fd37ba81..2561e3cb 100644 --- a/engine/apps/user_management/models/organization.py +++ b/engine/apps/user_management/models/organization.py @@ -218,6 +218,7 @@ class Organization(MaintainableObject): def sms_left(self, user): return self.subscription_strategy.sms_left(user) + # todo: manage backend specific limits in messaging backend def emails_left(self, user): return self.subscription_strategy.emails_left(user) @@ -244,6 +245,11 @@ class Organization(MaintainableObject): def web_link(self): return urljoin(self.grafana_url, "a/grafana-oncall-app/") + @property + def web_link_with_id(self): + # It's a workaround to pass org id to the oncall gateway while proxying telegram requests + return urljoin(self.grafana_url, f"a/grafana-oncall-app/?x-oncall-org-id={self.public_primary_key}") + def __str__(self): return f"{self.pk}: {self.org_title}" diff --git a/engine/apps/user_management/subscription_strategy/free_public_beta_subscription_strategy.py b/engine/apps/user_management/subscription_strategy/free_public_beta_subscription_strategy.py index 32f9fa69..dcd0be9f 100644 --- a/engine/apps/user_management/subscription_strategy/free_public_beta_subscription_strategy.py +++ b/engine/apps/user_management/subscription_strategy/free_public_beta_subscription_strategy.py @@ -1,6 +1,7 @@ -from datetime import datetime - from django.apps import apps +from django.utils import timezone + +from apps.email.models import EmailMessage from .base_subsription_strategy import BaseSubscriptionStrategy @@ -21,17 +22,16 @@ class FreePublicBetaSubscriptionStrategy(BaseSubscriptionStrategy): def sms_left(self, user): return self._calculate_phone_notifications_left(user) + # todo: manage backend specific limits in messaging backend def emails_left(self, user): - # Email notifications are disabled now. - EmailMessage = apps.get_model("sendgridapp", "EmailMessage") - now = datetime.now() + now = timezone.now() day_start = now.replace(hour=0, minute=0, second=0, microsecond=0) - emails_this_week = EmailMessage.objects.filter( + emails_today = EmailMessage.objects.filter( created_at__gte=day_start, represents_alert_group__channel__organization=self.organization, receiver=user, ).count() - return self._emails_limit - emails_this_week + return self._emails_limit - emails_today def notifications_limit_web_report(self, user): limits_to_show = [] @@ -59,7 +59,7 @@ class FreePublicBetaSubscriptionStrategy(BaseSubscriptionStrategy): """ PhoneCall = apps.get_model("twilioapp", "PhoneCall") SMSMessage = apps.get_model("twilioapp", "SMSMessage") - now = datetime.now() + now = timezone.now() day_start = now.replace(hour=0, minute=0, second=0, microsecond=0) calls_today = PhoneCall.objects.filter( created_at__gte=day_start, diff --git a/engine/apps/user_management/tests/test_free_public_beta_subcription_strategy.py b/engine/apps/user_management/tests/test_free_public_beta_subcription_strategy.py index 0f309570..c26b4216 100644 --- a/engine/apps/user_management/tests/test_free_public_beta_subcription_strategy.py +++ b/engine/apps/user_management/tests/test_free_public_beta_subcription_strategy.py @@ -1,8 +1,5 @@ -import sys - import pytest -from apps.sendgridapp.constants import SendgridEmailMessageStatuses from apps.twilioapp.constants import TwilioCallStatuses, TwilioMessageStatuses from common.constants.role import Role @@ -65,7 +62,6 @@ def test_phone_calls_and_sms_counts_together( assert organization.sms_left(user) == organization.subscription_strategy._phone_notifications_limit -@pytest.mark.skip(reason="email disabled") @pytest.mark.django_db def test_emails_left( make_organization, @@ -75,10 +71,11 @@ def test_emails_left( make_alert_group, ): organization = make_organization() - admin = make_user_for_organization(organization, role=Role.ADMIN) + user = make_user_for_organization(organization) + alert_receive_channel = make_alert_receive_channel(organization) alert_group = make_alert_group(alert_receive_channel) - make_email_message( - receiver=admin, status=SendgridEmailMessageStatuses.DELIVERED, represents_alert_group=alert_group - ), - assert organization.emails_left(admin) == sys.maxsize + + make_email_message(receiver=user, represents_alert_group=alert_group) + + assert organization.emails_left(user) == organization.subscription_strategy._emails_limit - 1 diff --git a/engine/apps/user_management/tests/test_user.py b/engine/apps/user_management/tests/test_user.py index fe615c7c..74440cd1 100644 --- a/engine/apps/user_management/tests/test_user.py +++ b/engine/apps/user_management/tests/test_user.py @@ -2,6 +2,7 @@ import pytest +from apps.user_management.models import User from common.constants.role import Role @@ -22,3 +23,16 @@ def test_self_or_admin( assert admin.self_or_admin(editor, organization) is False assert admin.self_or_admin(second_admin, organization) is True assert admin.self_or_admin(admin_from_another_organization, organization) is False + + +@pytest.mark.django_db +def test_lower_email_filter( + make_organization, + make_user_for_organization, +): + organization = make_organization() + user = make_user_for_organization(organization, email="TestingUser@test.com") + make_user_for_organization(organization, email="testing_user@test.com") + + assert User.objects.get(email__lower="testinguser@test.com") == user + assert User.objects.filter(email__lower__in=["testinguser@test.com"]).get() == user diff --git a/engine/common/api_helpers/mixins.py b/engine/common/api_helpers/mixins.py index cddecdc7..3af06bcc 100644 --- a/engine/common/api_helpers/mixins.py +++ b/engine/common/api_helpers/mixins.py @@ -11,7 +11,6 @@ from rest_framework.exceptions import NotFound, Throttled from rest_framework.response import Response from apps.alerts.incident_appearance.templaters import ( - AlertEmailTemplater, AlertPhoneCallTemplater, AlertSlackTemplater, AlertSmsTemplater, @@ -245,9 +244,8 @@ SLACK = "slack" WEB = "web" PHONE_CALL = "phone_call" SMS = "sms" -EMAIL = "email" TELEGRAM = "telegram" -NOTIFICATION_CHANNEL_OPTIONS = [SLACK, WEB, PHONE_CALL, SMS, EMAIL, TELEGRAM] +NOTIFICATION_CHANNEL_OPTIONS = [SLACK, WEB, PHONE_CALL, SMS, TELEGRAM] TITLE = "title" MESSAGE = "message" IMAGE_URL = "image_url" @@ -261,7 +259,6 @@ NOTIFICATION_CHANNEL_TO_TEMPLATER_MAP = { WEB: AlertWebTemplater, PHONE_CALL: AlertPhoneCallTemplater, SMS: AlertSmsTemplater, - EMAIL: AlertEmailTemplater, TELEGRAM: AlertTelegramTemplater, } diff --git a/engine/config_integrations/alertmanager.py b/engine/config_integrations/alertmanager.py index cc356e26..b2ff3de0 100644 --- a/engine/config_integrations/alertmanager.py +++ b/engine/config_integrations/alertmanager.py @@ -73,22 +73,6 @@ web_image_url = slack_image_url sms_title = '{{ payload.get("labels", {}).get("alertname", "Title undefined") }}' phone_call_title = sms_title -email_title = web_title - -email_message = """\ -{{- payload.messsage }} -{%- if "status" in payload -%} -**Status**: {{ payload.status }} -{% endif -%} -**Labels:** {% for k, v in payload["labels"].items() %} -{{ k }}: {{ v }}{% endfor %} -**Annotations:** -{%- for k, v in payload.get("annotations", {}).items() %} -{#- render annotation as markdown url if it starts with http #} -{{ k }}: {{v}} -{% endfor %} -""" # noqa: W291 - telegram_title = sms_title telegram_message = """\ @@ -188,23 +172,6 @@ tests = { "phone_call": { "title": "KubeJobCompletion", }, - "email": { - "title": "KubeJobCompletion", - "message": ( - "**Status**: firing\n" - "**Labels:** \n" - "job: kube-state-metrics\n" - "instance: 10.143.139.7:8443\n" - "job_name: email-tracking-perform-initialization-1.0.50\n" - "severity: warning\n" - "alertname: KubeJobCompletion\n" - "namespace: default\n" - "prometheus: monitoring/k8s\n" - "**Annotations:**\n" - "message: Job default/email-tracking-perform-initialization-1.0.50 is taking more than one hour to complete.\n\n" - "runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubejobcompletion\n" - ), - }, "telegram": { "title": "KubeJobCompletion", "message": ( diff --git a/engine/config_integrations/elastalert.py b/engine/config_integrations/elastalert.py index 73320d53..bb5dc8db 100644 --- a/engine/config_integrations/elastalert.py +++ b/engine/config_integrations/elastalert.py @@ -36,10 +36,6 @@ sms_title = web_title phone_call_title = sms_title -email_title = web_title - -email_message = "{{ payload|tojson_pretty }}" - telegram_title = sms_title telegram_message = "
{{ payload|tojson_pretty }}"
diff --git a/engine/config_integrations/formatted_webhook.py b/engine/config_integrations/formatted_webhook.py
index 6847639f..fb6e3061 100644
--- a/engine/config_integrations/formatted_webhook.py
+++ b/engine/config_integrations/formatted_webhook.py
@@ -32,10 +32,6 @@ sms_title = web_title
phone_call_title = sms_title
-email_title = web_title
-
-email_message = slack_message
-
telegram_title = sms_title
telegram_message = slack_message
diff --git a/engine/config_integrations/grafana.py b/engine/config_integrations/grafana.py
index 4feefd61..cc35a778 100644
--- a/engine/config_integrations/grafana.py
+++ b/engine/config_integrations/grafana.py
@@ -81,29 +81,6 @@ sms_title = """\
phone_call_title = sms_title
-email_title = web_title
-
-email_message = """\
-{{- payload.message }}
-{%- for value in payload.get("evalMatches", []) %}
-**{{ value.metric }}**: {{ value.value }}
-{% endfor -%}
-{%- if "status" in payload -%}
-**Status**: {{ payload.status }}
-{% endif -%}
-{%- if "labels" in payload -%}
-**Labels:** {% for k, v in payload["labels"].items() %}
-{{ k }}: {{ v }}{% endfor %}
-{% endif -%}
-{%- if "annotations" in payload -%}
-**Annotations:**
-{%- for k, v in payload.get("annotations", {}).items() %}
-{#- render annotation as markdown url if it starts with http #}
-{{ k }}: {{v}}
-{% endfor %}
-{%- endif -%}
-"""
-
telegram_title = sms_title
telegram_message = """\
@@ -215,23 +192,6 @@ tests = {
"phone_call": {
"title": "KubeJobCompletion",
},
- "email": {
- "title": "KubeJobCompletion",
- "message": (
- "**Status**: firing\n"
- "**Labels:** \n"
- "job: kube-state-metrics\n"
- "instance: 10.143.139.7:8443\n"
- "job_name: email-tracking-perform-initialization-1.0.50\n"
- "severity: warning\n"
- "alertname: KubeJobCompletion\n"
- "namespace: default\n"
- "prometheus: monitoring/k8s\n"
- "**Annotations:**\n"
- "message: Job default/email-tracking-perform-initialization-1.0.50 is taking more than one hour to complete.\n\n"
- "runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubejobcompletion\n"
- ),
- },
"telegram": {
"title": "KubeJobCompletion",
"message": (
diff --git a/engine/config_integrations/grafana_alerting.py b/engine/config_integrations/grafana_alerting.py
index 4eac0135..e44aaaae 100644
--- a/engine/config_integrations/grafana_alerting.py
+++ b/engine/config_integrations/grafana_alerting.py
@@ -77,22 +77,6 @@ web_image_url = slack_image_url
sms_title = '{{ payload.get("labels", {}).get("alertname", "Title undefined") }}'
phone_call_title = sms_title
-email_title = web_title
-
-email_message = """\
-{{- payload.messsage }}
-{%- if "status" in payload -%}
-**Status**: {{ payload.status }}
-{% endif -%}
-**Labels:** {% for k, v in payload["labels"].items() %}
-{{ k }}: {{ v }}{% endfor %}
-**Annotations:**
-{%- for k, v in payload.get("annotations", {}).items() %}
-{#- render annotation as markdown url if it starts with http #}
-{{ k }}: {{v}}
-{% endfor %}
-""" # noqa:W291
-
telegram_title = sms_title
telegram_message = """\
@@ -191,23 +175,6 @@ tests = {
"phone_call": {
"title": "KubeJobCompletion",
},
- "email": {
- "title": "KubeJobCompletion",
- "message": (
- "**Status**: firing\n"
- "**Labels:** \n"
- "job: kube-state-metrics\n"
- "instance: 10.143.139.7:8443\n"
- "job_name: email-tracking-perform-initialization-1.0.50\n"
- "severity: warning\n"
- "alertname: KubeJobCompletion\n"
- "namespace: default\n"
- "prometheus: monitoring/k8s\n"
- "**Annotations:**\n"
- "message: Job default/email-tracking-perform-initialization-1.0.50 is taking more than one hour to complete.\n\n"
- "runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubejobcompletion\n"
- ),
- },
"telegram": {
"title": "KubeJobCompletion",
"message": (
diff --git a/engine/config_integrations/inbound_email.py b/engine/config_integrations/inbound_email.py
index 4ecac8e4..7ddfa0e7 100644
--- a/engine/config_integrations/inbound_email.py
+++ b/engine/config_integrations/inbound_email.py
@@ -32,10 +32,6 @@ sms_title = web_title
phone_call_title = web_title
-email_title = web_title
-
-email_message = slack_message
-
telegram_title = sms_title
telegram_message = slack_message
diff --git a/engine/config_integrations/kapacitor.py b/engine/config_integrations/kapacitor.py
index 3d761766..fd76c695 100644
--- a/engine/config_integrations/kapacitor.py
+++ b/engine/config_integrations/kapacitor.py
@@ -38,10 +38,6 @@ sms_title = web_title
phone_call_title = web_title
-email_title = web_title
-
-email_message = slack_message
-
telegram_title = sms_title
telegram_message = "{{ payload|tojson_pretty }}"
diff --git a/engine/config_integrations/maintenance.py b/engine/config_integrations/maintenance.py
index d27405ef..60b8710b 100644
--- a/engine/config_integrations/maintenance.py
+++ b/engine/config_integrations/maintenance.py
@@ -32,10 +32,6 @@ sms_title = web_title
phone_call_title = sms_title
-email_title = web_title
-
-email_message = slack_message
-
telegram_title = sms_title
telegram_message = slack_message
diff --git a/engine/config_integrations/manual.py b/engine/config_integrations/manual.py
index fdcaadaa..416be3e6 100644
--- a/engine/config_integrations/manual.py
+++ b/engine/config_integrations/manual.py
@@ -41,10 +41,6 @@ sms_title = web_title
phone_call_title = sms_title
-email_title = web_title
-
-email_message = slack_message
-
telegram_title = sms_title
telegram_message = slack_message
diff --git a/engine/config_integrations/webhook.py b/engine/config_integrations/webhook.py
index 4a3b0b73..823bc837 100644
--- a/engine/config_integrations/webhook.py
+++ b/engine/config_integrations/webhook.py
@@ -36,10 +36,6 @@ sms_title = web_title
phone_call_title = sms_title
-email_title = web_title
-
-email_message = "{{ payload|tojson_pretty }}"
-
telegram_title = sms_title
telegram_message = "{{ payload|tojson_pretty }}"
diff --git a/engine/conftest.py b/engine/conftest.py
index 68ef50d5..8291d921 100644
--- a/engine/conftest.py
+++ b/engine/conftest.py
@@ -44,6 +44,7 @@ from apps.base.tests.factories import (
UserNotificationPolicyFactory,
UserNotificationPolicyLogRecordFactory,
)
+from apps.email.tests.factories import EmailMessageFactory
from apps.heartbeat.tests.factories import IntegrationHeartBeatFactory
from apps.schedules.tests.factories import (
CustomOnCallShiftFactory,
@@ -105,7 +106,7 @@ register(ResolutionNoteSlackMessageFactory)
register(PhoneCallFactory)
register(SMSFactory)
-# register(EmailMessageFactory)
+register(EmailMessageFactory)
register(IntegrationHeartBeatFactory)
@@ -627,13 +628,12 @@ def make_sms():
return _make_sms
-# TODO: restore email notifications
-# @pytest.fixture()
-# def make_email_message():
-# def _make_email_message(receiver, status, **kwargs):
-# return EmailMessageFactory(receiver=receiver, status=status, **kwargs)
-#
-# return _make_email_message
+@pytest.fixture()
+def make_email_message():
+ def _make_email_message(receiver, **kwargs):
+ return EmailMessageFactory(receiver=receiver, **kwargs)
+
+ return _make_email_message
@pytest.fixture()
diff --git a/engine/engine/urls.py b/engine/engine/urls.py
index 518c5608..e8080a7f 100644
--- a/engine/engine/urls.py
+++ b/engine/engine/urls.py
@@ -36,7 +36,6 @@ urlpatterns = [
path("api/internal/v1/", include("apps.social_auth.urls", namespace="social_auth")),
path("integrations/v1/", include("apps.integrations.urls", namespace="integrations")),
path("twilioapp/", include("apps.twilioapp.urls")),
- # path('sendgridapp/', include('apps.sendgridapp.urls')), TODO: restore email notifications
path("api/v1/", include("apps.public_api.urls", namespace="api-public")),
path("api/internal/v1/", include("apps.migration_tool.urls", namespace="migration-tool")),
] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
diff --git a/engine/requirements.txt b/engine/requirements.txt
index 950c1d1e..5232c646 100644
--- a/engine/requirements.txt
+++ b/engine/requirements.txt
@@ -23,7 +23,6 @@ recurring-ical-events==0.1.16b0
slack-export-viewer==1.0.0
beautifulsoup4==4.8.1
social-auth-app-django==3.1.0
-sendgrid==6.1.2
cryptography==3.3.2
pytest==5.4.3
pytest-django==3.9.0
diff --git a/engine/settings/base.py b/engine/settings/base.py
index d9ec9f36..92e759ed 100644
--- a/engine/settings/base.py
+++ b/engine/settings/base.py
@@ -64,14 +64,6 @@ TWILIO_VERIFY_SERVICE_SID = os.environ.get("TWILIO_VERIFY_SERVICE_SID")
TELEGRAM_WEBHOOK_HOST = os.environ.get("TELEGRAM_WEBHOOK_HOST", BASE_URL)
TELEGRAM_TOKEN = os.environ.get("TELEGRAM_TOKEN")
-# For Sending email
-SENDGRID_API_KEY = os.environ.get("SENDGRID_API_KEY")
-SENDGRID_FROM_EMAIL = os.environ.get("SENDGRID_FROM_EMAIL")
-
-# For Inbound email
-SENDGRID_SECRET_KEY = os.environ.get("SENDGRID_SECRET_KEY")
-SENDGRID_INBOUND_EMAIL_DOMAIN = os.environ.get("SENDGRID_INBOUND_EMAIL_DOMAIN")
-
# For Grafana Cloud integration
GRAFANA_CLOUD_ONCALL_API_URL = os.environ.get(
"GRAFANA_CLOUD_ONCALL_API_URL", "https://oncall-prod-us-central-0.grafana.net/oncall"
@@ -198,13 +190,13 @@ INSTALLED_APPS = [
"apps.integrations",
"apps.schedules",
"apps.heartbeat",
+ "apps.email",
"apps.slack",
"apps.telegram",
"apps.twilioapp",
"apps.api",
"apps.api_for_grafana_incident",
"apps.base",
- # "apps.sendgridapp", TODO: restore email notifications
"apps.auth_token",
"apps.public_api",
"apps.grafana_plugin",
@@ -244,6 +236,7 @@ MIDDLEWARE = [
"django.middleware.clickjacking.XFrameOptionsMiddleware",
"social_django.middleware.SocialAuthExceptionMiddleware",
"apps.social_auth.middlewares.SocialAuthAuthCanceledExceptionMiddleware",
+ "apps.integrations.middlewares.IntegrationExceptionMiddleware",
]
LOG_REQUEST_ID_HEADER = "HTTP_X_CLOUD_TRACE_CONTEXT"
@@ -569,6 +562,18 @@ SLOW_THRESHOLD_SECONDS = 2.0
EXTRA_MESSAGING_BACKENDS = []
+# Email messaging backend
+EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
+EMAIL_HOST = os.getenv("EMAIL_HOST")
+EMAIL_HOST_USER = os.getenv("EMAIL_HOST_USER")
+EMAIL_HOST_PASSWORD = os.getenv("EMAIL_HOST_PASSWORD")
+EMAIL_PORT = getenv_integer("EMAIL_PORT", 587)
+EMAIL_USE_TLS = getenv_boolean("EMAIL_USE_TLS", True)
+DEFAULT_FROM_EMAIL = os.getenv("DEFAULT_FROM_EMAIL")
+
+if FEATURE_EMAIL_INTEGRATION_ENABLED:
+ EXTRA_MESSAGING_BACKENDS = [("apps.email.backend.EmailBackend", 8)]
+
INSTALLED_ONCALL_INTEGRATIONS = [
"config_integrations.alertmanager",
"config_integrations.grafana",
diff --git a/engine/settings/ci-test.py b/engine/settings/ci-test.py
index 7af883d3..23439c13 100644
--- a/engine/settings/ci-test.py
+++ b/engine/settings/ci-test.py
@@ -36,8 +36,6 @@ if BROKER_TYPE != BrokerTypes.REDIS:
# Dummy Telegram token (fake one)
TELEGRAM_TOKEN = "0000000000:XXXXXXXXXXXXXXXXXXXXXXXXXXXX-XXXXXX"
-SENDGRID_FROM_EMAIL = "dummy_sendgrid_from_email@test.ci-test"
-SENDGRID_SECRET_KEY = "dummy_sendgrid_secret_key"
TWILIO_ACCOUNT_SID = "dummy_twilio_account_sid"
TWILIO_AUTH_TOKEN = "dummy_twilio_auth_token"
diff --git a/grafana-plugin/.eslintrc.js b/grafana-plugin/.eslintrc.js
index 87f1dd00..9bfe88c0 100644
--- a/grafana-plugin/.eslintrc.js
+++ b/grafana-plugin/.eslintrc.js
@@ -9,18 +9,7 @@ module.exports = {
'^assets|^components|^containers|^declare|^icons|^img|^interceptors|^models|^network|^pages|^services|^state|^utils',
},
rules: {
- 'no-unused-vars': ['warn', { vars: 'all', args: 'after-used', ignoreRestSiblings: false }],
- 'react/prop-types': 'warn',
- 'react/display-name': 'warn',
- 'react/jsx-key': 'warn',
- 'react-hooks/exhaustive-deps': 'off',
- 'react/no-unescaped-entities': 'warn',
- 'react/jsx-no-target-blank': 'warn',
- 'react-hooks/exhaustive-deps': 'warn',
- 'no-restricted-imports': 'warn',
eqeqeq: 'warn',
- 'no-duplicate-imports': 'error',
- 'rulesdir/no-relative-import-paths': ['error', { allowSameFolder: true }],
'import/order': [
'error',
{
@@ -47,5 +36,33 @@ module.exports = {
'newlines-between': 'always',
},
],
+ 'no-unused-vars': [
+ 'warn',
+ {
+ vars: 'all',
+ args: 'after-used',
+ argsIgnorePattern: '^_',
+ destructuredArrayIgnorePattern: '^_',
+ ignoreRestSiblings: true,
+ },
+ ],
+ 'no-duplicate-imports': 'error',
+ 'no-restricted-imports': 'warn',
+ 'react/display-name': 'warn',
+ /**
+ * It appears as though the react/prop-types rule has a bug in it
+ * when your props extend an interface
+ * https://github.com/jsx-eslint/eslint-plugin-react/issues/3325
+ */
+ 'react/prop-types': 'off',
+ 'react/jsx-key': 'warn',
+ 'react/jsx-no-target-blank': 'warn',
+ 'react/no-unescaped-entities': 'off',
+ /**
+ * TODO: react-hooks/exhaustive-deps is temporarily disabled
+ * this will be turned back on, and the warnings fixed, in a forthcoming PR
+ */
+ 'react-hooks/exhaustive-deps': 'off',
+ 'rulesdir/no-relative-import-paths': ['error', { allowSameFolder: true }],
},
};
diff --git a/grafana-plugin/.stylelintrc b/grafana-plugin/.stylelintrc
index 7cda5c91..c37d4c08 100644
--- a/grafana-plugin/.stylelintrc
+++ b/grafana-plugin/.stylelintrc
@@ -1,12 +1,14 @@
{
- "extends": "stylelint-config-standard",
- "rules": {
- "block-no-empty": [true,{ "severity": "warning"}],
+ "extends": ["stylelint-config-standard", "stylelint-prettier/recommended"],
+ "plugins": ["stylelint-prettier"],
+ "rules": {
+ "block-no-empty": [true, { "severity": "warning" }],
"selector-pseudo-class-no-unknown": [
true,
{
"ignorePseudoClasses": ["global"]
}
- ]
+ ],
+ "prettier/prettier": true
}
}
diff --git a/grafana-plugin/jest.config.js b/grafana-plugin/jest.config.js
index bcf17c90..31684c09 100644
--- a/grafana-plugin/jest.config.js
+++ b/grafana-plugin/jest.config.js
@@ -1,8 +1,29 @@
-// This file is needed because it is used by vscode and other tools that
-// call `jest` directly. However, unless you are doing anything special
-// do not edit this file
+module.exports = {
+ preset: 'ts-jest',
+ testEnvironment: 'jsdom',
-const standard = require('@grafana/toolkit/src/config/jest.plugin.config');
+ moduleDirectories: ['node_modules', 'src'],
+ moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json'],
-// This process will use the same config that `yarn test` is using
-module.exports = standard.jestConfig();
+ globals: {
+ 'ts-jest': {
+ isolatedModules: true,
+ babelConfig: true
+ },
+ },
+
+ transform: {
+ '^.+\\.js?$': require.resolve('babel-jest'),
+ '^.+\\.jsx?$': require.resolve('babel-jest'),
+ '^.+\\.ts?$': require.resolve('ts-jest'),
+ '^.+\\.tsx?$': require.resolve('ts-jest'),
+ },
+
+ moduleNameMapper: {
+ "grafana/app/(.*)": '
-