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

feat: add cluster to alerts description (when possible) #988

Merged
merged 2 commits into from
Nov 25, 2024
Merged

feat: add cluster to alerts description (when possible) #988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1122d94
feat: add cluster to alerts description (when possible)
lorenzofelletti Nov 8, 2024
d8a8fc2
feat: use showMultiCluster instead of cluster label
lorenzofelletti Nov 19, 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
10 changes: 8 additions & 2 deletions alerts/kube_apiserver.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,10 @@ local utils = import '../lib/utils.libsonnet';
severity: 'warning',
},
annotations: {
description: 'A client certificate used to authenticate to kubernetes apiserver is expiring in less than %s.' % (utils.humanizeSeconds($._config.certExpirationWarningSeconds)),
description: 'A client certificate used to authenticate to kubernetes apiserver is expiring in less than %s%s.' % [
(utils.humanizeSeconds($._config.certExpirationWarningSeconds)),
utils.ifShowMultiCluster($._config, ' on cluster {{ $labels.%(clusterLabel)s }}' % $._config),
],
summary: 'Client certificate is about to expire.',
},
},
Expand All @@ -75,7 +78,10 @@ local utils = import '../lib/utils.libsonnet';
severity: 'critical',
},
annotations: {
description: 'A client certificate used to authenticate to kubernetes apiserver is expiring in less than %s.' % (utils.humanizeSeconds($._config.certExpirationCriticalSeconds)),
description: 'A client certificate used to authenticate to kubernetes apiserver is expiring in less than %s%s.' % [
(utils.humanizeSeconds($._config.certExpirationCriticalSeconds)),
utils.ifShowMultiCluster($._config, ' on cluster {{ $labels.%(clusterLabel)s }}' % $._config),
],
summary: 'Client certificate is about to expire.',
},
},
Expand Down
4 changes: 4 additions & 0 deletions lib/utils.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,8 @@
metric: labels.metric,
},
},

// if showMultiCluster is true in config, return the string, otherwise return an empty string
ifShowMultiCluster(config, string)::
if config.showMultiCluster then string else '',
}
Loading