mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-01-30 07:03:06 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge pull request #2306 from EdSchouten/sorted-alerts

Browse source 
Use lexicographic order to sort alerts by name.
This commit is contained in:
Julius Volz 2016-12-31 13:12:30 +01:00 committed by GitHub
parent 7e369b9318 b3a39ccd8a
commit 90dd216646
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
web/web.go
View file

@ -274,7 +274,7 @@ func (h *Handler) Run() {
func (h *Handler) alerts(w http.ResponseWriter, r *http.Request) { func (h *Handler) alerts(w http.ResponseWriter, r *http.Request) {
alerts := h.ruleManager.AlertingRules() alerts := h.ruleManager.AlertingRules()
alertsSorter := byAlertStateSorter{alerts: alerts} alertsSorter := byAlertStateAndNameSorter{alerts: alerts}
sort.Sort(alertsSorter) sort.Sort(alertsSorter)
alertStatus := AlertStatus{ alertStatus := AlertStatus{
@ -541,18 +541,20 @@ type AlertStatus struct {
AlertStateToRowClass map[rules.AlertState]string AlertStateToRowClass map[rules.AlertState]string
} }
type byAlertStateSorter struct { type byAlertStateAndNameSorter struct {
alerts []*rules.AlertingRule alerts []*rules.AlertingRule
} }
func (s byAlertStateSorter) Len() int { func (s byAlertStateAndNameSorter) Len() int {
return len(s.alerts) return len(s.alerts)
} }
func (s byAlertStateSorter) Less(i, j int) bool { func (s byAlertStateAndNameSorter) Less(i, j int) bool {
return s.alerts[i].State() > s.alerts[j].State() return s.alerts[i].State() > s.alerts[j].State() ||
(s.alerts[i].State() == s.alerts[j].State() &&
s.alerts[i].Name() < s.alerts[j].Name())
} }
func (s byAlertStateSorter) Swap(i, j int) { func (s byAlertStateAndNameSorter) Swap(i, j int) {
s.alerts[i], s.alerts[j] = s.alerts[j], s.alerts[i] s.alerts[i], s.alerts[j] = s.alerts[j], s.alerts[i]
} }