prometheus

Commit Graph

Author	SHA1	Message	Date
JuanJo Ciarlante	c94c5b64c3	feat: add limitk() and limit_ratio() operators (#12503 ) * rebase 2024-07-01, picks previous renaming to `limitk()` and `limit_ratio()` Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * gofumpt -d -extra Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * more lint fixes Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * more lint fixes+ Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * put limitk() and limit_ratio() behind --enable-feature=promql-experimental-functions Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * EnableExperimentalFunctions for TestConcurrentRangeQueries() also Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * use testutil.RequireEqual to fix tests, WIP equivalent thingie for require.Contains Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * lint fix Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * moar linting Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * rebase 2024-06-19 Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * re-add limit(2, metric) testing for N=2 common series subset Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * move `ratio = param` to default switch case, for better readability Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * gofumpt -d -extra util/testutil/cmp.go Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * early break when reaching k elems in limitk(), should have always been so (!) Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * small typo fix Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * no-change small break-loop rearrange for readability Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * remove IsNan(ratio) condition in switch-case, already handled as input validation Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * no-change adding some comments Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * no-change simplify fullMatrix() helper functions used for tests Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * add `limitk(-1, metric)` testcase, which is handled as any k < 1 case Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * engine_test.go: no-change create `requireCommonSeries() helper func (moving code into it) for readability Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * rebase 2024-06-21 Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * engine_test.go: HAPPY NOW about its code -> reorg, create and use simpleRangeQuery() function, less lines and more readable ftW \o/ Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * move limitk(), limit_ratio() testing to promql/promqltest/testdata/limit.test Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * remove stale leftover after moving tests from engine_test.go to testdata/ Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * fix flaky `limit_ratio(0.5, ...)` test case Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * Update promql/engine.go Co-authored-by: Julius Volz <julius.volz@gmail.com> Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * Update promql/engine.go Co-authored-by: Julius Volz <julius.volz@gmail.com> Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * Update promql/engine.go Co-authored-by: Julius Volz <julius.volz@gmail.com> Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * fix AddRatioSample() implementation to use a single conditional (instead of switch/case + fallback return) Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * docs/querying/operators.md: document r < 0 Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * add negative limit_ratio() example to docs/querying/examples.md Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * move more extensive docu examples to docs/querying/operators.md Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * typo Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * small docu fix for poor-mans-normality-check, add it to limit.test ;) Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * limit.test: expand "Poor man's normality check" to whole eval range Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * restore mistakenly removed existing small comment Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * expand poors-man-normality-check case(s) Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * Revert "expand poors-man-normality-check case(s)" This reverts commit f69e1603b2ebe69c0a100197cfbcf6f81644b564, indeed too flaky 0:) Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * remove humor from docs/querying/operators.md Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * fix signoff Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * add web/ui missing changes Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * expand limit_ratio test cases, cross-fingering they'll not be flaky Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * remove flaky test Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * add missing warnings.Merge(ws) in instant-query return shortcut Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * add missing LimitK\|\|LimitRatio case to codemirror-promql/src/parser/parser.ts Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * fix ui-lint Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> * actually fix returned warnings :] Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> --------- Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com> Co-authored-by: Julius Volz <julius.volz@gmail.com>	1 year ago
zenador	545a7e48f9	[nhcb branch] Enhance unit test framework for nhcb and warnings (#14009 ) * process custom values in histogram unit test framework * check for warnings when evaluating in unit test framework * add test cases for custom buckets in test framework Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>	2 years ago
Owen Williams	a28d7865ad	UTF-8: Add support for parsing UTF8 metric and label names This adds support for the new grammar of `{"metric_name", "l1"="val"}` to promql and some of the exposition formats. This grammar will also be valid for non-UTF-8 names. UTF-8 names will not be considered valid unless model.NameValidationScheme is changed. This does not update the go expfmt parser in text_parse.go, which will be addressed by https://github.com/prometheus/common/issues/554/. Part of https://github.com/prometheus/prometheus/issues/13095 Signed-off-by: Owen Williams <owen.williams@grafana.com>	2 years ago
Julien Pivotto	c92fbf3fdf	Add feature flag for PromQL experimental functions. This PR adds an Experimental flag to the functions. This can be used by https://github.com/prometheus/prometheus/pull/13059 but also xrate and other future functions. Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>	2 years ago
zenador	69edd8709b	Add warnings (and annotations) to PromQL query results (#12152 ) Return annotations (warnings and infos) from PromQL queries This generalizes the warnings we have already used before (but only for problems with remote read) as "annotations". Annotations can be warnings or infos (the latter could be false positives). We do not treat them different in the API for now and return them all as "warnings". It would be easy to distinguish them and return infos separately, should that appear useful in the future. The new annotations are then used to create a lot of warnings or infos during PromQL evaluations. Partially these are things we have wanted for a long time (e.g. inform the user that they have applied `rate` to a metric that doesn't look like a counter), but the new native histograms have created even more needs for those annotations (e.g. if a query tries to aggregate float numbers with histograms). The annotations added here are not yet complete. A prominent example would be a warning about a range too short for a rate calculation. But such a warnings is more tricky to create with good fidelity and we will tackle it later. Another TODO is to take annotations into account when evaluating recording rules. --------- Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>	2 years ago
Gregor Zeitlinger	f01718262a	Unit tests for native histograms (#12668 ) promql: Extend testing framework to support native histograms This includes both the internal testing framework as well as the rules unit test feature of promtool. This also adds a bunch of basic tests. Many of the code level tests can now be converted to tests within the framework, and more tests can be added easily. --------- Signed-off-by: Harold Dost <h.dost@criteo.com> Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com> Signed-off-by: Stephen Lang <stephen.lang@grafana.com> Co-authored-by: Harold Dost <h.dost@criteo.com> Co-authored-by: Stephen Lang <stephen.lang@grafana.com> Co-authored-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>	2 years ago
Bryan Boreham	b987afa7ef	labels: simplify call to get Labels from Builder It took a `Labels` where the memory could be re-used, but in practice this hardly ever benefitted. Especially after converting `relabel.Process` to `relabel.ProcessBuilder`. Comparing the parameter to `nil` was a bug; `EmptyLabels` is not `nil` so the slice was reallocated multiple times by `append`. Lastly `Builder.Labels()` now estimates that the final size will depend on labels added and deleted. Signed-off-by: Bryan Boreham <bjboreham@gmail.com>	3 years ago
Filip Petkovski	97c7fffbb8	parser: Allow parsing arbitrary functions In Thanos we would like to start experimenting with custom functions that are currently not part of the PromQL spec. We would do this by adding an implementation for those functions in the Thanos engine: https://github.com/thanos-community/promql-engine and allow users to decide which engine they want to use on a per-query basis. Since we use the PromQL parser from Prometheus, injecting functions in the global `Functions` variable would mean they also become available for the Prometheus engine. To avoid this side-effect, this commit exposes a Parser interface in which the supported functions can be injected as an option. If not functions are injected, the parser implementation will default to the functions defined in the global Functions variable. Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com>	3 years ago
Bryan Boreham	56fefcd812	Update package promql for new labels.Labels type We use `labels.Builder` to parse metrics, to avoid depending on the internal implementation. This is not efficient, but the feature is only used in tests. It wasn't efficient previously either - calling `Sort()` after adding each label. `createLabelsForAbsentFunction` also uses a Builder now, and gets an extra `map` to replace the previous `Has()` usage. Signed-off-by: Bryan Boreham <bjboreham@gmail.com> Fix up promql to compile with changes to Labels	3 years ago
beorn7	c954cd9d1d	Move packages out of deprecated pkg directory This creates a new `model` directory and moves all data-model related packages over there: exemplar labels relabel rulefmt textparse timestamp value All the others are more or less utilities and have been moved to `util`: gate logging modetimevfs pool runtime Signed-off-by: beorn7 <beorn@grafana.com>	4 years ago
Levi Harrison	7471208b5c	Add `ATAN2` to `maybe_label` Signed-off-by: Levi Harrison <git@leviharrison.dev>	4 years ago
Levi Harrison	8547a2bd86	Add `atan2` binary operator Signed-off-by: Levi Harrison <git@leviharrison.dev>	4 years ago
Julien Pivotto	cab96a06ef	Merge release 2.29 in main (#9196 ) * PromQL: Fix start and end keywords masking label and metric names This commit fixes an issue with the "at modifier" that introduced two new keywords: `start` and `end`. In grouping options and in metric names, these keywords took precedence over metric or label names, so that those metrics and labels could no longer be referenced. Signed-off-by: Clayton Peters <clayton.peters@man.com> * Add in additional tests for metrics and/or labels called start/end. Signed-off-by: Clayton Peters <clayton.peters@man.com> * : Cut 2.29.0-rc.0 Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com> VERSION: bump to 2.29.0-rc.0 Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com> * Remove experimental wording on size-based retention Followup of #9004 Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu> * Fix PR reference in changelog Signed-off-by: George Brighton <george@gebn.co.uk> * Describe EC2 availability zone IDs at most once per refresh (#9142) Signed-off-by: George Brighton <george@gebn.co.uk> * Describe EC2 availability zones at most once per SD load Closes #9142. Signed-off-by: George Brighton <george@gebn.co.uk> * Incorporate feedback Signed-off-by: George Brighton <george@gebn.co.uk> * Integrate feedback Signed-off-by: George Brighton <george@gebn.co.uk> * Add a compatibility note for macOS users. Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu> * : Cut v2.29.0-rc.1 Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com> Fix `kuma_sd` targetgroup reporting (#9157) * Bundle all xDS targets into a single group Signed-off-by: austin ce <austin.cawley@gmail.com> * : cut v2.29.0-rc.2 Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com> Rename links Signed-off-by: Levi Harrison <git@leviharrison.dev> * bump codemirror-promql to 0.17.0 Signed-off-by: Augustin Husson <husson.augustin@gmail.com> * : cut v2.29.0 Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com> tsdb: align atomically accessed int64 (#9192) This prevents a panic in 32-bit archs: https://pkg.go.dev/sync/atomic#pkg-note-BUG Fixed #9190 Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu> * Release 2.29.1 (#9193) Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu> Co-authored-by: Clayton Peters <clayton.peters@man.com> Co-authored-by: Frederic Branczyk <fbranczyk@gmail.com> Co-authored-by: George Brighton <george@gebn.co.uk> Co-authored-by: Austin Cawley-Edwards <austin.cawley@gmail.com> Co-authored-by: Levi Harrison <git@leviharrison.dev> Co-authored-by: Augustin Husson <husson.augustin@gmail.com>	4 years ago
Clayton Peters	6b4bf3f697	PromQL: Fix start and end keywords masking label and metric names This commit fixes an issue with the "at modifier" that introduced two new keywords: `start` and `end`. In grouping options and in metric names, these keywords took precedence over metric or label names, so that those metrics and labels could no longer be referenced. Signed-off-by: Clayton Peters <clayton.peters@man.com>	4 years ago
schou	efbf3af05d	reduce addOffst to 2 parameters Signed-off-by: schou <pschou@users.noreply.github.com>	5 years ago
schou	0c577c547b	add negative offset ability Signed-off-by: schou <pschou@users.noreply.github.com>	5 years ago
Ganesh Vernekar	86c71856e8	Add start() and end() pre-processors for @ modifier (#8425 ) * Add start() and end() pre-processors for @ modifier Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in> * Fix reviews Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in> * Fix review comments Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in> * Fix review comments Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>	5 years ago
Ganesh Vernekar	9199fcb8d1	'@ <timestamp>' modifier (#8121 ) This commit adds `@ <timestamp>` modifier as per this design doc: https://docs.google.com/document/d/1uSbD3T2beM-iX4-Hp7V074bzBRiRNlqUdcWP6JTDQSs/edit. An example query: ``` rate(process_cpu_seconds_total[1m]) and topk(7, rate(process_cpu_seconds_total[1h] @ 1234)) ``` which ranks based on last 1h rate and w.r.t. unix timestamp 1234 but actually plots the 1m rate. Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>	5 years ago
Harkishen Singh	fc8e769d71	Use ASSIGN when using = inside braces (#7911 ) * Fix EQL when using = inside braces. Signed-off-by: Harkishen-Singh <harkishensingh@hotmail.com> * EQL => EQLC and ASSIGN => EQL Signed-off-by: Harkishen-Singh <harkishensingh@hotmail.com> * Aligned yacc code. Signed-off-by: Harkishen-Singh <harkishensingh@hotmail.com>	5 years ago
Tobias Guggenmos	1f73073d73	Make without a valid metric identifier (#7533 ) Discussion see #7532. cc @juliusv Signed-off-by: Tobias Guggenmos <tobias.guggenmos@uni-ulm.de>	6 years ago
Julien Pivotto	72425d4e3d	Add group() aggregator (#7480 ) * Add group() aggregator Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	6 years ago
Brian Brazil	44ad28dd5e	PromQL: Allow more keywords as metric names (#6933 ) * Allow more keywords as metric names * Add documentation about forbidden keywords Signed-off-by: Tobias Guggenmos <tobias.guggenmos@uni-ulm.de>	6 years ago
Brian Brazil	7164b58945	PromQL: Fix parser panic (#6931 ) Signed-off-by: Tobias Guggenmos <tobias.guggenmos@uni-ulm.de>	6 years ago
Tobias Guggenmos	1360f9ff12	Fix all build errors in promql package Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>	6 years ago
Tobias Guggenmos	65f5b9827d	Rename package Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>	6 years ago
Tobias Guggenmos	e7c2716f55	Move files Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>	6 years ago
Tobias Guggenmos	2aacd807b3	PromQL: Various small improvements in the parser (#6652 ) * Move check for empty VectorSelector to typeChecking * Move check for twice set metric name to typeChecking * Make child of MatrixSelector a general Node * rename checkType to checkAST * Rename fail to addParseErr * Remove trailing whitespace Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>	6 years ago
Tobias Guggenmos	2ca25d1c96	PromQL: Don't panic on syntax errors (#6643 ) Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>	6 years ago
Tobias Guggenmos	d642570924	PromQL: Use PositionRange in parser errors (#6634 ) Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>	6 years ago
Tobias Guggenmos	0c8e9ef09e	PromQL: Add position metadata to the AST (#6615 ) Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com> Co-authored-by: Julius Volz <julius.volz@gmail.com>	6 years ago
Tobias Guggenmos	64194f7d45	PromQL: AST: Make VectorSelector Children of MatrixSelector (#6590 ) Make Vector selectors children of Matrix Selectors Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>	6 years ago
Tobias Guggenmos	d8bc24349c	PromQL: Fix unary operator precedence (#6579 ) * PromQL: Fix unary operator precedence Fixes #6575 Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>	6 years ago
Tobias Guggenmos	3d6cf1c289	PromQL: Make parser completely generated (#6548 ) Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>	6 years ago
Tobias Guggenmos	213a8fe89a	PromQL: Parse Series descriptions using the generated parser (#6494 ) * Use generated parser for series descriptions Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>	6 years ago
Tobias Guggenmos	1e0cd28bf6	PromQL: Support trailing commas in grouping opts (#6480 ) * PromQL: Support trailing commas in grouping opts Fixes #6470 Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>	6 years ago
Tobias Guggenmos	db1258f2a5	PromQL: Refactor error message generation (#6481 ) * Add parser method to produce errors messages about unexpected items * PromQL: use parser.unexpected in generated parser Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>	6 years ago
Tobias Guggenmos	9e34f08ac3	PromQL: Parse grouping opts with the generated parser (#6472 ) * PromQL: Parse grouping opts with the generated parser Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>	6 years ago
Tobias Guggenmos	53615412b4	PromQL: Parse Metrics using generated parser (#6466 ) * Parse Metrics with the generated parser Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>	6 years ago
Tobias Guggenmos	8cb4a48e2e	PromQL: Parse label sets using the generated parser (#6432 ) * Add grammar for label_sets * Parse label Sets using the generated parser * Allow trailing commas for label sets and selectors * Add test to trigger all possible error messages for label matchers Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>	6 years ago
Tobias Guggenmos	5c503d85f7	PromQL: export lexer (#6435 ) Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>	6 years ago
Tobias Guggenmos	3bb715031f	PromQL: Use generated parser to parse label matchers (#6410 ) Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>	6 years ago

26 Commits (c94c5b64c35b20e7b9062ae325f91a169ddf8ffc)