Skip to content

Fix alert state when no alerts are included #152

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

Open
martialblog wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix alert state when no alerts are included #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion cmd/alert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@ inactive = 0`,
}

var overall goresult.Overall
// We need to count how many times we added an alert for the no-alerts-state
var counterPartialResult int

for _, rl := range rules {
// If it's not the Alert we're looking for, Skip!
Expand Down Expand Up @@ -172,6 +174,8 @@ inactive = 0`,
sc.SetState(rlStatus)
sc.SetOutput(rl.GetOutput())
overall.AddSubcheck(sc)

counterPartialResult++
}

// Handle active alerts
Expand Down Expand Up @@ -225,6 +229,8 @@ inactive = 0`,
rl.Alert = alert
sc.SetOutput(rl.GetOutput())
overall.AddSubcheck(sc)

counterPartialResult++
}
}
}
Expand All @@ -239,7 +245,7 @@ inactive = 0`,
}

// When there are no alerts we add an empty PartialResult just to have consistent output
if counterAlert == 0 {
if counterPartialResult == 0 {
sc := goresult.NewPartialResult()
sc.SetDefaultState(noAlertsState)
sc.SetOutput("No alerts retrieved")
Expand Down
13 changes: 13 additions & 0 deletions cmd/alert_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,19 @@ exit status 2
\_ [CRITICAL] [BlackboxTLS] - Job: [blackbox] on Instance: [https://localhost:443] is firing - value: -6065338.00 - {"alertname":"TLS","icinga":"ok","instance":"https://localhost:443","job":"blackbox","severity":"critical","team":"network"}
|total=3 firing=1 pending=1 inactive=1
exit status 2
`,
},
{
name: "alert-include-label-no-alerts-state",
server: httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusOK)
w.Write(loadTestdata(alertTestDataSet1))
})),
args: []string{"run", "../main.go", "alert", "--include-label", "foo=bar", "--no-alerts-state", "1", "-P", "true"},
expected: `[WARNING] - No alerts retrieved
\_ [WARNING] No alerts retrieved
|total=2 firing=1 pending=1 inactive=0
exit status 1
`,
},
{
Expand Down
Loading