Commit Graph

1427 Commits

Author SHA1 Message Date
Björn Rabenstein
38ab8cc39b Merge pull request #580 from prometheus/beorn7/fix
Fix embed-static.sh.
2015-03-05 14:36:53 +01:00
beorn7
cbe92347ef Fix embed-static.sh.
Some versions of the cd command print out the directory they have
changed into.
2015-03-05 14:27:46 +01:00
Björn Rabenstein
9376e0520f Merge pull request #578 from prometheus/beorn7/fix
Update persistQueueLength after chunks were persisted.
2015-03-04 20:37:17 +01:00
Julius Volz
9219aab87b Merge pull request #577 from josephwilk/patch-1
typo
2015-03-04 18:51:17 +01:00
beorn7
5ed8f6c205 Update persistQueueLength after chunks were persisted. 2015-03-04 18:46:16 +01:00
Joseph Wilk
3d423b7864 typo 2015-03-04 17:54:48 +01:00
Björn Rabenstein
5101c58f6c Merge pull request #576 from prometheus/beorn7/license-cleanup
Add license files left out by godep.
2015-03-04 17:00:02 +01:00
beorn7
b98622094f Add license files left out by godep.
As it looks, `godep update ...` will preserve the files.

Obviously, if you blow away everything and run a `godep save ...` from
scratch, those files will be missing again. A `godep save` to add new
dependencies without blowing away the `Godeps` directory should work
fine, though.
2015-03-04 15:48:51 +01:00
Björn Rabenstein
55dcb55498 Merge pull request #575 from prometheus/beorn7/release
Cut 0.12.0.
2015-03-04 13:58:57 +01:00
beorn7
34396f75ea Cut 0.12.0. 2015-03-04 13:50:58 +01:00
beorn7
5ed3bf2e4b Update vendoring of client_golang to 0.3.1. 2015-03-04 13:42:06 +01:00
Björn Rabenstein
ecf3449222 Merge pull request #574 from tomprince/patch-1
Use docker volume to store metric data
2015-03-04 13:02:02 +01:00
Tom Prince
6874377e9b Use docker volume to store metric data 2015-03-03 16:34:35 -07:00
Björn Rabenstein
0a1678b5f1 Merge pull request #573 from prometheus/beorn7/fingerprint
The big and scary fingerprint update.
2015-03-03 19:00:38 +01:00
beorn7
0167083da6 Improvements after review. 2015-03-03 18:59:39 +01:00
beorn7
a18cb29fa8 Update vendored client_golang to v0.3.0. 2015-03-03 18:34:01 +01:00
beorn7
9e85ab0eef Apply the new signature/fingerprinting functions from client_golang.
This requires the new version of client_golang (vendoring will follow
in the next commit), which changes the fingerprinting for
clientmodel.Metric.
2015-03-03 18:34:01 +01:00
beorn7
ebac14eff3 Add version guard to persistence. 2015-03-03 18:34:01 +01:00
Julius Volz
938290624b Merge pull request #572 from fabxc/fabxc/unary_fix
Fix unary +/- expressions.
2015-03-03 13:43:49 +01:00
Fabian Reinartz
182de6b99f Fix unary +/- expressions.
Unary expressions cause parsing errors if they are done in the lexer
by tokenizing them into the number.
This fix moves unary expressions to the parser.
2015-03-03 13:30:08 +01:00
Julius Volz
0b5dd24fd2 Merge pull request #554 from fabxc/fabxc/or
or operation and vector matching opts implemented
2015-03-03 13:05:57 +01:00
Fabian Reinartz
6f754073d5 Add OR operation and vector matching options.
This commits implements the OR operation between two vectors.
Vector matching using the ON clause is added to limit the set of
labels that define a match between two elements. Group modifiers
(GROUP_LEFT/GROUP_RIGHT) to request many-to-one matching are added.
2015-03-03 11:35:10 +01:00
Julius Volz
cce2f30a8b Merge pull request #567 from prometheus/floats
Support scientific notation and special float values.
2015-03-02 13:05:21 +01:00
Julius Volz
0ac931aed1 Also support parsing float formats like "2.". 2015-03-02 12:58:05 +01:00
Julius Volz
c2ab54e9a6 Support scientific notation and special float values.
This adds support for scientific notation in the expression language, as
well as for all possible literal forms of +Inf/-Inf/NaN.

