diff --git a/pkg/cli/cli_test.go b/pkg/cli/cli_test.go index b0713c41f4bf..5cda14260c7d 100644 --- a/pkg/cli/cli_test.go +++ b/pkg/cli/cli_test.go @@ -2293,6 +2293,7 @@ writing ` + os.DevNull + ` debug/gossip/liveness debug/gossip/nodes debug/metrics + debug/alerts debug/nodes/1/status debug/nodes/1/gossip debug/nodes/1/stacks diff --git a/pkg/cli/zip.go b/pkg/cli/zip.go index 0e19e8431b98..be2ffc5419aa 100644 --- a/pkg/cli/zip.go +++ b/pkg/cli/zip.go @@ -25,6 +25,7 @@ import ( "sort" "time" + "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/cockroachdb/cockroach/pkg/server/serverpb" @@ -103,6 +104,7 @@ func runDebugZip(cmd *cobra.Command, args []string) error { eventsName = base + "/events" gossipLName = base + "/gossip/liveness" gossipNName = base + "/gossip/nodes" + alertsName = base + "/alerts" livenessName = base + "/liveness" metricsName = base + "/metrics" nodesPrefix = base + "/nodes" @@ -204,19 +206,16 @@ func runDebugZip(cmd *cobra.Command, args []string) error { } } - { - queryLiveness := "SELECT * FROM crdb_internal.gossip_liveness;" - queryNodes := "SELECT * FROM crdb_internal.gossip_nodes;" - queryMetrics := "SELECT * FROM crdb_internal.node_metrics;" - - if err := dumpTableDataForZip(z, sqlConn, queryLiveness, gossipLName); err != nil { - return err - } - if err := dumpTableDataForZip(z, sqlConn, queryNodes, gossipNName); err != nil { - return err - } - if err := dumpTableDataForZip(z, sqlConn, queryMetrics, metricsName); err != nil { - return err + for _, item := range []struct { + query, name string + }{ + {"SELECT * FROM crdb_internal.gossip_liveness;", gossipLName}, + {"SELECT * FROM crdb_internal.gossip_nodes;", gossipNName}, + {"SELECT * FROM crdb_internal.node_metrics;", metricsName}, + {"SELECT * FROM crdb_internal.gossip_alerts;", alertsName}, + } { + if err := dumpTableDataForZip(z, sqlConn, item.query, item.name); err != nil { + return errors.Wrap(err, item.name) } }