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

Jump to bottom

Fixed issue where nextID was not inherited #179

Merged
merged 3 commits into from
Nov 22, 2018
Merged

Fixed issue where nextID was not inherited #179

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9907fdf
Fixed issue where nextID was not inherited
Nov 21, 2018
f23c7ca
Fixed to show only alerts
Nov 22, 2018
e0bc981
Fixed an issue where LIMIT was not working properly
Nov 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 8 additions & 4 deletions alerts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@ func doAlertsRetrieve(c *cli.Context) error {
nextAlerts, err := client.FindWithClosedAlertsByNextID(alerts.NextID)
logger.DieIf(err)
alerts.Alerts = append(alerts.Alerts, nextAlerts.Alerts...)
alerts.NextID = nextAlerts.NextID
if alerts.NextID == "" {
break
}
Expand All @@ -262,7 +263,7 @@ func doAlertsRetrieve(c *cli.Context) error {
}
}

PrettyPrintJSON(alerts)
PrettyPrintJSON(alerts.Alerts[:limit])
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The output format is now the same as the latest released version 👍

} else {
alerts, err := client.FindAlerts()
logger.DieIf(err)
Expand All @@ -271,14 +272,15 @@ func doAlertsRetrieve(c *cli.Context) error {
nextAlerts, err := client.FindAlertsByNextID(alerts.NextID)
logger.DieIf(err)
alerts.Alerts = append(alerts.Alerts, nextAlerts.Alerts...)
alerts.NextID = nextAlerts.NextID
if alerts.NextID == "" {
break
}
time.Sleep(1 * time.Second)
}
}

PrettyPrintJSON(alerts)
PrettyPrintJSON(alerts.Alerts[:limit])
}
return nil
}
Expand All @@ -300,6 +302,7 @@ func doAlertsList(c *cli.Context) error {
nextAlerts, err := client.FindWithClosedAlertsByNextID(alerts.NextID)
logger.DieIf(err)
alerts.Alerts = append(alerts.Alerts, nextAlerts.Alerts...)
alerts.NextID = nextAlerts.NextID
if alerts.NextID == "" {
break
}
Expand All @@ -309,7 +312,7 @@ func doAlertsList(c *cli.Context) error {
}
}
}
alert = alerts.Alerts
alert = alerts.Alerts[:limit]
} else {
alerts, err := client.FindAlerts()
logger.DieIf(err)
Expand All @@ -318,13 +321,14 @@ func doAlertsList(c *cli.Context) error {
nextAlerts, err := client.FindAlertsByNextID(alerts.NextID)
logger.DieIf(err)
alerts.Alerts = append(alerts.Alerts, nextAlerts.Alerts...)
alerts.NextID = nextAlerts.NextID
if alerts.NextID == "" {
break
}
time.Sleep(1 * time.Second)
}
}
alert = alerts.Alerts
alert = alerts.Alerts[:limit]
}
joinedAlerts := joinMonitorsAndHosts(client, alert)
for _, joinAlert := range joinedAlerts {
Expand Down