MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-05-21 17:43:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add bucket and object count along with total object size (#8639)

Browse Source
This commit is contained in:
Ashish Kumar Sinha 2019-12-12 23:28:33 +05:30 committed by Harshavardhana
parent c364f0af6c
commit abc266caa1
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cmd/admin-handlers.go
View File

@ -1307,12 +1307,20 @@ func (a adminAPIHandlers) ServerInfoHandler(w http.ResponseWriter, r *http.Reque
return return
} }
infoMsg := madmin.InfoMessage{} buckets := madmin.Buckets{}
vault := madmin.Vault{} objects := madmin.Objects{}
if GlobalKMS != nil { usage := madmin.Usage{}
vault = fetchVaultStatus(cfg)
dataUsageInfo, err := loadDataUsageFromBackend(ctx, objectAPI)
if err == nil {
buckets = madmin.Buckets{Count: dataUsageInfo.BucketsCount}
objects = madmin.Objects{Count: dataUsageInfo.ObjectsCount}
usage = madmin.Usage{Size: dataUsageInfo.ObjectsTotalSize}
} }
infoMsg := madmin.InfoMessage{}
vault := fetchVaultStatus(cfg)
ldap := madmin.LDAP{} ldap := madmin.LDAP{}
if globalLDAPConfig.Enabled { if globalLDAPConfig.Enabled {
ldapConn, err := globalLDAPConfig.Connect() ldapConn, err := globalLDAPConfig.Connect()
@ -1407,9 +1415,6 @@ func (a adminAPIHandlers) ServerInfoHandler(w http.ResponseWriter, r *http.Reque
} }
domain := globalDomainNames domain := globalDomainNames
buckets := madmin.Buckets{}
objects := madmin.Objects{}
usage := madmin.Usage{}
services := madmin.Services{ services := madmin.Services{
Vault: vault, Vault: vault,
LDAP: ldap, LDAP: ldap,
@ -1446,7 +1451,7 @@ func (a adminAPIHandlers) ServerInfoHandler(w http.ResponseWriter, r *http.Reque
func fetchLambdaInfo(cfg config.Config) []map[string][]madmin.TargetIDStatus { func fetchLambdaInfo(cfg config.Config) []map[string][]madmin.TargetIDStatus {
lambdaMap := make(map[string][]madmin.TargetIDStatus) lambdaMap := make(map[string][]madmin.TargetIDStatus)
targetList, _ := notify.GetNotificationTargets(cfg, GlobalServiceDoneCh, globalRootCAs) targetList, _ := notify.GetNotificationTargets(cfg, GlobalServiceDoneCh, NewCustomHTTPTransport())
for targetID, target := range targetList.TargetMap() { for targetID, target := range targetList.TargetMap() {
targetIDStatus := make(map[string]madmin.Status) targetIDStatus := make(map[string]madmin.Status)

4
pkg/madmin/info-commands.go
View File

@ -408,12 +408,12 @@ type Services struct {
// Buckets contains the number of buckets // Buckets contains the number of buckets
type Buckets struct { type Buckets struct {
Count int `json:"count,omitempty"` Count uint64 `json:"count,omitempty"`
} }
// Objects contains the number of objects // Objects contains the number of objects
type Objects struct { type Objects struct {
Count int `json:"count,omitempty"` Count uint64 `json:"count,omitempty"`
} }
// Usage contains the tottal size used // Usage contains the tottal size used