From 030db9a23a8a89c777aa1b59a2db2cc64f40cb0e Mon Sep 17 00:00:00 2001 From: Ashwanth Goli Date: Tue, 14 Nov 2023 12:21:48 +0530 Subject: [PATCH] chore: follow-up to #11151 --- docs/sources/setup/upgrade/_index.md | 4 ---- pkg/ruler/base/client_pool.go | 20 ++++++++++--------- production/docker/config/loki.yaml | 1 - production/helm/loki/values.yaml | 1 - .../loki-simple-scalable/example/main.jsonnet | 1 - production/ksonnet/loki/config.libsonnet | 1 - production/nomad/loki-distributed/config.yml | 1 - production/nomad/loki-simple/config.yml | 1 - production/nomad/loki/config.yml | 1 - 9 files changed, 11 insertions(+), 20 deletions(-) diff --git a/docs/sources/setup/upgrade/_index.md b/docs/sources/setup/upgrade/_index.md index e76a3d1b191d..e9483e521940 100644 --- a/docs/sources/setup/upgrade/_index.md +++ b/docs/sources/setup/upgrade/_index.md @@ -241,10 +241,6 @@ Some Loki metrics started with the prefix `cortex_`. In this release they will b - `cortex_query_scheduler_queue_duration_seconds_sum` - `cortex_query_scheduler_queue_length` - `cortex_query_scheduler_running` - - `cortex_quota_cgroup_cpu_max` - - `cortex_quota_cgroup_cpu_period` - - `cortex_quota_cpu_count` - - `cortex_quota_gomaxprocs` - `cortex_ring_member_heartbeats_total` - `cortex_ring_member_tokens_owned` - `cortex_ring_member_tokens_to_own` diff --git a/pkg/ruler/base/client_pool.go b/pkg/ruler/base/client_pool.go index ca2a3ac2d45f..4a66fc935107 100644 --- a/pkg/ruler/base/client_pool.go +++ b/pkg/ruler/base/client_pool.go @@ -48,15 +48,16 @@ func newRulerClientPool(clientCfg grpcclient.Config, logger log.Logger, reg prom }) return &rulerClientsPool{ - client.NewPool("ruler", poolCfg, nil, newRulerClientFactory(clientCfg, reg), clientsCount, logger), + client.NewPool("ruler", poolCfg, nil, newRulerClientFactory(clientCfg, reg, metricsNamespace), clientsCount, logger), } } -func newRulerClientFactory(clientCfg grpcclient.Config, reg prometheus.Registerer) client.PoolFactory { +func newRulerClientFactory(clientCfg grpcclient.Config, reg prometheus.Registerer, metricsNamespace string) client.PoolFactory { requestDuration := promauto.With(reg).NewHistogramVec(prometheus.HistogramOpts{ - Name: "cortex_ruler_client_request_duration_seconds", - Help: "Time spent executing requests to the ruler.", - Buckets: prometheus.ExponentialBuckets(0.008, 4, 7), + Namespace: metricsNamespace, + Name: "ruler_client_request_duration_seconds", + Help: "Time spent executing requests to the ruler.", + Buckets: prometheus.ExponentialBuckets(0.008, 4, 7), }, []string{"operation", "status_code"}) return client.PoolAddrFunc(func(addr string) (client.PoolClient, error) { @@ -64,11 +65,12 @@ func newRulerClientFactory(clientCfg grpcclient.Config, reg prometheus.Registere }) } -func newRulerPoolClient(clientCfg grpcclient.Config, reg prometheus.Registerer) func(addr string) (client.PoolClient, error) { +func newRulerPoolClient(clientCfg grpcclient.Config, reg prometheus.Registerer, metricsNamespace string) func(addr string) (client.PoolClient, error) { requestDuration := promauto.With(reg).NewHistogramVec(prometheus.HistogramOpts{ - Name: "cortex_ruler_client_request_duration_seconds", - Help: "Time spent executing requests to the ruler.", - Buckets: prometheus.ExponentialBuckets(0.008, 4, 7), + Namespace: metricsNamespace, + Name: "ruler_client_request_duration_seconds", + Help: "Time spent executing requests to the ruler.", + Buckets: prometheus.ExponentialBuckets(0.008, 4, 7), }, []string{"operation", "status_code"}) return func(addr string) (client.PoolClient, error) { diff --git a/production/docker/config/loki.yaml b/production/docker/config/loki.yaml index 7d7346cfc63b..e6a2f5fe31d8 100644 --- a/production/docker/config/loki.yaml +++ b/production/docker/config/loki.yaml @@ -89,7 +89,6 @@ schema_config: limits_config: max_cache_freshness_per_query: '10m' - enforce_metric_name: false reject_old_samples: true reject_old_samples_max_age: 30m ingestion_rate_mb: 10 diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml index 92b7069af39f..de6048aecc71 100644 --- a/production/helm/loki/values.yaml +++ b/production/helm/loki/values.yaml @@ -254,7 +254,6 @@ loki: grpc_listen_port: 9095 # -- Limits config limits_config: - enforce_metric_name: false reject_old_samples: true reject_old_samples_max_age: 168h max_cache_freshness_per_query: 10m diff --git a/production/ksonnet/loki-simple-scalable/example/main.jsonnet b/production/ksonnet/loki-simple-scalable/example/main.jsonnet index ebf7b5cf288a..66a0d185f44d 100644 --- a/production/ksonnet/loki-simple-scalable/example/main.jsonnet +++ b/production/ksonnet/loki-simple-scalable/example/main.jsonnet @@ -38,7 +38,6 @@ loki { }, }, limits_config: { - enforce_metric_name: false, reject_old_samples_max_age: '168h', //1 week max_global_streams_per_user: 60000, ingestion_rate_mb: 75, diff --git a/production/ksonnet/loki/config.libsonnet b/production/ksonnet/loki/config.libsonnet index 8450e524fd1e..20cd6ad1fe41 100644 --- a/production/ksonnet/loki/config.libsonnet +++ b/production/ksonnet/loki/config.libsonnet @@ -208,7 +208,6 @@ query_ingesters_within: '2h', // twice the max-chunk age (1h default) for safety buffer }, limits_config: { - enforce_metric_name: false, // align middleware parallelism with shard factor to optimize one-legged sharded queries. max_query_parallelism: if $._config.queryFrontend.sharded_queries_enabled then // For a sharding factor of 16 (default), this is 256, or enough for 16 sharded queries. diff --git a/production/nomad/loki-distributed/config.yml b/production/nomad/loki-distributed/config.yml index 2391ff1afed0..48fc8e166c68 100644 --- a/production/nomad/loki-distributed/config.yml +++ b/production/nomad/loki-distributed/config.yml @@ -122,6 +122,5 @@ ruler: dir: {{ env "NOMAD_ALLOC_DIR" }}/data/ruler limits_config: - enforce_metric_name: false reject_old_samples: true reject_old_samples_max_age: 168h diff --git a/production/nomad/loki-simple/config.yml b/production/nomad/loki-simple/config.yml index d0883b2dfa6a..79b1d39d57a9 100644 --- a/production/nomad/loki-simple/config.yml +++ b/production/nomad/loki-simple/config.yml @@ -50,7 +50,6 @@ storage_config: s3forcepathstyle: true limits_config: - enforce_metric_name: false reject_old_samples: true reject_old_samples_max_age: 168h diff --git a/production/nomad/loki/config.yml b/production/nomad/loki/config.yml index 1f1e24701925..ceeda7d2e49e 100644 --- a/production/nomad/loki/config.yml +++ b/production/nomad/loki/config.yml @@ -50,7 +50,6 @@ storage_config: s3forcepathstyle: true limits_config: - enforce_metric_name: false reject_old_samples: true reject_old_samples_max_age: 168h