1167 commits

Author	SHA1	Message	Date
Neeraj Gartia	36e0897f0f	[BUGFIX] PromQL: Fix behaviour of changes() for mix of histograms and floats (#15469) ... PromQL: Fix behaviour of changes() for mix of histograms and floats --------- Signed-off-by: Neeraj Gartia <neerajgartia211002@gmail.com>	2024-11-27 21:05:08 +01:00
Björn Rabenstein	a7264eb0d4	Merge pull request #15475 from prometheus/beorn7/promql ... promql: Add NaN tests for avg and avg_over_time	2024-11-27 19:41:39 +01:00
Joshua Hesketh	8e3301eb44	Export quantile functions (#15190) ... Export quantile functions For use in Mimir's query engine, it would be helpful if these functions were exported. Co-authored-by: Björn Rabenstein <github@rabenste.in> Signed-off-by: Joshua Hesketh <josh@hesketh.net.au> --------- Signed-off-by: Joshua Hesketh <josh@nitrotech.org> Signed-off-by: Joshua Hesketh <josh@hesketh.net.au> Co-authored-by: Björn Rabenstein <github@rabenste.in>	2024-11-27 13:20:23 +01:00
beorn7	a44c449155	promql: Add NaN tests for avg and avg_over_time ... Signed-off-by: beorn7 <beorn@grafana.com>	2024-11-27 13:08:34 +01:00
Neeraj Gartia	38bb6ece25	[BUGFIX] PromQL: Fix behaviour of some aggregations with histograms (#15432) ... promql: fix some aggregations for histograms This PR fixes the behaviour of `topk`,`bottomk`, `limitk` and `limit_ratio` with histograms. The fixed behaviour are as follows: - For `topk` and `bottomk` histograms are ignored and add info annotations added. - For `limitk` and `limit_ratio` histograms are included in the results(if applicable). Signed-off-by: Neeraj Gartia <neerajgartia211002@gmail.com>	2024-11-26 19:12:36 +01:00
György Krajcsovits	a48d05912d	nhcb: optimize, do not recalculate suffixes multiple times ... Reduce string manipulation by just cutting off the histogram suffixes from the series name label once. Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>	2024-11-25 15:37:38 +01:00
Neeraj Gartia	abfc3145a2	apply DRY on clamp (#15441) ... Signed-off-by: Neeraj Gartia <neerajgartia211002@gmail.com>	2024-11-24 17:08:59 +01:00
Björn Rabenstein	125a90899c	promqltest: Complete the tests for info annotations (#15429) ... promqltest: Complete the tests for info annotations So far, we did not test for the _absence_ of an info annotation (because many tests triggered info annotations, which we haven't taken into account so far). The test for info annotations was also missed for range queries. This completes the tests for info annotations (and refactors the many `if` statements into a somewhat more compact `switch` statement). It fixes most tests to not emit an info annotation anymore. Or it changes the `eval` to `eval_info` where we actually want to test for the info annotation. It also fixes a few spelling errors in comments. --------- Signed-off-by: beorn7 <beorn@grafana.com> Signed-off-by: Björn Rabenstein <github@rabenste.in> Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>	2024-11-21 14:20:38 +01:00
Arve Knudsen	89bbb885e5	Upgrade to golangci-lint v1.62.0 (#15424) ... Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	2024-11-20 17:22:20 +01:00
Björn Rabenstein	e8003cb347	Merge pull request #15417 from huochexizhan/main ... chore: fix some function names in comment	2024-11-20 14:36:47 +01:00
Neeraj Gartia	a6fb16fcb4	PromQL: Convert more native histogram tests to promql-test framework (#15419) ... This converts `TestNativeHistogram_SubOperator` to the promql testing framework. It also removes `TestNativeHistogram_Sum_Count_Add_AvgOperator`, which got converted earlier. Signed-off-by: Neeraj Gartia <neerajgartia211002@gmail.com>	2024-11-20 11:41:36 +01:00
Björn Rabenstein	4ef1170868	Merge pull request #15422 from NeerajGartia21/promql-corrections ... [BUGFIX] PromQL: Fix `count_values` for histograms	2024-11-20 11:27:32 +01:00
George Krajcsovits	5cd9855999	tests(promql/testdata): add regression test for and-on (#15425) ... * tests(promql/testdata): add regression test for and-on I'd like to use queries of the form "x and on() (vector(y)==1)" to be able to include and exclude series for dashboards. This helps migration to native histograms in dashboards by using a dashboard variable to set "y" to either -1 or 1 to exclude or include the result. Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> --------- Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>	2024-11-20 10:29:18 +01:00
Neeraj Gartia	048222867a	fix count_values for histograms ... Signed-off-by: Neeraj Gartia <neerajgartia211002@gmail.com>	2024-11-20 02:07:31 +05:30
Charles Korn	62e6e55c07	promql: fix issues with comparison binary operations with bool modifier and native histograms (#15413) ... * Fix issue where comparison operations with `bool` modifier and native histograms return histograms rather than 0 or 1 * Don't emit anything for comparisons between floats and histograms when `bool` modifier is used * Don't emit anything for comparisons between floats and histograms when `bool` modifier is used between a vector and a scalar --------- Signed-off-by: Charles Korn <charles.korn@grafana.com>	2024-11-19 09:13:34 +01:00
Charles Korn	45db23617a	promql: fix incorrect "native histogram ignored in aggregation" annotations (#15414) ... Signed-off-by: Charles Korn <charles.korn@grafana.com>	2024-11-19 08:17:49 +01:00
huochexizhan	4f48e76086	chore: fix some function names in comment ... Signed-off-by: huochexizhan <huochexizhan@outlook.com>	2024-11-19 12:02:10 +08:00
zenador	e13c28bd4a	Use a function to determine if an aggregation function is experimental (#15331) ... Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>	2024-11-15 15:09:50 +01:00
Neeraj Gartia	789c9b1a5e	[BUGFIX] PromQL: Corrects the behaviour of some operator and aggregators with Native Histograms (#15245) ... PromQL: Correct the behaviour of some operator and aggregators with Native Histograms --------- Signed-off-by: Neeraj Gartia <neerajgartia211002@gmail.com>	2024-11-12 15:37:05 +01:00
Joshua Hesketh	ed2668bbda	Merge branch 'main' into jhesketh/clamp ... Signed-off-by: Joshua Hesketh <josh@nitrotech.org>	2024-11-12 10:20:58 +11:00
Bartlomiej Plotka	76432aaf4e	Merge pull request #15220 from prometheus/nhcb-scrape-optimize ... perf(nhcb): scrape optimize	2024-11-08 19:02:48 +01:00
Matthieu MOREL	af1a19fc78	enable errorf rule from perfsprint linter ... Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>	2024-11-06 16:50:36 +01:00
Bryan Boreham	6979b237b9	Merge branch 'release-2.55' into merge-2.55-into-main2	2024-11-04 12:58:38 +00:00
Ben Ye	b7aca45de7	fix round function ignoring enableDelayedNameRemoval feature flag ... Signed-off-by: Ben Ye <benye@amazon.com>	2024-10-31 00:30:22 -07:00
György Krajcsovits	eafe72a0d0	perf(nhcb): optimize away most allocations in convertnhcb ... In general aim for the happy case when the exposer lists the buckets in ascending order. Use Compact(2) to compact the result of nhcb convert. This is more in line with how client_golang optimizes spans vs buckets. aef8aedb4b/prometheus/histogram.go (L1485) Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>	2024-10-28 08:34:54 +01:00
Jan Fajerski	38fd48e6b5	v2.55.0 ... -----BEGIN SSH SIGNATURE----- U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgX42TrpDUXJbbi9yZ3hs6cDg+kz G6d3nAlAb2XQInrEgAAAADZ2l0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5 AAAAQGoSEKIFT/BfavtG2qW9n7NYonNQk/9r6gCLvxln9elt1hiY0ZGcwRhm1QNx6FotxJ Y3LB9dt4s5akB3fOPkYwc= -----END SSH SIGNATURE----- Merge tag 'v2.55.0' into release-3.0.0-rc.0 v2.55.0	2024-10-25 14:16:22 +02:00
Björn Rabenstein	7c7116fea8	Merge pull request #15176 from jhesketh/jhesketh/round ... Round function should ignore native histograms	2024-10-22 19:14:16 +02:00
Alex Greenbank	421a3c22ea	scrape: provide a fallback format (#15136) ... scrape: Remove implicit fallback to the Prometheus text format Remove implicit fallback to the Prometheus text format in case of invalid/missing Content-Type and fail the scrape instead. Add ability to specify a `fallback_scrape_protocol` in the scrape config. --------- Signed-off-by: alexgreenbank <alex.greenbank@grafana.com> Signed-off-by: Alex Greenbank <alex.greenbank@grafana.com> Co-authored-by: Björn Rabenstein <beorn@grafana.com>	2024-10-18 17:12:31 +02:00
Bryan Boreham	754c104a3e	Merge pull request #15173 from prometheus/merge-2.55-into-main-3 ... Merge release-2.55 into main (interim)	2024-10-18 10:28:20 +01:00
Joshua Hesketh	14ef1ce8ab	Round function should ignore native histograms ... As per the documentation, native histograms are skipped. This is in line with other simpleFunc's. Signed-off-by: Joshua Hesketh <josh@nitrotech.org>	2024-10-17 15:39:48 +11:00
Bryan Boreham	a846bf9a5e	Merge branch 'release-2.55' into merge-2.55-into-main-3	2024-10-16 14:08:54 +01:00
Joshua Hesketh	5a4e4f6936	Fix stddev/stdvar when aggregating histograms, NaNs, and infinities (#14941) ... promql: Fix stddev/stdvar when aggregating histograms, NaNs, and Infs Native histograms are ignored when calculating stddev or stdvar. However, for the first series of each group, a `groupedAggregation` is always created. If the first series that was encountered is a histogram then it acts as the equivalent of a 0 point. This change creates the first `groupedAggregation` with the `seen` field set to `false` if the point is a histogram, thus ignoring it like the rest of the aggregation function does. A new `groupedAggregation` will then be created once an actual float value is encountered. This commit also sets the `floatValue` field of the `groupedAggregation` to `NaN`, if the first float value of a group is `NaN` or `±Inf`, so that the outcome is consistently `NaN` once those values are in the mix. (The added tests fail without this change). Signed-off-by: Joshua Hesketh <josh@nitrotech.org> Signed-off-by: beorn7 <beorn@grafana.com> --------- Signed-off-by: Joshua Hesketh <josh@nitrotech.org> Signed-off-by: beorn7 <beorn@grafana.com> Co-authored-by: beorn7 <beorn@grafana.com>	2024-10-16 15:00:46 +02:00
Arve Knudsen	de16f5e387	[FEATURE] PromQL: Add experimental info function MVP (#14495) ... The `info` function is an experiment to improve UX around including labels from info metrics. `info` has to be enabled via the feature flag `--enable-feature=promql-experimental-functions`. This MVP of info simplifies the implementation by assuming: * Only support for the target_info metric * That target_info's identifying labels are job and instance Also: * Encode info samples' original timestamp as sample value * Deduce info series select hints from top-most VectorSelector --------- Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> Co-authored-by: Ying WANG <ying.wang@grafana.com> Co-authored-by: Augustin Husson <augustin.husson@amadeus.com> Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com> Co-authored-by: Björn Rabenstein <github@rabenste.in> Co-authored-by: Bryan Boreham <bjboreham@gmail.com>	2024-10-16 13:52:11 +01:00
Arve Knudsen	e05e97cdd7	evaluator.rangeEval: Split out gatherVector method ... Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	2024-10-16 14:01:03 +02:00
Joshua Hesketh	31d19381f6	Clamp functions should ignore native histograms ... As per the documentation, native histograms are skipped. This is in line with other `simpleFunc`'s. Signed-off-by: Joshua Hesketh <josh@nitrotech.org>	2024-10-16 15:10:54 +11:00
Arve Knudsen	f7b396a1dc	promql.Engine: Refactor vector selector evaluation into a method (#14900) ... New method is named `evalVectorSelector`. --------- Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	2024-10-15 14:57:54 +01:00
Neeraj Gartia	d4b1f9eb33	Corrects the behaviour of binary opperators between histogram and float (#14726) ... promql: corrects binary operators functioning for mixed sample with histogram and float For invalid pairings of sample types, an annotation is added now. Signed-off-by: Neeraj Gartia <neerajgartia211002@gmail.com> --------- Signed-off-by: Neeraj Gartia <neerajgartia211002@gmail.com>	2024-10-15 14:44:36 +02:00
George Krajcsovits	522149a2ae	model: move classic NHCB conversion into its own file (#15156) ... * model: move classic to NHCB conversion into its own file In preparation for #14978. Author: Jeanette Tan <jeanette.tan@grafana.com> 2024-07-03 11:56:48 Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com> Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> Co-authored-by: Jeanette Tan <jeanette.tan@grafana.com> Co-authored-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Better naming from review comment Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Add doc strings. Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> --------- Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com> Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> Co-authored-by: Jeanette Tan <jeanette.tan@grafana.com>	2024-10-14 14:23:11 +02:00
Fiona Liao	8650d25804	Add additional basic nhcb unit tests (#15086) ... * Add additional basic nhcb unit tests * Update promql/promqltest/testdata/histograms.test Signed-off-by: Fiona Liao <fiona.liao@grafana.com> Signed-off-by: Fiona Liao <fiona.y.liao@gmail.com> Co-authored-by: George Krajcsovits <krajorama@users.noreply.github.com>	2024-10-08 14:34:32 +02:00
TJ Hoplock	6ebfbd2d54	chore!: adopt log/slog, remove go-kit/log ... For: #14355 This commit updates Prometheus to adopt stdlib's log/slog package in favor of go-kit/log. As part of converting to use slog, several other related changes are required to get prometheus working, including: - removed unused logging util func `RateLimit()` - forward ported the util/logging/Deduper logging by implementing a small custom slog.Handler that does the deduping before chaining log calls to the underlying real slog.Logger - move some of the json file logging functionality to use prom/common package functionality - refactored some of the new json file logging for scraping - changes to promql.QueryLogger interface to swap out logging methods for relevant slog sugar wrappers - updated lots of tests that used/replicated custom logging functionality, attempting to keep the logical goal of the tests consistent after the transition - added a healthy amount of `if logger == nil { $makeLogger }` type conditional checks amongst various functions where none were provided -- old code that used the go-kit/log.Logger interface had several places where there were nil references when trying to use functions like `With()` to add keyvals on the new *slog.Logger type Signed-off-by: TJ Hoplock <t.hoplock@gmail.com>	2024-10-07 15:58:50 -04:00
Matthieu MOREL	ab64966e9d	fix: use "ErrorContains" or "EqualError" instead of "Contains(t, err.Error()" and "Equal(t, err.Error()" (#15094) ... * fix: use "ErrorContains" or "EqualError" instead of "Contains(t, err.Error()" and "Equal(t, err.Error()" --------- Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com> Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>	2024-10-06 16:35:29 +00:00
Björn Rabenstein	199d2fb492	Merge pull request #14989 from NeerajGartia21/eval_info ... Adds eval_info command to PromQL testing framework	2024-10-02 16:53:24 +02:00
Björn Rabenstein	78f792135c	Merge pull request #15025 from prometheus/notreset-bug ... Fix bug in rate vs float and histogram mixup	2024-10-02 14:17:55 +02:00
György Krajcsovits	b5479831b8	Unit test for regression in rate vs float and histogram mixup ... Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>	2024-10-02 13:56:33 +02:00
Manik Rana	f1c57a95ed	change: No longer ingest OM _created as timeseries if feature-flag 'enable-ct-zero-ingestion' is enabled; fixed OM text CT conversion bug (#14738) ... * chore: revert TypeRequiresCT to private Signed-off-by: Manik Rana <manikrana54@gmail.com> * feat: init NewOpenMetricsParser with skipCT true Signed-off-by: Manik Rana <manikrana54@gmail.com> * refac: allow opt-in to OM CT ingestion Signed-off-by: Manik Rana <manikrana54@gmail.com> * chore: lint Signed-off-by: Manik Rana <manikrana54@gmail.com> * chore: use textparse interface to set om options Signed-off-by: Manik Rana <manikrana54@gmail.com> * fix: set skipOMSeries in test Signed-off-by: Manik Rana <manikrana54@gmail.com> * chore: gofumpt Signed-off-by: Manik Rana <manikrana54@gmail.com> * wip: add tests for OM CR parse Signed-off-by: Manik Rana <manikrana54@gmail.com> * chore: merge ct tests Signed-off-by: Manik Rana <manikrana54@gmail.com> * tests: add cases for OM text Signed-off-by: Manik Rana <manikrana54@gmail.com> * fix: check correct test cases Signed-off-by: Manik Rana <manikrana54@gmail.com> * chore: use both scrape protocols in config Signed-off-by: Manik Rana <manikrana54@gmail.com> * fix: fix inputs and output tests for OM Signed-off-by: Manik Rana <manikrana54@gmail.com> * chore: cleanup Signed-off-by: Manik Rana <manikrana54@gmail.com> * refac: rename skipOMSeries to skipOMCTSeries Co-authored-by: Arthur Silva Sens <arthursens2005@gmail.com> Signed-off-by: Manik Rana <Manikrana54@gmail.com> * fix: finish refac Signed-off-by: Manik Rana <manikrana54@gmail.com> * refac: move setup code outside test Signed-off-by: Manik Rana <manikrana54@gmail.com> * tests: verify _created lines create new metric in certain cases Signed-off-by: Manik Rana <manikrana54@gmail.com> * fix: post merge fixes Signed-off-by: Manik Rana <manikrana54@gmail.com> * chore: lint Signed-off-by: Manik Rana <manikrana54@gmail.com> * manager: Fixed CT OMText conversion bug; Refactored tests. Signed-off-by: bwplotka <bwplotka@gmail.com> * chore: lint Signed-off-by: Manik Rana <manikrana54@gmail.com> * chore: gofumpt Signed-off-by: Manik Rana <manikrana54@gmail.com> * chore: imports Signed-off-by: Manik Rana <manikrana54@gmail.com> --------- Signed-off-by: Manik Rana <manikrana54@gmail.com> Signed-off-by: Manik Rana <Manikrana54@gmail.com> Signed-off-by: bwplotka <bwplotka@gmail.com> Co-authored-by: Arthur Silva Sens <arthursens2005@gmail.com> Co-authored-by: bwplotka <bwplotka@gmail.com>	2024-10-02 11:52:03 +01:00
Bryan Boreham	b8e5b7cda9	[REFACTOR] PromQL: remove label_join and label_replace stubs ... These functions operate on whole series, not on samples, so they do not fit into the table of functions that return a Vector. Remove the stub entries that were left to help downstream users of the code identify what changed. We cannot remove the entries from the `FunctionCalls` map without breaking `TestFunctionList`, so put some nils in to keep it happy. Signed-off-by: Bryan Boreham <bjboreham@gmail.com>	2024-09-27 11:20:45 +01:00
Neeraj Gartia	8aef821e10	eval_info command ... Signed-off-by: Neeraj Gartia <neerajgartia211002@gmail.com>	2024-09-27 01:10:00 +05:30
Bryan Boreham	7f99d2930d	[BUGFIX] PromQL: make sort_by_label stable ... Go's sorting functions can re-order equal elements, so the strategy of sorting by the fallback ordering first does not always work. Pulling the fallback into the main comparison function is more reliable and more efficient. Signed-off-by: Bryan Boreham <bjboreham@gmail.com>	2024-09-26 11:12:33 +01:00
Arve Knudsen	c2bbabb4a7	promql.Engine: Refactor vector selector evaluation into a method (#14900) ... * PromQL.Engine: Refactor Matrix expansion into a method Add utility method promql.evaluator.expandSeriesToMatrix, for expanding a slice of storage.Series into a promql.Matrix. Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Rename to generateMatrix Rename evaluator.expandSeriesToMatrix into generateMatrix, while also dropping the start, end, interval arguments since they are evaluator fields. Write more extensive method documentation. Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Rename to evalVectorSelector Rename to evalVectorSelector after discussing with @michahoffmann. Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> --------- Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	2024-09-24 11:03:56 +01:00
Arthur Silva Sens	6bcb064d93	Merge pull request #14950 from Maniktherana/fuzz-om-minor-change ... chore: remove unused code	2024-09-21 09:22:17 +01:00