4414 Commits (5f715f5733c2fc844db979806e5ae07843657cf6)

 

All Branches   

Search

Author	SHA1	Message	Date
Fabian Reinartz	ca2b68889b	Merge branch 'master' into dev-2.0	8 years ago
Tobias Schmidt	43075d0215	Merge pull request #2865 from mattbostock/add_marathon_port_ordinal_label ... Marathon SD: Set port index label	8 years ago
Fabian Reinartz	5cd37fe36f	Merge branch 'nolockfile' into dev-2.0	8 years ago
Fabian Reinartz	cdfd9c829d	Merge pull request #2870 from prometheus/fix-label-display-issue ... Fix display of before-relabeling labels	8 years ago
Matt Bostock	ab4d64959f	Marathon SD: Set port index label ... The changes [1][] to Marathon service discovery to support multiple ports mean that Prometheus now attempts to scrape all ports belonging to a Marathon service. You can use port definition or port mapping labels to filter out which ports to scrape but that requires service owners to update their Marathon configuration. To allow for a smoother migration path, add a `__meta_marathon_port_index` label, whose value is set to the port's sequential index integer. For example, PORT0 has the value `0`, PORT1 has the value `1`, and so on. This allows you to support scraping both the first available port (the previous behaviour) in addition to ports with a `metrics` label. For example, here's the relabel configuration we might use with this patch: - action: keep source_labels: ['__meta_marathon_port_definition_label_metrics', '__meta_marathon_port_mapping_label_metrics', '__meta_marathon_port_index'] # Keep if port mapping or definition has a 'metrics' label with any # non-empty value, or if no 'metrics' port label exists but this is the # service's first available port regex: ([^;]+;;[^;]+|;[^;]+;[^;]+|;;0) This assumes that the Marathon API returns the ports in sorted order (matching PORT0, PORT1, etc), which it appears that it does. [1]: https://github.com/prometheus/prometheus/pull/2506	8 years ago
Julius Volz	7be94d6643	Fix display of before-relabeling labels	8 years ago
Fabian Reinartz	be32afd6df	cmd/prometheus: add back tsdb.no-lockfile flag	8 years ago
Fabian Reinartz	70f96b0ffb	*: cut v2.0.0-alpha.3	8 years ago
Fabian Reinartz	e69dca6b9c	Merge pull request #2868 from Gouthamve/kingpin-promtool ... Move promtool to kingpin	8 years ago
Goutham Veeramachaneni	f9202c6511	Move from .yaml to .yml in update rules ... Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>	8 years ago
Goutham Veeramachaneni	e3701077c3	Move promtool to kingpin ... Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>	8 years ago
Fabian Reinartz	290c6b2383	Merge pull request #2866 from prometheus/kingpin ... Kingpin instead of Cobra	8 years ago
Fabian Reinartz	867b8d108f	cmd/prometheus: cleanup	8 years ago
Fabian Reinartz	34ab7a885a	cmd/prometheus: switch to kingpin	8 years ago
Fabian Reinartz	8088600202	vendor: add kingpin, drop unused deps	8 years ago
Brian Brazil	dd07f693c8	Single quotes are not valid label value delimiters.	8 years ago
Brian Brazil	a6ca391e6e	Reject scrapes with invalid utf-8 label values.	8 years ago
Alexey Palazhchenko	6a767b736b	Parse custom step parameter correctly. (#2861) ... Fixes #2827.	8 years ago
Fabian Reinartz	ab1bc9bcdd	Merge pull request #2842 from Gouthamve/rulegroups ... Rulegroups	8 years ago
Goutham Veeramachaneni	592cb00c2f	Remove version from RuleGroups ... Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>	8 years ago
Goutham Veeramachaneni	37e7b69f56	Merge remote-tracking branch 'upstream/dev-2.0' into rulegroups ... Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>	8 years ago
Fabian Reinartz	98c2d8477a	Merge pull request #2844 from Gouthamve/cobra ... Move CLI commander to cobra	8 years ago
Goutham Veeramachaneni	b2f7c8d842	Use user nobody in Dockerfile ... Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>	8 years ago
Fabian Reinartz	f46a8e9ea4	Merge pull request #2854 from prometheus/promql-rune ... Check for invalid utf-8 in lexer strings.	8 years ago
Goutham Veeramachaneni	67dc73fd59	Flag changes for 2.0 ... Fixes: prometheus/prometheus#2087 Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>	8 years ago
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>	8 years ago
Goutham Veeramachaneni	f40a5990a0	vendor: Update common/model ... Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>	8 years ago
Brian Brazil	6f5d952132	Check for invalid utf-8 in lexer strings. ... This protects against invalid utf-8 sneaking in via label_replace.	8 years ago
Harsh Agarwal	16867c89a7	implement label_join issue 1147 (#2806) ... Replace OptionalArgs int with Variadic int.	8 years ago
Goutham Veeramachaneni	c472316fb3	Check done before every rule evaluation. ... Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>	8 years ago
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>	8 years ago
Goutham Veeramachaneni	771e5a5d1d	vendor: gh/Sirupsen/logrus -> gh/sirupsen/logrus ... Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>	8 years ago
Goutham Veeramachaneni	6c1617fd13	Simplify usage string ... Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>	8 years ago
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>	8 years ago
Goutham Veeramachaneni	c399563ec1	vendor: Update common/log ... Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>	8 years ago
Fabian Reinartz	c89f8753f5	Merge pull request #2828 from prometheus/sd-label-valid ... Check target labels are valid. Check for address after relabelling.	8 years ago
Goutham Veeramachaneni	dc69645e92	Move back to go-yaml ... Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>	8 years ago
Goutham Veeramachaneni	ea255c6520	vendor: Add win specific dependency ... Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>	8 years ago
Goutham Veeramachaneni	8abb91f656	Move CLI commander to cobra ... Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>	8 years ago
Goutham Veeramachaneni	cbeeaf48aa	vendor: Add cobra and pflag ... Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>	8 years ago
Fabian Reinartz	dfef6cf234	Merge pull request #2843 from prometheus/fix-scrape-err-reporting ... retrieval: Fix "up" reporting for failed scrapes	8 years ago
Julius Volz	6f66125809	retrieval: Fix "up" reporting for failed scrapes	8 years ago
Goutham Veeramachaneni	5ff283a7b7	Reflect the grouping in the UI ... Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>	8 years ago
Goutham Veeramachaneni	8cca666cf2	Add file name to group. ... Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>	8 years ago
Goutham Veeramachaneni	e893c89333	Validate labels and annotations ... Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>	8 years ago
Goutham Veeramachaneni	c884881f7d	Add License Header ... Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>	8 years ago
Goutham Veeramachaneni	1c08743721	Update check-rules to new format. ... Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>	8 years ago
Goutham Veeramachaneni	2d1e92513b	Add tests ... Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>	8 years ago
Goutham Veeramachaneni	a48a018368	Make sure groups are unique in a single file ... Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>	8 years ago
Goutham Veeramachaneni	cea1e99f78	Add update-rules command to promtool ... Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>	8 years ago