RepoMirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2024-12-26 00:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,447 Commits 243 Branches 444 Tags 653 MiB
7d159b2f01
Commit Graph

7447 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Björn Rabenstein
7d159b2f01
Merge pull request #6666 from roidelapluie/deps2 
Add a note about updating deps
 2020-01-21 11:47:42 +01:00
Julien Pivotto
372039530b Add a note about updating deps 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-01-20 22:29:12 +01:00
Julius Volz
a677622184
React UI: Send cookies on fetch() on older browsers (#6553) 
* React UI: Send cookies on fetch() on older browsers

Fixes https://github.com/prometheus/prometheus/issues/6428

Signed-off-by: Julius Volz <julius.volz@gmail.com>

* Fix fetch() tests to expect new options

Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2020-01-20 16:50:32 +01:00
Ganesh Vernekar
21a5cf5d1d
Bring back tombstones to Head block (#6542) 
* Bring back tombstones to Head block

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>

* Add test cases

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>

* Cleanup

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2020-01-20 21:08:00 +05:30
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>
 2020-01-20 13:17:11 +00:00
Julien Pivotto
46d18112a3 tsdb: error on series with duplicate labels (#6664) 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-01-20 11:05:27 +00:00
Ganesh Vernekar
08d6ddc7f2
Merge pull request #6667 from codesome/expose-compact 
Expose DB.compact() method
 2020-01-20 15:22:48 +05:30
Ganesh Vernekar
e0733a99e3
Expose DB.Compact() 
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2020-01-20 12:59:49 +05:30
Julien Pivotto
0eb34299da End-to-end Query Log test (#6600) 
* End-to-end Query Log test

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-01-19 21:56:13 +00:00
Joaquín Fernández Campo
088614a17f Added the version to tsdb stats api methods (#6656) 
* Added the version to tsdb stats api methods
* Updated changelog.md with references to the status page PRs

Signed-off-by: Joaquin Fernandez Campo <jfcampo@gmail.com>
 2020-01-19 09:54:39 +00:00
Julien Pivotto
1a58d2657d Removed compilation step inside main_test (#6658) 
Inspired by https://github.com/prometheus/prometheus/pull/6347 and
https://github.com/prometheus/prometheus/pull/6347#issuecomment-570151979

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-01-19 07:14:25 +00:00
Julien Pivotto
29086533fd web: use chained WithInstrumentation (#6661) 
* web: use chained WithInstrumentation

Requires an update of github.com/prometheus/common
* Update yaml.v2

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-01-19 00:07:10 +00:00
Boyko
0f84d5b2cf React UI: broken graph page browser history (#6659) 
* add panel state for the expression input

Signed-off-by: blalov <boiskila@gmail.com>

* remove redundant test

Signed-off-by: blalov <boiskila@gmail.com>
 2020-01-18 23:40:25 +01:00
John McBride
669592a2c4 Exports metric for WAL write errors (#6647) 
* Exports metric for WAL write errors

Signed-off-by: John McBride <jpmmcbride@gmail.com>

* Correct name for counter

Signed-off-by: John McBride <jpmmcbride@gmail.com>

* Move WAL write failure to wal.go

Signed-off-by: John McBride <jpmmcbride@gmail.com>

* WAL write fail metric moved to Log for external consumers

Signed-off-by: John McBride <jpmmcbride@gmail.com>
 2020-01-17 12:12:04 -08:00
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>
 2020-01-17 15:16:58 +00:00
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>
 2020-01-17 13:06:26 +00:00
Björn Rabenstein
7d627da97f
Merge pull request #6648 from cstyan/cstyan-release-2.16 
Add myself (@cstyan) as 2.16 release shepherd.
 2020-01-17 09:33:50 +01:00
Callum Styan
329046a5ab Add myself as 2.16 release shepherd. 
Signed-off-by: Callum Styan <callumstyan@gmail.com>
 2020-01-16 16:13:25 -08:00
Boyko
c8469ecaf5 React UI: hide non selected alert types (#6642) 
* hide non selected alert types

Signed-off-by: Boyko Lalov <boiskila@gmail.com>

* revert 'show annotations' checkbox to be always visible

Signed-off-by: blalov <boiskila@gmail.com>
 2020-01-16 22:22:47 +01:00
Tobias Guggenmos
2ca25d1c96 PromQL: Don't panic on syntax errors (#6643) 
Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>
 2020-01-16 15:20:20 +00:00
Ganesh Vernekar
bc42cf6806
Merge pull request #6559 from yeya24/tomb-test 
Add a tomb interval test case
 2020-01-16 11:42:28 +05:30
Björn Rabenstein
949e4d12a4
Merge pull request #6633 from roidelapluie/215b 
merge release-2.15
 2020-01-15 23:12:08 +01:00
Tobias Guggenmos
d642570924 PromQL: Use PositionRange in parser errors (#6634) 
Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>
 2020-01-15 20:01:49 +00:00
Harkishen Singh
84e6459c4d Adds support for line-column numbers for invalid rules, promtool (#6533) 
Signed-off-by: Harkishen Singh <harkishensingh@hotmail.com>
 2020-01-15 18:07:54 +00:00
Julien Pivotto
f069074dd9 Merge remote-tracking branch 'origin/release-2.15' 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-01-15 18:51:29 +01:00
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>
 2020-01-15 18:31:58 +01:00
beorn7
ee03dbe011 v2.5.0 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEE8GG9G6RqQ7DWttOfd0GlJ4KpAGkFAlvhfW8ACgkQd0GlJ4Kp
 AGla+w//Xys6sGO6w9hN8NlBhKHyU6Ubj17cWRNLhKArZyqcBJxFoqd3ew1UmpbN
 YebGeHb3H2GV+HMPzHdhCrKQMAm/CLtCragYk+AJVWXJ8DEEbBzdSCdG+7wm0aBL
 5zImzVzFIyQD+rfoBqKNrSekPGJuWJmDpUFaZRsJOQA/N5KdeqTRyaYUQP+HmheY
 E/2PLQQ+3uV5GKguAOxML0FDjwpV6k92kZcZyMvvfzdnVyaHL55b03wI8CaLRMEC
 bd8s6SRt68Sz/ctenPx4KnTf4Ikdwqaok0qbsme9VLiyC7EYy6FWw9x1O7p28Wfw
 HW6P8Qk3MZhjUxwr28LZJ+loIGiikahK4haTCytILg1C76t/42EGqDiD3HqfGtFw
 OzZT8oU9kL0Pogp+2mhzZykOSYVGLedzA8lnHvSrYhpZP5RwNT9t17RDGI1YmZXp
 MG8RVaW2o+RYLUPqGlHMVvI0Em+kzRFRT4LxZpVrXLM/jue2si0ecHfwjZ8xHsLR
 5p3H3RbbEeS9FkWsEAL513LTPm2yHAf6Pd8hHE7V+2AKm9aGtP2t13QTcJMGcB7d
 qa2RT+3GrQP1yvVbQJfaGfDZlMHLykS2qiX0j8lK0sFwy3nr+24XPSTsl7mLcT5v
 ibS+yGgJcs0Hr66kmO8g0Z8qDW2DHGoLoMsIFXcG2/2vvkdcX20=
 =y9a/
 -----END PGP SIGNATURE-----

Merge tag 'v2.5.0'

v2.5.0
 2020-01-15 13:16:41 +01:00
beorn7
d9607a7070 Merge branch 'release-2.11' 2020-01-15 13:05:55 +01:00
beorn7
bfa277ddac Merge branch 'release-2.13' 2020-01-15 12:41:37 +01:00
Boyko
bab47b58f5 ReactUI: folder re-organization (#6601) 
* remove redundant sanitizeHTML abstraction

Signed-off-by: blalov <boiskila@gmail.com>

* organize folders

Signed-off-by: blalov <boiskila@gmail.com>

* move hooks outside common folder

Signed-off-by: blalov <boiskila@gmail.com>

* move PathPrefix interface in types

Signed-off-by: blalov <boiskila@gmail.com>

* remove config folder

Signed-off-by: blalov <boiskila@gmail.com>

* remove redundant snapshots

Signed-off-by: blalov <boiskila@gmail.com>

* rename common folder

Signed-off-by: blalov <boiskila@gmail.com>

* merge utils files

Signed-off-by: Boyko Lalov <boiskila@gmail.com>

* sync with master

Signed-off-by: blalov <boiskila@gmail.com>
 2020-01-14 19:34:48 +01:00
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>
 2020-01-14 16:12:15 +00:00
Boyko
e12e5ecc8f ReactUI: adopt grafana flot fix for stacked graphs (#6603) 
* adopt grafana flot fix for stacked graphs

Signed-off-by: blalov <boiskila@gmail.com>
Signed-off-by: Boyko Lalov <boiskila@gmail.com>

* remove flot as dependencie

Signed-off-by: blalov <boiskila@gmail.com>
Signed-off-by: Boyko Lalov <boiskila@gmail.com>

* disable eslint error in flot.js

Signed-off-by: blalov <boiskila@gmail.com>
Signed-off-by: Boyko Lalov <boiskila@gmail.com>

* fix broken test due to wrong import

Signed-off-by: blalov <boiskila@gmail.com>
Signed-off-by: Boyko Lalov <boiskila@gmail.com>

* bring back flot crosshair plugin

Signed-off-by: blalov <boiskila@gmail.com>
Signed-off-by: Boyko Lalov <boiskila@gmail.com>

* trying to prevent CI out of memory by adding test script --runInBand flag

Signed-off-by: blalov <boiskila@gmail.com>
Signed-off-by: Boyko Lalov <boiskila@gmail.com>

* additional notices regarding origin of the flot vendor

Signed-off-by: Boyko Lalov <boiskila@gmail.com>

* move flot in own folder

Signed-off-by: Boyko Lalov <boiskila@gmail.com>

* move text on top

Signed-off-by: Boyko Lalov <boiskila@gmail.com>
 2020-01-14 16:12:08 +01:00
Ganesh Vernekar
3b9304d22e
Merge pull request #6626 from claytono/fix-curl-args 
Fix curl args for data-urlencode in docs
 2020-01-14 17:46:33 +05:30
Clayton O'Neill
7e76edc300
Fix curl args for data-urlencode 
The curl argument `--data-urlencode` doesn't accept equal signs between
the arg and the value, but needs whitespace instead.

Signed-off-by: Clayton O'Neill <claytono@github.com>
 2020-01-14 07:10:16 -05:00
Julien Pivotto
201491fd1b Remove old checkpoint dir if it still exists (#6621) 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-01-14 09:35:24 +00:00
Julien Pivotto
aad8f89ecb Remote storage: propagate json marshal errors (#6622) 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-01-14 08:40:30 +00:00
Julien Pivotto
0cff72d756 tsdb: writePostingsToTmpFiles returns nil instead of err (#6618) 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-01-13 22:40:12 +00:00
Julien Pivotto
398bd84d6f small tsdb fixes (#6616) 
* tsdb: register compactions_skipped_total

That metric was not registered.

I also reordered the metrics in the list.

* tsdb: display correct error when WAL can't be read

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-01-13 22:15:45 +00:00
Stuart Spence
5ade524a1b grammar typo (#6617) 
Signed-off-by: Stuart Spence <stuart.spence@canada.ca>
 2020-01-13 22:14:52 +00:00
Hu Shuai
a7f16749b7 Add unit test for Inverse in pkg/labels/matcher.go (#6586) 
This PR is about adding a unit test for Inverse and updating the other test in pkg/labels/matcher.go.

Signed-off-by: Hu Shuai <hus.fnst@cn.fujitsu.com>
 2020-01-13 07:29:14 -07:00
vitt-bagal
e3239c1093 Added support for s390x image (#6486) 
Signed-off-by: Vitthal Bagal <vitthalb@us.ibm.com>
 2020-01-13 14:54:07 +01:00
Björn Rabenstein
8cb2ab6a99
Merge pull request #6602 from paulfantom/mixins 
documentation/prometheus-mixin: add dependency on grafonnet
 2020-01-13 12:26:23 +01:00
paulfantom
7321f1d227
documentation/prometheus-mixin: add dependency on grafonnet 
Signed-off-by: paulfantom <pawel@krupa.net.pl>
 2020-01-11 23:18:04 +01:00
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>
 2020-01-10 14:25:41 +00:00
Julien Pivotto
e7f7b6a06f Query Log: Add source IP from console queries (#6593) 
* Query Log: Add source IP from console queries

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-01-10 12:56:36 +00:00
Bartlomiej Plotka
1e64d757f7
Merge pull request #6585 from prometheus/fix-symbols-lookup 
tsdb: Fixed Symbol Lookup edge case; Added tests.
 2020-01-10 11:44:23 +00:00
Bartlomiej Plotka
ab8748d0e0
Merge pull request #6596 from fenggw-fnst/work 
Fix typo in comment for func AddPadding
 2020-01-10 11:12:14 +00:00
Guangwen Feng
5e906cc09a Fix typo in comment for func AddPadding 
Signed-off-by: Guangwen Feng <fenggw-fnst@cn.fujitsu.com>
 2020-01-10 18:11:30 +08:00
Julien Pivotto
0011bba19b Query Log: add origin of the rules (#6592) 
* Query Log: add origin of the rules

We don't set rule name and rule kind because the added value would be
quite low, given we have now the file, the group and the query.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-01-10 08:28:17 +00:00
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>
 2020-01-09 21:11:39 +00:00