mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-28 06:59:40 -08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity
2590 commits 243 branches 444 tags 649 MiB
Commit graph

2590 commits

This branch
This branch
All branches
Author SHA1 Message Date
Fabian Reinartz 42a64a7d0b Merge pull request #1434 from igncp/master 
Fix function names in comments
 2016-03-01 12:32:15 +01:00
Ignacio Carbajo 1b3ea0ea1b Fix function names in comments 2016-02-29 21:58:32 +00:00
Björn Rabenstein e4d0ae9b4e Merge pull request #1432 from prometheus/beorn7/fix-deadlock 
Fix a deadlock
 2016-02-29 16:46:33 +01:00
beorn7 33a50e69f7 Fix a deadlock 
Double acquisition of the RLock usually doesn't blow up, but if the
write lock is called for between the two RLock's, we are deadlocked.

This deadlock does not exist in release-0.17, BTW.
 2016-02-29 16:34:29 +01:00
Julius Volz 73399f826a Merge pull request #1427 from prometheus/fix-scrape-timeout 
Remove invalid scrape timeout from example config.
 2016-02-24 22:27:55 +01:00
Julius Volz 657d65d6d6 Remove invalid scrape timeout from example config. 
It can't be greater than the scrape interval. Let's just remove it.
 2016-02-24 21:06:36 +01:00
Björn Rabenstein a8c79f0a0c Merge pull request #1422 from prometheus/release-0.17 
Merge more commits from 0.17.
 2016-02-23 23:07:44 +01:00
Björn Rabenstein 5eff37ccbe Merge pull request #1421 from prometheus/beorn7/fix 
Fix a very special case of handling the checkpoint timer
 2016-02-23 22:25:27 +01:00
beorn7 8fa1560e48 Fix a very special case of handling the checkpoint timer 2016-02-23 16:48:35 +01:00
Björn Rabenstein 17bfe798eb Merge pull request #1419 from prometheus/release-note-fixes 
Improve 0.17.0 changelog
 2016-02-23 11:21:35 +01:00
Tobias Schmidt b7e6651e06 Improve 0.17.0 changelog 
* remove wrong release date until 0.17.0 gets actually released
* fix wrong alertmanager version number
* add example for regex anchor change
 2016-02-22 19:49:33 -05:00
Brian Brazil e4e00b6f24 Merge pull request #1418 from igncp/patch-1 
Fix minor typo
 2016-02-22 23:44:46 +00:00
Ignacio Carbajo 0c537d6af6 Fix minor typo 2016-02-22 23:25:17 +00:00
Björn Rabenstein 888c77cb06 Merge pull request #1416 from prometheus/beorn7/fix-test 
Fix a targetmanager test
 2016-02-22 16:53:59 +01:00
beorn7 fd5108b038 Fix a targetmanager test 2016-02-22 16:43:48 +01:00
Björn Rabenstein d9eb624322 Merge pull request #1415 from prometheus/release-0.17 
Forward-merge release-0.17 into master
 2016-02-22 16:39:48 +01:00
Björn Rabenstein 51aad630b6 Merge pull request #1414 from prometheus/beorn7/rushed-race 
Fix a race condition in calculatePersistenceUrgencyScore
 2016-02-22 16:09:19 +01:00
beorn7 4d1f7b49b6 Fix a race condition in calculatePersistenceUrgencyScore 2016-02-22 15:48:39 +01:00
Brian Brazil 04946afd0a Merge pull request #1412 from prometheus/fingerprintfix 
Remove fullLabels method and fix target updating
 2016-02-22 12:11:08 +00:00
Fabian Reinartz 6df1f49c13 Remove fullLabels method and fix target updating 
With recent changes to a Target's internal data representation
updating by fullLabels() assigns the additional default
instance label. This breaks target identity comparison and causes
identical targets from service discovery to be constantly swapped.
 2016-02-22 13:06:30 +01:00
Fabian Reinartz 209c4ad64f Merge pull request #1410 from bluecmd/patch-1 
Allow custom ldflags for go build
 2016-02-21 10:35:00 +01:00
Christian Svensson 69ebf45649 Allow custom ldflags for go build 
This allows users to use CGO and external linker when building Prometheus.
 2016-02-20 17:34:36 +01:00
Fabian Reinartz fce17b41c5 Merge pull request #1408 from prometheus/hostname 
Log argument parse errors
 2016-02-19 12:22:12 +01:00
