telemetry: support collecting RAID information to ... (#19171) (#19457)

pingcap · Sep 2, 2020 · 9be2237 · 9be2237
1 parent 3e26e56
commit 9be2237
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/telemetry/data_cluster_hardware.go b/telemetry/data_cluster_hardware.go
@@ -28,7 +28,7 @@ var (
 	// Explicitly list all allowed field names to avoid potential leaking sensitive info when new fields are added later.
 	sortedCPUAllowedFieldNames    = []string{"cpu-logical-cores", "cpu-physical-cores", "cpu-frequency", "cache", "cpu-vendor-id", "l1-cache-size", "l1-cache-line-size", "l2-cache-size", "l2-cache-line-size", "l3-cache-size", "l3-cache-line-size"}
 	sortedDiskAllowedFieldNames   = []string{"fstype", "opts", "total", "free", "used", "free-percent", "used-percent"} // path is not included
-	regexDiskAllowedNames         = regexp.MustCompile(`^(disk\d+s\d+|rootfs|devtmpfs|sd[a-z]\d*|vd[a-z]\d*|hd[a-z]\d*|nvme\d+(n\d+(p\d)?)?)$`)
+	regexDiskAllowedNames         = regexp.MustCompile(`^(disk\d+s\d+|rootfs|devtmpfs|sd[a-z]\d*|vd[a-z]\d*|hd[a-z]\d*|nvme\d+(n\d+(p\d)?)?|md[\da-z]+)$`)
 	sortedDiskAllowedPaths        = []string{"/", "/boot", "/dev", "/private/var/vm", "/System/Volumes/Data"}
 	sortedMemoryAllowedFieldNames = []string{"capacity"}
 )

diff --git a/telemetry/data_cluster_hardware_test.go b/telemetry/data_cluster_hardware_test.go
@@ -31,7 +31,7 @@ func (s *testClusterHardwareSuite) TestNormalizeDiskName(c *C) {
 func (s *testClusterHardwareSuite) TestIsNormalizedDiskNameAllowed(c *C) {
 	c.Parallel()
 
-	passList := []string{"disk1s4", "rootfs", "devtmpfs", "sda", "sda1", "sdb", "sdb3", "sdc", "nvme0", "nvme0n1", "nvme0n1p0"}
+	passList := []string{"disk1s4", "rootfs", "devtmpfs", "sda", "sda1", "sdb", "sdb3", "sdc", "nvme0", "nvme0n1", "nvme0n1p0", "md127", "mdisk1s4"}
 	for _, n := range passList {
 		c.Assert(isNormalizedDiskNameAllowed(n), Equals, true)
 	}