MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-23 11:55:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

remove logging for invalid metadata values (#18068)

Browse Source
This commit is contained in:
Harshavardhana 2023-09-20 15:49:55 -07:00 committed by GitHub
parent 69c0e18685
commit 9788d85ea3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/metrics-v2.go
View File

@ -3667,8 +3667,12 @@ func (c *minioClusterCollector) Collect(out chan<- prometheus.Metric) {
prometheus.GaugeValue, prometheus.GaugeValue,
float64(v), float64(v),
append(values, k)...) append(values, k)...)
if err != nil { if err != nil {
// Enable for debugging
if serverDebugLog {
logger.LogOnceIf(GlobalContext, fmt.Errorf("unable to validate prometheus metric (%w) %v:%v", err, values, metric.Histogram), "cluster-metrics-histogram") logger.LogOnceIf(GlobalContext, fmt.Errorf("unable to validate prometheus metric (%w) %v:%v", err, values, metric.Histogram), "cluster-metrics-histogram")
}
} else { } else {
out <- pmetric out <- pmetric
} }
@ -3692,7 +3696,10 @@ func (c *minioClusterCollector) Collect(out chan<- prometheus.Metric) {
metric.Value, metric.Value,
values...) values...)
if err != nil { if err != nil {
// Enable for debugging
if serverDebugLog {
logger.LogOnceIf(GlobalContext, fmt.Errorf("unable to validate prometheus metric (%w) %v", err, values), "cluster-metrics") logger.LogOnceIf(GlobalContext, fmt.Errorf("unable to validate prometheus metric (%w) %v", err, values), "cluster-metrics")
}
} else { } else {
out <- pmetric out <- pmetric
} }
@ -3890,12 +3897,10 @@ func metricsServerHandler() http.Handler {
} }
mfs, err := gatherers.Gather() mfs, err := gatherers.Gather()
if err != nil { if err != nil && len(mfs) == 0 {
if len(mfs) == 0 {
writeErrorResponseJSON(r.Context(), w, toAdminAPIErr(r.Context(), err), r.URL) writeErrorResponseJSON(r.Context(), w, toAdminAPIErr(r.Context(), err), r.URL)
return return
} }
}
contentType := expfmt.Negotiate(r.Header) contentType := expfmt.Negotiate(r.Header)
w.Header().Set("Content-Type", string(contentType)) w.Header().Set("Content-Type", string(contentType))

2
cmd/metrics.go
View File

@ -616,7 +616,7 @@ func AuthMiddleware(h http.Handler) http.Handler {
tc, ok := r.Context().Value(mcontext.ContextTraceKey).(*mcontext.TraceCtxt) tc, ok := r.Context().Value(mcontext.ContextTraceKey).(*mcontext.TraceCtxt)
claims, groups, owner, authErr := metricsRequestAuthenticate(r) claims, groups, owner, authErr := metricsRequestAuthenticate(r)
if authErr != nil || !claims.VerifyIssuer("prometheus", true) { if authErr != nil || (claims != nil && !claims.VerifyIssuer("prometheus", true)) {
if ok { if ok {
tc.FuncName = "handler.MetricsAuth" tc.FuncName = "handler.MetricsAuth"
tc.ResponseRecorder.LogErrBody = true tc.ResponseRecorder.LogErrBody = true