Merge pull request #178 from mackerelio/with-closed

Implemented according to new specification of Alerts API.
mackerelio · Nov 19, 2018 · 045c8fe · 045c8fe
2 parents c3ce947 + b78bcbd
commit 045c8fe
Showing 1 changed file with 91 additions and 11 deletions.
diff --git a/alerts.go b/alerts.go
@@ -14,18 +14,23 @@ import (
 )
 
 var commandAlerts = cli.Command{
-	Name:  "alerts",
-	Usage: "Retrieve/Close alerts",
+	Name:      "alerts",
+	Usage:     "Retrieve/Close alerts",
+	ArgsUsage: "[--with-closed | -w] [--limit | -l]",
 	Description: `
     Retrieve/Close alerts. With no subcommand specified, this will show all alerts.
     Requests APIs under "/api/v0/alerts". See https://mackerel.io/api-docs/entry/alerts .
 `,
 	Action: doAlertsRetrieve,
+	Flags: []cli.Flag{
+		cli.BoolFlag{Name: "with-closed, w", Usage: "Display open alert including close alert. default: false"},
+		cli.IntFlag{Name: "limit, l", Value: 100, Usage: "Set the number of alerts to display at once when withClosed is active. default: 100"},
+	},
 	Subcommands: []cli.Command{
 		{
 			Name:      "list",
 			Usage:     "list alerts",
-			ArgsUsage: "[--service | -s <service>] [--host-status | -S <file>] [--color | -c]",
+			ArgsUsage: "[--service | -s <service>] [--host-status | -S <file>] [--color | -c] [--with-closed | -w] [--limit | -l]",
 			Description: `
     Shows alerts in human-readable format.
 `,
@@ -42,6 +47,8 @@ var commandAlerts = cli.Command{
 					Usage: "Filters alerts by status of each host. Multiple choices are allowed.",
 				},
 				cli.BoolTFlag{Name: "color, c", Usage: "Colorize output. default: true"},
+				cli.BoolFlag{Name: "with-closed, w", Usage: "Display open alert including close alert. default: false"},
+				cli.IntFlag{Name: "limit, l", Value: 100, Usage: "Set the number of alerts to display at once when withClosed is active. default: 100"},
 			},
 		},
 		{
@@ -196,9 +203,11 @@ func formatJoinedAlert(alertSet *alertSet, colorize bool) string {
 	if colorize {
 		switch alert.Status {
 		case "CRITICAL":
-			statusMsg = color.RedString("CRITICAL")
+			statusMsg = color.RedString("CRITICAL ")
 		case "WARNING":
 			statusMsg = color.YellowString("WARNING ")
+		case "OK":
+			statusMsg = color.GreenString("OK ")
 		case "UNKNOWN":
 			statusMsg = "UNKNOWN "
 		}
@@ -231,22 +240,93 @@ func formatCheckMessage(msg string) string {
 
 func doAlertsRetrieve(c *cli.Context) error {
 	client := newMackerelFromContext(c)
+	withClosed := c.Bool("with-closed")
+	limit := c.Int("limit")
 
-	alerts, err := client.FindAlerts()
-	logger.DieIf(err)
-	PrettyPrintJSON(alerts)
+	if withClosed {
+		alerts, err := client.FindWithClosedAlerts()
+		logger.DieIf(err)
+		if alerts.NextID != "" {
+			for {
+				if limit > len(alerts.Alerts) {
+					nextAlerts, err := client.FindWithClosedAlertsByNextID(alerts.NextID)
+					logger.DieIf(err)
+					alerts.Alerts = append(alerts.Alerts, nextAlerts.Alerts...)
+					if alerts.NextID == "" {
+						break
+					}
+					time.Sleep(1 * time.Second)
+				} else {
+					break
+				}
+			}
+		}
+
+		PrettyPrintJSON(alerts)
+	} else {
+		alerts, err := client.FindAlerts()
+		logger.DieIf(err)
+		if alerts.NextID != "" {
+			for {
+				nextAlerts, err := client.FindAlertsByNextID(alerts.NextID)
+				logger.DieIf(err)
+				alerts.Alerts = append(alerts.Alerts, nextAlerts.Alerts...)
+				if alerts.NextID == "" {
+					break
+				}
+				time.Sleep(1 * time.Second)
+			}
+		}
+
+		PrettyPrintJSON(alerts)
+	}
 	return nil
 }
 
 func doAlertsList(c *cli.Context) error {
 	filterServices := c.StringSlice("service")
 	filterStatuses := c.StringSlice("host-status")
 	client := newMackerelFromContext(c)
+	withClosed := c.Bool("with-closed")
+	limit := c.Int("limit")
+	var alert []*mkr.Alert
 
-	alerts, err := client.FindAlerts()
-	logger.DieIf(err)
-	joinedAlerts := joinMonitorsAndHosts(client, alerts)
-
+	if withClosed {
+		alerts, err := client.FindWithClosedAlerts()
+		logger.DieIf(err)
+		if alerts.NextID != "" {
+			for {
+				if limit > len(alerts.Alerts) {
+					nextAlerts, err := client.FindWithClosedAlertsByNextID(alerts.NextID)
+					logger.DieIf(err)
+					alerts.Alerts = append(alerts.Alerts, nextAlerts.Alerts...)
+					if alerts.NextID == "" {
+						break
+					}
+					time.Sleep(1 * time.Second)
+				} else {
+					break
+				}
+			}
+		}
+		alert = alerts.Alerts
+	} else {
+		alerts, err := client.FindAlerts()
+		logger.DieIf(err)
+		if alerts.NextID != "" {
+			for {
+				nextAlerts, err := client.FindAlertsByNextID(alerts.NextID)
+				logger.DieIf(err)
+				alerts.Alerts = append(alerts.Alerts, nextAlerts.Alerts...)
+				if alerts.NextID == "" {
+					break
+				}
+				time.Sleep(1 * time.Second)
+			}
+		}
+		alert = alerts.Alerts
+	}
+	joinedAlerts := joinMonitorsAndHosts(client, alert)
 	for _, joinAlert := range joinedAlerts {
 		if len(filterServices) > 0 {
 			found := false