1207 commits

Author	SHA1	Message	Date
Jan Fajerski	54cf0d6879	Merge pull request #15472 from tjhop/ref/jsonfilelogger-slog-handler ... ref: JSONFileLogger slog handler, add scrape.FailureLogger interface	2025-01-27 20:17:46 +01:00
Björn Rabenstein	2915b19773	Merge pull request #15859 from prometheus/krajo/abs-test ... test(promql): abs function on native histograms	2025-01-25 00:33:37 +01:00
György Krajcsovits	9097f8f4e7	test(promql): some functions silently ignore native histograms ... Functions that silently ignore native histograms, not covered by existing tests: abs(), ceil(), clamp(), clamp_min(), clamp_max(), floor(), round(). Ref: https://github.com/prometheus/prometheus/pull/15845 Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>	2025-01-24 11:16:20 +01:00
Björn Rabenstein	8846e42528	Merge pull request #15849 from linasm/use-histogram-stats-decoder-for-histogram_avg ... promql: use histogram stats decoder for histogram_avg	2025-01-23 15:03:01 +01:00
Linas Medziunas	940016e002	promql: use histogram stats decoder for histogram_avg ... Signed-off-by: Linas Medziunas <linas.medziunas@gmail.com>	2025-01-23 08:49:47 +02:00
Joshua Hesketh	665d1ba0cc	Ensure metric name is present on histogram_quantile annotations (#15828) ... Ensure metric name is present on histogram_quantile annotations Previously the series __name__ label was dropped before the annotation was emitted causing the annotation message to have a blank value. This fix also allows delayed name removal for classic histograms. This also adds a test for malformed le label This annotation could be split into two to be clearer for the user (one for missing, and one for malformed). This is outside of the scope of this change. Fixes: #15411 --------- Signed-off-by: Joshua Hesketh <josh@nitrotech.org> Signed-off-by: Björn Rabenstein <github@rabenste.in> Co-authored-by: Björn Rabenstein <github@rabenste.in>	2025-01-22 14:35:43 +01:00
Mikel Olasagasti Uranga	9258e40589	parser: fix non-constant format string call (#15835) ... Go 1.24 enhanced vet's printf analyzer to report calls of the form fmt.Printf(s), where s is a non-constant format string, with no other arguments. This change makes parser tests to fail. Signed-off-by: Mikel Olasagasti Uranga <mikel@olasagasti.info>	2025-01-18 13:21:51 +01:00
Fiona Liao	f46b984dd1	Add additional incompatible nhcb schemas tests for functions and comparison operators (#15813) ... promql: Add additional incompatible nhcb schemas tests for functions and comparison operators * Add agg_over_time tests for nhcb with incompatible schemas * Add more function and comparison operator tests --------- Signed-off-by: Fiona Liao <fiona.liao@grafana.com>	2025-01-17 17:17:11 +01:00
Owen Williams	7be00791ef	Merge pull request #15806 from prometheus/owilliams/error ... parser: fix misleading error message in grouping processing	2025-01-14 10:21:55 -05:00
Owen Williams	47563d942e	parser: fix misleading error message in grouping processing ... Signed-off-by: Owen Williams <owen.williams@grafana.com>	2025-01-10 15:23:33 -05:00
Arve Knudsen	f030894c2c	Fix issues raised by staticcheck (#15722) ... Fix issues raised by staticcheck We are not enabling staticcheck explicitly, though, because it has too many false positives. --------- Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	2025-01-09 17:51:26 +01:00
Neeraj Gartia	b3e30d52ce	[BUGFIX] PromQL: Fix <aggr_over_time> functions with histograms (#15711) ... fix aggr_over_time with histograms Signed-off-by: Neeraj Gartia <neerajgartia211002@gmail.com> --------- Signed-off-by: Neeraj Gartia <neerajgartia211002@gmail.com>	2025-01-09 16:38:42 +01:00
Fiona Liao	9d6f88cb73	Add additional tests for operators over incompatible nhcb (#15787) ... * Add additional tests for operators over incompatible nhcb Signed-off-by: Fiona Liao <fiona.liao@grafana.com>	2025-01-09 10:29:57 +01:00
beorn7	d9a80a91e3	docs: Document eval_warn and eval_info ... This also improves the documentation in the following ways: - Clarifies that `eval` requires no annotations. - Clarifies that `eval_ordered` ignores annotations. - Clarifies that `eval_ordered` does not work with matrix returns (which could very well be created by instant queries). - Clarifies that there are more `eval` commands than just `eval`. - Improves wording for `eval_ordered`. - Replaces `...` by the typographical correct `…`. - Fixes a numerical error in an example. Signed-off-by: beorn7 <beorn@grafana.com>	2025-01-08 13:57:13 +01:00
beorn7	7687661453	promqltest: make eval_ordered ignore annotations ... Besides making eval_ordered ignore annotations, this does the following: - Adds a test to verify that eval_ordered indeed ignores an info annotations now, while eval complains about it, eval_info recognizes it and, eval_warn flags the missing of the warn annotation. - Refactors the annotation check into its own method. - Moves closing of the query to the appropriate place where it wasn't so far. Signed-off-by: beorn7 <beorn@grafana.com>	2025-01-08 12:55:27 +01:00
machine424	9823a93c42	fix(main.go): avoid closing the query engine until it is guaranteed to no longer be in use. ... partially reverts https://github.com/prometheus/prometheus/pull/14064 fixes https://github.com/prometheus/prometheus/issues/15232 supersedes https://github.com/prometheus/prometheus/pull/15533 reusing Engine.Close() outside of tests will require more consideration. Signed-off-by: machine424 <ayoubmrini424@gmail.com>	2024-12-30 05:14:44 +01:00
beorn7	f7373a1f91	PromQL: improve some test comments ... This amends #15686. Signed-off-by: beorn7 <beorn@grafana.com>	2024-12-19 23:56:37 +01:00
Neeraj Gartia	8d5236f927	PromQL: Adds tests for delta with histograms (#15674) ... PromQL: Adds tests for delta with histograms Signed-off-by: Neeraj Gartia <neerajgartia211002@gmail.com> -------- Signed-off-by: Neeraj Gartia <neerajgartia211002@gmail.com>	2024-12-19 23:52:26 +01:00
Neeraj Gartia	0e99ca3e8c	[BUGFIX] PromQL: Fix deriv, predict_linear and double_exponential_smoothing with histograms (#15686) ... PromQL: Fix deriv, predict_linear and double_exponential_smoothing with histograms Signed-off-by: Neeraj Gartia <neerajgartia211002@gmail.com> --------- Signed-off-by: Neeraj Gartia <neerajgartia211002@gmail.com>	2024-12-19 23:50:28 +01:00
Joel Beckmeyer	41dabfb464	fix topk/bottomk with numbers greater than int maxsize on 32-bit ... Signed-off-by: Joel Beckmeyer <joel@beckmeyer.us>	2024-12-16 10:45:10 -05:00
Neeraj Gartia	9009724c5b	[BUGFIX] PromQL: Adds test for absent, absent_over_time and deriv func with histograms (#15667) ... Add test for `absent`, `absent_over_time` and `deriv` func with histograms Signed-off-by: Neeraj Gartia <neerajgartia211002@gmail.com> --------- Signed-off-by: Neeraj Gartia <neerajgartia211002@gmail.com>	2024-12-13 13:34:55 +01:00
Bartlomiej Plotka	791df4305e	Merge pull request #15668 from firetiger-inc/promqltest-with-storage ... promqltest: allow running tests with custom storage implementation	2024-12-13 10:20:46 +01:00
beorn7	ebfa1dd822	promql: Purge Holt-Winters from a doc comment ... `funcDoubleExponentialSmoothing` did not get its doc comment updated when we renamed it from the confusing `funcHoltWinters`. Signed-off-by: beorn7 <beorn@grafana.com>	2024-12-11 12:03:19 +01:00
Achille Roussel	b0e7de154e	promqltest: allow running tests with custom storage implementation ... Signed-off-by: Achille Roussel <achille.roussel@gmail.com>	2024-12-10 17:36:44 -08:00
Björn Rabenstein	3a4e7710a0	Merge pull request #15531 from prometheus/owilliams/promqltest ... promql: Fix various UTF-8 bugs related to quoting	2024-12-10 17:45:10 +01:00
Owen Williams	8d4bcd2c77	promql: Fix various UTF-8 bugs related to quoting ... Fixes UTF-8 aggregator label list items getting mutated with quote marks when String-ified. Fixes quoted metric names not supported in metric declarations. Fixes UTF-8 label names not being quoted when String-ified. Fixes https://github.com/prometheus/prometheus/issues/15470 Fixes https://github.com/prometheus/prometheus/issues/15528 Signed-off-by: Owen Williams <owen.williams@grafana.com> Co-authored-by: Bryan Boreham <bjboreham@gmail.com>	2024-12-04 14:18:59 -05:00
Neeraj Gartia	7fd3b13bd2	[TEST] PromQL: Adds tests with histograms for simple functions (#15488) ... adds tests with histograms for simple functions Signed-off-by: Neeraj Gartia <neerajgartia211002@gmail.com> --------- Signed-off-by: Neeraj Gartia <neerajgartia211002@gmail.com>	2024-12-04 13:11:05 +01:00
Björn Rabenstein	6a6630d2a7	Merge pull request #15527 from NeerajGartia21/promql/funcResets ... [BUGFIX] PromQL: Fix `resets` function for histograms	2024-12-03 22:43:07 +01:00
Neeraj Gartia	4aeed2c4b1	fix resets function for histograms ... Signed-off-by: Neeraj Gartia <neerajgartia211002@gmail.com>	2024-12-03 19:01:05 +05:30
George Krajcsovits	aceabbc81c	Merge pull request #14638 from roidelapluie/evalsubtest ... promqltest: run each eval command in a subtest	2024-12-03 12:41:37 +01:00
TJ Hoplock	53eb1fe71f	test: make promql engine_test use files to exercise query logger ... Signed-off-by: TJ Hoplock <t.hoplock@gmail.com>	2024-12-02 09:21:56 -05:00
TJ Hoplock	4d54c304f8	ref: make query logger more efficient by building list of attrs ... Addresses PR feedback to make query logger more efficient. Signed-off-by: TJ Hoplock <t.hoplock@gmail.com>	2024-12-02 09:21:07 -05:00
TJ Hoplock	e0104a6b7e	ref: JSONFileLogger slog handler, add scrape.FailureLogger interface ... Improves upon #15434, better resolves #15433. This commit introduces a few changes to ensure safer handling of the JSONFileLogger: - the JSONFileLogger struct now implements the slog.Handler interface, so it can directly be used to create slog Loggers. This pattern more closely aligns with upstream slog usage (which is generally based around handlers), as well as making it clear that devs are creating a whole new logger when interacting with it (vs silently modifying internal configs like it did previously). - updates the `promql.QueryLogger` interface to be a union of the methods of both the `io.Closer` interface and the `slog.Handler` interface. This allows for plugging in/using slog-compatible loggers other than the JSONFileLogger, if desired (ie, for downstream projects). - introduces new `scrape.FailureLogger` interface; just like `promql.QueryLogger`, it is a union of `io.Closer` and `slog.Handler` interfaces. Similar logic applies to reasoning. - updates tests where needed; have the `FakeQueryLogger` from promql's engine_test implement the `slog.Handler`, improve JSONFileLogger test suite, etc. Signed-off-by: TJ Hoplock <t.hoplock@gmail.com>	2024-11-28 23:14:31 -05:00
Björn Rabenstein	dfbfe8b5e8	Merge pull request #15479 from NeerajGartia21/promql/datewrapper ... [BUGFIX] PromQL: Ignore histograms in all time related functions	2024-11-29 00:26:52 +01:00
TJ Hoplock	aa8e067f13	Merge release-3.0 into main	2024-11-27 17:51:51 -05:00
Neeraj Gartia	0de340c1b4	ignore histogram in dateWrapper ... Signed-off-by: Neeraj Gartia <neerajgartia211002@gmail.com>	2024-11-28 01:57:04 +05:30
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
newtonne	88675710f9	Add support for utf8 names on /v1/label/:name/values endpoint ... Previously, the api was evaluating this regex to determine if the label name was valid or not: 14bac55a99/model/labels.go (L94) However, I believe that the `IsValid()` function is what ought to be used in the brave new utf8 era. **Before** ``` $ curl localhost:9090/api/v1/label/host.name/values {"status":"error","errorType":"bad_data","error":"invalid label name: \"host.name\""} ``` **After** ``` $ curl localhost:9090/api/v1/label/host.name/values {"status":"success","data":["localhost"]} ``` It's very likely that I'm missing something here or you were already planning to do this at some point but I just encountered this issue and figured I'd give it a go. Signed-off-by: Owen Williams <owen.williams@grafana.com>	2024-11-25 11:48:45 -05: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
TJ Hoplock	3e24e84172	fix!: stop unbounded memory usage from query log ... Resolves: #15433 When I converted prometheus to use slog in #14906, I update both the `QueryLogger` interface, as well as how the log calls to the `QueryLogger` were built up in `promql.Engine.exec()`. The backing logger for the `QueryLogger` in the engine is a `util/logging.JSONFileLogger`, and it's implementation of the `With()` method updates the logger the logger in place with the new keyvals added onto the underlying slog.Logger, which means they get inherited onto everything after. All subsequent calls to `With()`, even in later queries, would continue to then append on more and more keyvals for the various params and fields built up in the logger. In turn, this causes unbounded growth of the logger, leading to increased memory usage, and in at least one report was the likely cause of an OOM kill. More information can be found in the issue and the linked slack thread. This commit does a few things: - It was referenced in feedback in #14906 that it would've been better to not change the `QueryLogger` interface if possible, this PR proposes changes that bring it closer to alignment with the pre-3.0 `QueryLogger` interface contract - reverts `promql.Engine.exec()`'s usage of the query logger to the pattern of building up an array of args to pass at once to the end log call. Avoiding the repetitious calls to `.With()` are what resolve the issue with the logger growth/memory usage. - updates the scrape failure logger to use the update `QueryLogger` methods in the contract. - updates tests accordingly - cleans up unused methods Builds and passes tests successfully. Tested locally and confirmed I could no longer reproduce the issue/it resolved the issue. Signed-off-by: TJ Hoplock <t.hoplock@gmail.com>	2024-11-23 14:20:37 -05:00
beorn7	4b573e0521	promql: Fix subqueries to be really left-open ... Previously, we managed to get rid of the sample on the left bound later, so the problem didn't show up in the framework tests. But the subqueries were still evaluation with the sample on the left bound, taking space and showing up if returning the subquery result directly (without further processing through PromQL like in all the framework tests). Signed-off-by: beorn7 <beorn@grafana.com>	2024-11-21 14:28:05 +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