Merge e0bc981 into 045c8fe

mackerelio · Nov 22, 2018 · 455ed25 · 455ed25
2 parents 045c8fe + e0bc981
commit 455ed25
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/alerts.go b/alerts.go
@@ -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
 					}
@@ -262,7 +263,7 @@ func doAlertsRetrieve(c *cli.Context) error {
 			}
 		}
 
-		PrettyPrintJSON(alerts)
+		PrettyPrintJSON(alerts.Alerts[:limit])
 	} else {
 		alerts, err := client.FindAlerts()
 		logger.DieIf(err)
@@ -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
 }
@@ -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
 					}
@@ -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)
@@ -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 {