Skip to content

Commit 6c0075b

Browse files
won-jsfriedrichg
won-js
and
friedrichg
authored
remove multiple dots in redis flags (#6476)
* remove multiple dots in redis flags Signed-off-by: won-js <[email protected]> * update docs Signed-off-by: won-js <[email protected]> * add BUGFIX entry in the CHANGELOG Signed-off-by: won-js <[email protected]> * Update CHANGELOG.md Signed-off-by: Friedrich Gonzalez <[email protected]> * remove white space Signed-off-by: Friedrich Gonzalez <[email protected]> --------- Signed-off-by: won-js <[email protected]> Signed-off-by: Friedrich Gonzalez <[email protected]> Co-authored-by: Friedrich Gonzalez <[email protected]>
1 parent 50925fc commit 6c0075b

File tree

5 files changed

+47
-47
lines changed

5 files changed

+47
-47
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
* [BUGFIX] Ingester: Fix regression on usage of cortex_ingester_queried_chunks. #6398
6363
* [BUGFIX] Ingester: Fix possible race condition when `active series per LabelSet` is configured. #6409
6464
* [BUGFIX] Query Frontend: Fix @ modifier not being applied correctly on sub queries. #6450
65+
* [BUGFIX] Cortex Redis flags with multiple dots #6476
6566

6667
## 1.18.1 2024-10-14
6768

‎docs/blocks-storage/querier.md‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -755,25 +755,25 @@ blocks_storage:
755755
# Path to the client certificate file, which will be used for
756756
# authenticating with the server. Also requires the key path to be
757757
# configured.
758-
# CLI flag: -blocks-storage.bucket-store.index-cache.redis..tls-cert-path
758+
# CLI flag: -blocks-storage.bucket-store.index-cache.redis.tls-cert-path
759759
[tls_cert_path: <string> | default = ""]
760760

761761
# Path to the key file for the client certificate. Also requires the
762762
# client certificate to be configured.
763-
# CLI flag: -blocks-storage.bucket-store.index-cache.redis..tls-key-path
763+
# CLI flag: -blocks-storage.bucket-store.index-cache.redis.tls-key-path
764764
[tls_key_path: <string> | default = ""]
765765

766766
# Path to the CA certificates file to validate server certificate
767767
# against. If not set, the host's root CA certificates are used.
768-
# CLI flag: -blocks-storage.bucket-store.index-cache.redis..tls-ca-path
768+
# CLI flag: -blocks-storage.bucket-store.index-cache.redis.tls-ca-path
769769
[tls_ca_path: <string> | default = ""]
770770

771771
# Override the expected name on the server certificate.
772-
# CLI flag: -blocks-storage.bucket-store.index-cache.redis..tls-server-name
772+
# CLI flag: -blocks-storage.bucket-store.index-cache.redis.tls-server-name
773773
[tls_server_name: <string> | default = ""]
774774

775775
# Skip validating server certificate.
776-
# CLI flag: -blocks-storage.bucket-store.index-cache.redis..tls-insecure-skip-verify
776+
# CLI flag: -blocks-storage.bucket-store.index-cache.redis.tls-insecure-skip-verify
777777
[tls_insecure_skip_verify: <boolean> | default = false]
778778

779779
# If not zero then client-side caching is enabled. Client-side caching
@@ -990,25 +990,25 @@ blocks_storage:
990990
# Path to the client certificate file, which will be used for
991991
# authenticating with the server. Also requires the key path to be
992992
# configured.
993-
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis..tls-cert-path
993+
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.tls-cert-path
994994
[tls_cert_path: <string> | default = ""]
995995

996996
# Path to the key file for the client certificate. Also requires the
997997
# client certificate to be configured.
998-
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis..tls-key-path
998+
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.tls-key-path
999999
[tls_key_path: <string> | default = ""]
10001000

10011001
# Path to the CA certificates file to validate server certificate
10021002
# against. If not set, the host's root CA certificates are used.
1003-
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis..tls-ca-path
1003+
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.tls-ca-path
10041004
[tls_ca_path: <string> | default = ""]
10051005

10061006
# Override the expected name on the server certificate.
1007-
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis..tls-server-name
1007+
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.tls-server-name
10081008
[tls_server_name: <string> | default = ""]
10091009

10101010
# Skip validating server certificate.
1011-
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis..tls-insecure-skip-verify
1011+
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.tls-insecure-skip-verify
10121012
[tls_insecure_skip_verify: <boolean> | default = false]
10131013

10141014
# If not zero then client-side caching is enabled. Client-side caching
@@ -1231,25 +1231,25 @@ blocks_storage:
12311231
# Path to the client certificate file, which will be used for
12321232
# authenticating with the server. Also requires the key path to be
12331233
# configured.
1234-
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis..tls-cert-path
1234+
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.tls-cert-path
12351235
[tls_cert_path: <string> | default = ""]
12361236

12371237
# Path to the key file for the client certificate. Also requires the
12381238
# client certificate to be configured.
1239-
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis..tls-key-path
1239+
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.tls-key-path
12401240
[tls_key_path: <string> | default = ""]
12411241

12421242
# Path to the CA certificates file to validate server certificate
12431243
# against. If not set, the host's root CA certificates are used.
1244-
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis..tls-ca-path
1244+
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.tls-ca-path
12451245
[tls_ca_path: <string> | default = ""]
12461246

12471247
# Override the expected name on the server certificate.
1248-
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis..tls-server-name
1248+
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.tls-server-name
12491249
[tls_server_name: <string> | default = ""]
12501250

12511251
# Skip validating server certificate.
1252-
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis..tls-insecure-skip-verify
1252+
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.tls-insecure-skip-verify
12531253
[tls_insecure_skip_verify: <boolean> | default = false]
12541254

12551255
# If not zero then client-side caching is enabled. Client-side caching

‎docs/blocks-storage/store-gateway.md‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -859,25 +859,25 @@ blocks_storage:
859859
# Path to the client certificate file, which will be used for
860860
# authenticating with the server. Also requires the key path to be
861861
# configured.
862-
# CLI flag: -blocks-storage.bucket-store.index-cache.redis..tls-cert-path
862+
# CLI flag: -blocks-storage.bucket-store.index-cache.redis.tls-cert-path
863863
[tls_cert_path: <string> | default = ""]
864864

865865
# Path to the key file for the client certificate. Also requires the
866866
# client certificate to be configured.
867-
# CLI flag: -blocks-storage.bucket-store.index-cache.redis..tls-key-path
867+
# CLI flag: -blocks-storage.bucket-store.index-cache.redis.tls-key-path
868868
[tls_key_path: <string> | default = ""]
869869

870870
# Path to the CA certificates file to validate server certificate
871871
# against. If not set, the host's root CA certificates are used.
872-
# CLI flag: -blocks-storage.bucket-store.index-cache.redis..tls-ca-path
872+
# CLI flag: -blocks-storage.bucket-store.index-cache.redis.tls-ca-path
873873
[tls_ca_path: <string> | default = ""]
874874

875875
# Override the expected name on the server certificate.
876-
# CLI flag: -blocks-storage.bucket-store.index-cache.redis..tls-server-name
876+
# CLI flag: -blocks-storage.bucket-store.index-cache.redis.tls-server-name
877877
[tls_server_name: <string> | default = ""]
878878

879879
# Skip validating server certificate.
880-
# CLI flag: -blocks-storage.bucket-store.index-cache.redis..tls-insecure-skip-verify
880+
# CLI flag: -blocks-storage.bucket-store.index-cache.redis.tls-insecure-skip-verify
881881
[tls_insecure_skip_verify: <boolean> | default = false]
882882

883883
# If not zero then client-side caching is enabled. Client-side caching
@@ -1094,25 +1094,25 @@ blocks_storage:
10941094
# Path to the client certificate file, which will be used for
10951095
# authenticating with the server. Also requires the key path to be
10961096
# configured.
1097-
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis..tls-cert-path
1097+
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.tls-cert-path
10981098
[tls_cert_path: <string> | default = ""]
10991099

11001100
# Path to the key file for the client certificate. Also requires the
11011101
# client certificate to be configured.
1102-
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis..tls-key-path
1102+
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.tls-key-path
11031103
[tls_key_path: <string> | default = ""]
11041104

11051105
# Path to the CA certificates file to validate server certificate
11061106
# against. If not set, the host's root CA certificates are used.
1107-
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis..tls-ca-path
1107+
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.tls-ca-path
11081108
[tls_ca_path: <string> | default = ""]
11091109

11101110
# Override the expected name on the server certificate.
1111-
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis..tls-server-name
1111+
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.tls-server-name
11121112
[tls_server_name: <string> | default = ""]
11131113

11141114
# Skip validating server certificate.
1115-
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis..tls-insecure-skip-verify
1115+
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.tls-insecure-skip-verify
11161116
[tls_insecure_skip_verify: <boolean> | default = false]
11171117

11181118
# If not zero then client-side caching is enabled. Client-side caching
@@ -1335,25 +1335,25 @@ blocks_storage:
13351335
# Path to the client certificate file, which will be used for
13361336
# authenticating with the server. Also requires the key path to be
13371337
# configured.
1338-
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis..tls-cert-path
1338+
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.tls-cert-path
13391339
[tls_cert_path: <string> | default = ""]
13401340

13411341
# Path to the key file for the client certificate. Also requires the
13421342
# client certificate to be configured.
1343-
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis..tls-key-path
1343+
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.tls-key-path
13441344
[tls_key_path: <string> | default = ""]
13451345

13461346
# Path to the CA certificates file to validate server certificate
13471347
# against. If not set, the host's root CA certificates are used.
1348-
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis..tls-ca-path
1348+
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.tls-ca-path
13491349
[tls_ca_path: <string> | default = ""]
13501350

13511351
# Override the expected name on the server certificate.
1352-
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis..tls-server-name
1352+
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.tls-server-name
13531353
[tls_server_name: <string> | default = ""]
13541354

13551355
# Skip validating server certificate.
1356-
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis..tls-insecure-skip-verify
1356+
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.tls-insecure-skip-verify
13571357
[tls_insecure_skip_verify: <boolean> | default = false]
13581358

13591359
# If not zero then client-side caching is enabled. Client-side caching

‎docs/configuration/config-file-reference.md‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1299,25 +1299,25 @@ bucket_store:
12991299
# Path to the client certificate file, which will be used for
13001300
# authenticating with the server. Also requires the key path to be
13011301
# configured.
1302-
# CLI flag: -blocks-storage.bucket-store.index-cache.redis..tls-cert-path
1302+
# CLI flag: -blocks-storage.bucket-store.index-cache.redis.tls-cert-path
13031303
[tls_cert_path: <string> | default = ""]
13041304

13051305
# Path to the key file for the client certificate. Also requires the
13061306
# client certificate to be configured.
1307-
# CLI flag: -blocks-storage.bucket-store.index-cache.redis..tls-key-path
1307+
# CLI flag: -blocks-storage.bucket-store.index-cache.redis.tls-key-path
13081308
[tls_key_path: <string> | default = ""]
13091309

13101310
# Path to the CA certificates file to validate server certificate against.
13111311
# If not set, the host's root CA certificates are used.
1312-
# CLI flag: -blocks-storage.bucket-store.index-cache.redis..tls-ca-path
1312+
# CLI flag: -blocks-storage.bucket-store.index-cache.redis.tls-ca-path
13131313
[tls_ca_path: <string> | default = ""]
13141314

13151315
# Override the expected name on the server certificate.
1316-
# CLI flag: -blocks-storage.bucket-store.index-cache.redis..tls-server-name
1316+
# CLI flag: -blocks-storage.bucket-store.index-cache.redis.tls-server-name
13171317
[tls_server_name: <string> | default = ""]
13181318

13191319
# Skip validating server certificate.
1320-
# CLI flag: -blocks-storage.bucket-store.index-cache.redis..tls-insecure-skip-verify
1320+
# CLI flag: -blocks-storage.bucket-store.index-cache.redis.tls-insecure-skip-verify
13211321
[tls_insecure_skip_verify: <boolean> | default = false]
13221322

13231323
# If not zero then client-side caching is enabled. Client-side caching is
@@ -1532,25 +1532,25 @@ bucket_store:
15321532
# Path to the client certificate file, which will be used for
15331533
# authenticating with the server. Also requires the key path to be
15341534
# configured.
1535-
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis..tls-cert-path
1535+
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.tls-cert-path
15361536
[tls_cert_path: <string> | default = ""]
15371537

15381538
# Path to the key file for the client certificate. Also requires the
15391539
# client certificate to be configured.
1540-
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis..tls-key-path
1540+
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.tls-key-path
15411541
[tls_key_path: <string> | default = ""]
15421542

15431543
# Path to the CA certificates file to validate server certificate against.
15441544
# If not set, the host's root CA certificates are used.
1545-
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis..tls-ca-path
1545+
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.tls-ca-path
15461546
[tls_ca_path: <string> | default = ""]
15471547

15481548
# Override the expected name on the server certificate.
1549-
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis..tls-server-name
1549+
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.tls-server-name
15501550
[tls_server_name: <string> | default = ""]
15511551

15521552
# Skip validating server certificate.
1553-
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis..tls-insecure-skip-verify
1553+
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.tls-insecure-skip-verify
15541554
[tls_insecure_skip_verify: <boolean> | default = false]
15551555

15561556
# If not zero then client-side caching is enabled. Client-side caching is
@@ -1770,25 +1770,25 @@ bucket_store:
17701770
# Path to the client certificate file, which will be used for
17711771
# authenticating with the server. Also requires the key path to be
17721772
# configured.
1773-
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis..tls-cert-path
1773+
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.tls-cert-path
17741774
[tls_cert_path: <string> | default = ""]
17751775

17761776
# Path to the key file for the client certificate. Also requires the
17771777
# client certificate to be configured.
1778-
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis..tls-key-path
1778+
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.tls-key-path
17791779
[tls_key_path: <string> | default = ""]
17801780

17811781
# Path to the CA certificates file to validate server certificate against.
17821782
# If not set, the host's root CA certificates are used.
1783-
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis..tls-ca-path
1783+
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.tls-ca-path
17841784
[tls_ca_path: <string> | default = ""]
17851785

17861786
# Override the expected name on the server certificate.
1787-
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis..tls-server-name
1787+
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.tls-server-name
17881788
[tls_server_name: <string> | default = ""]
17891789

17901790
# Skip validating server certificate.
1791-
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis..tls-insecure-skip-verify
1791+
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.tls-insecure-skip-verify
17921792
[tls_insecure_skip_verify: <boolean> | default = false]
17931793

17941794
# If not zero then client-side caching is enabled. Client-side caching is

‎pkg/storage/tsdb/redis_client_config.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package tsdb
22

33
import (
44
"flag"
5-
65
"time"
76

87
"github.com/pkg/errors"
@@ -60,7 +59,7 @@ func (cfg *RedisClientConfig) RegisterFlagsWithPrefix(f *flag.FlagSet, prefix st
6059
f.StringVar(&cfg.MasterName, prefix+"master-name", "", "Specifies the master's name. Must be not empty for Redis Sentinel.")
6160
f.IntVar(&cfg.CacheSize, prefix+"cache-size", 0, "If not zero then client-side caching is enabled. Client-side caching is when data is stored in memory instead of fetching data each time. See https://redis.io/docs/manual/client-side-caching/ for more info.")
6261
f.BoolVar(&cfg.TLSEnabled, prefix+"tls-enabled", false, "Whether to enable tls for redis connection.")
63-
cfg.TLS.RegisterFlagsWithPrefix(prefix, f)
62+
cfg.TLS.RegisterFlagsWithPrefix(prefix[:len(prefix)-1], f)
6463
cfg.SetAsyncCircuitBreaker.RegisterFlagsWithPrefix(f, prefix+"set-async.")
6564
}
6665

0 commit comments

Comments
 (0)