Kiu/Node_Exporter
Kiu/Node_Exporter
1
0
Fork 0
mirror of https://github.com/prometheus/node_exporter.git synced 2024-11-23 20:36:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix promhttp_metric_handler_errors_total metric not being disabled by flag

Browse Source 
Signed-off-by: ToMe25 <ToMe25@gmx.de>
This commit is contained in:
ToMe25 2023-09-22 18:07:18 +02:00
parent e8c5110ada
commit db3a43783a
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
node_exporter.go
View File

@ -123,7 +123,10 @@ func (h *handler) innerHandler(filters ...string) (http.Handler, error) {
if err := r.Register(nc); err != nil { if err := r.Register(nc); err != nil {
return nil, fmt.Errorf("couldn't register node collector: %s", err) return nil, fmt.Errorf("couldn't register node collector: %s", err)
} }
handler := promhttp.HandlerFor(
var handler http.Handler
if h.includeExporterMetrics {
handler = promhttp.HandlerFor(
prometheus.Gatherers{h.exporterMetricsRegistry, r}, prometheus.Gatherers{h.exporterMetricsRegistry, r},
promhttp.HandlerOpts{ promhttp.HandlerOpts{
ErrorLog: stdlog.New(log.NewStdlibAdapter(level.Error(h.logger)), "", 0), ErrorLog: stdlog.New(log.NewStdlibAdapter(level.Error(h.logger)), "", 0),
@ -132,13 +135,22 @@ func (h *handler) innerHandler(filters ...string) (http.Handler, error) {
Registry: h.exporterMetricsRegistry, Registry: h.exporterMetricsRegistry,
}, },
) )
if h.includeExporterMetrics {
// Note that we have to use h.exporterMetricsRegistry here to // Note that we have to use h.exporterMetricsRegistry here to
// use the same promhttp metrics for all expositions. // use the same promhttp metrics for all expositions.
handler = promhttp.InstrumentMetricHandler( handler = promhttp.InstrumentMetricHandler(
h.exporterMetricsRegistry, handler, h.exporterMetricsRegistry, handler,
) )
} else {
handler = promhttp.HandlerFor(
r,
promhttp.HandlerOpts{
ErrorLog: stdlog.New(log.NewStdlibAdapter(level.Error(h.logger)), "", 0),
ErrorHandling: promhttp.ContinueOnError,
MaxRequestsInFlight: h.maxRequests,
},
)
} }
return handler, nil return handler, nil
} }