github/prometheus - prometheus - https://git.xinac.net

Author	SHA1	Message	Date
Fabian Reinartz	d21f149745	*: migrate to go-kit/log	7 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
Chris Goller	42de0ae013	Use log.Logger interface for all discovery services	8 years ago
Conor Broderick	6766123f93	Replace regex with Secret type and remarshal config to hide secrets (#2775 )	8 years ago
Robson Roberto Souza Peixoto	cc3e859d9e	Add support for multiple ports in Marathon (#2506 ) - create a target for every port - add meta labels for Marathon labels in portMappings and portDefinitions	8 years ago
Tobias Schmidt	7bde44e98e	Remove testing.T usage in goroutines The staticcheck warns about testing.T usage in goroutines. Moving the t.Fatal* calls to the main thread showed immediately that this is a good practice, as one of the test setups didn't work.	8 years ago
Tobias Schmidt	58cd39aacd	Follow golang naming conventions in discovery packages	8 years ago
Michael Kraus	690b49e503	Fix marathon tests	8 years ago
Michael Kraus	31252cc1b5	Clarify explicit use of authorization header	8 years ago
Michael Kraus	47bdcf0f67	Allow the use of bearer_token or bearer_token_file for MarathonSD	8 years ago
Fabian Reinartz	d19d1bcad3	discovery: move into top-level package	8 years ago

1 2