diff --git a/CHANGELOG.md b/CHANGELOG.md index 94244418e..7cba8c0af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# Release 0.18.3 + +## What's New + +* Ziti executables that use JSON logging now emit timestamps that include fractional seconds. Timestamps remain in + the RFC3339 format. + # Release 0.18.2 ## What's New diff --git a/test/sdk-echo-server/sdk-echo-server.go b/test/sdk-echo-server/sdk-echo-server.go index c084aa68a..5f2e9a318 100644 --- a/test/sdk-echo-server/sdk-echo-server.go +++ b/test/sdk-echo-server/sdk-echo-server.go @@ -52,7 +52,7 @@ var root = &cobra.Command{ case "pfxlog": logrus.SetFormatter(pfxlog.NewFormatterStartingToday()) case "json": - logrus.SetFormatter(&logrus.JSONFormatter{}) + logrus.SetFormatter(&logrus.JSONFormatter{TimestampFormat: "2006-01-02T15:04:05.000Z"}) case "text": logrus.SetFormatter(&logrus.TextFormatter{}) default: diff --git a/test/zapp-fortio-grpc-server/zapp-fortio-grpc-server.go b/test/zapp-fortio-grpc-server/zapp-fortio-grpc-server.go index 1b42d5b12..0882e863a 100644 --- a/test/zapp-fortio-grpc-server/zapp-fortio-grpc-server.go +++ b/test/zapp-fortio-grpc-server/zapp-fortio-grpc-server.go @@ -58,7 +58,7 @@ var root = &cobra.Command{ case "pfxlog": logrus.SetFormatter(pfxlog.NewFormatterStartingToday()) case "json": - logrus.SetFormatter(&logrus.JSONFormatter{}) + logrus.SetFormatter(&logrus.JSONFormatter{TimestampFormat: "2006-01-02T15:04:05.000Z"}) case "text": logrus.SetFormatter(&logrus.TextFormatter{}) default: diff --git a/ziti-controller/subcmd/root.go b/ziti-controller/subcmd/root.go index 1fe6ff434..d902305e3 100644 --- a/ziti-controller/subcmd/root.go +++ b/ziti-controller/subcmd/root.go @@ -46,7 +46,7 @@ var root = &cobra.Command{ case "pfxlog": logrus.SetFormatter(pfxlog.NewFormatterStartingToday()) case "json": - logrus.SetFormatter(&logrus.JSONFormatter{}) + logrus.SetFormatter(&logrus.JSONFormatter{TimestampFormat: "2006-01-02T15:04:05.000Z"}) case "text": logrus.SetFormatter(&logrus.TextFormatter{}) default: diff --git a/ziti-probe/subcmd/root.go b/ziti-probe/subcmd/root.go index 6fc95e321..5e28c439b 100644 --- a/ziti-probe/subcmd/root.go +++ b/ziti-probe/subcmd/root.go @@ -43,7 +43,7 @@ var root = &cobra.Command{ case "pfxlog": logrus.SetFormatter(pfxlog.NewFormatterStartingToday()) case "json": - logrus.SetFormatter(&logrus.JSONFormatter{}) + logrus.SetFormatter(&logrus.JSONFormatter{TimestampFormat: "2006-01-02T15:04:05.000Z"}) case "text": logrus.SetFormatter(&logrus.TextFormatter{}) default: diff --git a/ziti-router/subcmd/root.go b/ziti-router/subcmd/root.go index 5af86407f..844577e88 100644 --- a/ziti-router/subcmd/root.go +++ b/ziti-router/subcmd/root.go @@ -42,7 +42,7 @@ var root = &cobra.Command{ case "pfxlog": logrus.SetFormatter(pfxlog.NewFormatterStartingToday()) case "json": - logrus.SetFormatter(&logrus.JSONFormatter{}) + logrus.SetFormatter(&logrus.JSONFormatter{TimestampFormat: "2006-01-02T15:04:05.000Z"}) case "text": logrus.SetFormatter(&logrus.TextFormatter{}) default: diff --git a/ziti-tunnel/cmd/ziti-tunnel/subcmd/root.go b/ziti-tunnel/cmd/ziti-tunnel/subcmd/root.go index 2edd5f3c9..54849148d 100644 --- a/ziti-tunnel/cmd/ziti-tunnel/subcmd/root.go +++ b/ziti-tunnel/cmd/ziti-tunnel/subcmd/root.go @@ -78,7 +78,7 @@ func rootPreRun(cmd *cobra.Command, _ []string) { case "pfxlog": logrus.SetFormatter(pfxlog.NewFormatterStartingToday()) case "json": - logrus.SetFormatter(&logrus.JSONFormatter{}) + logrus.SetFormatter(&logrus.JSONFormatter{TimestampFormat: "2006-01-02T15:04:05.000Z"}) case "text": logrus.SetFormatter(&logrus.TextFormatter{}) default: