Merge e0182b85e0 into 534f4a9fb1

cmd/config-current.go

@@ -523,6 +523,7 @@ func lookupConfigs(s config.Config, objAPI ObjectLayer) {
 		configLogIf(ctx, fmt.Errorf("Invalid site configuration: %w", err))
 	}
 	globalSite.Update(siteCfg)
+	xhttp.SetSiteName(globalSite.Name())
 
 	globalAutoEncryption = crypto.LookupAutoEncryption() // Enable auto-encryption if enabled
 	if globalAutoEncryption && GlobalKMS == nil {

cmd/data-scanner-metric.go

@@ -106,16 +106,14 @@ func (p *scannerMetrics) log(s scannerMetric, paths ...string) func(custom map[s
 
 // time n scanner actions.
 // Use for s < scannerMetricLastRealtime
-func (p *scannerMetrics) timeN(s scannerMetric) func(n int) func() {
+func (p *scannerMetrics) timeN(s scannerMetric) func(n int) {
 	startTime := time.Now()
-	return func(n int) func() {
-		return func() {
-			duration := time.Since(startTime)
+	return func(n int) {
+		duration := time.Since(startTime)
 
-			atomic.AddUint64(&p.operations[s], uint64(n))
-			if s < scannerMetricLastRealtime {
-				p.latency[s].add(duration)
-			}
+		atomic.AddUint64(&p.operations[s], uint64(n))
+		if s < scannerMetricLastRealtime {
+			p.latency[s].add(duration)
 		}
 	}
 }

internal/http/server.go

@@ -37,6 +37,9 @@ var (
 
 	// GlobalDeploymentID - is sent in the header to all http targets
 	GlobalDeploymentID string
+
+	// GlobalSiteName - is sent in the header to all http targets
+	GlobalSiteName string
 )
 
 const (
@@ -236,3 +239,8 @@ func SetMinIOVersion(version string) {
 func SetDeploymentID(deploymentID string) {
 	GlobalDeploymentID = deploymentID
 }
+
+// SetSiteName -- user defined site from environment variable `MINIO_SITE_NAME` or from configuration `site.name`
+func SetSiteName(siteName string) {
+	GlobalSiteName = siteName
+}

internal/logger/audit.go

@@ -52,6 +52,7 @@ func GetAuditEntry(ctx context.Context) *audit.Entry {
 		r = &audit.Entry{
 			Version:      internalAudit.Version,
 			DeploymentID: xhttp.GlobalDeploymentID,
+			SiteName:     xhttp.GlobalSiteName,
 			Time:         time.Now().UTC(),
 		}
 		return r

internal/logger/message/audit/entry.go

@@ -36,6 +36,7 @@ func NewEntry(deploymentID string) audit.Entry {
 	return audit.Entry{
 		Version:      Version,
 		DeploymentID: deploymentID,
+		SiteName:     xhttp.GlobalSiteName,
 		Time:         time.Now().UTC(),
 	}
 }