Skip to content

Commit f012a54

Browse files
committed
[zh-cn] sync system-metrics.md system-metrics.md system-metrics.md
1 parent 4790769 commit f012a54

File tree

3 files changed

+18
-9
lines changed

3 files changed

+18
-9
lines changed

content/zh-cn/docs/concepts/cluster-administration/system-metrics.md

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -291,19 +291,24 @@ Once a pod reaches completion (has a `restartPolicy` of `Never` or `OnFailure` a
291291
the series is no longer reported since the scheduler is now free to schedule other pods to run.
292292
The two metrics are called `kube_pod_resource_request` and `kube_pod_resource_limit`.
293293
294-
The metrics are exposed at the HTTP endpoint `/metrics/resources` and require the same
295-
authorization as the `/metrics` endpoint on the scheduler. You must use the
296-
`--show-hidden-metrics-for-version=1.20` flag to expose these alpha stability metrics.
294+
The metrics are exposed at the HTTP endpoint `/metrics/resources`. They require
295+
authorization for the `/metrics/resources` endpoint, usually granted by a
296+
ClusterRole with the `get` verb for the `/metrics/resources` non-resource URL.
297+
298+
On Kubernetes 1.21 you must use the `--show-hidden-metrics-for-version=1.20`
299+
flag to expose these alpha stability metrics.
297300
-->
298301
一旦 Pod 进入完成状态(其 `restartPolicy``Never``OnFailure`,且
299302
其处于 `Succeeded``Failed` Pod 阶段,或者已经被删除且所有容器都具有
300303
终止状态),该时间序列停止报告,因为调度器现在可以调度其它 Pod 来执行。
301304
这两个指标称作 `kube_pod_resource_request``kube_pod_resource_limit`
302305

303-
指标暴露在 HTTP 端点 `/metrics/resources`,与调度器上的 `/metrics` 端点
304-
一样要求相同的访问授权。你必须使用
305-
`--show-hidden-metrics-for-version=1.20` 标志才能暴露那些稳定性为 Alpha
306-
的指标。
306+
这些指标通过 HTTP 端点 `/metrics/resources` 公开出来。
307+
访问 `/metrics/resources` 端点需要鉴权,通常通过对
308+
`/metrics/resources` 非资源 URL 的 `get` 访问授予访问权限。
309+
310+
在 Kubernetes 1.21 中,你必须使用 `--show-hidden-metrics-for-version=1.20`
311+
标志来公开 Alpha 级稳定性的指标。
307312

308313
<!--
309314
## Disabling metrics

content/zh-cn/docs/concepts/containers/container-lifecycle-hooks.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,14 @@ Enable the `PodLifecycleSleepActionAllowZero` feature gate if you want to set a
121121
122122
When a Container lifecycle management hook is called,
123123
the Kubernetes management system executes the handler according to the hook action,
124-
`httpGet` , `tcpSocket` and `sleep` are executed by the kubelet process, and `exec` is executed in the container.
124+
`httpGet`, `tcpSocket` ([deprecated](/docs/reference/generated/kubernetes-api/v1.31/#lifecyclehandler-v1-core))
125+
and `sleep` are executed by the kubelet process, and `exec` is executed in the container.
125126
-->
126127
### 回调处理程序执行 {#hook-handler-execution}
127128

128129
当调用容器生命周期管理回调时,Kubernetes 管理系统根据回调动作执行其处理程序,
129-
`httpGet``tcpSocket``sleep` 由 kubelet 进程执行,而 `exec` 在容器中执行。
130+
`httpGet``tcpSocket`[已弃用](/docs/reference/generated/kubernetes-api/v1.31/#lifecyclehandler-v1-core)
131+
`sleep` 由 kubelet 进程执行,而 `exec` 在容器内执行。
130132

131133
<!--
132134
The `PostStart` hook handler call is initiated when a container is created,

content/zh-cn/docs/concepts/security/_index.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ Huawei Cloud | https://www.huaweicloud.com/intl/en-us/securecenter/overallsafety
147147
IBM Cloud | https://www.ibm.com/cloud/security |
148148
Microsoft Azure | https://docs.microsoft.com/en-us/azure/security/azure-security |
149149
Oracle Cloud Infrastructure | https://www.oracle.com/security |
150+
Tencent Cloud | https://www.tencentcloud.com/solutions/data-security-and-information-protection |
150151
VMware vSphere | https://www.vmware.com/security/hardening-guides |
151152
152153
{{< /table >}}
@@ -162,6 +163,7 @@ IaaS 提供商 | 链接 |
162163
IBM 云 | https://www.ibm.com/cloud/security |
163164
微软 Azure | https://docs.microsoft.com/en-us/azure/security/azure-security |
164165
Oracle 云基础设施| https://www.oracle.com/security |
166+
腾讯云 | https://www.tencentcloud.com/solutions/data-security-and-information-protection |
165167
VMware vSphere | https://www.vmware.com/security/hardening-guides |
166168

167169
{{< /table >}}

0 commit comments

Comments
 (0)