mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-27 06:29:42 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
5005 commits 243 branches 444 tags 649 MiB
Commit graph

5005 commits

This branch
This branch
All branches
Author SHA1 Message Date
Frederic Branczyk 81a96d3140
Merge pull request #3779 from krasi-georgiev/rename-retrieval-to-scrape 
Rename retrieval to scrape
 2018-02-01 14:16:34 +01:00
Krasi Georgiev 6ce84dbcb1 rename ScrapeManager struct to Manager to remove stutter 2018-02-01 10:06:24 +00:00
Krasi Georgiev b75428ec19 rename package retrieve to scrape 
no fucnctinal changes just renaming retrieval to scrape
 2018-02-01 09:55:07 +00:00
Frederic Branczyk b30ee3e69a
Merge pull request #3766 from krasi-georgiev/renaming-consistency 
rename structs for consistency
 2018-02-01 07:08:38 +01:00
Tom Wilkie de17498608
Merge pull request #3736 from tomwilkie/3715-2.1-cpu 
Don't allocate a mergeSeries if there is only one series to merge.
 2018-01-31 16:17:29 +00:00
Krasi Georgiev 7858745c04 rename structs for consistency 2018-01-30 17:49:05 +00:00
Frederic Branczyk af547ce862
Merge pull request #3709 from krasi-georgiev/bearer-token 
read bearer token on every request + some http and scrape tests
 2018-01-30 18:17:54 +01:00
Frederic Branczyk d3ae1ac40e
Merge pull request #3741 from krasi-georgiev/discovery-race 
read/write race for the  context field in the discovery package
 2018-01-30 18:17:09 +01:00
