Merge branch 'main' into dependabot-auto-merge

nginx · Jun 20, 2024 · dc91f67 · dc91f67
2 parents fe40c37 + 9f7634f
commit dc91f67
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/cmd/nginx-ingress/main.go b/cmd/nginx-ingress/main.go
@@ -736,7 +736,14 @@ func createPlusAndLatencyCollectors(
 			streamServerZoneVariableLabels := []string{"resource_type", "resource_name", "resource_namespace"}
 			variableLabelNames := nginxCollector.NewVariableLabelNames(upstreamServerVariableLabels, serverZoneVariableLabels, upstreamServerPeerVariableLabelNames,
 				streamUpstreamServerVariableLabels, streamServerZoneVariableLabels, streamUpstreamServerPeerVariableLabelNames, nil, nil)
-			promlogConfig := &promlog.Config{}
+			infoLevel := new(promlog.AllowedLevel)
+			err := infoLevel.Set("info")
+			if err != nil {
+				glog.Error("Error setting prometheus exporter log level")
+			}
+			promlogConfig := &promlog.Config{
+				Level: infoLevel,
+			}
 			logger := promlog.New(promlogConfig)
 			plusCollector = nginxCollector.NewNginxPlusCollector(plusClient, "nginx_ingress_nginxplus", variableLabelNames, constLabels, logger)
 			go metrics.RunPrometheusListenerForNginxPlus(*prometheusMetricsListenPort, plusCollector, registry, prometheusSecret)

diff --git a/internal/metrics/listener.go b/internal/metrics/listener.go
@@ -26,7 +26,15 @@ func NewNginxMetricsClient(httpClient *http.Client) *prometheusClient.NginxClien
 
 // RunPrometheusListenerForNginx runs an http server to expose Prometheus metrics for NGINX
 func RunPrometheusListenerForNginx(port int, client *prometheusClient.NginxClient, registry *prometheus.Registry, constLabels map[string]string, prometheusSecret *v1.Secret) {
-	promlogConfig := &promlog.Config{}
+	infoLevel := new(promlog.AllowedLevel)
+	err := infoLevel.Set("info")
+	if err != nil {
+		glog.Error("Error setting prometheus exporter log level")
+	}
+	promlogConfig := &promlog.Config{
+		Level: infoLevel,
+	}
+
 	logger := promlog.New(promlogConfig)
 	registry.MustRegister(nginxCollector.NewNginxCollector(client, "nginx_ingress_nginx", constLabels, logger))
 	runServer(strconv.Itoa(port), registry, prometheusSecret)