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.

Sign up for GitHub

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

mixin: add extra alert options #7442

Merged
merged 12 commits into from
Feb 28, 2024
Merged

mixin: add extra alert options #7442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f05a35e
chore: add mixin extra labels and annotations option
Feb 22, 2024
8a0c388
chore: remove extra comma
jmichalek132 Feb 22, 2024
88b0e29
chore: remove extra comma
jmichalek132 Feb 22, 2024
a3fe1d7
chore: fix typo
jmichalek132 Feb 22, 2024
6df0cfc
Update operations/mimir-mixin/config.libsonnet
jmichalek132 Feb 23, 2024
5d2c246
use function to add extra labels and annotations
jmichalek132 Feb 23, 2024
910e025
chore: get rid of the _variables suffx
jmichalek132 Feb 23, 2024
9225b9b
chore: use the fuction to add extra labels and annotations
jmichalek132 Feb 23, 2024
81212e8
chore: mixin formated
jmichalek132 Feb 25, 2024
7491f0f
chore: comment wording improvement
jmichalek132 Feb 25, 2024
a899bee
chore: comment wording improvement fix
jmichalek132 Feb 25, 2024
8a56725
Update operations/mimir-mixin/alerts/alerts-utils.libsonnet
jmichalek132 Feb 28, 2024
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
2 changes: 1 addition & 1 deletion operations/mimir-mixin/alerts/alertmanager.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,5 +143,5 @@
},
],

groups+: $.withRunbookURL('https://grafana.com/docs/mimir/latest/operators-guide/mimir-runbooks/#%s', alertGroups),
groups+: $.withRunbookURL('https://grafana.com/docs/mimir/latest/operators-guide/mimir-runbooks/#%s', $.withExtraLabelsAnnotations(alertGroups)),
}
19 changes: 19 additions & 0 deletions operations/mimir-mixin/alerts/alerts-utils.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,23 @@
}
for group in groups
],

withExtraLabelsAnnotations(groups)::
local update_rule(rule) =
if std.objectHas(rule, 'alert')
then rule {
annotations+: $._config.alert_extra_annotations,
labels+: $._config.alert_extra_labels,
}
else rule;
[
group {
rules: [
update_rule(rule)
for rule in group.rules
],
}
for group in groups
],

}
2 changes: 1 addition & 1 deletion operations/mimir-mixin/alerts/alerts.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,5 +803,5 @@ local utils = import 'mixin-utils/utils.libsonnet';
},
],

groups+: $.withRunbookURL('https://grafana.com/docs/mimir/latest/operators-guide/mimir-runbooks/#%s', alertGroups),
groups+: $.withRunbookURL('https://grafana.com/docs/mimir/latest/operators-guide/mimir-runbooks/#%s', $.withExtraLabelsAnnotations(alertGroups)),
}
2 changes: 1 addition & 1 deletion operations/mimir-mixin/alerts/autoscaling.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,5 @@
},
],

groups+: $.withRunbookURL('https://grafana.com/docs/mimir/latest/operators-guide/mimir-runbooks/#%s', alertGroups),
groups+: $.withRunbookURL('https://grafana.com/docs/mimir/latest/operators-guide/mimir-runbooks/#%s', $.withExtraLabelsAnnotations(alertGroups)),
}
2 changes: 1 addition & 1 deletion operations/mimir-mixin/alerts/blocks.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,5 +230,5 @@
},
],

groups+: $.withRunbookURL('https://grafana.com/docs/mimir/latest/operators-guide/mimir-runbooks/#%s', alertGroups),
groups+: $.withRunbookURL('https://grafana.com/docs/mimir/latest/operators-guide/mimir-runbooks/#%s', $.withExtraLabelsAnnotations(alertGroups)),
}
2 changes: 1 addition & 1 deletion operations/mimir-mixin/alerts/compactor.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,5 +142,5 @@
},
],

groups+: $.withRunbookURL('https://grafana.com/docs/mimir/latest/operators-guide/mimir-runbooks/#%s', alertGroups),
groups+: $.withRunbookURL('https://grafana.com/docs/mimir/latest/operators-guide/mimir-runbooks/#%s', $.withExtraLabelsAnnotations(alertGroups)),
}
2 changes: 1 addition & 1 deletion operations/mimir-mixin/alerts/continuous-test.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@
},
],

groups+: $.withRunbookURL('https://grafana.com/docs/mimir/latest/operators-guide/mimir-runbooks/#%s', alertGroups),
groups+: $.withRunbookURL('https://grafana.com/docs/mimir/latest/operators-guide/mimir-runbooks/#%s', $.withExtraLabelsAnnotations(alertGroups)),
}
6 changes: 6 additions & 0 deletions operations/mimir-mixin/config.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,12 @@
namespace_query: 'cortex_build_info{%s=~"$cluster"}' % $._config.per_cluster_label,
},

// Used to add extra labels to all alerts. Careful: takes precedence over default labels.
alert_extra_labels: {},

// Used to add extra annotations to all alerts, Careful: takes precedence over default annotations.
alert_extra_annotations: {},

cortex_p99_latency_threshold_seconds: 2.5,

// Whether resources dashboards are enabled (based on cAdvisor metrics).
Expand Down
Loading