Fabian Reinartz e62677d7ba Log argument parse errors 
Fixes #1407
 2016-02-19 12:20:10 +01:00
Brian Brazil cd85352fe1 Merge pull request #1403 from igncp/master 
Fix minor typo
 2016-02-17 22:58:05 +00:00
Ignacio Carbajo 6a323b1e6d Fix minor typo 2016-02-17 22:52:44 +00:00
Brian Brazil b447002309 Merge pull request #1402 from prometheus/fabxc/target-identity 
Use fingerprint for target identity comparison
 2016-02-17 15:37:10 +00:00
Fabian Reinartz 825831e98f Use fingerprint for target identity comparison 
So far we were using the InstanceIdentifier to compare equality of targets.
This is not always accurate, for example for the blackbox exporter where the 
actual target is in the parameter.
 2016-02-17 16:34:53 +01:00
Fabian Reinartz c24c5e6fb3 Merge pull request #1400 from prometheus/beorn7/instrumentation 
Fix the instrumentation fixes
 2016-02-17 15:57:48 +01:00
beorn7 663a1550d0 Fix the instrumentation fixes 2016-02-17 15:50:55 +01:00
Fabian Reinartz 73e38c534a Merge pull request #1398 from prometheus/scraperef2 
Handle scrape timeout on request.
 2016-02-16 15:11:09 +01:00
Fabian Reinartz 66767121ab Handle scrape timeout on request. 
For historic reasons we were enforcing a timeout directly
via the TCP dialer. This is no longer necessary for quite a while now.
Switching to context.Context will allow us to properly terminate
requests on shutdown as well.
 2016-02-16 11:46:02 +01:00
Fabian Reinartz 1f70345d0c Merge pull request #1397 from prometheus/remove-old-scrapetime-setting 
Remove old superfluous calls to setLastScrape().
 2016-02-15 22:46:09 +01:00
Julius Volz 293486c7b1 Remove old superfluous calls to setLastScrape(). 
This is called from within the scrape()->report() flow now.

See https://github.com/prometheus/prometheus/pull/1394/files#r52945817
 2016-02-15 22:42:24 +01:00
Fabian Reinartz a0078ec84c Merge pull request #1394 from prometheus/scraperef2 
Refactor and test appender modifications
 2016-02-15 21:19:40 +01:00
Fabian Reinartz 463dd3ea06 Refactor target scrape reporting. 2016-02-15 18:06:15 +01:00
Fabian Reinartz f1101590ee Merge pull request #1395 from prometheus/fabxc/eof 
Fix wrong EOF error on successful target scraping
 2016-02-15 17:26:34 +01:00
Fabian Reinartz cd28b88b08 Fix wrong EOF error on successful target scraping 2016-02-15 17:23:04 +01:00
Fabian Reinartz cb86a4300b Merge pull request #1393 from prometheus/scraperef 
Make scraping offset consistent.
 2016-02-15 16:52:03 +01:00
Fabian Reinartz 27d71b08d1 Factor out appender wrapping 2016-02-15 16:47:39 +01:00
Fabian Reinartz fe7e91e2eb Make scraping offset consistent. 
To evenly distribute scraping load we currently rely on random
jittering. This commit hashes over the target's identity and calculates
a consistent offset. This also ensures that scrape intervals
are constantly spaced between config/target changes.
 2016-02-15 16:46:29 +01:00
Brian Brazil 65d226b17a Merge pull request #1392 from prometheus/scrapetimeout 
Fix global config YAML issues
 2016-02-15 13:21:17 +00:00
Björn Rabenstein 7e41f45fe7 Merge pull request #1387 from prometheus/beorn7/storage 
Populate first and last time in the chunk descriptor earlier
 2016-02-15 14:18:01 +01:00
Fabian Reinartz 37c709f917 Fix global config YAML issues 2016-02-15 14:08:25 +01:00
beorn7 ef3ab96111 Populate first and last time in the chunk descriptor earlier 
The First time is kind of trivial as we always know it when we create
a new chunkDesc.

The last time is only know when the chunk is closed, so we have to set
it at that time.

The change saves a lot of digging down into the chunk
itself. Especially the last time is relative expensive as it involves
the creation of an iterator. The first time access now doesn't require
locking, which is also a nice gain.
 2016-02-15 14:06:09 +01:00
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