[TiDB Dashboard] Playground deploys seperated dashboard server by default. Other improvements.

embed/examples/cluster/local.tpl

@@ -62,4 +62,10 @@ alertmanager_servers:
  {{- range .AlertManagerServers }}
   - host: {{ . }}
 {{- end }}
-{{ end }}
+{{ end }}
+{{- if .TidbDashboardServers }}
+tidb_dashboard_servers:
+ {{- range .TidbDashboardServers }}
+  - host: {{ . }}
+{{- end }}
+{{ end }}

embed/examples/cluster/minimal.yaml

@@ -258,3 +258,20 @@ alertmanager_servers:
     # data_dir: "/tidb-data/alertmanager-9093"
     # # Alertmanager log file storage directory.
     # log_dir: "/tidb-deploy/alertmanager-9093/log"
+
+# # Server configs are used to specify the configuration of TiDB Dashboard Servers.
+tidb_dashboard_servers:
+  # # The ip address of the PD Server.
+  - host: 10.0.1.11
+    # # SSH port of the server.
+    # ssh_port: 22
+    # # port of TiDB Dashboard
+    # port: 2380
+    # # TiDB Dashboard deployment file, startup script, configuration file storage directory.
+    # deploy_dir: "/tidb-deploy/tidb-dashboard-23333"
+    # # PD Server data storage directory.
+    # data_dir: "/tidb-data/tidb-dashboard-23333"
+    # # PD Server log file storage directory.
+    # log_dir: "/tidb-deploy/tidb-dashboard-23333/log"
+    # # numa node bindings.
+    # numa_node: "0,1"

embed/examples/cluster/multi-dc.yaml

@@ -61,7 +61,7 @@ server_configs:
   # tiflash-learner:
   pd:
     # # Label level settings.
-    replication.location-labels: ["zone","dc","rack","host"]
+    replication.location-labels: [ "zone","dc","rack","host" ]
     # # Number of replicas of TiKV data
     replication.max-replicas: 5
     # # Prohibit the leader be scheduled to the specified label place.
@@ -310,3 +310,20 @@ alertmanager_servers:
     # data_dir: "/tidb-data/alertmanager-9093"
     # # Alertmanager log file storage directory.
     # log_dir: "/tidb-deploy/alertmanager-9093/log"
+
+# # Server configs are used to specify the configuration of TiDB Dashboard Servers.
+tidb_dashboard_servers:
+  # # The ip address of the PD Server.
+  - host: 10.0.1.11
+    # # SSH port of the server.
+    # ssh_port: 22
+    # # port of TiDB Dashboard
+    # port: 2380
+    # # TiDB Dashboard deployment file, startup script, configuration file storage directory.
+    # deploy_dir: "/tidb-deploy/tidb-dashboard-23333"
+    # # PD Server data storage directory.
+    # data_dir: "/tidb-data/tidb-dashboard-23333"
+    # # PD Server log file storage directory.
+    # log_dir: "/tidb-deploy/tidb-dashboard-23333/log"
+    # # numa node bindings.
+    # numa_node: "0,1"

embed/examples/cluster/topology.example.yaml

@@ -296,7 +296,7 @@ kvcdc_servers:
 
 # # Server configs are used to specify the configuration of TiDB Dashboard Servers.
 tidb_dashboard_servers:
-  # # The ip address of the PD Server.
+  # # The ip address of the TiDB Dashboard server.
   - host: 10.0.1.11
     # # SSH port of the server.
     # ssh_port: 22

embed/templates/scripts/run_tidb-dashboard.sh.tpl

@@ -17,7 +17,12 @@ exec bin/tidb-dashboard \
     --port="{{.Port}}" \
     --pd="{{.PD}}" \
     --data-dir="{{.DataDir}}" \
-{{- if .TLSEnabled}}
+{{- if .ClusterTLSEnabled}}
+    --tidb-ca tls/ca.crt \
+    --tidb-cert tls/tidb-dashboard.crt \
+    --tidb-key tls/tidb-dashboard.pem \
+{{- end}}
+{{- if .MysqlClientTLSEnabled}}
     --tidb-ca tls/ca.crt \
     --tidb-cert tls/tidb-dashboard.crt \
     --tidb-key tls/tidb-dashboard.pem \

pkg/cluster/spec/dashboard.go

@@ -168,15 +168,16 @@ func (i *DashboardInstance) InitConfig(
 		pds = append(pds, pdspec.GetAdvertiseClientURL(enableTLS))
 	}
 	cfg := &scripts.DashboardScript{
-		TidbVersion: clusterVersion,
-		IP:          i.GetHost(),
-		DeployDir:   paths.Deploy,
-		DataDir:     paths.Data[0],
-		LogDir:      paths.Log,
-		Port:        spec.Port,
-		NumaNode:    spec.NumaNode,
-		PD:          strings.Join(pds, ","),
-		TLSEnabled:  enableTLS,
+		TidbVersion:       clusterVersion,
+		IP:                i.GetHost(),
+		DeployDir:         paths.Deploy,
+		DataDir:           paths.Data[0],
+		LogDir:            paths.Log,
+		Port:              spec.Port,
+		NumaNode:          spec.NumaNode,
+		PD:                strings.Join(pds, ","),
+		ClusterTLSEnabled: enableTLS,
+		ClusterTLSCAPath:  "placeholder",
 	}
 
 	fp := filepath.Join(paths.Cache, fmt.Sprintf("run_tidb-dashboard_%s_%d.sh", i.GetHost(), i.GetPort()))
@@ -203,7 +204,10 @@ func (i *DashboardInstance) InitConfig(
 	return checkConfig(ctx, e, i.ComponentName(), clusterVersion, i.OS(), i.Arch(), i.ComponentName()+".toml", paths, nil)
 }
 
-// setTLSConfig set TLS Config to support enable/disable TLS
-func (i *DashboardInstance) setTLSConfig(ctx context.Context, enableTLS bool, configs map[string]any, paths meta.DirPaths) (map[string]any, error) {
-	return nil, nil
+func (i *DashboardInstance) setClusterTLS() {
+
+}
+
+func (i *DashboardInstance) setMysqlClientTLS() {
+
 }

pkg/cluster/template/scripts/dashboard.go

@@ -22,17 +22,30 @@ import (
 	"github.com/pingcap/tiup/embed"
 )
 
-// DashboardScript represent the data to generate cdc config
+// DashboardScript represents the data structure for generating startup shell scripts,
+// with the help of Go Templates.
 type DashboardScript struct {
-	TidbVersion string
-	IP          string
-	Port        int
-	DeployDir   string
-	LogDir      string
-	DataDir     string
-	NumaNode    string
-	TLSEnabled  bool
-	PD          string
+	TidbVersion  string
+	IP           string
+	Port         int
+	DeployDir    string
+	LogDir       string
+	DataDir      string
+	NumaNode     string
+	PD           string
+	Telemetry    bool
+	Experimental bool
+	PathPrefix   string
+
+	ClusterTLSEnabled  bool
+	ClusterTLSCAPath   string
+	ClusterTLSCertPath string
+	ClusterTLSKeyPath  string
+
+	MysqlClientTLSEnabled  bool
+	MysqlClientTLSCAPath   string
+	MysqlClientTLSCertPath string
+	MysqlClientTLSKeyPath  string
 }
 
 // ConfigToFile write config content to specific file.