TODO: Keep enough state in the parser/lexer to distinguish contexts in
which "Inf", "NaN", etc. should be parsed as a number vs. parsed as a
label name. Currently, foo{nan="bar"} would be a syntax error. However,
that is an existing bug for all our reserved words. E.g. foo{sum="bar"}
is a syntax error as well. This should be fixed separately.
2015-03-01 19:31:16 +01:00
Julius Volz
ae832c9e63 Merge pull request #566 from prometheus/beorn7/makefile
Upgrade to go1.4.2.
2015-02-27 15:19:43 +01:00
Julius Volz
795704f0df Merge pull request #565 from fabxc/fabxc/labelmatcher_test
Tests for retrieving fingerprints for label matchers added.
2015-02-27 14:52:37 +01:00
Fabian Reinartz
4bff5d29bf Add tests for retrieving fingerprints for label matchers.
This checks for the basic behaviour of GetFingerprintsForLabelMatchers, that is, whether the different matcher types filter the correct fingerprints and intersections are correct.
2015-02-27 14:41:43 +01:00
beorn7
927bb55c3d Upgrade to go1.4.2. 2015-02-27 14:28:04 +01:00
Björn Rabenstein
82889319c9 Merge pull request #564 from prometheus/beorn7/release
Cut release 0.11.1
2015-02-27 13:33:35 +01:00
Björn Rabenstein
32f7825c35 Merge pull request #563 from prometheus/beorn7/fix
Some minor tweaks and bug fixes.
2015-02-27 13:17:55 +01:00
beorn7
e9b90c4ebd Cut release 0.11.1. 2015-02-27 11:49:52 +01:00
beorn7
92991026bb Fix chunkDescsTotal count in case of errors.
Only increment the counter if we actually add the memory series to the
fingerprintToSeries map.
2015-02-27 02:21:12 +01:00
beorn7
1db7589081 Reduce the capacity of countPersistedHeadChunks.
The capacity is basically how many persisted head chunks we will count
at most while doing other things, in particular checkpointing. To
limit the amount of already counted head chunks, keep this number low,
otherwise we will easily checkpoint too often if checkpoints take long
anyway.
2015-02-27 00:53:52 +01:00
Julius Volz
78cf64bf1d Merge pull request #560 from brian-brazil/almost-human
Better handling of edge conditions in humanizeDuration
2015-02-27 00:10:12 +01:00
beorn7
9406afad72 Do not double-count non-persisted head chunks on loading. 2015-02-27 00:06:16 +01:00
beorn7
dbc22b972c Check last time in head chunk for head chunk timeout, not first. 2015-02-26 23:40:42 +01:00
Björn Rabenstein
db49fd965f Merge pull request #562 from prometheus/beorn7/vendoring
Update vendoring.
2015-02-26 22:49:25 +01:00
beorn7
f74f7f2fb1 Re-rewrite import paths.
Another run of 'godep save' fixed the import path.

So you first have to run 'godep update <packages>' and then a 'godep save'.

Let's see if this satisfies Travis.
2015-02-26 22:08:45 +01:00
beorn7
08acf744f7 Update client_golang. 2015-02-26 19:26:44 +01:00
beorn7
784176d572 Update vendoring. 2015-02-26 19:26:43 +01:00
Björn Rabenstein
f8cb25e932 Merge pull request #559 from prometheus/beorn7/fix
Fix the embarrassing bug introduced in commit 0851945.
2015-02-26 19:25:57 +01:00
beorn7
edd716e63c Fix the embarrassing bug introduced in commit 0851945.
In that commit, the 'maintainSeries' call was accidentally removed.

This commit refactors things a bit so that there is now a clean
'maintainMemorySeries' and a 'maintainArchivedSeries' call.

Straighten the nomenclature a bit (consistently use 'drop' for
chunks and 'purge' for series/metrics).

Remove the annoying 'Completed maintenance sweep through archived
fingerprints' message if there were no archived fingerprints to do
maintenance on.
2015-02-26 18:30:33 +01:00
Brian Brazil
93edd930a6 Better handling of edge conditions in humanizeDuration 2015-02-26 17:30:03 +00:00
Björn Rabenstein
041aa59623 Merge pull request #553 from prometheus/beorn7/release
Version 0.11.0!
2015-02-23 20:21:59 +01:00
beorn7
5f8d7a9dbd Cut release 0.11.0. 2015-02-23 20:21:00 +01:00
beorn7
a4f6edf496 Vendor client_golang v0.2.0. 2015-02-23 18:11:42 +01:00
Björn Rabenstein
136cf661b7 Merge pull request #545 from prometheus/beorn7/quantile
Add the histogram_quantile function.
2015-02-23 15:30:24 +01:00
beorn7
1a61bcae07 Fix plural of 'histogram'.
Actually, 'histogram' is Ancient Greek and 3rd declension... ;-)
2015-02-23 15:29:26 +01:00
Julius Volz
03191cfc8e Merge pull request #550 from atombender/fix_makefile
Makefile: Calculate $(GOROOT), etc. relative to Makefile
2015-02-23 12:42:22 +01:00