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

13544 commits

This branch
This branch
All branches
Author SHA1 Message Date
Fabian Reinartz 4c31061251 Merge branch 'master' into dev-2.0 2017-05-24 15:36:17 +02:00
Fabian Reinartz 025f5531ad Merge pull request #2681 from prometheus/grobie/reduce-noisy-append-errors 
Handle errSeriesDropped correctly
 2017-05-24 15:30:02 +02:00
Fabian Reinartz d3f662f15e Merge branch 'dev-2.0' into grobie/reduce-noisy-append-errors 2017-05-24 15:29:30 +02:00
Brian Brazil e5f94145b8 Drop series for federation if latest sample is stale. 2017-05-24 14:27:17 +01:00
Brian Brazil 220e78b9c3 Consider a series stale after 4.1 intervals with no data. 
To cover the cases where stale markers may not be available,
we need to infer the interval and mark series stale based on that.
As we're lacking stale markers this is less accurate, however
it should be good enough for these cases.

We need 4 intervals as if say we had data at t=0 and t=10,
coming via federation. The next data point should be at t=20 however it
could take up to t=30 for it actually to be ingested, t=40 for it to be
scraped via federation and t=50 for it to be ingested.
We then add 10% on to that for slack, as we do elsewhere.
 2017-05-24 14:27:17 +01:00
Brian Brazil c02c25d5ba Allow peeking back further in buffer. 2017-05-24 14:27:17 +01:00
Fabian Reinartz 10d8b6b633 Merge pull request #2764 from prometheus/nullparse 
pkg/textparse: allow null bytes in label values
 2017-05-24 15:24:38 +02:00
conorbroderick 9c953064c3 check if result is a scalar in order to display correct number of returned time series 2017-05-24 14:07:24 +01:00
Fabian Reinartz bdc763f95f pkg/textparse: allow null bytes in label values 2017-05-24 14:52:46 +02:00
Brian Brazil dcea3e4773 Don't append a 0 when alert is no longer pending/firing 
With staleness we no longer need this behaviour.
 2017-05-24 13:52:45 +01:00
Brian Brazil cc867dae60 Copy previous series and alert state more intelligently. 
Usually rules don't more around, and if they do it's likely
that rules/alerts with the same name stay in the same order.

If rules/alerts with the same name are added/removed this
could cause a blip for one cycle, but this is unavoidable
without requiring rule and alert names to be unique - which we don't
want to do.
 2017-05-24 13:52:45 +01:00
Brian Brazil 9bc68db7e6 Track staleness per rule rather than per group. 2017-05-24 13:52:45 +01:00
Brian Brazil 0451d6d31b Add unittest for rule staleness, and rules generally. 2017-05-24 13:52:45 +01:00
Brian Brazil 0400f3cfd2 Very basic staleness handling for rules. 2017-05-24 13:52:45 +01:00
Brian Brazil 9aa8f822c1 Fix typo 2017-05-24 13:52:45 +01:00
Goutham Veeramachaneni c211ec4f49
Fix concurrent map access. 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-05-24 16:58:04 +05:30
Goutham Veeramachaneni bacb143b7e
Simplify tombstone and WAL Delete formats. 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-05-24 13:42:56 +05:30
Fabian Reinartz 09fcbf78df Merge pull request #2755 from brancz/redirect-prefix 
prefix redirect with external url path
 2017-05-24 10:09:47 +02:00
