RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2024-12-28 00:52:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make --expired list only expired silences (#1176) (#1190)

Browse Source 
This means there's no longer a way to list both active and expired
silences at the same time. This is the desired behaviour according to
consensus at https://github.com/prometheus/alertmanager/pull/1175
This commit is contained in:
Thomás S. Bregolin 2018-01-12 09:35:06 +00:00 committed by stuart nelson
parent 907ac510f8
commit cdb44955cf
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cli/silence_query.go
View File

@ -17,9 +17,9 @@ import (
var (
queryCmd = silenceCmd.Command("query", "Query Alertmanager silences.").Default()
queryExpired = queryCmd.Flag("expired", "Show expired silences as well as active").Bool()
queryExpired = queryCmd.Flag("expired", "Show expired silences instead of active").Bool()
silenceQuery = queryCmd.Arg("matcher-groups", "Query filter").Strings()
queryWithin = queryCmd.Flag("within", "Show silences that will expire within a duration").Duration()
queryWithin = queryCmd.Flag("within", "Show silences that will expire or have expired within a duration").Duration()
)
func init() {
@ -106,12 +106,20 @@ func query(element *kingpin.ParseElement, ctx *kingpin.ParseContext) error {
displaySilences := []types.Silence{}
for _, silence := range fetchedSilences {
// If we are only returning current silences and this one has already expired skip it
// skip expired silences if --expired is not set
if !*queryExpired && silence.EndsAt.Before(time.Now()) {
continue
}
if int64(*queryWithin) > 0 && silence.EndsAt.After(time.Now().UTC().Add(*queryWithin)) {
// skip active silences if --expired is set
if *queryExpired && silence.EndsAt.After(time.Now()) {
continue
}
// skip active silences expiring after "--within"
if !*queryExpired && int64(*queryWithin) > 0 && silence.EndsAt.After(time.Now().UTC().Add(*queryWithin)) {
continue
}
// skip silences that expired before "--within"
if *queryExpired && int64(*queryWithin) > 0 && silence.EndsAt.Before(time.Now().UTC().Add(-*queryWithin)) {
continue
}