mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-14 09:34:05 -08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity
2538 commits 248 branches 440 tags 656 MiB
Commit graph

2538 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brian Brazil b3fb91ec87 Merge pull request #1391 from prometheus/scrapetimeout 
Fix scrape timeout config checks
 2016-02-15 11:12:28 +00:00
Fabian Reinartz 44a5e860ed Fix scrape timeout config checks 2016-02-15 12:07:46 +01:00
Brian Brazil 938ebe78c2 Merge pull request #1390 from prometheus/scraperef 
Adjust labels on status page
 2016-02-15 10:19:45 +00:00
Fabian Reinartz 915a7c09a8 Adjust labels on status page 2016-02-15 11:10:14 +01:00
Fabian Reinartz 70336c6f5b Merge pull request #1385 from prometheus/scraperef 
Cleanup target internals
 2016-02-15 10:47:03 +01:00
Fabian Reinartz a06bc75519 Remove occurrences of 'base' labels 2016-02-15 10:36:57 +01:00
Brian Brazil 718098a4df Merge pull request #1388 from prometheus/update-dns-meta-refs 
Update two more __meta_dns_srv_name references.
 2016-02-14 22:36:52 +00:00
Julius Volz 829a029dda Update two more __meta_dns_srv_name references. 
Although they are only in examples/tests and don't affect anything, they
could be confusing (the label has been renamed in the rest of the code a
while ago).
 2016-02-14 22:20:39 +01:00
Fabian Reinartz 0d44248fb8 Cleanup cluttered test data 2016-02-13 10:13:38 +01:00
Fabian Reinartz 65eba080a0 Cleanup internal target data 2016-02-13 10:13:38 +01:00
Brian Brazil 738e6f41d4 Merge pull request #1384 from prometheus/scraperef 
Restrict scrape timeout to interval length
 2016-02-12 12:00:19 +00:00
Fabian Reinartz e26e4b6e89 Restrict scrape timeout to interval length 2016-02-12 12:52:22 +01:00
Björn Rabenstein abeeebeed4 Merge pull request #1383 from prometheus/beorn7/race 
Remove race condition from TestRetentionCutoff
 2016-02-12 12:42:13 +01:00
beorn7 9a3edea477 Remove race condition from TestRetentionCutoff 2016-02-12 12:13:19 +01:00
Fabian Reinartz 90b9fae638 Merge pull request #1382 from prometheus/beorn7/vendoring 
Update common/expfmt vendoring
 2016-02-11 17:06:56 +01:00
beorn7 6946fb2058 Update common/expfmt vendoring 2016-02-11 16:08:29 +01:00
Fabian Reinartz 83c5ef7c03 Merge pull request #1380 from prometheus/fix-typos 
Fix various typos in comments.
 2016-02-10 08:31:11 +01:00
Julius Volz 9b6d69610a Fix various typos in comments. 
Helpfully reported by
https://goreportcard.com/report/github.com/prometheus/prometheus :)
 2016-02-10 03:47:00 +01:00
Julius Volz 1c1dcd0255 Merge pull request #1379 from prometheus/fix-target-init 
Fix target update error handling.
 2016-02-10 01:14:24 +01:00
Julius Volz 3728b5872f Fix target update error handling. 
Fixes https://github.com/prometheus/prometheus/issues/1378
 2016-02-08 21:42:59 +01:00
Brian Brazil c0df1c7e81 Merge pull request #1376 from prometheus/without 
Add without aggregator modifier.
 2016-02-08 14:09:14 +00:00
Brian Brazil 9d0112d7cf Add without aggregator modifier. 
This has the advantage that the user doesn't need
to list all labels they want to keep (as with "by")
but without having to worry about inconsistent labels
as when there's only one time series (as with "keeping_common").

Almost all aggregation should use this rather than the existing
two options as it's much less error prone and easier to maintain
due to not having to always add in "job" plus whatever other common
job-level labels you have like "region".
 2016-02-08 14:05:33 +00:00
Julius Volz e3baa35e9f Fix typo in documentation/examples/kubernetes-rabbitmq/README.md 2016-02-08 02:00:10 +01:00
Julius Volz 7f6acef4d5 Merge pull request #1314 from katcipis/master 
Adding RabbitMQ deploy for kubernetes + prometheus integration
 2016-02-08 01:59:11 +01:00
Brian Brazil b7ef0b45e8 Break aggregation tests out. Add missing tests. 2016-02-07 18:02:51 +00:00
Fabian Reinartz 328e1d733a Change make to make build 
For building from source as an end user running the tests is not necessary.
 2016-02-05 11:30:31 +01:00
