mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-09-30 04:37:32 -07:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity
7921 commits 215 branches 425 tags 748 MiB
Commit graph

7921 commits

This branch
This branch
All branches
Author SHA1 Message Date
Frederic Branczyk b75ec7e6ef
Merge pull request #4458 from FUSAKLA/k8s-sd-add-metrics 
feat: added more k8s SD metrics
 2018-09-21 13:10:48 +02:00
Timo Beckers 1c9fbd65c4 marathon-sd - change port gathering strategy, support for container networking (#4499) 
* marathon-sd - change port gathering strategy, add support for container networking

- removed unnecessary error check on HTTPClientConfig.Validate()
- renamed PortDefinitions and PortMappings to PortDefinition and PortMapping respectively
- extended data model for extra parsed fields from Marathon json
- support container networking on Marathon 1.5+ (target Task.IPAddresses.x.Address)
- expanded test suite to cover all new cases
- test: cancel context when reading from doneCh before returning from function
- test: split test suite into Ports/PortMappings/PortDefinitions

Signed-off-by: Timo Beckers <timo@incline.eu>
 2018-09-21 11:53:04 +01:00
Goutham Veeramachaneni 1a5a3d3be6
Merge pull request #4645 from prometheus/release-2.4 
Merge release-2.4 into master
 2018-09-21 15:38:12 +05:30
Martin Chodur dbd765a0e3 Refactor Makefile to use Makefile.common (#324) 
make use of the Makefile.common

Signed-off-by: Martin Chodur <m.chodur@seznam.cz>
 2018-09-21 11:08:38 +03:00
Krasi Georgiev d05611c027
removed some unused code and moved mockSeriesSet in querier_test (#394) 
Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>
 2018-09-21 11:07:35 +03:00
Goutham Veeramachaneni c305ffaa09
release 2.4.2 (#4636) 
* vendor: Update prometheus/tsdb

This time, properly

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>

* release 2.4.2

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
 2018-09-21 12:48:39 +05:30
Krasi Georgiev d38516b1c2
remove unused changes variable (#391) 
This was added in
55a9b5428a

and later not used after some refactoring in following PRs.

Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>
 2018-09-21 09:24:01 +03:00
Chris Marchbanks 2db59a71a6 Fix assert order being backwards in a few places (#388) 
Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>
 2018-09-21 09:23:01 +03:00
Ganesh Vernekar e779603633 Reuse testutil (#393) 
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2018-09-21 11:47:59 +05:30
Goutham Veeramachaneni 9c8ca47399
Fix filehandling for windows (#392) 
* Fix filehandling for windows

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>

* Fix more windows filehandling issues

Windows: Close files before deleting Checkpoints.

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>

Windows: Close writers in case of errors so they can be deleted

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>

Windows: Close block so that it can be deleted.

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>

Windows: Close file to delete it

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>

Windows: Close dir so that it can be deleted.

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>

Windows: close files so that they can be deleted.

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>

* Review feedback

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
 2018-09-21 11:01:22 +05:30
Martin Chodur f2d037133e
feat: added more k8s SD metrics 
Signed-off-by: Martin Chodur <m.chodur@seznam.cz>
 2018-09-20 22:28:51 +02:00
Julius Volz 5ae6c60d39 Handle a bunch of unchecked errors (#365) 
As discovered by "gosec".

Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2018-09-20 11:33:52 +03:00
Goutham Veeramachaneni ce6716fe90
release 2.4.1 (#4632) 
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
 2018-09-19 19:04:43 +05:30
Goutham Veeramachaneni 5a24560d2b
vendor: update prometheus/tsdb (#4631) 
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
 2018-09-19 14:35:33 +05:30
Simon Pasquier 2d7f562ed6 web: fix asset paths for Windows platforms (#4616) 
* web: fix asset paths for Windows platforms

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

* web: add tests

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-09-19 12:50:53 +05:30
Fabian Reinartz dfcb7d0d50
Merge pull request #389 from gouthamve/wal-corruptio 
Make sure WAL Repair can handle wrapped errors
 2018-09-19 08:47:24 +02:00
Goutham Veeramachaneni c7d0d10da4
Make sure WAL Repair can handle wrapped errors 
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
 2018-09-19 12:12:25 +05:30
Björn Rabenstein d1a6edae6f
Merge pull request #386 from prometheus/beorn7/client_golang 
Revert "Remove `prometheus_` prefix from metrics"
 2018-09-18 19:27:31 +02:00
beorn7 3bc6c670fa Revert "Remove prometheus_ prefix from metrics" 
This reverts commit 98fe30438c.

After some discussion, it was concluded that we want the full
`prometheus_tsdb_...` prefix hardcoded in the library.

Signed-off-by: beorn7 <beorn@soundcloud.com>
 2018-09-18 19:19:19 +02:00
Camille Janicki b035ea0ea9 Change discovery subpackages to not use testify in tests (#4612) 
* Change discovery subpackages to not use testify in tests

Signed-off-by: Camille Janicki <camille.janicki@gmail.com>

* Remove testify suite from vendor dir

Signed-off-by: Camille Janicki <camille.janicki@gmail.com>
 2018-09-18 17:35:22 +02:00
Harsh Agarwal 18a9a390b5 Add duplicate-labelset check for range/instant vectors (#4589) 
Signed-off-by: Harsh Agarwal <cs15btech11019@iith.ac.in>
 2018-09-18 10:46:13 +01:00
Augustin Husson 3c0b130e5e apply review 
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
 2018-09-18 11:08:38 +02:00
Chris Marchbanks a8966cb53d Fix race condition between gc and committing (#378) 
Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>
 2018-09-17 19:58:42 +03:00
Callum Styan 722f0ab920 break MigrateWAL into two functions, detection and migration (#371) 
Signed-off-by: Callum Styan <callumstyan@gmail.com>
 2018-09-17 19:30:56 +03:00
Frederic Branczyk 1b651ea7d4
Merge pull request #383 from prometheus/beorn7/client_golang 
Remove `prometheus_` prefix from metrics
 2018-09-17 15:16:04 +02:00
beorn7 98fe30438c Remove prometheus_ prefix from metrics 
This can now be added by users of the library as needed with the new
https://godoc.org/github.com/prometheus/client_golang/prometheus#WrapRegistererWithPrefix

Signed-off-by: beorn7 <beorn@soundcloud.com>
 2018-09-17 14:54:28 +02:00
Björn Rabenstein cfbd72b4f1
Merge pull request #4620 from prometheus/beorn7/client_golang 
Update to current client_golang
 2018-09-17 14:28:47 +02:00
Krasi Georgiev ad459ca1f4
re-added TestDeleteUntilCurMax TestDelete_e2e (#382) 
no logic changes just uncommented and fixed the issues.

Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>
 2018-09-17 14:28:55 +03:00
beorn7 4fb59d1e61 Remove use of deprecated prometheus.Handler 
Signed-off-by: beorn7 <beorn@soundcloud.com>
 2018-09-17 13:05:43 +02:00
beorn7 5e4a76e66b Update vendoring of client_golang and friends 
Signed-off-by: beorn7 <beorn@soundcloud.com>
 2018-09-17 13:03:28 +02:00
Augustin Husson e03869de76 add unit test and isolate the method that generate the target 
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
 2018-09-16 23:50:10 +02:00
Augustin Husson 97950a3fae remove group if the target is empty at adapter level 
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
 2018-09-16 14:38:21 +02:00
Bob Shannon cb7f320d42 Expose prometheus_tsdb_lowest_timestamp metric (#363) 
* Expose prometheus_tsdb_start_time_seconds metric

Signed-off-by: Bob Shannon <bshannon@palantir.com>

* Search for block with smallest minTime

Signed-off-by: Bob Shannon <bshannon@palantir.com>

* PR comments

Signed-off-by: Bob Shannon <bshannon@palantir.com>

* PR comment: Make metric name more accurate

Signed-off-by: Bob Shannon <bshannon@palantir.com>
 2018-09-14 17:37:45 +05:30
Alexey Palazhchenko 9be883670e fix the test data file path in benchmarks. (#345) 
Signed-off-by: Alexey Palazhchenko <alexey.palazhchenko@gmail.com>
 2018-09-13 19:34:26 +03:00
Simon Pasquier 128ff546b8 config: add test for OpenStack SD (#4594) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-09-13 21:44:27 +05:30
Ganesh Vernekar 05726c5ea2 Test template expansion while loading groups (#4537) 
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2018-09-13 13:55:58 +01:00
yzpeninsula 4ae3bce260 Fix typo (#4497) 
Signed-off-by: yzpeninsula <yzpeninsula@gmail.com>
 2018-09-13 16:04:10 +05:30
Tom Wilkie e3d36f4802 Don't import testing from non-test code. (#4595) 
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
 2018-09-13 16:03:26 +05:30
Bryan Boreham 968f657eaa Stop removing the final dot from rooted DNS names (#4586) 
Removing a final dot changes the meaning of the name and can cause
extra DNS lookups as the resolver traverses its search path.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2018-09-13 15:28:38 +05:30
Ganesh Vernekar 576ee4d309 Label name check for 'count_values' (#4585) 
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2018-09-13 15:27:36 +05:30
Goutham Veeramachaneni 9ee4b05d16
Better link for docs (#4593) 
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
 2018-09-13 15:26:41 +05:30
Ganesh Vernekar 73db8b8cea [bugfix] Parse negative value in PromQL (#4564) 
* Parse negative value in PromQL
* Enforce space between values

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2018-09-13 09:08:01 +01:00
Simon Pasquier e7cee1b5ba Remove tests redundant with TestTargetUpdatesOrder 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-09-12 17:56:53 +02:00
Simon Pasquier 7dc3f11306 WIP discovery: refactor TestTargetUpdatesOrder 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-09-12 16:15:03 +02:00
Simon Pasquier 8fd891bf3f Speed up tests that were still using the 5s timeout 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-09-12 16:13:15 +02:00
Simon Pasquier 8289501420 Address krasi's comments 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-09-12 16:13:15 +02:00
Simon Pasquier 1cee5b5b06 Don't multiple the interval value by 1ms in the mock 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-09-12 16:13:15 +02:00
Simon Pasquier 4900405d2f Refactor TestCoordinationWithReceiver() to work with any Discoverer 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-09-12 16:13:15 +02:00
Simon Pasquier 0798f14e02 Add TestCoordinationWithEmptyProvider 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-09-12 16:13:15 +02:00
Simon Pasquier 48989d8996 discovery: add more tests 
Co-authored-by: Camille Janicki <camille.janicki@gmail.com>
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-09-12 16:13:15 +02:00