Commit Graph

4123 Commits

Author SHA1 Message Date
Fabian Reinartz
24e9deac71 Merge pull request #2859 from Gouthamve/docker-nobody
Dockerfile: Run as nobody
2017-07-05 16:13:21 +02:00
Fabian Reinartz
ad86c389cb Merge pull request #2869 from Gouthamve/lblspc
parser: Support spaces everywhere
2017-07-05 16:10:17 +02:00
Goutham Veeramachaneni
0e78b7e7c8 parser: support spaces everywhere
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2017-07-05 15:52:21 +02:00
Fabian Reinartz
329992201e Merge pull request #2897 from Gouthamve/oob-metric
Handle scrapes with OutOfBounds metrics better
2017-07-05 15:47:14 +02:00
Goutham Veeramachaneni
643c5837a0 Stop metrics that are 10mins ahead from now
Fixes #2893

Signed-off-by: Goutham Veeramachaneni <goutham@boomerangcommerce.com>
2017-07-04 15:34:08 +02:00
Fabian Reinartz
496c060f98 Merge pull request #2896 from prometheus/filepath
config: resolve file SD paths relative to config
2017-07-04 11:59:30 +02:00
Fabian Reinartz
65b087bcc1 config: resolve file SD paths relative to config 2017-07-04 11:40:26 +02:00
Goutham Veeramachaneni
3069bd3996 Handle scrapes with OutOfBounds metrics better
fixes #2894

