aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchrislu <chris.lu@gmail.com>2025-07-02 23:31:17 -0700
committerchrislu <chris.lu@gmail.com>2025-07-02 23:31:17 -0700
commit645b6d2603ae41e78ba5eb72f3a47e7c848fc82d (patch)
tree9bf93968c2a1bcb91d42cee07e48df5307834bc4
parent5e6d94319bb5c1435b94c80f013adc88ef605c47 (diff)
downloadseaweedfs-645b6d2603ae41e78ba5eb72f3a47e7c848fc82d.tar.xz
seaweedfs-645b6d2603ae41e78ba5eb72f3a47e7c848fc82d.zip
weed admin: disk types card can also show all disk type values, not just a count.
-rw-r--r--weed/admin/dash/admin_server.go12
-rw-r--r--weed/admin/view/app/cluster_volumes.templ2
-rw-r--r--weed/admin/view/app/cluster_volumes_templ.go2
3 files changed, 13 insertions, 3 deletions
diff --git a/weed/admin/dash/admin_server.go b/weed/admin/dash/admin_server.go
index 7e36b58a1..ad1a7f74d 100644
--- a/weed/admin/dash/admin_server.go
+++ b/weed/admin/dash/admin_server.go
@@ -168,6 +168,9 @@ type ClusterVolumesData struct {
// All versions when multiple exist
AllVersions []string `json:"all_versions"`
+ // All disk types when multiple exist
+ AllDiskTypes []string `json:"all_disk_types"`
+
// Filtering
FilterCollection string `json:"filter_collection"`
}
@@ -942,7 +945,7 @@ func (s *AdminServer) GetClusterVolumes(page int, pageSize int, sortBy string, s
showVersionColumn := versionCount > 1
var singleDataCenter, singleRack, singleDiskType, singleCollection, singleVersion string
- var allVersions []string
+ var allVersions, allDiskTypes []string
if dataCenterCount == 1 {
for dc := range dataCenterMap {
@@ -961,6 +964,12 @@ func (s *AdminServer) GetClusterVolumes(page int, pageSize int, sortBy string, s
singleDiskType = diskType
break
}
+ } else {
+ // Collect all disk types and sort them
+ for diskType := range diskTypeMap {
+ allDiskTypes = append(allDiskTypes, diskType)
+ }
+ sort.Strings(allDiskTypes)
}
if collectionCount == 1 {
for collection := range collectionMap {
@@ -1007,6 +1016,7 @@ func (s *AdminServer) GetClusterVolumes(page int, pageSize int, sortBy string, s
SingleCollection: singleCollection,
SingleVersion: singleVersion,
AllVersions: allVersions,
+ AllDiskTypes: allDiskTypes,
FilterCollection: collection,
}, nil
}
diff --git a/weed/admin/view/app/cluster_volumes.templ b/weed/admin/view/app/cluster_volumes.templ
index 312202f22..445de35b9 100644
--- a/weed/admin/view/app/cluster_volumes.templ
+++ b/weed/admin/view/app/cluster_volumes.templ
@@ -161,7 +161,7 @@ templ ClusterVolumes(data dash.ClusterVolumesData) {
if data.DiskTypeCount == 1 {
{data.SingleDiskType}
} else {
- {fmt.Sprintf("%d", data.DiskTypeCount)}
+ {strings.Join(data.AllDiskTypes, ", ")}
}
</div>
</div>
diff --git a/weed/admin/view/app/cluster_volumes_templ.go b/weed/admin/view/app/cluster_volumes_templ.go
index 8194bee08..b2b88ca17 100644
--- a/weed/admin/view/app/cluster_volumes_templ.go
+++ b/weed/admin/view/app/cluster_volumes_templ.go
@@ -262,7 +262,7 @@ func ClusterVolumes(data dash.ClusterVolumesData) templ.Component {
}
} else {
var templ_7745c5c3_Var11 string
- templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%d", data.DiskTypeCount))
+ templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(strings.Join(data.AllDiskTypes, ", "))
if templ_7745c5c3_Err != nil {
return templ.Error{Err: templ_7745c5c3_Err, FileName: `view/app/cluster_volumes.templ`, Line: 164, Col: 78}
}