Merge branch 'master' into vm-integration-update

Author: pavangudiwada

docs/configuration/holmesgpt/toolsets/aws.rst

@@ -74,21 +74,7 @@ Configuration
 
   .. md-tab-item:: Robusta Helm Chart
 
-    .. code-block:: yaml
-
-        holmes:
-            additionalEnvVars:
-                - name: AWS_ACCESS_KEY_ID
-                  value: AKIXDDDSDSdSA
-                - name: AWS_SECRET_ACCESS_KEY
-                  value: =wJalrXUtnFEMI/KNG/bPxRfiCYEXAMPLEKEY
-                - name: AWS_DEFAULT_REGION
-                  value: us-west-2
-            toolsets:
-                aws/rds:
-                    enabled: true
-
-    .. include:: ./_toolset_configuration.inc.rst
+    This builtin toolset is currently only available in HolmesGPT CLI.
 
   .. md-tab-item:: Holmes CLI
 

docs/playbook-reference/index.rst

@@ -12,4 +12,4 @@
    automatic-remediation-examples/index
    prometheus-examples/index
    kubernetes-examples/index
-   logs-triggers/index
+   Log Based Alerting <logs-triggers/index>

docs/playbook-reference/logs-triggers/index.rst

@@ -1,5 +1,7 @@
-Automate Responses to Application Logs
-==========================================
+:hide-toc:
+
+Log-based alerting and auto-remediation with fluentbit, prometheus, and robusta
+==================================================================================
 
 This tutorial walks you through building an automation that detects specific patterns in Kubernetes pod logs and responds automatically.
 

src/robusta/integrations/slack/sender.py

@@ -2,6 +2,7 @@
 import logging
 import ssl
 import tempfile
+import re
 from datetime import datetime, timedelta
 from itertools import chain
 from typing import Any, Dict, List, Optional, Set
@@ -52,6 +53,7 @@
 ACTION_LINK = "link"
 SlackBlock = Dict[str, Any]
 MAX_BLOCK_CHARS = 3000
+MENTION_PATTERN = re.compile(r"<[^>]+>")
 
 
 class SlackSender:
@@ -407,10 +409,25 @@ def __create_holmes_callback(self, finding: Finding) -> CallbackBlock:
             }
         )
 
+    @staticmethod
+    def extract_mentions(title) -> (str, str):
+        mentions = MENTION_PATTERN.findall(title)
+
+        mention = ""
+        if mentions:
+            mention = " " + " ".join(mentions)
+            title = MENTION_PATTERN.sub("", title).strip()
+
+        return title, mention
+
+
     def __create_finding_header(
         self, finding: Finding, status: FindingStatus, platform_enabled: bool, include_investigate_link: bool
     ) -> MarkdownBlock:
         title = finding.title.removeprefix("[RESOLVED] ")
+
+        title, mention = self.extract_mentions(title)
+
         sev = finding.severity
         if finding.source == FindingSource.PROMETHEUS:
             status_name: str = (
@@ -426,7 +443,7 @@ def __create_finding_header(
             title = f"<{finding.get_investigate_uri(self.account_id, self.cluster_name)}|*{title}*>"
         return MarkdownBlock(
             f"""{status_name} {sev.to_emoji()} *{sev.name.capitalize()}*
-{title}"""
+{title}{mention}"""
         )
 
     def __create_links(

src/robusta/runner/telemetry_service.py

@@ -34,9 +34,9 @@ def __init__(self, endpoint: str, periodic_time_sec: float, registry: Registry):
             try:
                 sentry_sdk.init(
                     SENTRY_DSN,
-                    enable_tracing=True,
-                    traces_sample_rate=0.01,
-                    profiles_sample_rate=0.01, 
+                    enable_tracing=False,
+                    traces_sample_rate=0,
+                    profiles_sample_rate=0, 
                     release=RUNNER_VERSION,
                     integrations=[
                         ThreadingIntegration(propagate_scope=True),

tests/slack/test_slack_mentions.py

@@ -0,0 +1,20 @@
+from robusta.integrations.slack import SlackSender
+
+
+def test_title_without_mentions():
+    title = "Title with no mentions"
+    new_title, mention = SlackSender.extract_mentions(title)
+    assert new_title == title
+    assert mention == ""
+
+def test_title_with_single_mention():
+    title = "Title with single mention <@U024BE7LH>"
+    new_title, mention = SlackSender.extract_mentions(title)
+    assert new_title == "Title with single mention"
+    assert mention == " <@U024BE7LH>"
+
+def test_title_with_two_mentions():
+    title = "Title with <@U024BE7LG> two mentions <@U024BE7LH>"
+    new_title, mention = SlackSender.extract_mentions(title)
+    assert new_title == "Title with  two mentions"
+    assert mention == " <@U024BE7LG> <@U024BE7LH>"