mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-18 19:44:06 -08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity
7062 commits 249 branches 440 tags 659 MiB
Commit graph

7062 commits

This branch
This branch
All branches
Author SHA1 Message Date
Fabian Reinartz 3a36551b90 Merge pull request #98 from prometheus/balance 
Properly balance k-way operations
 2017-06-13 10:09:55 +02:00
Goutham Veeramachaneni a280169427
Add regression test 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-13 13:21:22 +05:30
Fabian Reinartz eb8c9759fc Properly balance k-way operations 2017-06-13 08:25:13 +02:00
Goutham Veeramachaneni 9e1f34dae3
Fix bug with Seek() and optimise bounding params. 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-13 11:24:04 +05:30
Fabian Reinartz 7640960469 vendor: update tsdb (#2840) 2017-06-13 07:44:07 +02:00
Goutham Veeramachaneni baf5b0f0fc Fix error where we look into the future. (#2829) 
* Fix error where we look into the future.

So currently we are adding values that are in the future for an older
timestamp. For example, if we have [(1, 1), (150, 2)] we will end up
showing [(1, 1), (2,2)].

Further it is not advisable to call .At() after Next() returns false.

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>

* Retuen early if done

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>

* Handle Seek() where we reach the end of iterator

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>

* Simplify code

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-13 07:22:27 +02:00
Fabian Reinartz 9ba61df45a Merge pull request #2789 from mtanda/aws_default_region 
config: set default region for EC2 SD
 2017-06-12 16:15:53 +02:00
Goutham Veeramachaneni e8f55669ea Move rules to new format 
Signed-off-by: Goutham Veeramachaneni <goutham@boomerangcommerce.com>
 2017-06-12 18:14:39 +05:30
Frederic Branczyk 3afb3fffa3 Merge pull request #2836 from brancz/cut-1.7.1 
cut 1.7.1
 2017-06-12 13:41:21 +02:00
Frederic Branczyk aef7104791
cut 1.7.1 2017-06-12 11:44:04 +02:00
Fabian Reinartz 9963a4c7c3 Merge pull request #95 from Gouthamve/wal-ahead 
Fix race condition for 2 appenders having same ts
 2017-06-12 11:17:49 +02:00
Goutham Veeramachaneni 73cc5bae51 Colocate defer statements near relevant functions 
Signed-off-by: Goutham Veeramachaneni <goutham@boomerangcommerce.com>
 2017-06-12 14:37:58 +05:30
Fabian Reinartz 0ec9456675 Merge pull request #96 from prometheus/fdleak 
Fix directory file descriptor leak.
 2017-06-12 10:56:48 +02:00
Fabian Reinartz f71d39a053 Merge pull request #2832 from brancz/fix-redirect 
web: fix double prefix redirect
 2017-06-12 10:40:43 +02:00
Fabian Reinartz 03f95ee096 Fix directory file descriptor leak. 2017-06-12 00:05:04 +02:00
Frederic Branczyk 9063f8dedd
web: fix double prefix 2017-06-10 12:07:43 +02:00
Brian Brazil d8b4995ddd Check target labels are valid. Check for address after relabelling. 
Fixes #2822
Fixes #2819
 2017-06-09 16:18:19 +01:00
Goutham Veeramachaneni b51a05044e
Fix race condition for 2 appenders having same ts 
Race:
Suppose we have 100 existing series inside a HeadBlock.
Now we open two appenders in two routines A1, A2 and append 30 new series and
60 new series respectively with some common series.

Both try to commit at the same time and the following happens in the given order:

A2 executes createSeries()
A1 executes createSeries() (with its common series referencing the ids from A2)
A1 persists its newlabels, samples
A2 persists its newlabels, samples

Now when reading it back, we read A1's samples which reference A2's id and
thereby fail.

Ref: prometheus/promtheus#2795

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-08 16:26:25 +05:30
Fabian Reinartz d4cb579443 Add DB.Dir method 2017-06-08 12:14:13 +02:00
Fabian Reinartz 7e4368e6c3 Merge pull request #94 from prometheus/cutchunk 
Improve heuristic to spread chunks across block
 2017-06-08 11:30:49 +02:00
Fabian Reinartz 05e411a8eb Improve heuristic to spread chunks across block 2017-06-08 11:30:32 +02:00
Fabian Reinartz c843a0cd29 pkg/rulefmt: Add rule group parsing 2017-06-07 17:06:23 +02:00
Fabian Reinartz f006e2d1ab Merge pull request #92 from prometheus/sources 
Add list of source head blocks to meta.json
 2017-06-07 11:50:44 +02:00
Frederic Branczyk bfa37c8ee3 Merge pull request #2814 from brancz/cut-1.7.0 
cut 1.7.0
 2017-06-07 11:40:29 +02:00
Fabian Reinartz 683b4c8c2a Add list of source head blocks to meta.json 2017-06-07 11:06:45 +02:00
Frederic Branczyk 5d9ac3565e Merge pull request #2786 from tomwilkie/report-error-in-remote-write 
Remote write: read first line of response and include it in the error.
 2017-06-07 10:21:34 +02:00
Frederic Branczyk 6d29f0c19f
cut 1.7.0 2017-06-07 10:00:48 +02:00
Frederic Branczyk d26f789cb0 Merge pull request #2816 from brancz/gophercloud-vendoring 
vendor: fix mixed versions of gophercloud packages
 2017-06-07 09:54:31 +02:00
Frederic Branczyk d6a55c3013
vendor: fix mixed versions of gophercloud packages 2017-06-07 09:21:43 +02:00
Fabian Reinartz 357e33bd1e Merge pull request #88 from Gouthamve/backups-1 
Snapshot support
 2017-06-06 20:35:47 +02:00
Goutham Veeramachaneni ff4ccb6eb0
Remove unnecessary error from ToggleCompaction fns 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-06 23:45:23 +05:30
Goutham Veeramachaneni 261cd9f393
Incorporate feedback. 
Move back to {Enable, Disable}Compactions.

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-06 20:23:20 +05:30
Mitsuhiro Tanda 64cef5cd05 handle NewSession() error 2017-06-06 22:02:50 +09:00
Goutham Veeramachaneni a110a64abd
Add full Snapshot support 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-06 18:15:54 +05:30
Fabian Reinartz 669075c6b9 Merge branch 'master' into dev-2.0 2017-06-06 09:36:51 +02:00
Fabian Reinartz eb651233ac Merge pull request #2787 from prometheus/limit2 
Rework sample limit to work for 2.0
 2017-06-06 08:21:12 +02:00
Goutham Veeramachaneni a1c8425357
Initial implementation of HeadBlock Snapshots 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-05 13:48:31 +05:30
Christian Groschupp 8f781e411c Openstack Service Discovery (#2701) 
* Add openstack service discovery.

* Add gophercloud code for openstack service discovery.

* first changes for juliusv comments.

* add gophercloud code for floatingip.

* Add tests to openstack sd.

* Add testify suite vendor files.

* add copyright and make changes for code climate.

* Fixed typos in provider openstack.

* Renamed tenant to project in openstack sd.

* Change type of password to Secret in openstack sd.
 2017-06-01 23:49:02 +02:00
Roman Vynar dbe2eb2afc Hide consul token on UI. (#2797) 2017-06-01 22:14:23 +01:00
Fabian Reinartz a391156dfb Merge pull request #2667 from goller/go-discovery-logger 
Add logger injection into discovery services
 2017-06-01 10:20:10 -07:00
Mitsuhiro Tanda a1ddab463e config: set default region for EC2 SD 2017-06-02 01:40:24 +09:00
Chris Goller 42de0ae013 Use log.Logger interface for all discovery services 2017-06-01 11:25:55 -05:00
Tom Wilkie 24a113bb09 Review feedback: limit number of bytes read under error. 2017-06-01 11:21:48 +01:00
Brian Brazil 37bc607e96 Rework sample limit to work for 2.0 
Correctly update reported series.
Increment prometheus_target_scrapes_exceeded_sample_limit_total.
Add back unittests.
Ignore stale markers when calculating sample limit.

Fixes #2770
 2017-05-31 15:41:51 +01:00
Tom Wilkie 46abe8cbf2 Remote write: read first line of response and include it in the error. 2017-05-31 13:46:08 +01:00
Tobias Schmidt 1c9499bbbd Merge pull request #2785 from prometheus/grobie/fix-target-group-naming 
Fix outdated target_group naming in error message
 2017-05-31 11:28:46 +02:00
Tobias Schmidt 287ec6e6cc Fix outdated target_group naming in error message 
The target_groups config has been renamed to static_configs, the error
message for overflow attributes should reflect that.
 2017-05-31 11:01:13 +02:00
Fabian Reinartz c6eed97c77 Merge pull request #2774 from prometheus/stalemem 
Fix staleness memory leak
 2017-05-30 15:55:37 -07:00
Julius Volz 240bb671e2 config: Fix overflow checking in global config (#2783) 2017-05-30 20:58:06 +02:00
Fabian Reinartz bc7aff8cef retrieval: extract scrape cache 2017-05-30 09:37:23 -07:00