mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-26 22:19:40 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
5226 commits 243 branches 444 tags 649 MiB
Commit graph

5226 commits

This branch
This branch
All branches
Author SHA1 Message Date
Richard Kiene b537f6047a Add ability to filter triton_sd targets by pre-defined groups (#4701) 
Additionally, add triton groups metadata to the discovery reponse
and correct a documentation error regarding the triton server id
metadata.

Signed-off-by: Richard Kiene <richard.kiene@joyent.com>
 2018-10-10 10:03:34 +01:00
Benji Visser eb4cc37e50 Update moment.js and moment-timezone.js (#4679) 
* upgrading moment-timezome (0.5.13 -> 0.5.17)
* upgrading dependency moment (2.16.0 -> 2.22.2)

Signed-off-by: noqcks <benny@noqcks.io>
 2018-10-10 09:48:06 +01:00
Simon Pasquier a2a78d0a09 discovery/openstack: discover all interfaces (#4649) 
* discovery/openstack: discover all interfaces
* Add address pool label

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-09 16:17:08 +01:00
Simon Pasquier 33c97d73e4
Merge pull request #4713 from simonpasquier/circleci-2.1 
circleci: switch to 2.1 config
 2018-10-09 16:07:38 +02:00
Simon Pasquier a41aec1d67 circleci: switch to 2.1 config 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-09 14:24:36 +02:00
Krasi Georgiev 73fba6d0e4
update tsdb (#4692) 
removed unused code
metrics for WAL operations
minor variable renamings to improve readability
now using the common.Makefile
fixed the total NumTombstones count Stats

Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>
 2018-10-08 18:26:53 +03:00
Julien Pivotto 17fea5478a Improve rule views by wrapping lines (#4702) 
With the addition of the errors in the views list, it is now difficult
to have a view on all the rules in a screen witdh.

This commit adds wrapping to improve the overall display of the rules
page.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2018-10-07 15:31:16 +01:00
Simon Pasquier e1e2821cca
Merge pull request #4654 from simonpasquier/openstack-tls 
discovery/openstack: support tls_config
 2018-10-05 18:11:55 +02:00
Björn Rabenstein 8dbd84bb9f
Merge pull request #4698 from prometheus/beorn7/vendoring 
Update prometheus/client_golang vendoring
 2018-10-05 14:10:44 +02:00
beorn7 02cda044bb Update prometheus/client_golang vendoring 
This is mostly required to fix a bug with histograms on 32bit platforms.

Signed-off-by: beorn7 <beorn@soundcloud.com>
 2018-10-05 13:02:31 +02:00
Simon Pasquier f033f48f74
Merge pull request #4667 from simonpasquier/add-discovery-metrics 
discovery: add metrics + send updates from one goroutine only
 2018-10-04 14:40:17 +02:00
Ganesh Vernekar 420c0f5e46 Fix docs (#4690) 
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2018-10-03 12:45:09 +01:00
Björn Rabenstein 6932030aa1 Fix quoting in issue template (#4688) 
Signed-off-by: beorn7 <beorn@soundcloud.com>
 2018-10-02 14:52:57 +02:00
Callum Styan 9bca041285 WIP: keep track of samples per query, set a max # of samples (#4513) 
* keep track of samples per query, set a max # of samples that can be in
memory at once

Signed-off-by: Callum Styan <callumstyan@gmail.com>
 2018-10-02 12:59:19 +01:00
Simon Pasquier f0ba860bdb circleci: store build outputs as artifacts (#4685) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-02 10:21:47 +02:00
Simon Pasquier 657199af22 Address Krasi comments 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-09-28 12:29:24 +02:00
Simon Pasquier 365931ea83 discovery: add metrics + send updates from one goroutine only 
The added metrics are:

* prometheus_sd_discovered_targets
* prometheus_sd_received_updates_total
* prometheus_sd_updates_delayed_total
* prometheus_sd_updates_total

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-09-27 15:59:42 +02:00
Simon Pasquier f2d43af820
Merge pull request #4582 from simonpasquier/add-discovery-tests 
discovery: add more tests
 2018-09-27 15:18:42 +02:00
Simon Pasquier 07152ecc48
Merge pull request #4575 from Nexucis/bugfix/fix-unregistered-source 
[ServiceDiscovery] Unregister source when the target is empty
 2018-09-27 09:12:01 +02:00
Duane D'Souza d7b376afd4 Adding change to support s390x (#4605) 
Signed-off-by: duane-ibm <duaned@us.ibm.com>
 2018-09-26 15:48:54 +05:30
Krasi Georgiev 47a673c3a0
process scrape loops reloading in parallel (#4526) 
The scrape manage receiver's channel now just saves the target sets
and another backgorund runner updates the scrape loops every 5 seconds.
This is so that the scrape manager doesn't block the receiving channel
when it does the long background reloading of the scrape loops.

Active and dropped targets are now saved in each scrape pool instead of
the scrape manager. This is mainly to avoid races when getting the
targets via the web api.

When reloading the scrape loops now happens in parallel to speed up the
final disared state and this also speeds up the prometheus's shutting
down.

Also updated some funcs signatures in the web package for consistency.

Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>
 2018-09-26 12:20:56 +03:00
Augustin Husson f60620ec0b format comment 
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
 2018-09-26 10:48:35 +02:00
Thomas Jackson abf6fe0a98 Change max/min over_time to handle NaNs properly (#4386) 
We only want to return a NaN if the NaN is the only value

Signed-off-by: Thomas Jackson <jacksontj.89@gmail.com>

Fixes #4385
 2018-09-26 08:58:16 +01:00
Tom Wilkie 4c52400708
Limit concurrent remote reads. (#4656) 
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
 2018-09-25 20:07:34 +01:00
Tom Wilkie d3a1ff1abf
Reduce memory usage of remote read by reducing pointer usage. (#4655) 
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
 2018-09-25 19:14:00 +01:00
Augustin Husson 9e6dc6f96c fix targetGroup that disappear totally 
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
 2018-09-25 19:05:02 +02:00
Ganesh Vernekar 5790d23fd8 Unit testing for rules (#4350) 
* Unit testing for rules
* Specifying order of group evaluation in unit tests

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2018-09-25 17:06:26 +01:00
Simon Pasquier ff08c40091 discovery/openstack: support tls_config 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-09-25 14:31:32 +02:00
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
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
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
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
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
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
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
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