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

feat(alertmanager-extra-infos): Adding extra labels or annotations the alert #347

Merged
merged 1 commit into from
Jul 25, 2022
Merged

feat(alertmanager-extra-infos): Adding extra labels or annotations the alert #347

merged 1 commit into from
Jul 25, 2022

Conversation

Lowaiz
Copy link
Contributor

@Lowaiz Lowaiz commented Jul 22, 2022

Signed-off-by: Lyonel Martinez lyonel.martinez@numberly.com

What type of PR is this?

Uncomment one (or more) /kind <> lines:

/kind feature

Any specific area of the project related to this PR?

/area outputs

What this PR does / why we need it:

Now, we can add extra labels and extra annotations to the alerts send to the AlertManager Output.
Each label/annotation can have a name and a value defined by this format:

config:
    alertmanager:
        extralabels: "label1:value1, label2:value2"
        extraannotations: "annotation1:value1, annotation2:value2"

Which issue(s) this PR fixes:
None

Special notes for your reviewer:

We can use the same format to add extra labels with values to the Prometheus' extra-labels configuration and to the Loki one's.

outputs/alertmanager.go Outdated Show resolved Hide resolved
Copy link
Member

@Issif Issif left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you also update the README (both section, example file + env vars) + the config_example.yaml, please

outputs/alertmanager.go Outdated Show resolved Hide resolved
outputs/alertmanager.go Outdated Show resolved Hide resolved
types/types.go Outdated Show resolved Hide resolved
@Issif Issif added this to In progress in 2.x via automation Jul 22, 2022
@Issif Issif added this to the 2.27.0 milestone Jul 22, 2022
outputs/alertmanager.go Outdated Show resolved Hide resolved
… the alert

Signed-off-by: Lyonel Martinez <lyonel.martinez@numberly.com>
Copy link
Member

@Issif Issif left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@poiana poiana added the lgtm label Jul 25, 2022
@poiana
Copy link

poiana commented Jul 25, 2022

LGTM label has been added.

Git tree hash: 245b150ac473fb2594e6da40cb8312b92c8a338b

@poiana
Copy link

poiana commented Jul 25, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Issif, Lowaiz

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@poiana poiana merged commit 8602cca into falcosecurity:master Jul 25, 2022
2.x automation moved this from In progress to Done Jul 25, 2022
Lowaiz added a commit to Lowaiz/charts that referenced this pull request Jul 26, 2022
…Manager extra labels and annotations.

In prevision of sidekick version bump.
falcosecurity/falcosidekick#347

Signed-off-by: Lyonel Martinez <lyonel.martinez@numberly.com>
Lowaiz added a commit to Lowaiz/charts that referenced this pull request Jul 26, 2022
feat(alertmanager-extra-fields): Updates values and secrets for AlertManager extra labels and annotations.

In prevision of sidekick version bump.
falcosecurity/falcosidekick#341
falcosecurity/falcosidekick#347

Signed-off-by: Lyonel Martinez <lyonel.martinez@numberly.com>
Lowaiz added a commit to Lowaiz/charts that referenced this pull request Jul 29, 2022
feat(alertmanager-extra-fields): Updates values and secrets for AlertManager extra labels and annotations.

In prevision of sidekick version bump.
falcosecurity/falcosidekick#341
falcosecurity/falcosidekick#347

Signed-off-by: Lyonel Martinez <lyonel.martinez@numberly.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
2.x
Done
Development

Successfully merging this pull request may close these issues.

None yet

3 participants