prometheus

Commit Graph

Author	SHA1	Message	Date
Julien Pivotto	9adad8ad30	Remove MaxConcurrent from the PromQL engine opts (#6712 ) Since we use ActiveQueryTracker to check for concurrency in `d992c36b3a` it does not make sense to keep the MaxConcurrent value as an option of the PromQL engine. This pull request removes it from the PromQL engine options, sets the max concurrent metric to -1 if there is no active query tracker, and use the value of the active query tracker otherwise. It removes dead code and also will inform people who import the promql package that we made that change, as it breaks the EngineOpts struct. Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	5 years ago
Brian Brazil	61262159c4	Simplify benchmark given the new API Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>	5 years ago
Brian Brazil	38d32e0686	Don't sort postings if we only have one block. Sorting the heads postings can be quite slow. We only need sorted series when merging with another querier, so only sort then. This will make big queries that only touch the head faster, though queries that touch both the head and a block will still be the same speed. This probably won't help much with graphing unless the range is under an hour, however it should make most recording rules faster. Add gaurantee that remote read streaming produces sorted series. PromQL benchmarks for histograms show only 2-3% improvement, but they're only over 1k series. benchmark old ns/op new ns/op delta BenchmarkQuerierSelect/Head/1of1000000-4 1375486282 507657736 -63.09% BenchmarkQuerierSelect/Head/10of1000000-4 1387859004 507769850 -63.41% BenchmarkQuerierSelect/Head/100of1000000-4 1387087935 506029110 -63.52% BenchmarkQuerierSelect/Head/1000of1000000-4 1386869064 504521986 -63.62% BenchmarkQuerierSelect/Head/10000of1000000-4 1386213685 505210422 -63.55% BenchmarkQuerierSelect/Head/100000of1000000-4 1392754988 529842406 -61.96% BenchmarkQuerierSelect/Head/1000000of1000000-4 1569414722 725059506 -53.80% BenchmarkQuerierSelect/SortedHead/1of1000000-4 1381019902 1370495863 -0.76% BenchmarkQuerierSelect/SortedHead/10of1000000-4 1375696209 1366789468 -0.65% BenchmarkQuerierSelect/SortedHead/100of1000000-4 1386009422 1364519297 -1.55% BenchmarkQuerierSelect/SortedHead/1000of1000000-4 1377700532 1364486191 -0.96% BenchmarkQuerierSelect/SortedHead/10000of1000000-4 1383539536 1369545314 -1.01% BenchmarkQuerierSelect/SortedHead/100000of1000000-4 1410089163 1394731339 -1.09% BenchmarkQuerierSelect/SortedHead/1000000of1000000-4 1634744148 1581554956 -3.25% BenchmarkQuerierSelect/Block/1of1000000-4 881741242 879839470 -0.22% BenchmarkQuerierSelect/Block/10of1000000-4 880381562 882846038 +0.28% BenchmarkQuerierSelect/Block/100of1000000-4 887519357 881016916 -0.73% BenchmarkQuerierSelect/Block/1000of1000000-4 902194205 883433524 -2.08% BenchmarkQuerierSelect/Block/10000of1000000-4 892321964 885130170 -0.81% BenchmarkQuerierSelect/Block/100000of1000000-4 938604466 933527150 -0.54% BenchmarkQuerierSelect/Block/1000000of1000000-4 1313510845 1295881124 -1.34% benchmark old allocs new allocs delta BenchmarkQuerierSelect/Head/1of1000000-4 4000056 4000018 -0.00% BenchmarkQuerierSelect/Head/10of1000000-4 4000074 4000036 -0.00% BenchmarkQuerierSelect/Head/100of1000000-4 4000254 4000216 -0.00% BenchmarkQuerierSelect/Head/1000of1000000-4 4002054 4002016 -0.00% BenchmarkQuerierSelect/Head/10000of1000000-4 4020054 4020016 -0.00% BenchmarkQuerierSelect/Head/100000of1000000-4 4200054 4200016 -0.00% BenchmarkQuerierSelect/Head/1000000of1000000-4 6000054 6000016 -0.00% BenchmarkQuerierSelect/SortedHead/1of1000000-4 4000071 4000071 +0.00% BenchmarkQuerierSelect/SortedHead/10of1000000-4 4000089 4000089 +0.00% BenchmarkQuerierSelect/SortedHead/100of1000000-4 4000269 4000269 +0.00% BenchmarkQuerierSelect/SortedHead/1000of1000000-4 4002069 4002069 +0.00% BenchmarkQuerierSelect/SortedHead/10000of1000000-4 4020069 4020069 +0.00% BenchmarkQuerierSelect/SortedHead/100000of1000000-4 4200069 4200069 +0.00% BenchmarkQuerierSelect/SortedHead/1000000of1000000-4 6000069 6000069 +0.00% BenchmarkQuerierSelect/Block/1of1000000-4 6000023 6000022 -0.00% BenchmarkQuerierSelect/Block/10of1000000-4 6000059 6000058 -0.00% BenchmarkQuerierSelect/Block/100of1000000-4 6000419 6000418 -0.00% BenchmarkQuerierSelect/Block/1000of1000000-4 6004019 6004018 -0.00% BenchmarkQuerierSelect/Block/10000of1000000-4 6040019 6040018 -0.00% BenchmarkQuerierSelect/Block/100000of1000000-4 6400019 6400018 -0.00% BenchmarkQuerierSelect/Block/1000000of1000000-4 10000020 10000019 -0.00% benchmark old bytes new bytes delta BenchmarkQuerierSelect/Head/1of1000000-4 229192200 176001176 -23.21% BenchmarkQuerierSelect/Head/10of1000000-4 229193352 176002328 -23.21% BenchmarkQuerierSelect/Head/100of1000000-4 229204872 176013848 -23.21% BenchmarkQuerierSelect/Head/1000of1000000-4 229320072 176129048 -23.20% BenchmarkQuerierSelect/Head/10000of1000000-4 230472072 177281048 -23.08% BenchmarkQuerierSelect/Head/100000of1000000-4 241992072 188801048 -21.98% BenchmarkQuerierSelect/Head/1000000of1000000-4 357192072 304001048 -14.89% BenchmarkQuerierSelect/SortedHead/1of1000000-4 229193928 229193928 +0.00% BenchmarkQuerierSelect/SortedHead/10of1000000-4 229195080 229195080 +0.00% BenchmarkQuerierSelect/SortedHead/100of1000000-4 229206600 229206600 +0.00% BenchmarkQuerierSelect/SortedHead/1000of1000000-4 229321800 229321800 +0.00% BenchmarkQuerierSelect/SortedHead/10000of1000000-4 230473800 230473800 +0.00% BenchmarkQuerierSelect/SortedHead/100000of1000000-4 241993800 241993800 +0.00% BenchmarkQuerierSelect/SortedHead/1000000of1000000-4 357193800 357193800 +0.00% BenchmarkQuerierSelect/Block/1of1000000-4 227201516 227201500 -0.00% BenchmarkQuerierSelect/Block/10of1000000-4 227202924 227202908 -0.00% BenchmarkQuerierSelect/Block/100of1000000-4 227217036 227217020 -0.00% BenchmarkQuerierSelect/Block/1000of1000000-4 227358156 227358140 -0.00% BenchmarkQuerierSelect/Block/10000of1000000-4 228769356 228769340 -0.00% BenchmarkQuerierSelect/Block/100000of1000000-4 242881356 242881340 -0.00% BenchmarkQuerierSelect/Block/1000000of1000000-4 384001616 384001600 -0.00% Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>	5 years ago
Julien Pivotto	d992c36b3a	promql: make active query tracker context-aware (#6701 ) * promql: make query logger context-aware * Remove gate Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	5 years ago
Julien Pivotto	cf42888e4d	Fix order of testutil.Equals (#6695 ) Equals takes the expected value as first parameter, and the actual value as second parameter. Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	5 years ago
Julien Pivotto	5f27ac3583	Refactor query log fields (#6694 ) * Refactor query log fields Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	5 years ago
Julien Pivotto	3fbeee07fa	Fix flaky windows test (#6677 ) The windows clock is sometime off by 25ms, and as precise as 15ms. Let's give it more time to avoid flaky tests. Fix #6672 Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	5 years ago
Julien Pivotto	2b2eb79e8b	Add windows tests for query logger (#6653 ) * Add windows tests * Do not rely on time.Time in timer Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	5 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>	5 years ago
Tobias Guggenmos	f5eed7ae0a	PromQL: Fix panic in parser (#6650 ) Fixes #6649. The crash is fixed here, was caused because some AST sanity checks were performed on the syntax tree while assembling it. In case of previous parsing errors this could lead to undefined behaviour. The fix is to move the checks to the typechecking phase, which runs only when a syntax tree was assembled without there being parsing errors. There are other places, where similiar checks are performed while assembling the syntax tree. It might be a good idea to move those to the typechecking phase, too. Should I do this in the same or a separate PR? Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>	5 years ago
Tobias Guggenmos	2ca25d1c96	PromQL: Don't panic on syntax errors (#6643 ) Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>	5 years ago
Tobias Guggenmos	d642570924	PromQL: Use PositionRange in parser errors (#6634 ) Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>	5 years ago
Tobias Guggenmos	3a204be6b7	PromQL: Fix string and parentheses handling in engine (#6612 ) * WIP: PromQL: Allow engine to return strings Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com> * Add test suggested by @roidelapluie Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com> * Fix typo in React UI Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com> * Fix parenthesis handling for functions and aggregator params Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com> * Add more tests Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com> * Fix React UI test Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>	5 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>	5 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>	5 years ago
Julien Pivotto	3885562587	Query Logging styling (#6594 ) - Fix Json vs JSON in activequerylogger - Fix SetQueryLogger always returns nil Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	5 years ago
Tobias Guggenmos	6534ce843f	PromQL: Use a sync.Pool for the generated parser structure (#6591 ) * PromQL: Use a sync.Pool for the generated parser structure The generated PromQL parser allocates a struct about 4kb in size on every run. This puts a high load on the garbage collector. To reduce that load, a sync.Pool is used to recycle these structures. On small queries this makes parsing 2-3 times faster. Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>	5 years ago
Guangwen Feng	835c27a76b	Fix typo in comment for func Lex (#6588 ) Signed-off-by: Guangwen Feng <fenggw-fnst@cn.fujitsu.com>	5 years ago
Tobias Guggenmos	b18b6cb332	PromQL: Avoid lexer item copies and allocations (#6584 ) * PromQL: Avoid lexer item copies and allocations Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>	5 years ago
Tobias Guggenmos	4aef43a9f5	Cleanup: Remove parser switching logic (#6583 ) During the PromQL parser rewrite there was some logic put in place that allowed switching between the non generated and the generated parser. Since the parser is now fully generated this is not needed anymore. Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>	5 years ago
Tobias Guggenmos	2064abab40	Cleanup: Remove unused variable (#6581 ) Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>	5 years ago
Tobias Guggenmos	7c7746257c	Cleanup: remove function that does not do anything (#6580 ) Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>	5 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>	5 years ago
Julien Pivotto	9d9bc524e5	Add query log (#6520 ) * Add query log, make stats logged in JSON like in the API Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	5 years ago
Tobias Guggenmos	3d6cf1c289	PromQL: Make parser completely generated (#6548 ) Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>	5 years ago
Julien Pivotto	577e738986	Cleanup PromQL functions (#6551 ) * Cleanup PromQL functions The engine ensures, for Matrix functions, that functions are called with exactly one series at the time. Therefore a lot of code can be inlined and we can directly assume the first element of the arguments exists and contains all the samples needed. Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	5 years ago
Julien Pivotto	e0afec906f	add absent_over_time (#6490 ) * Implement absent_over_time Fixes #2882 Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	5 years ago
Josh Soref	91d76c8023	Spelling (#6517 ) * spelling: alertmanager Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: attributes Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: autocomplete Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: bootstrap Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: caught Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: chunkenc Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: compaction Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: corrupted Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: deletable Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: expected Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: fine-grained Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: initialized Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: iteration Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: javascript Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: multiple Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: number Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: overlapping Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: possible Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: postings Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: procedure Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: programmatic Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: queuing Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: querier Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: repairing Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: received Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: reproducible Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: retention Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: sample Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: segements Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: semantic Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: software [LICENSE] Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: staging Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: timestamp Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: unfortunately Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: uvarint Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: subsequently Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: ressamples Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>	5 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>	5 years ago
Julien Pivotto	f363a71ef7	promql: function: fix typo (#6501 ) Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	5 years ago
Julien Pivotto	4b3bab890d	Fix absent output where two label matchers are identical (#6493 ) Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	5 years ago
Tobias Guggenmos	a48acbcb23	PromQL: Fix parser benchmark (#6495 ) The parser benchmarks called the `ParseMetric` function instead of the `ParseExpr` function, which resulted in parsing failing every time. This means only the case of PromQL parser failure was benchmarked. Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>	5 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>	5 years ago
Julien Pivotto	f315c69129	promql: fix typo in value.go (#6491 ) Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	5 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>	5 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>	5 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>	5 years ago
Tobias Guggenmos	b38b25e9e1	Add Benchmark for the PromQL Parser (#6355 ) Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>	5 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>	5 years ago
Tobias Guggenmos	5c503d85f7	PromQL: export lexer (#6435 ) Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>	5 years ago
Tobias Guggenmos	35c1f31721	PromQL: Use more standart format for error positions (#6433 ) The most common format (used by go, gcc and clang) for compiler error positions seems to be `filename:line:char:` or `line:char:` if the filename is unknown. This PR adapts the PromQL parser to use this convention. Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>	5 years ago
Tobias Guggenmos	cd39ebe7c6	PromQL: export function list (#6434 ) This PR exports the list of supported PromQL functions and their signatures. The reason for that is that the PromQL language server likes to use that list. Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>	5 years ago
Mark Nevill	b0a5c51b95	Return unused point slice to pool in Call and VectorSelector eval. (#6427 ) Signed-off-by: Mark Nevill <mark.nevill@gmail.com>	5 years ago
Tobias Guggenmos	3bb715031f	PromQL: Use generated parser to parse label matchers (#6410 ) Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>	5 years ago
Garrett	5a9c4acfbf	Pushdown aggregator group by through read hint (#6401 ) * Pushdown aggregator group by through read hint Implement https://github.com/prometheus/prometheus/issues/6400 * add temporal aggregation pushdown support Signed-off-by: xiancli <xiancli@ebay.com>	5 years ago
Tobias Guggenmos	408574a6e1	promql: Allow injecting fake tokens into the generated parser (#6381 ) * promql: Allow injecting fake tokens into the generated parser Yacc grammars do not support having multiple start symbols. To work around that restriction, it is possible to inject fake tokens into the lexer stream, as described here https://www.gnu.org/software/bison/manual/html_node/Multiple-start_002dsymbols.html . This is part of the parser rewrite effort described in #6256. Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>	5 years ago
Tobias Guggenmos	bbd92b85da	promql: Use capitalized names for item types (#6371 ) For yacc generated parsers there is the convention to capitalize the names of item types provided by the lexer, which makes it easy to distinct lexer tokens (capitalized) from nonterminal symbols (not capitalized) in language grammars. This convention is also followed by the (non generated) go compiler (see https://golang.org/pkg/go/token/#Token). Part of the parser rewrite described in #6256. Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>	5 years ago
Tobias Guggenmos	c229ed17e2	promql: Implement yyLexer interface (#6370 ) This is the first step towards a generated lexer as described in #6256. It adds methods to the parser struct, that make it implement the yyLexer interface required by a yacc generated parser, as described here: https://godoc.org/golang.org/x/tools/cmd/goyacc . The yyLexer interface is implemented by the parser struct instead of the lexer struct for the following reasons: * Both parsers have a lookahead that the lexer does not know about. This solution makes it possible to synchronize these lookaheads when switching parsers. * The routines to handle parser errors are not accessible to the lexer. Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>	5 years ago
Bartosz Jakubski	80ba03c67d	fix subquery with offset conversion to string (#6373 ) Signed-off-by: Bartosz Jakubski <b.jakubski@gmail.com>	5 years ago
Tobias Guggenmos	c63259b83c	promql: Clean up parser struct (#6360 ) * promql: Clean up parser struct The parser struct used two have two somewhat misused fields: peekCount int token [3]item By reading the code carefully one notices, that peekCount always has the value 0 or 1 and that only the first element of token is ever accessed. To make this clearer, this commit replaces the token array with a single variable and the peekCount int with a boolean. Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>	5 years ago

1 2 3 4 5 ...

458 Commits (492414542ec8502e8885c8fefc3402ec51167457)