Skip to content

Commit

Permalink
Add query format to native histograms flag description
Browse files Browse the repository at this point in the history
Followup to #4513

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
  • Loading branch information
krajorama committed Mar 17, 2023
1 parent 4eff59b commit 06bad41
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion cmd/mimir/config-descriptor.json
Original file line number Diff line number Diff line change
Expand Up @@ -3056,7 +3056,7 @@
"kind": "field",
"name": "native_histograms_ingestion_enabled",
"required": false,
"desc": "Enable ingestion of native histogram samples. If false, native histogram samples are ignored without an error.",
"desc": "Enable ingestion of native histogram samples. If true, -query-frontend.query-result-response-format must be set to 'protobuf' otherwise query sharding will fail. If false, native histogram samples are ignored without an error.",
"fieldValue": null,
"fieldDefaultValue": false,
"fieldFlag": "ingester.native-histograms-ingestion-enabled",
Expand Down
2 changes: 1 addition & 1 deletion cmd/mimir/help-all.txt.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -1186,7 +1186,7 @@ Usage of ./cmd/mimir/mimir:
-ingester.metadata-retain-period duration
Period at which metadata we have not seen will remain in memory before being deleted. (default 10m0s)
-ingester.native-histograms-ingestion-enabled
[experimental] Enable ingestion of native histogram samples. If false, native histogram samples are ignored without an error.
[experimental] Enable ingestion of native histogram samples. If true, -query-frontend.query-result-response-format must be set to 'protobuf' otherwise query sharding will fail. If false, native histogram samples are ignored without an error.
-ingester.out-of-order-blocks-external-label-enabled
[experimental] Whether the shipper should label out-of-order blocks with an external label before uploading them. Setting this label will compact out-of-order blocks separately from non-out-of-order blocks
-ingester.out-of-order-time-window duration
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2590,8 +2590,10 @@ The `limits` block configures default and per-tenant limits imposed by component
# CLI flag: -ingester.max-global-exemplars-per-user
[max_global_exemplars_per_user: <int> | default = 0]

# (experimental) Enable ingestion of native histogram samples. If false, native
# histogram samples are ignored without an error.
# (experimental) Enable ingestion of native histogram samples. If true,
# -query-frontend.query-result-response-format must be set to 'protobuf'
# otherwise query sharding will fail. If false, native histogram samples are
# ignored without an error.
# CLI flag: -ingester.native-histograms-ingestion-enabled
[native_histograms_ingestion_enabled: <boolean> | default = false]

Expand Down
2 changes: 1 addition & 1 deletion pkg/util/validation/limits.go
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ func (l *Limits) RegisterFlags(f *flag.FlagSet) {
f.IntVar(&l.MaxGlobalExemplarsPerUser, "ingester.max-global-exemplars-per-user", 0, "The maximum number of exemplars in memory, across the cluster. 0 to disable exemplars ingestion.")
f.Var(&l.ActiveSeriesCustomTrackersConfig, "ingester.active-series-custom-trackers", "Additional active series metrics, matching the provided matchers. Matchers should be in form <name>:<matcher>, like 'foobar:{foo=\"bar\"}'. Multiple matchers can be provided either providing the flag multiple times or providing multiple semicolon-separated values to a single flag.")
f.Var(&l.OutOfOrderTimeWindow, "ingester.out-of-order-time-window", fmt.Sprintf("Non-zero value enables out-of-order support for most recent samples that are within the time window in relation to the TSDB's maximum time, i.e., within [db.maxTime-timeWindow, db.maxTime]). The ingester will need more memory as a factor of rate of out-of-order samples being ingested and the number of series that are getting out-of-order samples. If query falls into this window, cached results will use value from -%s option to specify TTL for resulting cache entry.", resultsCacheTTLForOutOfOrderWindowFlag))
f.BoolVar(&l.NativeHistogramsIngestionEnabled, "ingester.native-histograms-ingestion-enabled", false, "Enable ingestion of native histogram samples. If false, native histogram samples are ignored without an error.")
f.BoolVar(&l.NativeHistogramsIngestionEnabled, "ingester.native-histograms-ingestion-enabled", false, "Enable ingestion of native histogram samples. If true, -query-frontend.query-result-response-format must be set to 'protobuf' otherwise query sharding will fail. If false, native histogram samples are ignored without an error.")
f.BoolVar(&l.OutOfOrderBlocksExternalLabelEnabled, "ingester.out-of-order-blocks-external-label-enabled", false, "Whether the shipper should label out-of-order blocks with an external label before uploading them. Setting this label will compact out-of-order blocks separately from non-out-of-order blocks")

f.StringVar(&l.SeparateMetricsGroupLabel, "validation.separate-metrics-group-label", "", "Label used to define the group label for metrics separation. For each write request, the group is obtained from the first non-empty group label from the first timeseries in the incoming list of timeseries. Specific distributor and ingester metrics will be further separated adding a 'group' label with group label's value. Currently applies to the following metrics: cortex_discarded_samples_total")
Expand Down

0 comments on commit 06bad41

Please sign in to comment.