From 2a04ac9af709b1199f9b2e442b34945b70065298 Mon Sep 17 00:00:00 2001 From: Trevor Whitney Date: Mon, 25 Apr 2022 16:06:47 -0500 Subject: [PATCH] Remove references to cortex (#6015) --- docs/sources/configuration/_index.md | 34 ++----------------- .../chunk/client/azure/blob_storage_client.go | 2 +- 2 files changed, 3 insertions(+), 33 deletions(-) diff --git a/docs/sources/configuration/_index.md b/docs/sources/configuration/_index.md index 8067e753a61c4..4861c24537c44 100644 --- a/docs/sources/configuration/_index.md +++ b/docs/sources/configuration/_index.md @@ -742,7 +742,7 @@ The `azure_storage_config` configures Azure as a general storage for different d # Name of the blob container used to store chunks. This container must be # created before running cortex. # CLI flag: -.azure.container-name -[container_name: | default = "cortex"] +[container_name: | default = "loki"] # The Microsoft Azure account name to be used # CLI flag: -.azure.account-name @@ -938,7 +938,7 @@ The `swift_storage_config` configures Swift as a general storage for different d # Name of the Swift container to put chunks in. # CLI flag: -.swift.container-name -[container_name: | default = "cortex"] +[container_name: | default = ""] ``` ## hedging @@ -1489,36 +1489,6 @@ aws: # CLI flag: -metrics.ignore-throttle-below [ignore_throttle_below: | default = 1] - # Query to fetch ingester queue length - # CLI flag: -metrics.queue-length-query - [queue_length_query: | - default = "sum(avg_over_time(cortex_ingester_flush_queue_length{job="cortex/ingester"}[2m]))"] - - # Query to fetch throttle rates per table - # CLI flag: -metrics.write-throttle-query - [write_throttle_query: | - default = "sum(rate(cortex_dynamo_throttled_total{operation="DynamoDB.BatchWriteItem"}[1m])) - by (table) > 0"] - - # Query to fetch write capacity usage per table - # CLI flag: -metrics.usage-query - [write_usage_query: | - default = - "sum(rate(cortex_dynamo_consumed_capacity_total{operation="DynamoDB.BatchWriteItem"}[15m])) - by (table) > 0"] - - # Query to fetch read capacity usage per table - # CLI flag: -metrics.read-usage-query - [read_usage_query: | - default = "sum(rate(cortex_dynamo_consumed_capacity_total{operation="DynamoDB.QueryPages"}[1h])) - by (table) > 0"] - - # Query to fetch read errors per table - # CLI flag: -metrics.read-error-query - [read_error_query: | - default = "sum(increase(cortex_dynamo_failures_total{operation="DynamoDB.QueryPages", - error="ProvisionedThroughputExceededException"}[1m])) by (table) > 0"] - # Number of chunks to group together to parallelise fetches (0 to disable) # CLI flag: -dynamodb.chunk-gang-size [chunk_gang_size: | default = 10] diff --git a/pkg/storage/chunk/client/azure/blob_storage_client.go b/pkg/storage/chunk/client/azure/blob_storage_client.go index 163b4a28cd8cd..f74ade5f6811f 100644 --- a/pkg/storage/chunk/client/azure/blob_storage_client.go +++ b/pkg/storage/chunk/client/azure/blob_storage_client.go @@ -105,7 +105,7 @@ func (c *BlobStorageConfig) RegisterFlags(f *flag.FlagSet) { // RegisterFlagsWithPrefix adds the flags required to config this to the given FlagSet func (c *BlobStorageConfig) RegisterFlagsWithPrefix(prefix string, f *flag.FlagSet) { f.StringVar(&c.Environment, prefix+"azure.environment", azureGlobal, fmt.Sprintf("Azure Cloud environment. Supported values are: %s.", strings.Join(supportedEnvironments, ", "))) - f.StringVar(&c.ContainerName, prefix+"azure.container-name", "cortex", "Name of the blob container used to store chunks. This container must be created before running cortex.") + f.StringVar(&c.ContainerName, prefix+"azure.container-name", "loki", "Name of the blob container used to store chunks. This container must be created before running cortex.") f.StringVar(&c.AccountName, prefix+"azure.account-name", "", "The Microsoft Azure account name to be used") f.StringVar(&c.ChunkDelimiter, prefix+"azure.chunk-delimiter", "-", "Chunk delimiter for blob ID to be used") f.Var(&c.AccountKey, prefix+"azure.account-key", "The Microsoft Azure account key to use.")