Add LogLevel & LogFormat flags

charts/nginx-ingress/templates/_helpers.tpl

@@ -244,7 +244,8 @@ Build the args for the service binary.
 - -health-status={{ .Values.controller.healthStatus }}
 - -health-status-uri={{ .Values.controller.healthStatusURI }}
 - -nginx-debug={{ .Values.controller.nginxDebug }}
-- -v={{ .Values.controller.logLevel }}
+- -log-level={{ .Values.controller.logLevel }}
+- -log-format={{ .Values.controller.logFormat }}
 - -nginx-status={{ .Values.controller.nginxStatus.enable }}
 {{- if .Values.controller.nginxStatus.enable }}
 - -nginx-status-port={{ .Values.controller.nginxStatus.port }}

charts/nginx-ingress/values.schema.json

@@ -486,17 +486,32 @@
           ]
         },
         "logLevel": {
-          "type": "integer",
-          "default": 1,
+          "type": "string",
+          "default": "info",
           "title": "The logLevel of the Ingress Controller",
           "enum": [
-            0,
-            1,
-            2,
-            3
+            "trace",
+            "debug",
+            "info",
+            "warning",
+            "error",
+            "fatal"
+          ],
+          "examples": [
+            "info"
+          ]
+        },
+        "logFormat": {
+          "type": "string",
+          "default": "glog",
+          "title": "The logFormat of the Ingress Controller",
+          "enum": [
+            "glog",
+            "json",
+            "text"
           ],
           "examples": [
-            1
+            "json"
           ]
         },
         "customPorts": {
@@ -1674,7 +1689,7 @@
           "hostNetwork": false,
           "nginxDebug": false,
           "shareProcessNamespace": false,
-          "logLevel": 1,
+          "logLevel": "info",
           "customPorts": [],
           "image": {
             "repository": "nginx/nginx-ingress",
@@ -2214,7 +2229,7 @@
         },
         "hostNetwork": false,
         "nginxDebug": false,
-        "logLevel": 1,
+        "logLevel": "info",
         "customPorts": [],
         "image": {
           "repository": "nginx/nginx-ingress",

charts/nginx-ingress/values.yaml

@@ -124,7 +124,10 @@ controller:
   shareProcessNamespace: false
 
   ## The log level of the Ingress Controller.
-  logLevel: 1
+  logLevel: info
+
+  ## Sets the log format of Ingress Controller. Options include: glog, json, text
+  logFormat: glog
 
   ## A list of custom ports to expose on the NGINX Ingress Controller pod. Follows the conventional Kubernetes yaml syntax for container ports.
   customPorts: []

cmd/nginx-ingress/flags.go

@@ -208,6 +208,11 @@ var (
 
 	enableTelemetryReporting = flag.Bool("enable-telemetry-reporting", true, "Enable gathering and reporting of product related telemetry.")
 
+	logFormat = flag.String("log-format", "glog", "Set log format to either glog, text, or json.")
+
+	logLevel = flag.String("log-level", "info",
+		`Sets log level for Ingress Controller. Allowed values: fatal, error, warning, info, debug, trace.`)
+
 	enableDynamicWeightChangesReload = flag.Bool(dynamicWeightChangesParam, false, "Enable changing weights of split clients without reloading NGINX. Requires -nginx-plus")
 
 	startupCheckFn func() error
@@ -310,6 +315,18 @@ func mustValidateWatchedNamespaces() {
 // mustValidateFlags checks the values for various flags
 // and calls os.Exit if any of the flags is invalid.
 func mustValidateFlags() {
+	logFormatValidationError := validateLogFormat(*logFormat)
+	if logFormatValidationError != nil {
+		glog.Fatalf("Invalid log format: %s. Valid options are: glog, text, json", *logFormat)
+		os.Exit(1)
+	}
+
+	logLevelValidationError := validateLogLevel(*logLevel)
+	if logLevelValidationError != nil {
+		glog.Fatalf("Invalid log level: %s. Valid options are: trace, debug, info, warning, error, fatal", *logFormat)
+		os.Exit(1)
+	}
+
 	healthStatusURIValidationError := validateLocation(*healthStatusURI)
 	if healthStatusURIValidationError != nil {
 		glog.Fatalf("Invalid value for health-status-uri: %v", healthStatusURIValidationError)
@@ -347,8 +364,8 @@ func mustValidateFlags() {
 	}
 
 	if *appProtectLogLevel != appProtectLogLevelDefault && *appProtect && *nginxPlus {
-		logLevelValidationError := validateAppProtectLogLevel(*appProtectLogLevel)
-		if logLevelValidationError != nil {
+		appProtectlogLevelValidationError := validateLogLevel(*appProtectLogLevel)
+		if appProtectlogLevelValidationError != nil {
 			glog.Fatalf("Invalid value for app-protect-log-level: %v", *appProtectLogLevel)
 		}
 	}
@@ -443,8 +460,8 @@ func validatePort(port int) error {
 	return nil
 }
 
-// validateAppProtectLogLevel makes sure a given logLevel is one of the allowed values
-func validateAppProtectLogLevel(logLevel string) error {
+// validateLogLevel makes sure a given logLevel is one of the allowed values
+func validateLogLevel(logLevel string) error {
 	switch strings.ToLower(logLevel) {
 	case
 		"fatal",
@@ -455,7 +472,16 @@ func validateAppProtectLogLevel(logLevel string) error {
 		"trace":
 		return nil
 	}
-	return fmt.Errorf("invalid App Protect log level: %v", logLevel)
+	return fmt.Errorf("invalid log level: %v", logLevel)
+}
+
+// validateLogFormat makes sure a given logFormat is one of the allowed values
+func validateLogFormat(logFormat string) error {
+	switch strings.ToLower(logFormat) {
+	case "glog", "json", "text":
+		return nil
+	}
+	return fmt.Errorf("invalid log format: %v", logFormat)
 }
 
 // parseNginxStatusAllowCIDRs converts a comma separated CIDR/IP address string into an array of CIDR/IP addresses.

cmd/nginx-ingress/flags_test.go

@@ -125,17 +125,17 @@ func TestValidateLocation(t *testing.T) {
 	}
 }
 
-func TestValidateAppProtectLogLevel(t *testing.T) {
+func TestValidateLogLevel(t *testing.T) {
 	badLogLevels := []string{
 		"",
 		"critical",
 		"none",
 		"info;",
 	}
 	for _, badLogLevel := range badLogLevels {
-		err := validateAppProtectLogLevel(badLogLevel)
+		err := validateLogLevel(badLogLevel)
 		if err == nil {
-			t.Errorf("validateAppProtectLogLevel(%v) returned no error when it should have returned an error", badLogLevel)
+			t.Errorf("validateLogLevel(%v) returned no error when it should have returned an error", badLogLevel)
 		}
 	}
 
@@ -148,9 +148,9 @@ func TestValidateAppProtectLogLevel(t *testing.T) {
 		"trace",
 	}
 	for _, goodLogLevel := range goodLogLevels {
-		err := validateAppProtectLogLevel(goodLogLevel)
+		err := validateLogLevel(goodLogLevel)
 		if err != nil {
-			t.Errorf("validateAppProtectLogLevel(%v) returned an error when it should have returned no error: %v", goodLogLevel, err)
+			t.Errorf("validateLogLevel(%v) returned an error when it should have returned no error: %v", goodLogLevel, err)
 		}
 	}
 }
@@ -172,3 +172,30 @@ func TestValidateNamespaces(t *testing.T) {
 		}
 	}
 }
+
+func TestValidateLogFormat(t *testing.T) {
+	badLogFormats := []string{
+		"",
+		"jason",
+		"txt",
+		"gloog",
+	}
+	for _, badLogFormat := range badLogFormats {
+		err := validateLogFormat(badLogFormat)
+		if err == nil {
+			t.Errorf("validateLogFormat(%v) returned no error when it should have returned an error", badLogFormat)
+		}
+	}
+
+	goodLogFormats := []string{
+		"json",
+		"text",
+		"glog",
+	}
+	for _, goodLogFormat := range goodLogFormats {
+		err := validateLogFormat(goodLogFormat)
+		if err != nil {
+			t.Errorf("validateLogFormat(%v) returned an error when it should have returned no error: %v", goodLogFormat, err)
+		}
+	}
+}

cmd/nginx-ingress/main.go

@@ -3,6 +3,8 @@ package main
 import (
 	"context"
 	"fmt"
+	"io"
+	"log/slog"
 	"net"
 	"net/http"
 	"os"
@@ -41,12 +43,23 @@ import (
 
 	kitlog "github.com/go-kit/log"
 	"github.com/go-kit/log/level"
+
+	nic_logger "github.com/nginxinc/kubernetes-ingress/internal/logger"
+	nic_glog "github.com/nginxinc/kubernetes-ingress/internal/logger/glog"
 )
 
 // Injected during build
 var (
 	version           string
 	telemetryEndpoint string
+	logLevels         = map[string]slog.Level{
+		"trace":   nic_glog.LevelTrace,
+		"debug":   nic_glog.LevelDebug,
+		"info":    nic_glog.LevelInfo,
+		"warning": nic_glog.LevelWarning,
+		"error":   nic_glog.LevelError,
+		"fatal":   nic_glog.LevelFatal,
+	}
 )
 
 const (
@@ -63,6 +76,9 @@ func main() {
 	commitHash, commitTime, dirtyBuild := getBuildInfo()
 	fmt.Printf("NGINX Ingress Controller Version=%v Commit=%v Date=%v DirtyState=%v Arch=%v/%v Go=%v\n", version, commitHash, commitTime, dirtyBuild, runtime.GOOS, runtime.GOARCH, runtime.Version())
 	parseFlags()
+	ctx := initLogger(*logFormat, logLevels[*logLevel], os.Stdout)
+	_ = nic_logger.LoggerFromContext(ctx)
+
 	initValidate()
 	parsedFlags := os.Args[1:]
 
@@ -877,3 +893,23 @@ func updateSelfWithVersionInfo(kubeClient *kubernetes.Clientset, version, appPro
 		glog.Errorf("Failed to update pod labels after %d attempts", maxRetries)
 	}
 }
+
+func initLogger(logFormat string, level slog.Level, out io.Writer) context.Context {
+	programLevel := new(slog.LevelVar) // Info by default
+	var h slog.Handler
+	switch {
+	case logFormat == "json":
+		h = slog.NewJSONHandler(out, &slog.HandlerOptions{Level: programLevel})
+	case logFormat == "text":
+		h = slog.NewTextHandler(out, &slog.HandlerOptions{Level: programLevel})
+	default:
+		h = nic_glog.New(out, &nic_glog.Options{Level: programLevel})
+	}
+	l := slog.New(h)
+	slog.SetDefault(l)
+	c := context.Background()
+
+	programLevel.Set(level)
+
+	return nic_logger.ContextWithLogger(c, l)
+}

cmd/nginx-ingress/main_test.go

@@ -0,0 +1,48 @@
+package main
+
+import (
+	"bytes"
+	"regexp"
+	"testing"
+
+	nic_logger "github.com/nginxinc/kubernetes-ingress/internal/logger"
+	nic_glog "github.com/nginxinc/kubernetes-ingress/internal/logger/glog"
+)
+
+func TestLogFormats(t *testing.T) {
+	testCases := []struct {
+		name   string
+		format string
+		wantre string
+	}{
+		{
+			name:   "glog level format message",
+			format: "glog",
+			wantre: `^I\d{8}\s\d+:\d+:\d+.\d{6}\s+\d+\s\w+\.go:\d+\]\s.*\s$`,
+		},
+		{
+			name:   "json level format message",
+			format: "json",
+			wantre: `^{"time":"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d+.*","level":"INFO","msg":".*}`,
+		},
+		{
+			name:   "text level format message",
+			format: "text",
+			wantre: `^time=\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d+.*level=\w+\smsg=\w+`,
+		},
+	}
+	t.Parallel()
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			var buf bytes.Buffer
+			ctx := initLogger(tc.format, nic_glog.LevelInfo, &buf)
+			l := nic_logger.LoggerFromContext(ctx)
+			l.Log(ctx, nic_glog.LevelInfo, "test")
+			got := buf.String()
+			re := regexp.MustCompile(tc.wantre)
+			if !re.MatchString(got) {
+				t.Errorf("\ngot:\n%q\nwant:\n%q", got, tc.wantre)
+			}
+		})
+	}
+}