Fabian Reinartz facabe254f Merge pull request #1373 from prometheus/fix-flapping-alert-detection 
Fix detection of flapping alerts
 2016-02-05 11:28:20 +01:00
Fabian Reinartz 2b9de9e8bc Merge pull request #1374 from prometheus/link-to-https 
Use https://prometheus.io
 2016-02-05 08:17:59 +01:00
Tobias Schmidt 211cb10f13 Use https://prometheus.io 2016-02-05 00:07:03 -05:00
Tobias Schmidt f1f8317fa5 Fix detection of flapping alerts 
Alerts in the resolve retention period must be transitioned to the
active state again when their condition is met.
 2016-02-04 23:55:12 -05:00
Fabian Reinartz 1756c0811c Merge pull request #1370 from prometheus/pathjoin 
Sanitize POST URL for AM integration
 2016-02-04 17:02:59 +01:00
Fabian Reinartz 0b02315517 Sanitize POST URL for AM integration 2016-02-04 11:56:14 +01:00
Fabian Reinartz 0dd3a23510 Merge pull request #1365 from prometheus/appenderr 
Return error on sample appending
 2016-02-03 12:13:49 +01:00
Fabian Reinartz 1f877f3d2a Fix deadlock, structure target logging 2016-02-03 10:39:34 +01:00
Fabian Reinartz d0d2c38c68 Fix tests for append API changes 2016-02-03 10:17:08 +01:00
Fabian Reinartz 59f1e722df Return error on sample appending 2016-02-02 14:01:44 +01:00
Björn Rabenstein 9ea3897ea7 Merge pull request #1354 from prometheus/beorn7/storage 
Rework the way to communicate backpressure (AKA suspended ingestion)
 2016-02-01 15:10:13 +01:00
beorn7 ec08c9a391 Rework the way to communicate backpressure (AKA suspended ingestion) 
This gives up on the idea to communicate throuh the Append() call (by
either not returning as it is now or returning an error as
suggested/explored elsewhere). Here I have added a Throttled() call,
which has the advantage that it can be called before a whole _batch_
of Append()'s. Scrapes will happen completely or not at all. Same for
rule group evaluations. That's a highly desired behavior (as discussed
elsewhere). The code is even simpler now as the whole ingestion buffer
could be removed.

Logging of throttled mode has been streamlined and will create at most
one message per minute.
 2016-02-01 14:45:44 +01:00
Björn Rabenstein b555be85e2 Merge pull request #1357 from prometheus/beorn7/duration 
Unify duration parsing
 2016-01-29 19:19:25 +01:00
beorn7 a7408bfb47 Unify duration parsing 
It's actually happening in several places (and for flags, we use the
standard Go time.Duration...). This at least reduces all our
home-grown parsing to one place (in model).
 2016-01-29 15:41:50 +01:00
beorn7 cfc15cf103 Update common/model vendoring 2016-01-29 15:33:00 +01:00
Fabian Reinartz d9f836e5b8 Merge pull request #1340 from prometheus/validate-externa-url 
Validate URL parameters
 2016-01-27 15:49:08 +01:00
Fabian Reinartz 2e29573770 Merge pull request #1348 from prometheus/notifytestfix 
Increase notification test timeouts
 2016-01-27 02:50:03 +01:00
Björn Rabenstein d7f92a012b Merge pull request #1345 from prometheus/beorn7/storage2 
Fix multiple issues around chunks to persist.
 2016-01-26 17:47:16 +01:00
beorn7 87ef24cd25 Add instrumentation and refactor things around "rushed mode" 2016-01-26 17:44:21 +01:00
Fabian Reinartz c1fdfc5a8b Merge pull request #1350 from prometheus/rulefix 
Remove old WITH clause in alert printing
 2016-01-26 16:57:41 +01:00
Fabian Reinartz a6935024e1 Remove old WITH clause in alert printing 2016-01-26 15:45:27 +01:00
Julius Volz 9a4b7cca1a Merge pull request #1347 from prometheus/support-options-method 
Handle OPTIONS HTTP requests correctly.
 2016-01-26 12:52:29 +01:00
Julius Volz 1ae23bf5e9 Handle OPTIONS HTTP requests correctly. 
Fixes https://github.com/prometheus/prometheus/issues/1346
 2016-01-26 12:31:44 +01:00
Fabian Reinartz 41a39472a1 Increase notification test timeouts 2016-01-26 11:24:35 +01:00