whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve conflit

Browse Source
This commit is contained in:
Guangze GAO
2020-05-01 09:42:52 +08:00
parent ab76a102ed
commit 47db6142b6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/zh/docs/concepts/configuration/manage-compute-resources-container.md
+2 -2
View File
@@ -298,7 +298,7 @@ resource limits, see the
The resource usage of a Pod is reported as part of the Pod status. The resource usage of a Pod is reported as part of the Pod status.
If [optional monitoring](http://releases.k8s.io/{{< param "githubbranch" >}}/cluster/addons/cluster-monitoring/README.md) If [optional monitoring](/docs/tasks/debug-application-cluster/resource-metrics-pipeline/)
is configured for your cluster, then Pod resource usage can be retrieved from is configured for your cluster, then Pod resource usage can be retrieved from
the monitoring system. the monitoring system.
--> -->
@@ -307,7 +307,7 @@ the monitoring system.
Pod 的资源使用情况被报告为 Pod 状态的一部分。 Pod 的资源使用情况被报告为 Pod 状态的一部分。
如果为集群配置了 [可选监控](http://releases.k8s.io/{{< param "githubbranch" >}}/cluster/addons/cluster-monitoring/README.md)，则可以从监控系统检索 Pod 资源的使用情况。 如果为集群配置了 [可选监控](/docs/tasks/debug-application-cluster/resource-metrics-pipeline/)，则可以从监控系统检索 Pod 资源的使用情况。
<!-- <!--
## Troubleshooting ## Troubleshooting