mirrors/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2025-11-28 06:01:08 +01:00
Code Issues Projects Releases Wiki Activity

VAULT-34541 CE changes (#29920)

Browse Source
This commit is contained in:
Violet Hynes 2025-03-18 16:01:59 -04:00 committed by GitHub
parent 02ea49b1fc
commit bbaaa3f76e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/sys_utilization_report.go
View File

@ -53,6 +53,8 @@ type UtilizationReportOutput struct {
AuthMethods map[string]int `json:"auth_methods,omitempty" structs:"auth_methods" mapstructure:"auth_methods"`
SecretEngines map[string]int `json:"secret_engines,omitempty" structs:"secret_engines" mapstructure:"secret_engines"`
LeasesByAuthMethod map[string]int `json:"leases_by_auth_method,omitempty" structs:"leases_by_auth_method" mapstructure:"leases_by_auth_method"`
ReplicationStatus *UtilizationReportReplicationStatusInformation `json:"replication_status,omitempty" structs:"replication_status" mapstructure:"replication_status"`
PKI *UtilizationReportPKIInformation `json:"pki,omitempty" structs:"pki" mapstructure:"pki"`

29
vault/core_metrics.go
View File

@ -650,6 +650,35 @@ func (c *Core) GetAuthMethodUsageMetrics() map[string]int {
return mounts
}
// GetAuthMethodLeaseCounts returns a map of auth mount types to the number of leases those mounts have.
func (c *Core) GetAuthMethodLeaseCounts() (map[string]int, error) {
mounts := make(map[string]int)
c.authLock.RLock()
defer c.authLock.RUnlock()
for _, entry := range c.auth.Entries {
authType := entry.Type
if authType == mountTypeNSToken {
authType = pluginconsts.AuthTypeToken
}
mountPath := fmt.Sprintf("%s/%s", credentialTableType, entry.Path)
keys, err := logical.CollectKeysWithPrefix(c.expiration.quitContext, c.expiration.leaseView(entry.namespace), mountPath)
if err != nil {
return nil, err
}
if _, ok := mounts[authType]; !ok {
mounts[authType] = len(keys)
} else {
mounts[authType] += len(keys)
}
}
return mounts, nil
}
// GetKvUsageMetrics returns a map of namespace paths to KV secret counts within those namespaces.
func (c *Core) GetKvUsageMetrics(ctx context.Context, kvVersion string) (map[string]int, error) {
mounts := c.findKvMounts()