Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bugs in web title and message templates rendering and visual representation #1747

Merged
merged 17 commits into from
May 2, 2023
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix tests
iskhakov committed May 2, 2023

Verified

This commit was signed with the committer’s verified signature.
rezkiy37 Michael (Mykhailo) Kravchenko
commit 166422b93d6d45308cf6a15df5f33cd7af251299
4 changes: 4 additions & 0 deletions engine/apps/alerts/tests/test_default_templates.py
Original file line number Diff line number Diff line change
@@ -63,6 +63,10 @@ def test_default_templates(
)

rendered_attr = getattr(rendered_alert, attr)
print(f"{alert_receive_channel}'s {notification_channel} {attr} ")
print(rendered_attr)
print()
print("====================================")
assert rendered_attr == expected, (
f"{alert_receive_channel}'s {notification_channel} {attr} " f"is not equal to expected"
)
28 changes: 13 additions & 15 deletions engine/config_integrations/grafana.py
Original file line number Diff line number Diff line change
@@ -169,21 +169,19 @@
},
"web": {
"title": "KubeJobCompletion",
"message": (
"<p>"
"<strong>Status</strong>: firing<br/>"
"<strong>Labels:</strong> <br/>"
"<em>job</em>: kube-state-metrics<br/>"
"<em>instance</em>: 10.143.139.7:8443<br/>"
"<em>job_name</em>: email-tracking-perform-initialization-1.0.50<br/>"
"<em>severity</em>: warning<br/><em>alertname</em>: KubeJobCompletion<br/>"
"<em>namespace</em>: default<br/><em>prometheus</em>: monitoring/k8s<br/>"
"<strong>Annotations:</strong><br/>"
"<em>message</em>: Job default/email-tracking-perform-initialization-1.0.50 is taking more than one hour to complete. <br/>"
"<em>runbook_url</em>: "
'<a href="https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubejobcompletion">here</a>'
"</p>"
),
"message": """\
<p><strong>Status</strong>: firing
<strong>Labels:</strong>
<em>job</em>: kube-state-metrics
<em>instance</em>: 10.143.139.7:8443
<em>job_name</em>: email-tracking-perform-initialization-1.0.50
<em>severity</em>: warning
<em>alertname</em>: KubeJobCompletion
<em>namespace</em>: default
<em>prometheus</em>: monitoring/k8s
<strong>Annotations:</strong>
<em>message</em>: Job default/email-tracking-perform-initialization-1.0.50 is taking more than one hour to complete.
<em>runbook_url</em>: <a href="https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubejobcompletion" rel="nofollow noopener" target="_blank">here</a></p>""", # noqa
"image_url": None,
},
"sms": {
91 changes: 0 additions & 91 deletions engine/config_integrations/grafana_alerting.py
Original file line number Diff line number Diff line change
@@ -104,97 +104,6 @@

acknowledge_condition = None

tests = {
"payload": {
"endsAt": "0001-01-01T00:00:00Z",
"labels": {
"job": "kube-state-metrics",
"instance": "10.143.139.7:8443",
"job_name": "email-tracking-perform-initialization-1.0.50",
"severity": "warning",
"alertname": "KubeJobCompletion",
"namespace": "default",
"prometheus": "monitoring/k8s",
},
"status": "firing",
"startsAt": "2019-12-13T08:57:35.095800493Z",
"annotations": {
"message": "Job default/email-tracking-perform-initialization-1.0.50 is taking more than one hour to complete.",
"runbook_url": "https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubejobcompletion",
},
"generatorURL": (
"https://localhost/prometheus/graph?g0.expr=kube_job_spec_completions%7Bjob%3D%22kube-state-metrics%22%7D+-+"
"kube_job_status_succeeded%7Bjob%3D%22kube-state-metrics%22%7D+%3E+0&g0.tab=1"
),
},
"slack": {
"title": (
"*<{web_link}|#1 KubeJobCompletion>* via {integration_name} (*<"
"https://localhost/prometheus/graph?g0.expr=kube_job_spec_completions%7Bjob%3D%22kube-state-metrics%22%7D+-+"
"kube_job_status_succeeded%7Bjob%3D%22kube-state-metrics%22%7D+%3E+0&g0.tab=1"
"|source>*)"
),
"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"
"runbook_url: <https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubejobcompletion|here> "
),
"image_url": None,
},
"web": {
"title": "KubeJobCompletion",
"message": (
"<p>"
"<strong>Status</strong>: firing<br/>"
"<strong>Labels:</strong> <br/>"
"<em>job</em>: kube-state-metrics<br/>"
"<em>instance</em>: 10.143.139.7:8443<br/>"
"<em>job_name</em>: email-tracking-perform-initialization-1.0.50<br/>"
"<em>severity</em>: warning<br/><em>alertname</em>: KubeJobCompletion<br/>"
"<em>namespace</em>: default<br/><em>prometheus</em>: monitoring/k8s<br/>"
"<strong>Annotations:</strong><br/>"
"<em>message</em>: Job default/email-tracking-perform-initialization-1.0.50 is taking more than one hour to complete. <br/>"
"<em>runbook_url</em>: "
'<a href="https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubejobcompletion">here</a>'
"</p>"
),
"image_url": None,
},
"sms": {
"title": "KubeJobCompletion",
},
"phone_call": {
"title": "KubeJobCompletion",
},
"telegram": {
"title": "KubeJobCompletion",
"message": (
"<b>Status</b>: firing\n"
"<b>Labels:</b> \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"
"<b>Annotations:</b>\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"
),
"image_url": None,
},
}

example_payload = {
"receiver": "amixr",
"status": "firing",