diff --git a/config/config.go b/config/config.go index d4e1beca4c..08b621f47d 100644 --- a/config/config.go +++ b/config/config.go @@ -572,8 +572,8 @@ var ( // DefaultProtoFirstScrapeProtocols is like DefaultScrapeProtocols, but it // favors protobuf Prometheus exposition format. - // Used by default for certain feature-flags like - // "native-histograms" and "created-timestamp-zero-ingestion". + // Used by default by the "scrape_native_histograms" option and for certain + // feature-flags like "created-timestamp-zero-ingestion". DefaultProtoFirstScrapeProtocols = []ScrapeProtocol{ PrometheusProto, OpenMetricsText1_0_0, diff --git a/tsdb/wlog/watcher.go b/tsdb/wlog/watcher.go index 3594cf47bc..abb5ef9731 100644 --- a/tsdb/wlog/watcher.go +++ b/tsdb/wlog/watcher.go @@ -563,7 +563,7 @@ func (w *Watcher) readSegment(r *LiveReader, segmentNum int, tail bool) error { w.writer.AppendExemplars(exemplars) case record.HistogramSamples, record.CustomBucketsHistogramSamples: - // Skip if experimental "histograms over remote write" is not enabled. + // Skip if "native histograms over remote write" is not enabled. if !w.sendHistograms { break } @@ -591,7 +591,7 @@ func (w *Watcher) readSegment(r *LiveReader, segmentNum int, tail bool) error { } case record.FloatHistogramSamples, record.CustomBucketsFloatHistogramSamples: - // Skip if experimental "histograms over remote write" is not enabled. + // Skip if "native histograms over remote write" is not enabled. if !w.sendHistograms { break } diff --git a/web/ui/mantine-ui/src/promql/functionDocs.tsx b/web/ui/mantine-ui/src/promql/functionDocs.tsx index 99ffdd74f5..91221666d7 100644 --- a/web/ui/mantine-ui/src/promql/functionDocs.tsx +++ b/web/ui/mantine-ui/src/promql/functionDocs.tsx @@ -1010,8 +1010,7 @@ const funcDocs: Record = { <>

- This function only acts on native histograms, which are an experimental feature. The behavior of this function may - change in future versions of Prometheus, including its removal from PromQL. + This function only acts on native histograms.

@@ -1043,8 +1042,7 @@ const funcDocs: Record = { <>

- Both functions only act on native histograms, which are an experimental feature. The behavior of these functions - may change in future versions of Prometheus, including their removal from PromQL. + Both functions only act on native histograms.

@@ -1071,8 +1069,7 @@ const funcDocs: Record = { <>

- This function only acts on native histograms, which are an experimental feature. The behavior of this function may - change in future versions of Prometheus, including its removal from PromQL. + This function only acts on native histograms.

@@ -1121,13 +1118,6 @@ const funcDocs: Record = { explanation of φ-quantiles and the usage of the (classic) histogram metric type in general.)

-

- - Note that native histograms are an experimental feature. The behavior of this function when dealing with native - histograms may change in future versions of Prometheus. - -

-

The float samples in b are considered the counts of observations in each bucket of one or more classic histograms. Each float sample must have a label @@ -1260,8 +1250,7 @@ const funcDocs: Record = { <>

- Both functions only act on native histograms, which are an experimental feature. The behavior of these functions - may change in future versions of Prometheus, including their removal from PromQL. + Both functions only act on native histograms.

diff --git a/web/ui/module/codemirror-promql/src/complete/promql.terms.ts b/web/ui/module/codemirror-promql/src/complete/promql.terms.ts index 2da92e034c..d356268d74 100644 --- a/web/ui/module/codemirror-promql/src/complete/promql.terms.ts +++ b/web/ui/module/codemirror-promql/src/complete/promql.terms.ts @@ -218,43 +218,43 @@ export const functionIdentifierTerms = [ { label: 'histogram_avg', detail: 'function', - info: 'Return the average of observations from a native histogram (experimental feature)', + info: 'Return the average of observations from a native histogram', type: 'function', }, { label: 'histogram_count', detail: 'function', - info: 'Return the count of observations from a native histogram (experimental feature)', + info: 'Return the count of observations from a native histogram', type: 'function', }, { label: 'histogram_fraction', detail: 'function', - info: 'Calculate fractions of observations within an interval from a native histogram (experimental feature)', + info: 'Calculate fractions of observations within an interval from a native histogram', type: 'function', }, { label: 'histogram_quantile', detail: 'function', - info: 'Calculate quantiles from native histograms (experimental) and from conventional histogram buckets', + info: 'Calculate quantiles from native histograms and from conventional histogram buckets', type: 'function', }, { label: 'histogram_sum', detail: 'function', - info: 'Return the sum of observations from a native histogram (experimental feature)', + info: 'Return the sum of observations from a native histogram', type: 'function', }, { label: 'histogram_stddev', detail: 'function', - info: 'Estimate the standard deviation of observations from a native histogram (experimental feature)', + info: 'Estimate the standard deviation of observations from a native histogram', type: 'function', }, { label: 'histogram_stdvar', detail: 'function', - info: 'Estimate the standard variance of observations from a native histogram (experimental feature)', + info: 'Estimate the standard variance of observations from a native histogram', type: 'function', }, {