Merge branch 'master' into grant-cap-net-raw-on-blacbox-exporter

Makefile

@@ -85,6 +85,7 @@ tidy:
 clean:
 	@rm -rf bin
 	@rm -rf cover
+	@rm -rf tests/*/{bin/*.test,logs,cover/*.out}
 
 test: failpoint-enable run-tests failpoint-disable
 

components/cluster/command/display.go

@@ -80,6 +80,7 @@ func newDisplayCmd() *cobra.Command {
 
 	cmd.Flags().StringSliceVarP(&gOpt.Roles, "role", "R", nil, "Only display specified roles")
 	cmd.Flags().StringSliceVarP(&gOpt.Nodes, "node", "N", nil, "Only display specified nodes")
+	cmd.Flags().BoolVar(&gOpt.ShowUptime, "uptime", false, "Display with uptime")
 	cmd.Flags().BoolVar(&showDashboardOnly, "dashboard", false, "Only display TiDB Dashboard information")
 	cmd.Flags().BoolVar(&showVersionOnly, "version", false, "Only display TiDB cluster version")
 

components/dm/command/display.go

@@ -54,6 +54,7 @@ func newDisplayCmd() *cobra.Command {
 	cmd.Flags().StringSliceVarP(&gOpt.Roles, "role", "R", nil, "Only display specified roles")
 	cmd.Flags().StringSliceVarP(&gOpt.Nodes, "node", "N", nil, "Only display specified nodes")
 	cmd.Flags().BoolVar(&showVersionOnly, "version", false, "Only display DM cluster version")
+	cmd.Flags().BoolVar(&gOpt.ShowUptime, "uptime", false, "Display DM with uptime")
 
 	return cmd
 }

components/dm/spec/bindversion.go

@@ -8,7 +8,9 @@ func DMComponentVersion(comp, version string) string {
 	switch comp {
 	case spec.ComponentAlertmanager,
 		spec.ComponentGrafana,
-		spec.ComponentPrometheus:
+		spec.ComponentPrometheus,
+		spec.ComponentBlackboxExporter,
+		spec.ComponentNodeExporter:
 		return ""
 	default:
 		return version

components/dm/spec/logic.go

@@ -15,9 +15,11 @@ package spec
 
 import (
 	"context"
+	"crypto/tls"
 	"fmt"
 	"path/filepath"
 	"strings"
+	"time"
 
 	"github.com/pingcap/tiup/pkg/logger/log"
 	"github.com/pingcap/tiup/pkg/meta"
@@ -88,6 +90,9 @@ func (c *DMMasterComponent) Instances() []Instance {
 					s.DataDir,
 				},
 				StatusFn: s.Status,
+				UptimeFn: func(tlsCfg *tls.Config) time.Duration {
+					return spec.UptimeByHost(s.Host, s.Port, tlsCfg)
+				},
 			},
 			topo: c.Topology,
 		})
@@ -216,6 +221,9 @@ func (c *DMWorkerComponent) Instances() []Instance {
 					s.DataDir,
 				},
 				StatusFn: s.Status,
+				UptimeFn: func(tlsCfg *tls.Config) time.Duration {
+					return spec.UptimeByHost(s.Host, s.Port, tlsCfg)
+				},
 			},
 			topo: c.Topology,
 		})
@@ -294,7 +302,7 @@ func (topo *Specification) GetGlobalOptions() spec.GlobalOptions {
 
 // GetMonitoredOptions returns MonitoredOptions
 func (topo *Specification) GetMonitoredOptions() *spec.MonitoredOptions {
-	return nil
+	return topo.MonitoredOptions
 }
 
 // ComponentsByStopOrder return component in the order need to stop.