Merge branch 'main' into chore/adding-go-memlimit

thanos-io · Mar 23, 2024 · ef98c6f · ef98c6f
2 parents eab1db8 + deb615f
commit ef98c6f
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 42 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,7 +29,7 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re
 ### Changed
 
 - [#7123](https://github.com/thanos-io/thanos/pull/7123) Rule: Change default Alertmanager API version to v2.
-- [##7222](https://github.com/thanos-io/thanos/pull/7123) Automatic detection of memory limits and configure GOMEMLIMIT to match.
+- [#7222](https://github.com/thanos-io/thanos/pull/7123) Automatic detection of memory limits and configure GOMEMLIMIT to match.
 
 ### Removed
 

diff --git a/cmd/thanos/config.go b/cmd/thanos/config.go
@@ -292,7 +292,7 @@ type goMemLimitConfig struct {
 
 func (gml *goMemLimitConfig) registerFlag(cmd extkingpin.FlagClause) *goMemLimitConfig {
  cmd.Flag("enable-auto-gomemlimit",
- "Enable go runtime to automatically limit memory consumption by compact component. This is an experimental feature.").
+ "Enable go runtime to automatically limit memory consumption.").
  Default("false").BoolVar(&gml.enableAutoGoMemlimit)
 
  cmd.Flag("auto-gomemlimit.ratio",

diff --git a/docs/components/compact.md b/docs/components/compact.md
@@ -379,8 +379,7 @@ Flags:
  e.g it is not possible to render all samples for
  a human eye anyway
  --enable-auto-gomemlimit Enable go runtime to automatically limit memory
- consumption by compact component. This is an
- experimental feature.
+ consumption.
  --hash-func= Specify which hash function to use when
  calculating the hashes of produced files.
  If no function has been specified, it does not

diff --git a/docs/components/query-frontend.md b/docs/components/query-frontend.md
@@ -207,8 +207,7 @@ Flags:
  Supported values are: 'snappy' and ” (disable
  compression).
  --enable-auto-gomemlimit Enable go runtime to automatically limit memory
- consumption by compact component. This is an
- experimental feature.
+ consumption.
  -h, --help Show context-sensitive help (also try
  --help-long and --help-man).
  --http-address="0.0.0.0:10902"

diff --git a/docs/components/query.md b/docs/components/query.md
@@ -298,8 +298,7 @@ Flags:
  The ratio of reserved GOMEMLIMIT memory to the
  detected maximum container or system memory.
  --enable-auto-gomemlimit Enable go runtime to automatically limit memory
- consumption by compact component. This is an
- experimental feature.
+ consumption.
  --endpoint=<endpoint> ... Addresses of statically configured Thanos
  API servers (repeatable). The scheme may be
  prefixed with 'dns+' or 'dnssrv+' to detect

diff --git a/docs/components/receive.md b/docs/components/receive.md
@@ -301,8 +301,7 @@ Flags:
  The ratio of reserved GOMEMLIMIT memory to the
  detected maximum container or system memory.
  --enable-auto-gomemlimit Enable go runtime to automatically limit memory
- consumption by compact component. This is an
- experimental feature.
+ consumption.
  --grpc-address="0.0.0.0:10901"
  Listen ip:port address for gRPC endpoints
  (StoreAPI). Make sure this address is routable

diff --git a/docs/components/rule.md b/docs/components/rule.md
@@ -321,8 +321,7 @@ Flags:
  detected maximum container or system memory.
  --data-dir="data/" data directory
  --enable-auto-gomemlimit Enable go runtime to automatically limit memory
- consumption by compact component. This is an
- experimental feature.
+ consumption.
  --eval-interval=1m The default evaluation interval to use.
  --for-grace-period=10m Minimum duration between alert and restored
  "for" state. This is maintained only for alerts

diff --git a/docs/components/sidecar.md b/docs/components/sidecar.md
@@ -80,8 +80,7 @@ Flags:
  The ratio of reserved GOMEMLIMIT memory to the
  detected maximum container or system memory.
  --enable-auto-gomemlimit Enable go runtime to automatically limit memory
- consumption by compact component. This is an
- experimental feature.
+ consumption.
  --grpc-address="0.0.0.0:10901"
  Listen ip:port address for gRPC endpoints
  (StoreAPI). Make sure this address is routable

diff --git a/docs/components/store.md b/docs/components/store.md
@@ -73,8 +73,7 @@ Flags:
  cases use Prometheus + sidecar. Ignored if
  --no-cache-index-header option is specified.
  --enable-auto-gomemlimit Enable go runtime to automatically limit memory
- consumption by compact component. This is an
- experimental feature.
+ consumption.
  --grpc-address="0.0.0.0:10901"
  Listen ip:port address for gRPC endpoints
  (StoreAPI). Make sure this address is routable
@@ -381,8 +380,6 @@ While the remaining settings are **optional**:
 The `redis` index cache allows to use [Redis](https://redis.io) as cache backend. This cache type is configured using `--index-cache.config-file` to reference the configuration file or `--index-cache.config` to put yaml config directly:
 
 ```yaml mdox-exec="go run scripts/cfggen/main.go --name=cacheutil.RedisClientConfig"
-# command-line-arguments
-ld: warning: ignoring duplicate libraries: '-lproc'
 type: REDIS
 config:
  addr: ""

diff --git a/docs/components/tools.md b/docs/components/tools.md
@@ -16,8 +16,7 @@ Flags:
  The ratio of reserved GOMEMLIMIT memory to the
  detected maximum container or system memory.
  --enable-auto-gomemlimit Enable go runtime to automatically limit memory
- consumption by compact component. This is an
- experimental feature.
+ consumption.
  -h, --help Show context-sensitive help (also try
  --help-long and --help-man).
  --log.format=logfmt Log format to use. Possible options: logfmt or
@@ -126,8 +125,7 @@ Flags:
  The ratio of reserved GOMEMLIMIT memory to the
  detected maximum container or system memory.
  --enable-auto-gomemlimit Enable go runtime to automatically limit memory
- consumption by compact component. This is an
- experimental feature.
+ consumption.
  -h, --help Show context-sensitive help (also try
  --help-long and --help-man).
  --log.format=logfmt Log format to use. Possible options: logfmt or
@@ -238,8 +236,7 @@ Flags:
  Disable UI/API admin operations like marking
  blocks for deletion and no compaction.
  --enable-auto-gomemlimit Enable go runtime to automatically limit memory
- consumption by compact component. This is an
- experimental feature.
+ consumption.
  -h, --help Show context-sensitive help (also try
  --help-long and --help-man).
  --http-address="0.0.0.0:10902"
@@ -372,8 +369,7 @@ Flags:
  or compactor is ignoring the deletion because
  it's compacting the block at the same time.
  --enable-auto-gomemlimit Enable go runtime to automatically limit memory
- consumption by compact component. This is an
- experimental feature.
+ consumption.
  -h, --help Show context-sensitive help (also try
  --help-long and --help-man).
  --id=ID ... Block IDs to verify (and optionally repair)
@@ -447,8 +443,7 @@ Flags:
  The ratio of reserved GOMEMLIMIT memory to the
  detected maximum container or system memory.
  --enable-auto-gomemlimit Enable go runtime to automatically limit memory
- consumption by compact component. This is an
- experimental feature.
+ consumption.
  --exclude-delete Exclude blocks marked for deletion.
  -h, --help Show context-sensitive help (also try
  --help-long and --help-man).
@@ -501,8 +496,7 @@ Flags:
  The ratio of reserved GOMEMLIMIT memory to the
  detected maximum container or system memory.
  --enable-auto-gomemlimit Enable go runtime to automatically limit memory
- consumption by compact component. This is an
- experimental feature.
+ consumption.
  -h, --help Show context-sensitive help (also try
  --help-long and --help-man).
  --log.format=logfmt Log format to use. Possible options: logfmt or
@@ -574,8 +568,7 @@ Flags:
  --compaction-min=1 Only blocks with at least this compaction level
  will be replicated.
  --enable-auto-gomemlimit Enable go runtime to automatically limit memory
- consumption by compact component. This is an
- experimental feature.
+ consumption.
  -h, --help Show context-sensitive help (also try
  --help-long and --help-man).
  --http-address="0.0.0.0:10902"
@@ -690,8 +683,7 @@ Flags:
  Number of goroutines to use when downsampling
  blocks.
  --enable-auto-gomemlimit Enable go runtime to automatically limit memory
- consumption by compact component. This is an
- experimental feature.
+ consumption.
  --hash-func= Specify which hash function to use when
  calculating the hashes of produced files.
  If no function has been specified, it does not
@@ -769,8 +761,7 @@ Flags:
  detected maximum container or system memory.
  --details=DETAILS Human readable details to be put into marker.
  --enable-auto-gomemlimit Enable go runtime to automatically limit memory
- consumption by compact component. This is an
- experimental feature.
+ consumption.
  -h, --help Show context-sensitive help (also try
  --help-long and --help-man).
  --id=ID ... ID (ULID) of the blocks to be marked for
@@ -857,8 +848,7 @@ Flags:
  Defaults to true, for user to double check. (:
  Pass --no-dry-run to skip this.
  --enable-auto-gomemlimit Enable go runtime to automatically limit memory
- consumption by compact component. This is an
- experimental feature.
+ consumption.
  --hash-func= Specify which hash function to use when
  calculating the hashes of produced files.
  If no function has been specified, it does not
@@ -934,8 +924,7 @@ Flags:
  The ratio of reserved GOMEMLIMIT memory to the
  detected maximum container or system memory.
  --enable-auto-gomemlimit Enable go runtime to automatically limit memory
- consumption by compact component. This is an
- experimental feature.
+ consumption.
  -h, --help Show context-sensitive help (also try
  --help-long and --help-man).
  --label=key="value" ... External labels to add to the uploaded blocks
@@ -994,8 +983,7 @@ Flags:
  The ratio of reserved GOMEMLIMIT memory to the
  detected maximum container or system memory.
  --enable-auto-gomemlimit Enable go runtime to automatically limit memory
- consumption by compact component. This is an
- experimental feature.
+ consumption.
  -h, --help Show context-sensitive help (also try
  --help-long and --help-man).
  --log.format=logfmt Log format to use. Possible options: logfmt or