Goutham Veeramachaneni f29fb62fba
Make TombstoneReader a Getter. 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-05-24 11:24:24 +05:30
Goutham Veeramachaneni 9bf7aa9af1
Misc. fixes incorporating feedback. 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-05-23 18:13:30 +05:30
Tobias Schmidt 5405a4724f Use tag names consistently (#2743) 2017-05-23 14:14:15 +02:00
Goutham Veeramachaneni 31cf939448
Add NumTombstones to BlockMeta. 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-05-23 17:37:04 +05:30
Goutham Veeramachaneni 9d388941ef
Add checksums and magic number to the tombstones. 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-05-23 17:27:45 +05:30
Goutham Veeramachaneni 3eb4119ab1
Make HeadBlock use WAL. 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-05-23 16:15:16 +05:30
Fabian Reinartz fa58fdbd5d Merge pull request #2753 from prometheus/uptsdb2 
storage: update TSDB
 2017-05-22 16:32:25 +02:00
Frederic Branczyk ad22606a3d
web: prefix redirect with ExternalURL path 2017-05-22 14:56:52 +02:00
Frederic Branczyk 45df5c2daf
Merge branch 'release-1.6' 2017-05-22 13:44:44 +02:00
Goutham Veeramachaneni 244b73fce1
Rename for clarity and consistency. 
Misc. changes for code cleanliness.

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-05-22 16:42:36 +05:30
Fabian Reinartz d289dc55c3 storage: update TSDB 2017-05-22 11:53:08 +02:00
Fabian Reinartz ea09299ca5 pkg/textparse: handle trailing labels comma (#2752) 2017-05-22 11:15:40 +02:00
Goutham Veeramachaneni 7ccf9d0211
Add test on blockQuerier which uses tombstones. 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-05-22 13:31:57 +05:30
Goutham Veeramachaneni 8434019ad9
Merge branch 'master' into deletes-1 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-05-22 12:58:38 +05:30
Fabian Reinartz 4f2eb2057e Merge pull request #83 from prometheus/refstr 
Switch append refs to string
 2017-05-22 08:49:09 +02:00
Goutham Veeramachaneni 662d8173fe
Make Appends after Delete visible. 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-05-22 11:28:24 +05:30
Goutham Veeramachaneni 009dd2cde5
Add test for mergedTombstoneReader 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-05-22 10:31:50 +05:30
Goutham Veeramachaneni 0b70333ef6
Add tests for tombstones. 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-05-21 23:20:05 +05:30
Jacky Wu 75b89739de Fix go version hint. (#2750) 2017-05-20 18:33:14 +02:00
Goutham Veeramachaneni d32eb25662
Synchronise deletes and compactions. 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-05-20 13:21:10 +05:30
Goutham Veeramachaneni 3dbb400bef
Initial implementation of Delete on DB. 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-05-20 00:35:50 +05:30
Goutham Veeramachaneni d6bd64357b
Fix Delete on HeadBlock 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-05-19 22:54:29 +05:30
Fabian Reinartz 10cccd2e45 Bump version file 2017-05-19 09:56:41 +02:00
Goutham Veeramachaneni 45d3db4e9e
Use a *mapTombstoneReader instead of map 
We need to recalculate the sorted ref list everytime we make a
Tombstones() call. This avoids that.

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-05-19 11:56:37 +05:30
Fabian Reinartz 7e6961b4ac Fix import and var name 2017-05-18 17:30:52 +02:00
Fabian Reinartz debfe9b1e5 Simplify AddFast and avoid errgroup Commits in general 2017-05-18 17:17:56 +02:00
Frederic Branczyk 7d17ecbd48 Merge pull request #2735 from brancz/cut-1.6.3 
cut 1.6.3
 2017-05-18 16:56:54 +02:00
Frederic Branczyk 53a2bd71b9
*: cut 1.6.3 2017-05-18 16:51:46 +02:00
Tobias Schmidt 2ae2b663a9
Create sha256 checksums file during release 2017-05-18 16:50:44 +02:00
Tom Wilkie e9787382b4
Ensure ewma int64s are always aligned. (#2675) 2017-05-18 16:50:44 +02:00
Frederic Branczyk 363554f675 Merge pull request #2739 from Conorbro/stack-graph-fix 
Fixed graph ui max/min logic to accommodate for toggling of stacked graph option
 2017-05-18 16:49:30 +02:00
Fabian Reinartz fb5c5535fc Misc cleanup 2017-05-18 16:38:45 +02:00