pasquier-s bde64cf5a6 Fix Kubernetes endpoints SD for empty subsets (#3660) 
* Fix Kubernetes endpoints SD for empty subsets

When an endpoints object has no associated pods (replica scaled to zero
for instance), the endpoints SD should return a target group with no
targets so that the SD manager propagates this information to the scrape
manager.

Fixes #3659

* Don't send nil target groups from the Kubernetes SD

This is to be consistent with the endpoints SD part.
 2018-01-30 15:00:33 +00:00
Krasi Georgiev 4d47a48422 client test comment nits. 2018-01-29 15:26:46 +00:00
Krasi Georgiev 818dda72db updated the sd tests 2018-01-29 15:19:15 +00:00
Krasi Georgiev acc4197098 remove dicovery race for the context field 2018-01-29 15:18:07 +00:00
Frederic Branczyk 47538cf6ce
Merge pull request #3747 from prometheus/sched-update-throttle 
Update throttle & tsdb update
 2018-01-29 16:05:05 +01:00
Frederic Branczyk 73e829137b
discovery: Cleanup ticker 2018-01-29 13:51:04 +01:00
Tom Wilkie 3dc5b8eef5 Use sub benchmarks. 2018-01-29 11:37:48 +00:00
Paddy Newman 568ecce421 Fix rendering issues with console templates. (#3744) 
Move tables into the content area so that graphs and very long/wide tables are
readable.

The issue is present on the node-overview and node-disk pages when the tables
are very long and wide. E.g., the host has lots of NICs, disks and filesystems
and the filesystem names are very long. We have very long lists of long Docker
filesystem names in our Kubernetes clusters.

I know people don't really care about the console templates anymore but they
are still useful in some cases and the queries are a nice reference for
beginners.
 2018-01-29 10:38:39 +00:00
Ganesh Vernekar 66b0aa3b45 Fixed race condition in map iteration and map write in Discovery (#3735) (#3738) 
* Fixed concurrent map iteration and map write in Discovery (#3735)

* discovery: Changed Lock to RLock in Collect
 2018-01-28 22:24:31 +05:30
Krasi Georgiev fe926e7829 update the discover tests 
the discovery test is now only testing update and get groups.
It doesn't do an e2e test but just a unit test of setting and receiving
target groups
 2018-01-27 12:03:06 +00:00
Julien Pivotto 8b20cb1e8d last config success time gauge: use SetToCurrentTime() (#3750) 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2018-01-27 07:48:13 +00:00
Callum Styan 7dc05538f7 docs: SD implementations do not have to only send new/changed target groups (#3713) 2018-01-26 22:03:11 +00:00
Frederic Branczyk 46693444de
vendor: Update github.com/prometheus/tsdb 2018-01-26 16:24:51 +01:00
Frederic Branczyk cfa0253ed8
discovery: Schedule updates to throttle 2018-01-26 16:24:44 +01:00
Tom Wilkie da29c09dca Some benchmarks for the mergeSeries set. 2018-01-26 11:01:59 +00:00
Ben Kochie 40acc632bb
Merge pull request #3505 from rdemachkovych/ansible_prom2.0 
Added to documentation Ansible roles for Prometheus 2.0
 2018-01-26 11:30:15 +01:00
Roman Demachkovych 8bfc611616 Remove not maintained roles 2018-01-26 09:46:44 +01:00
Frederic Branczyk 753f8c1071
Merge pull request #3733 from simonpasquier/update-vendor-tsdb 
Update vendor tsdb
 2018-01-25 14:20:36 +01:00
Simon Pasquier eb11d912bd vendor: update tsdb 2018-01-25 13:04:24 +01:00
Tom Wilkie 749781edf3 Also, don't make a mergeSeriesSet if there is only one SeriesSet. 2018-01-25 11:17:16 +00:00
Tom Wilkie 48e39068bd Don't allocate a mergeSeries if there is only one series to merge. 2018-01-25 11:11:55 +00:00
Bryan Boreham 8a4535e6ad Re-use timer instead of creating new ones on every sample 
The docs for `time.After()` note that "The underlying Timer is not
recovered by the garbage collector until the timer fires".
 2018-01-24 12:36:29 +00:00
zemek 8a01a0fbed Set consul server default to localhost:8500 (#3703) 2018-01-24 12:14:32 +00:00
Simon Pasquier 81c0ab69e0 Don't reset FiredAt for inactive alerts 
Otherwise AlertManager receives resolved alerts where StartsAt is zero which
fails the validation.
 2018-01-22 17:17:33 +01:00
Julius Volz 09e460a647
discovery: Rename file SD mtime metric (#3723) 
- "timestamp" -> "mtime" to be in line with node exporter and clearer.
- add unit suffix
 2018-01-22 14:02:24 +01:00
Goutham Veeramachaneni 84e462ae24
Merge pull request #3722 from prometheus/reusable-rulefmt 
rulefmt: Allow parsing from bytes instead of file
 2018-01-22 18:19:06 +05:30
Julius Volz 192e665317 rulefmt: Allow parsing from bytes instead of file 
This makes the rulefmt package more reusable for users whose rulesets are not
stored in files on disk. Concrete example: Cortex.
 2018-01-22 11:46:55 +01:00
Julius Volz 953af2c089
promql: Make printer formatting less vintage (#3721) 
- lower-case modifiers
- reverse order of aggregation modifiers and aggregated expression
- remove spacing before modifier parentheses
 2018-01-22 11:14:59 +01:00
Julius Volz 1e943fc10a
promql: Fix printing of empty without() (#3719) 
* promql: Fix printing of empty without()

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

* Test cleanup fixup
 2018-01-21 22:22:55 +01:00
Krasi Georgiev 66bcb10f40 t.Fatal should be t.Fatalf in the one scrape test 2018-01-19 12:07:19 +00:00
Goutham Veeramachaneni 85f23d82a0
Merge pull request #3700 from Gouthamve/release-2.1 
*: release 2.1.0
 2018-01-19 17:24:28 +05:30
Krasi Georgiev d202718116 read bearer token on every request , + some http and scrape tests 
read bearer token on every request
removed unuseful  scrape manager startup log
new tests -TestScrapeManagerReloadNoChange( scrape pool is not reloaded
when the config hasn't changed), TestMissingBearerAuthFile ,
TestBearerAuthFileRoundTripper
 2018-01-19 11:36:21 +00:00
Goutham Veeramachaneni 14eb15fe45 *: release 2.1.0 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2018-01-19 16:57:18 +05:30
Goutham Veeramachaneni 4b984d2378
Merge pull request #3705 from Gouthamve/update_tsdb 
vendor: update tsdb
 2018-01-19 14:13:01 +05:30
Goutham Veeramachaneni d982427aa8 vendor: update tsdb 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2018-01-19 13:31:33 +05:30
Goutham Veeramachaneni ab7c54e2c8
Merge pull request #3698 from krasi-georgiev/scrape-config-reload-fix 
Scraper config reload bugfix
 2018-01-18 19:00:28 +05:30
Krasi Georgiev 910c22418c move cleanup and reload in ApplyConfig 2018-01-18 11:49:42 +00:00
Krasi Georgiev 719c579f7b refactor main execution reloadReady handling, update some comments 2018-01-17 18:14:24 +00:00
Krasi Georgiev ec26751fd2 use mutexes for the discovery manager instead of a loop as this was a stupid idea 2018-01-17 18:12:58 +00:00
Krasi Georgiev 0eafaf32d3 set the correct config reloading execution for scraper and notifier 2018-01-17 13:06:56 +00:00
Alexey Palazhchenko 85bef0d583 Add comment about samples order. (#3642) 2018-01-17 12:31:30 +00:00
Tom Wilkie f2c5399e39
Merge pull request #3561 from twiedenbein/master 
fixed bug with initialization of queueconfig
 2018-01-17 12:24:58 +00:00