This is an automated email from the ASF dual-hosted git repository. trohrmann pushed a commit to branch release-1.12 in repository https://gitbox.apache.org/repos/asf/flink.git
commit 0275bbd2623e934cd570d9294b947564aef0afa9 Author: Till Rohrmann <[email protected]> AuthorDate: Wed Nov 25 13:29:57 2020 +0100 [FLINK-20342][docs] Move monitoring/historyserver.md and monitoring/logging.md to deployment/* This removes effectively the Monitoring & Debugging entry. --- docs/deployment/config.md | 2 +- docs/deployment/config.zh.md | 2 +- docs/{monitoring => deployment}/historyserver.md | 4 ++-- .../{monitoring => deployment}/historyserver.zh.md | 4 ++-- docs/{monitoring => deployment}/logging.md | 4 ++-- docs/{monitoring => deployment}/logging.zh.md | 4 ++-- docs/monitoring/README.md | 21 ------------------ docs/monitoring/index.md | 25 ---------------------- docs/monitoring/index.zh.md | 25 ---------------------- 9 files changed, 10 insertions(+), 81 deletions(-) diff --git a/docs/deployment/config.md b/docs/deployment/config.md index b6143a9..3444203 100644 --- a/docs/deployment/config.md +++ b/docs/deployment/config.md @@ -262,7 +262,7 @@ The metrics here are scoped to the operators and then further broken down by col The history server keeps the information of completed jobs (graphs, runtimes, statistics). To enable it, you have to enable "job archiving" in the JobManager (`jobmanager.archive.fs.dir`). -See the [History Server Docs]({% link monitoring/historyserver.md %}) for details. +See the [History Server Docs]({% link deployment/historyserver.md %}) for details. {% include generated/history_server_configuration.html %} diff --git a/docs/deployment/config.zh.md b/docs/deployment/config.zh.md index eb10fdd..d61ce9d 100644 --- a/docs/deployment/config.zh.md +++ b/docs/deployment/config.zh.md @@ -262,7 +262,7 @@ The metrics here are scoped to the operators and then further broken down by col The history server keeps the information of completed jobs (graphs, runtimes, statistics). To enable it, you have to enable "job archiving" in the JobManager (`jobmanager.archive.fs.dir`). -See the [History Server Docs]({% link monitoring/historyserver.zh.md %}) for details. +See the [History Server Docs]({% link deployment/historyserver.zh.md %}) for details. {% include generated/history_server_configuration.html %} diff --git a/docs/monitoring/historyserver.md b/docs/deployment/historyserver.md similarity index 99% rename from docs/monitoring/historyserver.md rename to docs/deployment/historyserver.md index 107a9c4..f366f7e 100644 --- a/docs/monitoring/historyserver.md +++ b/docs/deployment/historyserver.md @@ -1,7 +1,7 @@ --- title: "History Server" -nav-parent_id: monitoring -nav-pos: 3 +nav-parent_id: deployment +nav-pos: 17 --- <!-- Licensed to the Apache Software Foundation (ASF) under one diff --git a/docs/monitoring/historyserver.zh.md b/docs/deployment/historyserver.zh.md similarity index 99% rename from docs/monitoring/historyserver.zh.md rename to docs/deployment/historyserver.zh.md index 40e22ab..6631498 100644 --- a/docs/monitoring/historyserver.zh.md +++ b/docs/deployment/historyserver.zh.md @@ -1,7 +1,7 @@ --- title: "History Server" -nav-parent_id: monitoring -nav-pos: 3 +nav-parent_id: deployment +nav-pos: 17 --- <!-- Licensed to the Apache Software Foundation (ASF) under one diff --git a/docs/monitoring/logging.md b/docs/deployment/logging.md similarity index 99% rename from docs/monitoring/logging.md rename to docs/deployment/logging.md index 4fbfb59..74df73e 100644 --- a/docs/monitoring/logging.md +++ b/docs/deployment/logging.md @@ -1,8 +1,8 @@ --- title: "How to use logging" nav-title: Logging -nav-parent_id: monitoring -nav-pos: 2 +nav-parent_id: deployment +nav-pos: 18 --- <!-- Licensed to the Apache Software Foundation (ASF) under one diff --git a/docs/monitoring/logging.zh.md b/docs/deployment/logging.zh.md similarity index 99% rename from docs/monitoring/logging.zh.md rename to docs/deployment/logging.zh.md index 512d133..7f05743 100644 --- a/docs/monitoring/logging.zh.md +++ b/docs/deployment/logging.zh.md @@ -1,8 +1,8 @@ --- title: "如何使用日志记录" nav-title: 日志 -nav-parent_id: monitoring -nav-pos: 2 +nav-parent_id: deployment +nav-pos: 18 --- <!-- Licensed to the Apache Software Foundation (ASF) under one diff --git a/docs/monitoring/README.md b/docs/monitoring/README.md deleted file mode 100644 index 88c6509..0000000 --- a/docs/monitoring/README.md +++ /dev/null @@ -1,21 +0,0 @@ -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -This folder contains the documentation in the category -**Debugging & Monitoring**. diff --git a/docs/monitoring/index.md b/docs/monitoring/index.md deleted file mode 100644 index 0ae1254..0000000 --- a/docs/monitoring/index.md +++ /dev/null @@ -1,25 +0,0 @@ ---- -title: "Debugging and Monitoring" -nav-title: '<i class="fa fa-bug title maindish" aria-hidden="true"></i> Debugging & Monitoring' -nav-id: monitoring -nav-parent_id: root -nav-pos: 11 ---- -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> diff --git a/docs/monitoring/index.zh.md b/docs/monitoring/index.zh.md deleted file mode 100644 index 792f0a0..0000000 --- a/docs/monitoring/index.zh.md +++ /dev/null @@ -1,25 +0,0 @@ ---- -title: "调试和监控" -nav-title: '<i class="fa fa-bug title maindish" aria-hidden="true"></i> 调试和监控' -nav-id: monitoring -nav-parent_id: root -nav-pos: 11 ---- -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. --->
