-
Notifications
You must be signed in to change notification settings - Fork 833
Add Overrides API component and rename old overrides to overrides-configs #6975
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
bogdan-st
wants to merge
13
commits into
cortexproject:master
Choose a base branch
from
bogdan-st:overrides_api
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 7 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
aad1fee
rename overrides to overridesConfig
bogdan-st 60d09fb
initial overrides api draft
bogdan-st 9e8166d
Merge branch 'master' into overrides_api
bogdan-st f97b319
fix docs and integration tests
bogdan-st 608f1ab
remove from all target
bogdan-st 15f9f3c
remove consul and unneeded flags from test
bogdan-st a2a7665
missed some
bogdan-st 5e21b22
suggestions
bogdan-st 61632a1
Merge branch 'master' into overrides_api
bogdan-st dff25e3
sugestions from dsabsay
bogdan-st 8e50e9a
lint
bogdan-st 06195e0
lint2
bogdan-st 8ba408b
modernize?
bogdan-st File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -411,6 +411,296 @@ query_scheduler: | |
# CLI flag: -query-scheduler.grpc-client-config.connect-timeout | ||
[connect_timeout: <duration> | default = 5s] | ||
|
||
overrides: | ||
|
||
# Path to the runtime configuration file that can be updated via the overrides | ||
# API | ||
# CLI flag: -overrides.runtime-config-file | ||
[runtime_config_file: <string> | default = "runtime.yaml"] | ||
|
||
# Backend storage to use. Supported backends are: s3, gcs, azure, swift, | ||
# filesystem. | ||
# CLI flag: -overrides.backend | ||
[backend: <string> | default = "s3"] | ||
|
||
s3: | ||
# The S3 bucket endpoint. It could be an AWS S3 endpoint listed at | ||
# https://docs.aws.amazon.com/general/latest/gr/s3.html or the address of an | ||
# S3-compatible service in hostname:port format. | ||
# CLI flag: -overrides.s3.endpoint | ||
[endpoint: <string> | default = ""] | ||
|
||
# S3 region. If unset, the client will issue a S3 GetBucketLocation API call | ||
# to autodetect it. | ||
# CLI flag: -overrides.s3.region | ||
[region: <string> | default = ""] | ||
|
||
# S3 bucket name | ||
# CLI flag: -overrides.s3.bucket-name | ||
[bucket_name: <string> | default = ""] | ||
|
||
# If enabled, S3 endpoint will use the non-dualstack variant. | ||
# CLI flag: -overrides.s3.disable-dualstack | ||
[disable_dualstack: <boolean> | default = false] | ||
|
||
# S3 secret access key | ||
# CLI flag: -overrides.s3.secret-access-key | ||
[secret_access_key: <string> | default = ""] | ||
|
||
# S3 access key ID | ||
# CLI flag: -overrides.s3.access-key-id | ||
[access_key_id: <string> | default = ""] | ||
|
||
# If enabled, use http:// for the S3 endpoint instead of https://. This | ||
# could be useful in local dev/test environments while using an | ||
# S3-compatible backend storage, like Minio. | ||
# CLI flag: -overrides.s3.insecure | ||
[insecure: <boolean> | default = false] | ||
|
||
# The signature version to use for authenticating against S3. Supported | ||
# values are: v4, v2. | ||
# CLI flag: -overrides.s3.signature-version | ||
[signature_version: <string> | default = "v4"] | ||
|
||
# The s3 bucket lookup style. Supported values are: auto, virtual-hosted, | ||
# path. | ||
# CLI flag: -overrides.s3.bucket-lookup-type | ||
[bucket_lookup_type: <string> | default = "auto"] | ||
|
||
# If true, attach MD5 checksum when upload objects and S3 uses MD5 checksum | ||
# algorithm to verify the provided digest. If false, use CRC32C algorithm | ||
# instead. | ||
# CLI flag: -overrides.s3.send-content-md5 | ||
[send_content_md5: <boolean> | default = true] | ||
|
||
# The list api version. Supported values are: v1, v2, and ''. | ||
# CLI flag: -overrides.s3.list-objects-version | ||
[list_objects_version: <string> | default = ""] | ||
|
||
# The s3_sse_config configures the S3 server-side encryption. | ||
# The CLI flags prefix for this block config is: overrides | ||
[sse: <s3_sse_config>] | ||
|
||
http: | ||
# The time an idle connection will remain idle before closing. | ||
# CLI flag: -overrides.s3.http.idle-conn-timeout | ||
[idle_conn_timeout: <duration> | default = 1m30s] | ||
|
||
# The amount of time the client will wait for a servers response headers. | ||
# CLI flag: -overrides.s3.http.response-header-timeout | ||
[response_header_timeout: <duration> | default = 2m] | ||
|
||
# If the client connects via HTTPS and this option is enabled, the client | ||
# will accept any certificate and hostname. | ||
# CLI flag: -overrides.s3.http.insecure-skip-verify | ||
[insecure_skip_verify: <boolean> | default = false] | ||
|
||
# Maximum time to wait for a TLS handshake. 0 means no limit. | ||
# CLI flag: -overrides.s3.tls-handshake-timeout | ||
[tls_handshake_timeout: <duration> | default = 10s] | ||
|
||
# The time to wait for a server's first response headers after fully | ||
# writing the request headers if the request has an Expect header. 0 to | ||
# send the request body immediately. | ||
# CLI flag: -overrides.s3.expect-continue-timeout | ||
[expect_continue_timeout: <duration> | default = 1s] | ||
|
||
# Maximum number of idle (keep-alive) connections across all hosts. 0 | ||
# means no limit. | ||
# CLI flag: -overrides.s3.max-idle-connections | ||
[max_idle_connections: <int> | default = 100] | ||
|
||
# Maximum number of idle (keep-alive) connections to keep per-host. If 0, | ||
# a built-in default value is used. | ||
# CLI flag: -overrides.s3.max-idle-connections-per-host | ||
[max_idle_connections_per_host: <int> | default = 100] | ||
|
||
# Maximum number of connections per host. 0 means no limit. | ||
# CLI flag: -overrides.s3.max-connections-per-host | ||
[max_connections_per_host: <int> | default = 0] | ||
|
||
gcs: | ||
# GCS bucket name | ||
# CLI flag: -overrides.gcs.bucket-name | ||
[bucket_name: <string> | default = ""] | ||
|
||
# JSON representing either a Google Developers Console | ||
# client_credentials.json file or a Google Developers service account key | ||
# file. If empty, fallback to Google default logic. | ||
# CLI flag: -overrides.gcs.service-account | ||
[service_account: <string> | default = ""] | ||
|
||
azure: | ||
# Azure storage account name | ||
# CLI flag: -overrides.azure.account-name | ||
[account_name: <string> | default = ""] | ||
|
||
# Azure storage account key | ||
# CLI flag: -overrides.azure.account-key | ||
[account_key: <string> | default = ""] | ||
|
||
# The values of `account-name` and `endpoint-suffix` values will not be | ||
# ignored if `connection-string` is set. Use this method over `account-key` | ||
# if you need to authenticate via a SAS token or if you use the Azurite | ||
# emulator. | ||
# CLI flag: -overrides.azure.connection-string | ||
[connection_string: <string> | default = ""] | ||
|
||
# Azure storage container name | ||
# CLI flag: -overrides.azure.container-name | ||
[container_name: <string> | default = ""] | ||
|
||
# Azure storage endpoint suffix without schema. The account name will be | ||
# prefixed to this value to create the FQDN | ||
# CLI flag: -overrides.azure.endpoint-suffix | ||
[endpoint_suffix: <string> | default = ""] | ||
|
||
# Number of retries for recoverable errors | ||
# CLI flag: -overrides.azure.max-retries | ||
[max_retries: <int> | default = 20] | ||
|
||
# Deprecated: Azure storage MSI resource. It will be set automatically by | ||
# Azure SDK. | ||
# CLI flag: -overrides.azure.msi-resource | ||
[msi_resource: <string> | default = ""] | ||
|
||
# Azure storage MSI resource managed identity client Id. If not supplied | ||
# default Azure credential will be used. Set it to empty if you need to | ||
# authenticate via Azure Workload Identity. | ||
# CLI flag: -overrides.azure.user-assigned-id | ||
[user_assigned_id: <string> | default = ""] | ||
|
||
http: | ||
# The time an idle connection will remain idle before closing. | ||
# CLI flag: -overrides.azure.http.idle-conn-timeout | ||
[idle_conn_timeout: <duration> | default = 1m30s] | ||
|
||
# The amount of time the client will wait for a servers response headers. | ||
# CLI flag: -overrides.azure.http.response-header-timeout | ||
[response_header_timeout: <duration> | default = 2m] | ||
|
||
# If the client connects via HTTPS and this option is enabled, the client | ||
# will accept any certificate and hostname. | ||
# CLI flag: -overrides.azure.http.insecure-skip-verify | ||
[insecure_skip_verify: <boolean> | default = false] | ||
|
||
# Maximum time to wait for a TLS handshake. 0 means no limit. | ||
# CLI flag: -overrides.azure.tls-handshake-timeout | ||
[tls_handshake_timeout: <duration> | default = 10s] | ||
|
||
# The time to wait for a server's first response headers after fully | ||
# writing the request headers if the request has an Expect header. 0 to | ||
# send the request body immediately. | ||
# CLI flag: -overrides.azure.expect-continue-timeout | ||
[expect_continue_timeout: <duration> | default = 1s] | ||
|
||
# Maximum number of idle (keep-alive) connections across all hosts. 0 | ||
# means no limit. | ||
# CLI flag: -overrides.azure.max-idle-connections | ||
[max_idle_connections: <int> | default = 100] | ||
|
||
# Maximum number of idle (keep-alive) connections to keep per-host. If 0, | ||
# a built-in default value is used. | ||
# CLI flag: -overrides.azure.max-idle-connections-per-host | ||
[max_idle_connections_per_host: <int> | default = 100] | ||
|
||
# Maximum number of connections per host. 0 means no limit. | ||
# CLI flag: -overrides.azure.max-connections-per-host | ||
[max_connections_per_host: <int> | default = 0] | ||
|
||
swift: | ||
# OpenStack Swift authentication API version. 0 to autodetect. | ||
# CLI flag: -overrides.swift.auth-version | ||
[auth_version: <int> | default = 0] | ||
|
||
# OpenStack Swift authentication URL | ||
# CLI flag: -overrides.swift.auth-url | ||
[auth_url: <string> | default = ""] | ||
|
||
# OpenStack Swift application credential ID. | ||
# CLI flag: -overrides.swift.application-credential-id | ||
[application_credential_id: <string> | default = ""] | ||
|
||
# OpenStack Swift application credential name. | ||
# CLI flag: -overrides.swift.application-credential-name | ||
[application_credential_name: <string> | default = ""] | ||
|
||
# OpenStack Swift application credential secret. | ||
# CLI flag: -overrides.swift.application-credential-secret | ||
[application_credential_secret: <string> | default = ""] | ||
|
||
# OpenStack Swift username. | ||
# CLI flag: -overrides.swift.username | ||
[username: <string> | default = ""] | ||
|
||
# OpenStack Swift user's domain name. | ||
# CLI flag: -overrides.swift.user-domain-name | ||
[user_domain_name: <string> | default = ""] | ||
|
||
# OpenStack Swift user's domain ID. | ||
# CLI flag: -overrides.swift.user-domain-id | ||
[user_domain_id: <string> | default = ""] | ||
|
||
# OpenStack Swift user ID. | ||
# CLI flag: -overrides.swift.user-id | ||
[user_id: <string> | default = ""] | ||
|
||
# OpenStack Swift API key. | ||
# CLI flag: -overrides.swift.password | ||
[password: <string> | default = ""] | ||
|
||
# OpenStack Swift user's domain ID. | ||
# CLI flag: -overrides.swift.domain-id | ||
[domain_id: <string> | default = ""] | ||
|
||
# OpenStack Swift user's domain name. | ||
# CLI flag: -overrides.swift.domain-name | ||
[domain_name: <string> | default = ""] | ||
|
||
# OpenStack Swift project ID (v2,v3 auth only). | ||
# CLI flag: -overrides.swift.project-id | ||
[project_id: <string> | default = ""] | ||
|
||
# OpenStack Swift project name (v2,v3 auth only). | ||
# CLI flag: -overrides.swift.project-name | ||
[project_name: <string> | default = ""] | ||
|
||
# ID of the OpenStack Swift project's domain (v3 auth only), only needed if | ||
# it differs the from user domain. | ||
# CLI flag: -overrides.swift.project-domain-id | ||
[project_domain_id: <string> | default = ""] | ||
|
||
# Name of the OpenStack Swift project's domain (v3 auth only), only needed | ||
# if it differs from the user domain. | ||
# CLI flag: -overrides.swift.project-domain-name | ||
[project_domain_name: <string> | default = ""] | ||
|
||
# OpenStack Swift Region to use (v2,v3 auth only). | ||
# CLI flag: -overrides.swift.region-name | ||
[region_name: <string> | default = ""] | ||
|
||
# Name of the OpenStack Swift container to put chunks in. | ||
# CLI flag: -overrides.swift.container-name | ||
[container_name: <string> | default = ""] | ||
|
||
# Max retries on requests error. | ||
# CLI flag: -overrides.swift.max-retries | ||
[max_retries: <int> | default = 3] | ||
|
||
# Time after which a connection attempt is aborted. | ||
# CLI flag: -overrides.swift.connect-timeout | ||
[connect_timeout: <duration> | default = 10s] | ||
|
||
# Time after which an idle request is aborted. The timeout watchdog is reset | ||
# each time some data is received, so the timeout triggers after X time no | ||
# data is received on a request. | ||
# CLI flag: -overrides.swift.request-timeout | ||
[request_timeout: <duration> | default = 5s] | ||
|
||
filesystem: | ||
# Local filesystem storage directory. | ||
# CLI flag: -overrides.filesystem.dir | ||
[dir: <string> | default = ""] | ||
|
||
# The tracing_config configures backends cortex uses. | ||
[tracing: <tracing_config>] | ||
``` | ||
|
@@ -6077,6 +6367,7 @@ The `s3_sse_config` configures the S3 server-side encryption. The supported CLI | |
|
||
- `alertmanager-storage` | ||
- `blocks-storage` | ||
- `overrides` | ||
- `ruler-storage` | ||
- `runtime-config` | ||
|
||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.