From 73adf9ba03d8417853f77f1e41406441b6af181f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20B=C3=BCrki?= <eric.buerki@lernende.ethz.ch>
Date: Wed, 29 May 2024 10:57:51 +0200
Subject: [PATCH] handles alert['values'] being none, cleanup, whitespace
---
template/default.html.jinja | 4 +-
template/default.txt.jinja | 3 +-
template/detailed.html.jinja | 12 ++--
template/detailed.txt.jinja | 3 +-
template/detailed_table.html.jinja | 106 +++++++++++------------------
template/oneliner.html.jinja | 3 +-
template/oneliner.txt.jinja | 3 +-
7 files changed, 57 insertions(+), 77 deletions(-)
diff --git a/template/default.html.jinja b/template/default.html.jinja
index 407e500..94c895f 100644
--- a/template/default.html.jinja
+++ b/template/default.html.jinja
@@ -10,5 +10,7 @@
{%- for key, value in alert['values'].items() -%}
<b>{{ key }}:</b> {{ value }}<br>
{%- endfor %}
+{%- else -%}
+<b>Value:</b> [no value]<br>
{%- endif %}
-{%- endfor %}{% endif %}
\ No newline at end of file
+{%- endfor %}{% endif %}
diff --git a/template/default.txt.jinja b/template/default.txt.jinja
index 26b827c..e2f3252 100644
--- a/template/default.txt.jinja
+++ b/template/default.txt.jinja
@@ -7,4 +7,5 @@
{{- "\n" + key }} = {{ value }}
{%- endfor -%}
{{- "\n" if not loop.last }}
-{%- endfor %}
\ No newline at end of file
+{{- " Value: [no value]" if not alert['values'] }}
+{%- endfor %}
diff --git a/template/detailed.html.jinja b/template/detailed.html.jinja
index 80df0e2..0a5eb77 100644
--- a/template/detailed.html.jinja
+++ b/template/detailed.html.jinja
@@ -7,8 +7,9 @@
<br>
{%- for key, value in alert['values'].items() -%}
{{- "<br>" if not loop.first }}
-<b>{{ key }}:</b> {{ value }}
+<b>{{ key }}:</b> {{ value -}}
{%- endfor -%}
+{{- "<b>Value:</b> [no value]<br>" if not alert['values'] -}}
<i>
@@ -30,14 +31,13 @@
{{- key }} = {{ value }}<br>
{%- endfor %}{% endif %}
-{%- if not commonStartsAtParsed %}
+{%- if not commonStartsAtParsed and alert['startsAtParsed'] %}
<i>(StartsAt: {{alert['startsAtParsed'] }}{% if alert['endsAtParsed'] %}, EndsAt: {{alert['endsAtParsed'] }}{% endif %})</i><br>
-{% endif -%}
+{%- endif -%}
-</i></p>{% endfor %}
+</i></p>{% endfor -%}
-<p><b>Metadata:</b><br>
-<b>Grafana Folder:</b> {{ commonLabels['grafana_folder'] }}<br>
+<p><b>Metadata:</b><br><b>Grafana Folder:</b> {{ commonLabels['grafana_folder'] }}<br>
{%- if summary -%}
<b>Summary:</b> {{ summary }}<br>{% endif %}
diff --git a/template/detailed.txt.jinja b/template/detailed.txt.jinja
index d733e9a..1649369 100644
--- a/template/detailed.txt.jinja
+++ b/template/detailed.txt.jinja
@@ -3,6 +3,7 @@
{% for key, value in alert['values'].items() %}
{{ key }}: {{ value }}
{% endfor %}
+{{- "Value: [no value]\n" if not alert['values'] }}
{%- if alert['uniqueLabels'] %}
Labels:
@@ -64,4 +65,4 @@ Ends At: {{ commonEndsAtParsed -}}
{%- if truncatedAlerts %}
Truncated Alerts: {{ truncatedAlerts }}
-{% endif -%}
\ No newline at end of file
+{% endif -%}
diff --git a/template/detailed_table.html.jinja b/template/detailed_table.html.jinja
index 269c5b2..ad14da9 100644
--- a/template/detailed_table.html.jinja
+++ b/template/detailed_table.html.jinja
@@ -1,88 +1,62 @@
{% for alert in alerts -%}
<p><b><a href="{{ alert['generatorURL'] }}">[{{ status}}] {{ alert['labels']['alertname'] }}</a></b>(<a href="{{ alert['silenceURL'] }}">Silence</a>):
-{% if alert['values'] %}
-<table>
-<caption>Values</caption>
-{% for key, value in alert['values'].items() %}
-<tr>
-<th>{{ key }}</th>
-<td>{{ value }}</td>
-</tr>
-{% endfor %}
+{%- if alert['values'] -%}
+<table><caption>Values</caption>
+{%- for key, value in alert['values'].items() -%}
+<tr><th>{{ key }}</th><td>{{ value }}</td></tr>
+{%- endfor -%}
</table>
-{% else %}
-<br>
-{% endif %}
+{%- else -%}
+<br><b>Value:</b> [no value]<br>
+{%- endif %}
-{% if alert['uniqueLabels'] %}
-<table>
-<caption>Labels</caption>
+{%- if alert['uniqueLabels'] %}
+<table><caption>Labels</caption>
{% for key, value in alert['uniqueLabels'].items() %}
-<tr>
-<td>{{ key }}</td>
-<td>{{ value }}</td>
-</tr>
+<tr><td>{{ key }}</td><td>{{ value }}</td></tr>
{% endfor %}
</table>
{% endif %}
-{% if alert['uniqueAnnotations'] %}
-<b>Annotations</b>
-<table>
- {% for key, value in alert['uniqueAnnotations'].items() %}
- <tr>
- <td>{{ key }}</td>
- <td>{{ value }}</td>
- </tr>
- {% endfor %}
+{%- if alert['uniqueAnnotations'] %}
+<table><caption>Annotations</caption>
+{%- for key, value in alert['uniqueAnnotations'].items() -%}
+<tr><td>{{ key }}</td><td>{{ value }}</td></tr>
+{%- endfor -%}
</table>
-{% endif %}
+{% endif -%}
-<i>(StartsAt: {{alert['startsAtParsed'] }}{% if alert['endsAtParsed'] %}, EndsAt: {{alert['endsAtParsed'] }}{% endif %})</i>
-</p>
-{% endfor %}
+{%- if alert['startsAtParsed'] %}
+<i>(StartsAt: {{alert['startsAtParsed'] }}{% if alert['endsAtParsed'] %}, EndsAt: {{alert['endsAtParsed'] }}{% endif %})</i></p>
+{%- endif -%}
+{%- endfor -%}
-<p><b>Metadata:</b></p>
-
-<table>
-<tr><td>Grafana Folder</td><td>{{ commonLabels['grafana_folder'] }}</td></tr>
+<p><b>Metadata:</b></p><table><tr><td>Grafana Folder</td><td>{{ commonLabels['grafana_folder'] }}</td></tr>
{%- if summary -%}<tr><td>Summary</td><td>{{ summary }}</td></tr>{% endif %}
{%- if description -%}<tr><td>Description</td><td>{{ description }}</td>{% endif %}
</table>
-{% if groupLabels %}
-<table>
- <caption>Grouped By:</caption>
- {% for key, value in groupLabels.items() %}
- <tr>
- <td>{{ key }}</td>
- <td>{{ value }}</td>
- </tr>
- {% endfor %}
+{%- if groupLabels %}
+<table><caption>Grouped By:</caption>
+{%- for key, value in groupLabels.items() %}
+<tr><td>{{ key }}</td><td>{{ value }}</td></tr>
+{%- endfor -%}
</table>
-{% endif %}
+{%- endif %}
-{% if normalLabels %}
-<table>
- <caption>Common Labels</caption>
- {% for key, value in normalLabels.items() %}
- <tr>
- <td>{{ key }}</td>
- <td>{{ value }}</td>
- </tr>
- {% endfor %}
+{%- if normalLabels -%}
+<table><caption>Common Labels</caption>
+{%- for key, value in normalLabels.items() %}
+<tr><td>{{ key }}</td><td>{{ value }}</td></tr>
+{%- endfor -%}
</table>
-{% endif %}
+{%- endif %}
-{% if normalAnnotations %}
-<table>
- <caption>Common Annotations</caption>
- {% for key, value in normalAnnotations.items() %}
- <tr>
- <td>{{ key }}</td>
- <td>{{ value }}</td>
- </tr>
- {% endfor %}
+{%- if normalAnnotations -%}
+<table><caption>Common Annotations</caption>
+{%- for key, value in normalAnnotations.items() %}
+<tr><td>{{ key }}</td><td>{{ value }}</td></tr>
+{%- endfor -%}
</table>
-{% endif %}
\ No newline at end of file
+{%- endif -%}
diff --git a/template/oneliner.html.jinja b/template/oneliner.html.jinja
index fb0d5c7..ce7227e 100644
--- a/template/oneliner.html.jinja
+++ b/template/oneliner.html.jinja
@@ -8,5 +8,6 @@
{%- for key, value in alert['values'].items() %}
{{- ", " if not loop.first -}}
<b>{{ key }}:</b> {{ value }}
-{%- endfor %}<br>
+{%- endfor %}
+{{- " <b>Value:</b> [no value] " if not alert['values'] }}<br>
{%- endfor -%}{% endif -%}
diff --git a/template/oneliner.txt.jinja b/template/oneliner.txt.jinja
index e3f4e5a..4130b3c 100644
--- a/template/oneliner.txt.jinja
+++ b/template/oneliner.txt.jinja
@@ -7,5 +7,6 @@
{{- "," if not loop.first }}
{{- " " + key }} = {{ value }}
{%- endfor -%}
+{{- " [no values]" if not alert['values'] }}
{{- "\n" if not loop.last }}
-{%- endfor %}
\ No newline at end of file
+{%- endfor %}
--
GitLab