Signed-off-by: Goutham Veeramachaneni <goutham@boomerangcommerce.com>
2017-07-04 11:24:13 +02:00
Fabian Reinartz
426125298e vendor: update prometheus/tsdb 2017-07-03 14:41:02 +02:00
Fabian Reinartz
3845dfb715 Merge pull request #2875 from prometheus/savemetric
Savemetric
2017-07-03 09:26:16 +02:00
Fabian Reinartz
4b70318d11 Merge pull request #2874 from prometheus/memleak
retrieval: fix memory leak in scrape cache
2017-06-26 15:21:35 +02:00
Fabian Reinartz
9ea748e745 Don't reallocate label set if still known
If the storage deprecates a ref, we have to re-insert with the full
label set. Typically that doesn't correlate with a new series being
created.
We can still use the allocated label set from before.
2017-06-26 14:38:57 +02:00
Fabian Reinartz
2368d2c45b retrieval: fix memory leak in scrape cache 2017-06-26 00:24:54 +02:00
Fabian Reinartz
ca2b68889b Merge branch 'master' into dev-2.0 2017-06-23 13:15:44 +02:00
Fabian Reinartz
5cd37fe36f Merge branch 'nolockfile' into dev-2.0 2017-06-23 11:38:08 +02:00
Fabian Reinartz
cdfd9c829d Merge pull request #2870 from prometheus/fix-label-display-issue
Fix display of before-relabeling labels
2017-06-23 11:37:05 +02:00
Julius Volz
7be94d6643 Fix display of before-relabeling labels 2017-06-22 15:36:17 -04:00
Fabian Reinartz
be32afd6df cmd/prometheus: add back tsdb.no-lockfile flag 2017-06-22 15:02:10 +02:00
Fabian Reinartz
70f96b0ffb *: cut v2.0.0-alpha.3 2017-06-22 12:02:51 +02:00
Fabian Reinartz
e69dca6b9c Merge pull request #2868 from Gouthamve/kingpin-promtool
Move promtool to kingpin
2017-06-22 11:38:29 +02:00
Goutham Veeramachaneni
f9202c6511
Move from .yaml to .yml in update rules
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2017-06-21 18:38:37 +05:30
Goutham Veeramachaneni
e3701077c3
Move promtool to kingpin
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2017-06-21 17:42:57 +05:30
Fabian Reinartz
290c6b2383 Merge pull request #2866 from prometheus/kingpin
Kingpin instead of Cobra
2017-06-21 11:56:30 +02:00
Fabian Reinartz
867b8d108f cmd/prometheus: cleanup 2017-06-21 11:38:13 +02:00
Fabian Reinartz
34ab7a885a cmd/prometheus: switch to kingpin 2017-06-20 17:38:01 +02:00
Fabian Reinartz
8088600202 vendor: add kingpin, drop unused deps 2017-06-20 17:37:40 +02:00
Brian Brazil
dd07f693c8 Single quotes are not valid label value delimiters. 2017-06-20 10:54:39 +01:00
Brian Brazil
a6ca391e6e Reject scrapes with invalid utf-8 label values. 2017-06-20 10:54:39 +01:00
Alexey Palazhchenko
6a767b736b Parse custom step parameter correctly. (#2861)
Fixes #2827.
2017-06-19 17:22:59 +01:00
Fabian Reinartz
ab1bc9bcdd Merge pull request #2842 from Gouthamve/rulegroups
Rulegroups
2017-06-19 13:27:37 +02:00
Goutham Veeramachaneni
592cb00c2f
Remove version from RuleGroups
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2017-06-19 16:38:46 +05:30
Goutham Veeramachaneni
37e7b69f56
Merge remote-tracking branch 'upstream/dev-2.0' into rulegroups
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2017-06-19 16:34:55 +05:30
Fabian Reinartz
98c2d8477a Merge pull request #2844 from Gouthamve/cobra
Move CLI commander to cobra
2017-06-19 11:59:52 +02:00
Goutham Veeramachaneni
b2f7c8d842
Use user nobody in Dockerfile
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2017-06-19 15:03:39 +05:30
Fabian Reinartz
f46a8e9ea4 Merge pull request #2854 from prometheus/promql-rune
Check for invalid utf-8 in lexer strings.
2017-06-17 14:42:20 +02:00
Goutham Veeramachaneni
67dc73fd59
Flag changes for 2.0
Fixes: prometheus/prometheus#2087

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2017-06-16 20:21:41 +05:30
Goutham Veeramachaneni
d407bd150c Consolidate the duration params in CLI
* All CLI params moved to model.Duration

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2017-06-16 20:20:57 +05:30
Goutham Veeramachaneni
f40a5990a0
vendor: Update common/model
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2017-06-16 20:20:44 +05:30
Brian Brazil
6f5d952132 Check for invalid utf-8 in lexer strings.
This protects against invalid utf-8 sneaking
in via label_replace.
2017-06-16 15:19:24 +01:00
Harsh Agarwal
16867c89a7 implement label_join issue 1147 (#2806)
Replace OptionalArgs int with Variadic int.
2017-06-16 14:51:22 +01:00
Goutham Veeramachaneni
c472316fb3
Check done before every rule evaluation.
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2017-06-16 16:57:22 +05:30
Goutham Veeramachaneni
6b70a4d850
Incorporate PR feedback
* Move fingerprint to Hash()
* Move away from tsdb.MultiError
* 0777 -> 0666 for files
* checkOverflow of extra fields

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2017-06-16 16:44:33 +05:30
Goutham Veeramachaneni
771e5a5d1d
vendor: gh/Sirupsen/logrus -> gh/sirupsen/logrus
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2017-06-16 16:04:33 +05:30
Goutham Veeramachaneni
6c1617fd13
Simplify usage string
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2017-06-16 15:55:13 +05:30
Goutham Veeramachaneni
507790a357
Rework logging to use explicitly passed logger
Mostly cleaned up the global logger use. Still some uses in discovery
package.

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2017-06-16 15:52:44 +05:30
Goutham Veeramachaneni
c399563ec1
vendor: Update common/log
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2017-06-16 15:49:41 +05:30
Fabian Reinartz
c89f8753f5 Merge pull request #2828 from prometheus/sd-label-valid
Check target labels are valid. Check for address after relabelling.
2017-06-16 10:43:45 +02:00
Goutham Veeramachaneni
dc69645e92
Move back to go-yaml
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2017-06-16 10:46:21 +05:30
Goutham Veeramachaneni
ea255c6520
vendor: Add win specific dependency
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2017-06-15 17:02:37 +05:30
Goutham Veeramachaneni
8abb91f656
Move CLI commander to cobra
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2017-06-15 16:38:08 +05:30