Skip to content

Commit 0249936

Browse files
authored
Merge pull request #1135 from flanksource/alertmanager-check-name
chore: update alertmanager check name generating algo
2 parents 3c14810 + 0739e84 commit 0249936

File tree

1 file changed

+18
-4
lines changed

1 file changed

+18
-4
lines changed

checks/alertmanager.go

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,29 @@ func extractMessage(annotations map[string]string) string {
9090
}
9191

9292
func generateFullName(name string, labels map[string]string) string {
93-
// We add alert metadata to the check name based on priority order
94-
priorityOrder := []string{"namespace", "node", "deployment", "daemonset", "job_name", "pod", "container"}
95-
9693
fullName := []string{name}
97-
for _, key := range priorityOrder {
94+
95+
// We add alert metadata to the check name
96+
level1 := []string{"namespace", "node"}
97+
for _, key := range level1 {
9898
if labels[key] != "" {
9999
fullName = append(fullName, labels[key])
100100
}
101101
}
102102

103+
// Only one of these labels must be used
104+
level2 := []string{"deployment", "daemonset", "cronjob_name", "job_name", "pod"}
105+
for _, key := range level2 {
106+
if labels[key] != "" {
107+
fullName = append(fullName, labels[key])
108+
break
109+
}
110+
}
111+
112+
// Add container name if it exists
113+
if labels["container"] != "" {
114+
fullName = append(fullName, labels["container"])
115+
}
116+
103117
return strings.Join(fullName, "/")
104118
}

0 commit comments

Comments
 (0)