diff --git a/cmd/mimir/config-descriptor.json b/cmd/mimir/config-descriptor.json index f60c8308c0..d626353e02 100644 --- a/cmd/mimir/config-descriptor.json +++ b/cmd/mimir/config-descriptor.json @@ -12378,7 +12378,7 @@ "kind": "field", "name": "token_url", "required": false, - "desc": "Endpoint used to fetch access token from.", + "desc": "Endpoint used to fetch access token.", "fieldValue": null, "fieldDefaultValue": "", "fieldFlag": "ruler.alertmanager-client.oauth.token_url", @@ -12402,7 +12402,7 @@ "kind": "field", "name": "proxy_url", "required": false, - "desc": "Optional HTTP, HTTPS via CONNECT, or SOCKS5 proxy URL to route requests through. Applies to all requests, including infra like oauth token requests.", + "desc": "Optional HTTP, HTTPS via CONNECT, or SOCKS5 proxy URL to route requests through. Applies to all requests, including auxiliary traffic such as OAuth token requests.", "fieldValue": null, "fieldDefaultValue": "", "fieldFlag": "ruler.alertmanager-client.proxy-url", diff --git a/cmd/mimir/help-all.txt.tmpl b/cmd/mimir/help-all.txt.tmpl index bb9f1d514a..eb9625c20f 100644 --- a/cmd/mimir/help-all.txt.tmpl +++ b/cmd/mimir/help-all.txt.tmpl @@ -2828,9 +2828,9 @@ Usage of ./cmd/mimir/mimir: -ruler.alertmanager-client.oauth.scopes string Optional scopes to include with the token request. -ruler.alertmanager-client.oauth.token_url string - Endpoint used to fetch access token from. + Endpoint used to fetch access token. -ruler.alertmanager-client.proxy-url string - Optional HTTP, HTTPS via CONNECT, or SOCKS5 proxy URL to route requests through. Applies to all requests, including infra like oauth token requests. + Optional HTTP, HTTPS via CONNECT, or SOCKS5 proxy URL to route requests through. Applies to all requests, including auxiliary traffic such as OAuth token requests. -ruler.alertmanager-client.tls-ca-path string Path to the CA certificates to validate server certificate against. If not set, the host's root CA certificates are used. -ruler.alertmanager-client.tls-cert-path string diff --git a/cmd/mimir/help.txt.tmpl b/cmd/mimir/help.txt.tmpl index fdc61aec4a..53bdccca7a 100644 --- a/cmd/mimir/help.txt.tmpl +++ b/cmd/mimir/help.txt.tmpl @@ -718,7 +718,7 @@ Usage of ./cmd/mimir/mimir: -ruler.alertmanager-client.oauth.scopes string Optional scopes to include with the token request. -ruler.alertmanager-client.oauth.token_url string - Endpoint used to fetch access token from. + Endpoint used to fetch access token. -ruler.alertmanager-url string Comma-separated list of URL(s) of the Alertmanager(s) to send notifications to. Each URL is treated as a separate group. Multiple Alertmanagers in HA per group can be supported by using DNS service discovery format, comprehensive of the scheme. Basic auth is supported as part of the URL. -ruler.enable-api diff --git a/docs/sources/mimir/configure/configuration-parameters/index.md b/docs/sources/mimir/configure/configuration-parameters/index.md index 26dd1ab20a..e28b00da85 100644 --- a/docs/sources/mimir/configure/configuration-parameters/index.md +++ b/docs/sources/mimir/configure/configuration-parameters/index.md @@ -1961,7 +1961,7 @@ alertmanager_client: # CLI flag: -ruler.alertmanager-client.oauth.client_secret [client_secret: | default = ""] - # Endpoint used to fetch access token from. + # Endpoint used to fetch access token. # CLI flag: -ruler.alertmanager-client.oauth.token_url [token_url: | default = ""] @@ -1970,8 +1970,8 @@ alertmanager_client: [scopes: | default = []] # (advanced) Optional HTTP, HTTPS via CONNECT, or SOCKS5 proxy URL to route - # requests through. Applies to all requests, including infra like oauth token - # requests. + # requests through. Applies to all requests, including auxiliary traffic such + # as OAuth token requests. # CLI flag: -ruler.alertmanager-client.proxy-url [proxy_url: | default = ""]