Merge c49a8d8 into bad9de5

mackerelio · Nov 26, 2018 · c361633 · c361633
2 parents bad9de5 + c49a8d8
commit c361633
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/alerts.go b/alerts.go
@@ -263,7 +263,10 @@ func doAlertsRetrieve(c *cli.Context) error {
 			}
 		}
 
-		PrettyPrintJSON(alerts.Alerts[:limit])
+		if len(alerts.Alerts) > limit {
+			alerts.Alerts = alerts.Alerts[:limit]
+		}
+		PrettyPrintJSON(alerts.Alerts)
 	} else {
 		alerts, err := client.FindAlerts()
 		logger.DieIf(err)
@@ -280,7 +283,10 @@ func doAlertsRetrieve(c *cli.Context) error {
 			}
 		}
 
-		PrettyPrintJSON(alerts.Alerts[:limit])
+		if len(alerts.Alerts) > limit {
+			alerts.Alerts = alerts.Alerts[:limit]
+		}
+		PrettyPrintJSON(alerts.Alerts)
 	}
 	return nil
 }
@@ -312,7 +318,10 @@ func doAlertsList(c *cli.Context) error {
 				}
 			}
 		}
-		alert = alerts.Alerts[:limit]
+		alert = alerts.Alerts
+		if len(alert) > limit {
+			alert = alert[:limit]
+		}
 	} else {
 		alerts, err := client.FindAlerts()
 		logger.DieIf(err)
@@ -328,7 +337,10 @@ func doAlertsList(c *cli.Context) error {
 				time.Sleep(1 * time.Second)
 			}
 		}
-		alert = alerts.Alerts[:limit]
+		alert = alerts.Alerts
+		if len(alert) > limit {
+			alert = alert[:limit]
+		}
 	}
 	joinedAlerts := joinMonitorsAndHosts(client, alert)
 	for _, joinAlert := range joinedAlerts {