Fixed bugs

engine/common/utils.py

@@ -168,13 +168,14 @@ def convert_md_to_html(text):
             # This gives us <pre> and <code> tags for ```-fenced blocks
             "fenced-code-blocks",
             "pyshell",
+            "nl2br",
+            "target-blank-links",
+            "nofollow",
+            "pymdownx.emoji",
+            "pymdownx.magiclink",
+            "tables",
         ],
     ).strip()
-    # Special handling cases for lists
-    text = text.replace("\n\n<ul>", "<ul>")
-    text = text.replace("\n<li>", "<li>")
-    # Special handling cases for newlines
-    text = text.replace("\n", "<br/>")
     return text
 
 

engine/config_integrations/alertmanager.py

@@ -47,9 +47,27 @@
 
 **🏷️ Labels:**
 ```
-{% for k, v in payload["labels"].items() -%}
+{%- for k, v in payload["labels"].items() %}
 {{ k }}={{ v }}
+{%- endfor %}
+```
+
+{%- if annotations |length > 0%}
+**Other annotations:**
+{% for k, v in payload["annotations"].items() %}
+{#- render annotation as markdown url if it starts with http #}
+- *{{ k }}*: {% if v.startswith("http") %} [here]({{v}}){% else %} {{v}} {% endif -%}
 {% endfor %}
+{% endif %}
+```
+
+{%- if annotations |length > 0%}
+**Other annotations:**
+{% for k, v in payload["annotations"].items() %}
+{#- render annotation as markdown url if it starts with http #}
+- *{{ k }}*: {% if v.startswith("http") %} [here]({{v}}){% else %} {{v}} {% endif -%}
+{% endfor %}
+{% endif %}
 ```
 
 {%- if annotations |length > 0%}

engine/requirements.txt

@@ -52,3 +52,4 @@ django-dbconn-retry==0.1.7
 django-ipware==4.0.2
 django-anymail==8.6
 django-deprecate-fields==0.1.1
+pymdown-extensions==9.11

grafana-plugin/src/utils/sanitize.ts

@@ -3,7 +3,7 @@ import dompurify from 'dompurify';
 export default function sanitize(str: string): string {
   return dompurify.sanitize(str, {
     USE_PROFILES: { html: true },
-    FORBID_TAGS: ['form', 'input', 'pre'],
+    FORBID_TAGS: ['form', 'input'],
     ADD_ATTR: ['target'],
   });
 }