cni: use default logger with timestamps.

Unlike runtime agent/operator logs, CNI logs are just written to disk so we have no way to attach timestamps to them.
This makes it harder to debug CNI issues as we have no way to correlate when things happened between Agent logs and CNI events.

This switches CNI to use the same default logger, except with timestamps enabled.

Signed-off-by: Tom Hadlaw <tom.hadlaw@isovalent.com>

pkg/logging/logging.go

@@ -28,13 +28,21 @@ const (
 	FormatOpt = "format"
 
 	LogFormatText          LogFormat = "text"
+	LogFormatTextTimestamp LogFormat = "text-ts"
 	LogFormatJSON          LogFormat = "json"
 	LogFormatJSONTimestamp LogFormat = "json-ts"
 
 	// DefaultLogFormat is the string representation of the default logrus.Formatter
 	// we want to use (possible values: text or json)
 	DefaultLogFormat LogFormat = LogFormatText
 
+	// DefaultLogFormat is the string representation of the default logrus.Formatter
+	// including timestamps.
+	// We don't use this for general runtime logs since kubernetes log capture handles those.
+	// This is only used for applications such as CNI which is written to disk so we have no
+	// way to correlate with other logs.
+	DefaultLogFormatTimestamp LogFormat = LogFormatTextTimestamp
+
 	// DefaultLogLevel is the default log level we want to use for our logrus.Formatter
 	DefaultLogLevel logrus.Level = logrus.InfoLevel
 )
@@ -202,6 +210,11 @@ func GetFormatter(format LogFormat) logrus.Formatter {
 			DisableTimestamp: true,
 			DisableColors:    true,
 		}
+	case LogFormatTextTimestamp:
+		return &logrus.TextFormatter{
+			DisableTimestamp: false,
+			DisableColors:    true,
+		}
 	case LogFormatJSON:
 		return &logrus.JSONFormatter{
 			DisableTimestamp: true,

plugins/cilium-cni/cmd/cmd.go

@@ -375,7 +375,7 @@ func prepareIP(ipAddr string, state *CmdState, mtu int) (*cniTypesV1.IPConfig, [
 func setupLogging(n *types.NetConf) error {
 	f := n.LogFormat
 	if f == "" {
-		f = string(logging.DefaultLogFormat)
+		f = string(logging.DefaultLogFormatTimestamp)
 	}
 	logOptions := logging.LogOptions{
 		logging.FormatOpt: f,