Merge pull request #408 from grafana/dev

Merge dev to main

Author: matiasb

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+## v1.0.25 (2022-08-24)
+- Bug fixes
+
 ## v1.0.24 (2022-08-24)
 - Insight logs
 - Default DATA_UPLOAD_MAX_MEMORY_SIZE to 1mb

engine/apps/alerts/models/alert.py

@@ -196,9 +196,9 @@ def render_group_data(cls, alert_receive_channel, raw_request_data, is_demo=Fals
         if grouping_id_template is not None:
             group_distinction, _ = apply_jinja_template(grouping_id_template, raw_request_data)
 
-        # Insert demo uuid to prevent grouping of demo alerts.
-        if is_demo:
-            group_distinction = cls.insert_demo_uuid(group_distinction)
+        # Insert random uuid to prevent grouping of demo alerts or alerts with group_distinction=None
+        if is_demo or not group_distinction:
+            group_distinction = cls.insert_random_uuid(group_distinction)
 
         if group_distinction is not None:
             group_distinction = hashlib.md5(str(group_distinction).encode()).hexdigest()
@@ -224,7 +224,7 @@ def render_group_data(cls, alert_receive_channel, raw_request_data, is_demo=Fals
         )
 
     @staticmethod
-    def insert_demo_uuid(distinction):
+    def insert_random_uuid(distinction):
         if distinction is not None:
             distinction += str(uuid4())
         else:

engine/apps/telegram/tasks.py

@@ -136,20 +136,30 @@ def send_log_and_actions_message(self, channel_chat_id, group_chat_id, channel_m
         with OkToRetry(
             task=self, exc=(error.RetryAfter, error.TimedOut), compute_countdown=lambda e: getattr(e, "retry_after", 3)
         ):
-            if not log_message_sent:
-                telegram_client.send_message(
-                    chat_id=group_chat_id,
-                    message_type=TelegramMessage.LOG_MESSAGE,
-                    alert_group=alert_group,
-                    reply_to_message_id=reply_to_message_id,
-                )
-            if not actions_message_sent:
-                telegram_client.send_message(
-                    chat_id=group_chat_id,
-                    message_type=TelegramMessage.ACTIONS_MESSAGE,
-                    alert_group=alert_group,
-                    reply_to_message_id=reply_to_message_id,
-                )
+            try:
+                if not log_message_sent:
+                    telegram_client.send_message(
+                        chat_id=group_chat_id,
+                        message_type=TelegramMessage.LOG_MESSAGE,
+                        alert_group=alert_group,
+                        reply_to_message_id=reply_to_message_id,
+                    )
+                if not actions_message_sent:
+                    telegram_client.send_message(
+                        chat_id=group_chat_id,
+                        message_type=TelegramMessage.ACTIONS_MESSAGE,
+                        alert_group=alert_group,
+                        reply_to_message_id=reply_to_message_id,
+                    )
+            except error.BadRequest as e:
+                if e.message == "Chat not found":
+                    logger.warning(
+                        f"Could not send log and actions messages to Telegram group with id {group_chat_id} "
+                        f"due to 'Chat not found'. alert_group {alert_group.pk}"
+                    )
+                    return
+                else:
+                    raise
 
 
 @shared_dedicated_queue_retry_task(

engine/apps/telegram/updates/update_handlers/verification/personal.py

@@ -4,7 +4,7 @@
 from apps.telegram.utils import is_verification_message
 
 USER_CONNECTED_TEXT = "Done! This Telegram account is now linked to <b>{username}</b> 🎉"
-RELINK_ACCOUNT_TEXT = """This user is already connected to a Telegram account</b>
+RELINK_ACCOUNT_TEXT = """This user is already connected to a Telegram account.
 Please unlink Telegram account in profile settings of user <b>{username}</b> or contact Grafana OnCall support."""
 WRONG_VERIFICATION_CODE = "Verification failed: wrong verification code"