the-distro/infra
Archived
8
1
Fork 8
Code Issues 40 Pull requests 9 Projects Releases Packages Wiki Activity Actions

Make Zulip's alertmanager integration closer to matrix-hookshot-adapter's formatting #287

Merged
raito merged 1 commit from alertmanager-zulip-ng into main 2025-08-27 12:40:51 +00:00
Conversation 6 Commits 1 Files changed 2 +145
raito commented 2025-08-27 00:28:22 +00:00
Owner
Copy link

As @delroth asked for, the last commit contains a patch to Zulip to enable an alerting formatting closer to the one we had on Matrix.

I plan to send this change to upstream and discuss a bit first, I surmise they will want to make some parts of it configurable.

As @delroth asked for, the last commit contains a patch to Zulip to enable an alerting formatting closer to the one we had on Matrix. I plan to send this change to upstream and discuss a bit first, I surmise they will want to make some parts of it configurable.
We have VMs sitting on the AFNix hypervisor for Lix secret tenancy.
Let the VM pick their tenant themselves.

Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
The `hostId` concept is akin to ZFS' `hostId` and aim to enable VM
identity across virtual machines renames, e.g. ZFS datasets consistency.

In addition, it ensure clash-free network interface names and VSOCK
CIDs.

Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
https://github.com/ryantm/agenix/pull/255
Otherwise, VMs cannot decrypt their secrets at all.

Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
This matches the matrix-hookshot-adapter's formatting made by @K900 more
or less.

Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
raito force-pushed alertmanager-zulip-ng from e397bf005c to a65af4cc0c 2025-08-27 00:38:27 +00:00 Compare
requested review from delroth 2025-08-27 00:38:34 +00:00
raito changed title from WIP: Make Zulip's alertmanager integration closer to matrix-hookshot-adapter's formatting to Make Zulip's alertmanager integration closer to matrix-hookshot-adapter's formatting 2025-08-27 00:38:37 +00:00
delroth approved these changes 2025-08-27 00:43:36 +00:00
delroth left a comment
Owner

Approval conditional on actual testing to make sure the formatting is good - feel free to apply minor changes without asking me for another look.

Approval conditional on actual testing to make sure the formatting is good - feel free to apply minor changes without asking me for another look.
raito force-pushed alertmanager-zulip-ng from a65af4cc0c to f340a3767e 2025-08-27 02:26:32 +00:00 Compare
raito commented 2025-08-27 02:31:46 +00:00
Author
Owner
Copy link

Pending final formatting validation

Pending final formatting validation
tom-hubrecht commented 2025-08-27 11:22:57 +00:00
Owner
Copy link

The formatting seems wrong

The formatting seems wrong
tom-hubrecht commented 2025-08-27 11:26:19 +00:00
Owner
Copy link

More precisely, the labels contain line breaks, which means that the call to dedent is useless because there is no common whitespace at the beginning of each line

More precisely, the labels contain line breaks, which means that the call to `dedent` is useless because there is no common whitespace at the beginning of each line
tom-hubrecht reviewed 2025-08-27 11:34:47 +00:00
vm/afnix-ovh-lim-hv01/afnix-zulip01/alertmanager-better-formatting.patch Outdated
@ -0,0 +83,4 @@
+ labels_block = "\n".join(f"- {k}: {v.tame(check_string)}" for k, v in labels.items())
+ annotations_block = "\n".join(f"- {k}: {v.tame(check_string)}" for k, v in annotations.items())
+
+ body = dedent(f"""{icon} **{heading}**
tom-hubrecht commented 2025-08-27 11:34:47 +00:00
Owner

Should be

body = dedent("""
    {icon} **{heading}**
    {silence_link}
    ```spoiler Details
    **Description**:
    {desc}

    **Labels:**
    {labels_block}

    **Annotations:**
    {annotations_block}
    ```
    """).strip().format(...)
Should be ````python body = dedent(""" {icon} **{heading}** {silence_link} ```spoiler Details **Description**: {desc} **Labels:** {labels_block} **Annotations:** {annotations_block} ``` """).strip().format(...) ````
raito commented 2025-08-27 12:19:31 +00:00
Author
Owner

Thanks!

Thanks!
raito marked this conversation as resolved
raito force-pushed alertmanager-zulip-ng from f340a3767e to 22f1cbb06a 2025-08-27 12:40:35 +00:00 Compare
raito commented 2025-08-27 12:40:46 +00:00
Author
Owner
Copy link

It's now perfect, thank you @tom-hubrecht !

It's now perfect, thank you @tom-hubrecht !
raito merged commit 22f1cbb06a into main 2025-08-27 12:40:51 +00:00
raito deleted branch alertmanager-zulip-ng 2025-08-27 12:40:51 +00:00
Commenting is not possible because the repository is archived.
Reviewers
No reviewers
delroth
Labels
Clear labels   
Compat/Breaking

Breaking change that won't be backward compatible

  
Difficulty
Architectural
Requires changes in multiple pieces of the stack: the Nix interpreter, etc.

  
Difficulty
Easy
Infrastructure beginner friendly tasks

  
Difficulty
Hard
Requires prior knowledge, research and design

  
Help Wanted

Looking for a first task to pick? This one is looking for somefew to do it as well!

  
Kind
Bug
Something is not working

  
Kind
Documentation
Documentation changes

  
Kind
Enhancement
Improve existing functionality

  
Kind
Feature
New functionality

  
Kind
Testing
Issue or pull request related to testing

  
Priority
Critical
The priority is critical

  
Priority
High
The priority is high

  
Priority
Low
The priority is low

  
Priority
Medium
The priority is medium

  
Reviewed
Confirmed
Issue has been confirmed

  
Reviewed
Duplicate
This issue or pull request already exists

  
Reviewed
Invalid
Invalid issue

  
Reviewed
Won't Fix
This issue won't be fixed

  
Security

This is a security issue

  
Silenced Alert

This issue was created to track a silenced alert which needs remediation work.

  
Status
Abandoned
Somebody has started to work on this but abandoned work

  
Status
Blocked
Something is blocking this issue or pull request

  
Status
Need More Info
Feedback is required to reproduce issue or to continue work

  
Status
Postponed
We can do this later

  
Tracking Issue

Umbrella issue of many things at the same time

No labels
Compat/Breaking
Difficulty
Architectural
Difficulty
Easy
Difficulty
Hard
Help Wanted
Kind
Bug
Kind
Documentation
Kind
Enhancement
Kind
Feature
Kind
Testing
Priority
Critical
Priority
High
Priority
Low
Priority
Medium
Reviewed
Confirmed
Reviewed
Duplicate
Reviewed
Invalid
Reviewed
Won't Fix
Security
Silenced Alert
Status
Abandoned
Status
Blocked
Status
Need More Info
Status
Postponed
Tracking Issue
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
3 participants
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: the-distro/infra#287
No description provided.
Delete branch "alertmanager-zulip-ng"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?