beorn7
e7ac9c6863
Improvments based on review
...
- Moved returns into the default section of switch statement that can
only happen then.
- Fix typo.
2016-03-17 14:37:24 +01:00
beorn7
79628ae883
Merge branch 'beorn7/storage5' into beorn7/storage6
2016-03-16 17:02:18 +01:00
beorn7
195853e8ba
Merge branch 'beorn7/storage4' into beorn7/storage5
2016-03-16 17:02:04 +01:00
Fabian Reinartz
19c5eb6194
Merge pull request #1486 from prometheus/instrument-scrape-pool-sync
...
Instrument scrape pool `sync()`
2016-03-15 18:46:19 +01:00
stuart nelson
dbe5d18b6e
Instrument scrape pool sync()
...
Instruments:
- duration
- count
2016-03-14 18:30:16 +01:00
stuart nelson
813f61e551
Merge pull request #1484 from prometheus/instrument-retrieval
...
Instrument retrieval/scrape.go
2016-03-11 12:26:00 +01:00
stuart nelson
a1ee77601a
Instrument the duration of the reload function
2016-03-11 12:12:42 +01:00
beorn7
5e4fa96719
Merge branch 'beorn7/storage5' into beorn7/storage6
2016-03-09 17:21:32 +01:00
Björn Rabenstein
583b1f3753
Merge pull request #1483 from prometheus/beorn7/storage
...
Accumulated merge, already reviewed.
2016-03-09 17:18:05 +01:00
Björn Rabenstein
c088b2669b
Merge pull request #1424 from prometheus/beorn7/storage2
...
Move and improve lastSamplePair.
2016-03-09 17:16:44 +01:00
Björn Rabenstein
b2ce53af00
Merge pull request #1426 from prometheus/beorn7/storage3
...
Improve predict_linear
2016-03-09 17:16:09 +01:00
Björn Rabenstein
cd068c1e65
Merge pull request #1448 from prometheus/beorn7/storage4
...
Handle errors caused by data corruption more gracefully
2016-03-09 17:15:45 +01:00
beorn7
b343e65907
Merge branch 'beorn7/storage4' into beorn7/storage5
...
erge is necessary,
2016-03-09 17:14:42 +01:00
beorn7
d0a4477446
Merge branch 'beorn7/storage3' into beorn7/storage4
...
Conflicts:
storage/local/preload.go
storage/local/storage.go
storage/local/storage_test.go
2016-03-09 17:13:16 +01:00
beorn7
55eddab25f
Merge branch 'beorn7/storage2' into beorn7/storage3
2016-03-09 16:48:46 +01:00
Fabian Reinartz
7bcf0f2893
Merge pull request #1482 from prometheus/fabxc/testswap
...
Fix flaky test comparison
2016-03-09 16:36:39 +01:00
beorn7
161eada3ad
Make chunkIterator even leaner.
2016-03-09 16:20:39 +01:00
Fabian Reinartz
895f2f092f
Fix flaky scrape test
...
t
2016-03-09 16:00:33 +01:00
beorn7
dad302144d
Make a naked return less naked
2016-03-09 15:06:00 +01:00
beorn7
beb36df4bb
De-flag preloadChunksForRange
...
Now there is preloadChunksForRange and preloadChunksForInstant in
both, the series and the storage.
2016-03-09 14:50:09 +01:00
beorn7
7cdfae1466
Merge branch 'beorn7/storage5' into beorn7/storage6
2016-03-09 00:50:17 +01:00
beorn7
d6b00b4f6c
Merge branch 'beorn7/storage4' into beorn7/storage5
2016-03-09 00:50:05 +01:00
beorn7
eb9caf13be
Merge branch 'beorn7/storage3' into beorn7/storage4
2016-03-09 00:49:52 +01:00
beorn7
d284864c87
Merge branch 'beorn7/storage2' into beorn7/storage3
2016-03-09 00:49:41 +01:00
beorn7
dcb7c0d3ee
Merge branch 'master' into beorn7/storage2
2016-03-09 00:48:51 +01:00
Björn Rabenstein
eebe077f98
Merge pull request #1476 from prometheus/beorn7/makefile
...
Use UTC for build timestamp
2016-03-08 18:18:54 +01:00
beorn7
6ba379e256
Use UTC for build timestamp
2016-03-08 17:47:17 +01:00
beorn7
d77d625ad3
Merge branch 'master' into beorn7/storage6
2016-03-08 17:39:14 +01:00
Brian Brazil
84c421da8e
Merge pull request #1475 from prometheus/fabxc/targetsort
...
Sort exported targets
2016-03-08 16:24:55 +00:00
Fabian Reinartz
f2e359962c
Sort exported targets
2016-03-08 17:12:27 +01:00
Fabian Reinartz
eb915ec40f
Merge pull request #1474 from prometheus/fabxc/spinfix
...
Handle closed target provider channel
2016-03-08 17:02:05 +01:00
Fabian Reinartz
56fc9bdff3
Handle closed target provider channel
...
This fixes the case where a target provider closes the update
channel and exits before the context is canceled.
This should only be true for the static provider but it's safer
to generally handle this case.
2016-03-08 15:49:03 +01:00
Tobias Schmidt
2f151d02eb
Merge pull request #1456 from prometheus/validate-alertmanager-url
...
Validate alertmanager URL
2016-03-07 20:09:46 -05:00
Tobias Schmidt
7763bbd993
Validate alertmanager URL
2016-03-07 20:07:17 -05:00
beorn7
167b83695c
Merge branch 'beorn7/storage5' into beorn7/storage6
2016-03-08 00:20:44 +01:00
beorn7
01795382c9
Merge branch 'beorn7/storage4' into beorn7/storage5
2016-03-08 00:20:13 +01:00
beorn7
c01658e20d
Merge branch 'beorn7/storage3' into beorn7/storage4
2016-03-08 00:18:00 +01:00
beorn7
f138847d31
Merge branch 'beorn7/storage2' into beorn7/storage3
2016-03-08 00:17:33 +01:00
beorn7
f7fc542db6
Merge branch 'master' into beorn7/storage4
...
Conflicts:
storage/local/persistence.go
2016-03-08 00:14:00 +01:00
beorn7
3d86130d8c
Merge branch 'master' into beorn7/storage3
2016-03-07 23:39:12 +01:00
beorn7
1f30c8de8d
Merge branch 'master' into beorn7/storage2
2016-03-07 23:38:42 +01:00
beorn7
c13b1ecfe9
Make chunk iterators more DRY
...
This finally extracts all the common code of the two chunk iterators
into one. Any future chunk encodings with fast access by index can use
the same iterator by simply providing an indexAccessor. Other future
chunk encodings without fast index access (like Gorilla-style) can
still implement the chunkIterator interface as usual.
2016-03-07 20:23:14 +01:00
beorn7
32f280a3cd
Slim down the chunkIterator interface
...
For one, remove unneeded methods.
Then, instead of using a channel for all values, use a
bufio.Scanner-like interface. This removes the need for creating a
goroutine and avoids the (unnecessary) locking performed by channel
sending and receiving.
This will make it much easier to write new chunk implementations (like
Gorilla-style encoding).
2016-03-07 19:50:13 +01:00
Björn Rabenstein
1bd4c92e1f
Merge pull request #1457 from prometheus/beorn7/promtool
...
Add a command to promtool that dumps metadata of heads.db
2016-03-07 17:22:48 +01:00
beorn7
b6fdb355d7
Move dump-heads into its own tool
2016-03-07 16:30:19 +01:00
beorn7
f193f2b8ef
Add a command to promtool that dumps metadata of heads.db
...
I needed this today for debugging. It can certainly be improved, but
it's already quite helpful.
I refactored the reading of heads.db files out of persistence, which
is an improvement, too.
I made minor changes to the cli package to allow outputting via the
io.Writer interface.
2016-03-07 16:21:57 +01:00
Fabian Reinartz
6bbb4af837
Merge pull request #1465 from prometheus/beorn7/fix-test2
...
Fix flaky file-sd test
2016-03-07 15:46:18 +01:00
beorn7
d44b83690e
Fix flaky file-sd test
2016-03-07 15:39:18 +01:00
Björn Rabenstein
2a2cc52828
Merge pull request #1405 from prometheus/beorn7/storage
...
Streamline series iterator creation
2016-03-07 13:30:56 +01:00
Fabian Reinartz
5b9e85e556
Merge pull request #1404 from prometheus/scraperef2
...
Retrieval refactoring
2016-03-06 22:17:00 +01:00
