Skip to content

Commit 9f7634f

Browse files
author
Jim Ryan
authored
Change log level, to Info and above, before calling prometheus exporter functions (nginx#5786)
* wrap logger * tidy go mod * remove level library import * make library indirect
1 parent 7a4d5f4 commit 9f7634f

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

cmd/nginx-ingress/main.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,14 @@ func createPlusAndLatencyCollectors(
736736
streamServerZoneVariableLabels := []string{"resource_type", "resource_name", "resource_namespace"}
737737
variableLabelNames := nginxCollector.NewVariableLabelNames(upstreamServerVariableLabels, serverZoneVariableLabels, upstreamServerPeerVariableLabelNames,
738738
streamUpstreamServerVariableLabels, streamServerZoneVariableLabels, streamUpstreamServerPeerVariableLabelNames, nil, nil)
739-
promlogConfig := &promlog.Config{}
739+
infoLevel := new(promlog.AllowedLevel)
740+
err := infoLevel.Set("info")
741+
if err != nil {
742+
glog.Error("Error setting prometheus exporter log level")
743+
}
744+
promlogConfig := &promlog.Config{
745+
Level: infoLevel,
746+
}
740747
logger := promlog.New(promlogConfig)
741748
plusCollector = nginxCollector.NewNginxPlusCollector(plusClient, "nginx_ingress_nginxplus", variableLabelNames, constLabels, logger)
742749
go metrics.RunPrometheusListenerForNginxPlus(*prometheusMetricsListenPort, plusCollector, registry, prometheusSecret)

internal/metrics/listener.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,15 @@ func NewNginxMetricsClient(httpClient *http.Client) *prometheusClient.NginxClien
2626

2727
// RunPrometheusListenerForNginx runs an http server to expose Prometheus metrics for NGINX
2828
func RunPrometheusListenerForNginx(port int, client *prometheusClient.NginxClient, registry *prometheus.Registry, constLabels map[string]string, prometheusSecret *v1.Secret) {
29-
promlogConfig := &promlog.Config{}
29+
infoLevel := new(promlog.AllowedLevel)
30+
err := infoLevel.Set("info")
31+
if err != nil {
32+
glog.Error("Error setting prometheus exporter log level")
33+
}
34+
promlogConfig := &promlog.Config{
35+
Level: infoLevel,
36+
}
37+
3038
logger := promlog.New(promlogConfig)
3139
registry.MustRegister(nginxCollector.NewNginxCollector(client, "nginx_ingress_nginx", constLabels, logger))
3240
runServer(strconv.Itoa(port), registry, prometheusSecret)

0 commit comments

Comments
 (0)