From cbdad68418fa0351a2714a01612a940bb1474aa1 Mon Sep 17 00:00:00 2001 From: Chunlin Yang Date: Mon, 12 Nov 2018 21:52:25 +0800 Subject: [PATCH] fix mixer attributes descriptions (#2859) Signed-off-by: Chun Lin Yang --- .../config/policy-and-telemetry/attribute-vocabulary/index.md | 4 ++-- .../config/policy-and-telemetry/attribute-vocabulary/index.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/content/docs/reference/config/policy-and-telemetry/attribute-vocabulary/index.md b/content/docs/reference/config/policy-and-telemetry/attribute-vocabulary/index.md index 645b904caa..a4b570d742 100644 --- a/content/docs/reference/config/policy-and-telemetry/attribute-vocabulary/index.md +++ b/content/docs/reference/config/policy-and-telemetry/attribute-vocabulary/index.md @@ -85,8 +85,8 @@ deployments will have agents (Envoy or Mixer adapters) that produce these attrib | `api.version` | string | The API version. | `v1alpha1` | | `api.operation` | string | Unique string used to identify the operation. The id is unique among all operations described in a specific <service, version>. | `getPetsById` | | `api.protocol` | string | The protocol type of the API call. Mainly for monitoring/analytics. Note that this is the frontend protocol exposed to the client, not the protocol implemented by the backend service. | `http`, `https`, or `grpc` | -| `request.auth.principal` | string | The authenticated principal of the request. This is a string of the issuer (`iss`) and subject (`sub`) claims within a JWT concatenated with "/” with a percent-encoded subject value. This attribute may come from the peer or the origin in the Istio authentication policy, depending on the binding rule defined in the Istio authentication policy. | `accounts.my-svc.com/104958560606` | -| `request.auth.audiences` | string | The intended audience(s) for this authentication information. This should reflect the audience (`aud`) claim within a JWT. | ['my-svc.com', 'scopes/read'] | +| `request.auth.principal` | string | The authenticated principal of the request. This is a string of the issuer (`iss`) and subject (`sub`) claims within a JWT concatenated with "/” with a percent-encoded subject value. This attribute may come from the peer or the origin in the Istio authentication policy, depending on the binding rule defined in the Istio authentication policy. | `issuer@foo.com/sub@foo.com` | +| `request.auth.audiences` | string | The intended audience(s) for this authentication information. This should reflect the audience (`aud`) claim within a JWT. | `aud1` | | `request.auth.presenter` | string | The authorized presenter of the credential. This value should reflect the optional Authorized Presenter (`azp`) claim within a JWT or the OAuth2 client id. | 123456789012.my-svc.com | | `request.auth.claims` | map[string, string] | all raw string claims from the `origin` JWT | `iss`: `issuer@foo.com`, `sub`: `sub@foo.com`, `aud`: `aud1` | | `request.api_key` | string | The API key used for the request. | abcde12345 | diff --git a/content_zh/docs/reference/config/policy-and-telemetry/attribute-vocabulary/index.md b/content_zh/docs/reference/config/policy-and-telemetry/attribute-vocabulary/index.md index 4b8fead89d..d12a4b7925 100644 --- a/content_zh/docs/reference/config/policy-and-telemetry/attribute-vocabulary/index.md +++ b/content_zh/docs/reference/config/policy-and-telemetry/attribute-vocabulary/index.md @@ -78,8 +78,8 @@ weight: 10 | `api.version` | string | API 版本。 | `v1alpha1` | | `api.operation` | string | 用于辨别操作的唯一字符串。在特定的 <service, version> 描述的所有操作中，这个 ID 是唯一的。 | `getPetsById` | | `api.protocol` | string | API 调用的协议类型。主要用于监控和分析。注意这是暴露给客户端的前端协议，不是后端服务实现的协议。 | `http`, `https`, or `grpc` | -| `request.auth.principal` | string | 请求的经过身份验证的主体。这是一个用“ / ”把 JWT 中的发行者（ `iss` ）和主题（ `sub` ）声明连接起来的字符串，其中主题的值是被 URL 编码的。此属性可能来自 Istio 身份验证策略中的对等体或源，具体取决于 Istio 身份验证策略中定义的绑定规则。 | `accounts.my-svc.com/104958560606` | -| `request.auth.audiences` | string | 此身份验证信息的目标受众。此值应反映 JWT 中的受众（ `aud` ）声明。 | `['my-svc.com', 'scopes/read']` | +| `request.auth.principal` | string | 请求的经过身份验证的主体。这是一个用“ / ”把 JWT 中的发行者（ `iss` ）和主题（ `sub` ）声明连接起来的字符串，其中主题的值是被 URL 编码的。此属性可能来自 Istio 身份验证策略中的对等体或源，具体取决于 Istio 身份验证策略中定义的绑定规则。 | `issuer@foo.com/sub@foo.com` | +| `request.auth.audiences` | string | 此身份验证信息的目标受众。此值应反映 JWT 中的受众（ `aud` ）声明。 | `au1` | | `request.auth.presenter` | string | 授权证书的出示人。此值应反映 JWT 或 OAuth2 客户端 ID 中的可选授权演示者（`azp`）声明。 | 123456789012.my-svc.com | | `request.auth.claims` | map[string, string] | 原始 JWT 中所有的的字符串声明。 | `iss`: `issuer@foo.com`, `sub`: `sub@foo.com`, `aud`: `aud1` | | `request.api_key` | string | 用于请求的 API key 。 | abcde12345 |