From d09c61417771dc368dbea04ce0bbb499b1e7a4eb Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Thu, 17 May 2018 02:20:17 -0700 Subject: [PATCH] Documentation/upgrades: clean up "--log*" flag changes Signed-off-by: Gyuho Lee --- Documentation/upgrades/upgrade_3_4.md | 12 ++++++------ Documentation/upgrades/upgrade_3_5.md | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Documentation/upgrades/upgrade_3_4.md b/Documentation/upgrades/upgrade_3_4.md index f37e2c781..6e4d936c8 100644 --- a/Documentation/upgrades/upgrade_3_4.md +++ b/Documentation/upgrades/upgrade_3_4.md @@ -33,15 +33,15 @@ Rename [`etcd --log-output` to `--log-outputs`](https://github.com/coreos/etcd/p **`etcd --log-output`** will be deprecated in v3.5. **`etcd --logger=capnslog` will be deprecated in v3.5**. ```diff --etcd --log-output stderr -+etcd --log-outputs stderr +-etcd --log-output=stderr ++etcd --log-outputs=stderr +# to write logs to stderr and a.log file at the same time -+# only "--logger zap" supports multiple writers -+etcd --logger zap --log-outputs stderr,a.log ++# only "--logger=zap" supports multiple writers ++etcd --logger=zap --log-outputs=stderr,a.log ``` -v3.4 adds `etcd --logger zap` support for structured logging and multiple log outputs. Main motivation is to promote automated etcd monitoring, rather than looking back server logs when it starts breaking. Future development will make etcd log as few as possible, and make etcd easier to monitor with metrics and alerts. **`etcd --logger=capnslog` will be deprecated in v3.5**. +v3.4 adds `etcd --logger=zap --log-outputs=stderr` support for structured logging and multiple log outputs. Main motivation is to promote automated etcd monitoring, rather than looking back server logs when it starts breaking. Future development will make etcd log as few as possible, and make etcd easier to monitor with metrics and alerts. **`etcd --logger=capnslog` will be deprecated in v3.5**. #### Changed `log-outputs` field type in `etcd --config-file` to `[]string` @@ -67,7 +67,7 @@ cfg := &embed.Config{Debug: false} #### v3.5 deprecates `capnslog` -**v3.5 will deprecate `etcd --log-package-levels` flag for `capnslog`**; `etcd --logger=zap` will the default. **v3.5 will deprecate `[CLIENT-URL]/config/local/log` endpoint.** +**v3.5 will deprecate `etcd --log-package-levels` flag for `capnslog`**; `etcd --logger=zap --log-outputs=stderr` will the default. **v3.5 will deprecate `[CLIENT-URL]/config/local/log` endpoint.** #### Deprecated `pkg/transport.TLSInfo.CAFile` field diff --git a/Documentation/upgrades/upgrade_3_5.md b/Documentation/upgrades/upgrade_3_5.md index b35ad8da0..fcb71a81c 100644 --- a/Documentation/upgrades/upgrade_3_5.md +++ b/Documentation/upgrades/upgrade_3_5.md @@ -19,14 +19,14 @@ v3.4 defaults to `--logger=zap` in order to support multiple log outputs and str **`etcd --logger=capnslog` has been deprecated in v3.5**, and now `--logger=zap` is the default. ```diff --etcd --logger capnslog -+etcd --logger zap --log-outputs stderr +-etcd --logger=capnslog ++etcd --logger=zap --log-outputs=stderr +# to write logs to stderr and a.log file at the same time -+etcd --logger zap --log-outputs stderr,a.log ++etcd --logger=zap --log-outputs=stderr,a.log ``` -TODO(add more monitoring guides); v3.4 adds `etcd --logger zap` support for structured logging and multiple log outputs. Main motivation is to promote automated etcd monitoring, rather than looking back server logs when it starts breaking. Future development will make etcd log as few as possible, and make etcd easier to monitor with metrics and alerts. **`etcd --logger=capnslog` will be deprecated in v3.5.** +TODO(add more monitoring guides); v3.4 adds `etcd --logger=zap` support for structured logging and multiple log outputs. Main motivation is to promote automated etcd monitoring, rather than looking back server logs when it starts breaking. Future development will make etcd log as few as possible, and make etcd easier to monitor with metrics and alerts. **`etcd --logger=capnslog` will be deprecated in v3.5.** #### Deprecated in `etcd --log-output` @@ -35,8 +35,8 @@ v3.4 renamed [`etcd --log-output` to `--log-outputs`](https://github.com/coreos/ **`etcd --log-output` has been deprecated in v3.5.** ```diff --etcd --log-output stderr -+etcd --log-outputs stderr +-etcd --log-output=stderr ++etcd --log-outputs=stderr ``` #### Deprecated `etcd --log-package-levels` @@ -47,7 +47,7 @@ Now, **`etcd --logger=zap`** is the default. ```diff -etcd --log-package-levels 'etcdmain=CRITICAL,etcdserver=DEBUG' -+etcd --logger=zap ++etcd --logger=zap --log-outputs=stderr ``` #### Deprecated `[CLIENT-URL]/config/local/log`