prometheus

Commit Graph

Author	SHA1	Message	Date
Ben Kochie	c6399296dc	Fix spelling/typos (#4921 ) * Fix spelling/typos Fix spelling/typos reported by codespell/misspell. * UK -> US spelling changes. Signed-off-by: Ben Kochie <superq@gmail.com>	6 years ago
Simon Pasquier	0bb810d126	discovery/marathon: fix leaked connections (#4915 ) Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Timo Beckers	bea302e061	marathon-sd - use 'hostPort' member of portMapping to construct target endpoints (#4887 ) Fixes #4855 - ServicePort was wrongly used to construct an address to endpoints defined in portMappings. This was changed to HostPort. Support for obtaining auto-generated host ports was also added. Signed-off-by: Timo Beckers <timo@incline.eu>	6 years ago
Timo Beckers	1c9fbd65c4	marathon-sd - change port gathering strategy, support for container networking (#4499 ) * marathon-sd - change port gathering strategy, add support for container networking - removed unnecessary error check on HTTPClientConfig.Validate() - renamed PortDefinitions and PortMappings to PortDefinition and PortMapping respectively - extended data model for extra parsed fields from Marathon json - support container networking on Marathon 1.5+ (target Task.IPAddresses.x.Address) - expanded test suite to cover all new cases - test: cancel context when reading from doneCh before returning from function - test: split test suite into Ports/PortMappings/PortDefinitions Signed-off-by: Timo Beckers <timo@incline.eu>	6 years ago
Adam Shannon	a22e1736b9	discovery/marathon: include url in fetchApps error (#4171 ) This was previously part of a larger PR, but that was closed. https://github.com/prometheus/prometheus/issues/4048#issuecomment-389899997 This change could include auth information in the URL. That's been fixed in upstream go, but not until Go 1.11. See: https://github.com/golang/go/issues/24572 Signed-off-by: Adam Shannon <adamkshannon@gmail.com>	7 years ago
Adam Shannon	809881d7f5	support reading basic_auth password_file for HTTP basic auth (#4077 ) Issue: https://github.com/prometheus/prometheus/issues/4076 Signed-off-by: Adam Shannon <adamkshannon@gmail.com>	7 years ago
Rohit Gupta	30c3e02864	Fixes #4090 . Marathon service discovery for 5XX http response (#4091 ) Signed-off-by: rohit01 <hello@rohit.io>	7 years ago
Philippe Laflamme	2aba238f31	Use common HTTPClientConfig for marathon_sd configuration (#4009 ) This adds support for basic authentication which closes #3090 The support for specifying the client timeout was removed as discussed in https://github.com/prometheus/common/pull/123. Marathon was the only sd mechanism doing this and configuring the timeout is done through `Context`. DC/OS uses a custom `Authorization` header for authenticating. This adds 2 new configuration properties to reflect this. Existing configuration files that use the bearer token will no longer work. More work is required to make this backwards compatible.	7 years ago
Manos Fokas	25f929b772	Yaml UnmarshalStrict implementation. (#4033 ) * Updated yaml vendor package. * remove checkOverflow duplicate in rulefmt * remove duplicated HTTPClientConfig.Validate() * Added yaml static check.	7 years ago
Shubheksha Jalan	0471e64ad1	Use shared types from the `common` repo (#3674 ) * refactor: use shared types from common repo, remove util/config * vendor: add common/config * fix nit	7 years ago
Callum Styan	97464236c7	comments with TargetProvider should read Discoverer instead (#3667 )	7 years ago
Shubheksha Jalan	ec94df49d4	Refactor SD configuration to remove `config` dependency (#3629 ) * refactor: move targetGroup struct and CheckOverflow() to their own package * refactor: move auth and security related structs to a utility package, fix import error in utility package * refactor: Azure SD, remove SD struct from config * refactor: DNS SD, remove SD struct from config into dns package * refactor: ec2 SD, move SD struct from config into the ec2 package * refactor: file SD, move SD struct from config to file discovery package * refactor: gce, move SD struct from config to gce discovery package * refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil * refactor: consul, move SD struct from config into consul discovery package * refactor: marathon, move SD struct from config into marathon discovery package * refactor: triton, move SD struct from config to triton discovery package, fix test * refactor: zookeeper, move SD structs from config to zookeeper discovery package * refactor: openstack, remove SD struct from config, move into openstack discovery package * refactor: kubernetes, move SD struct from config into kubernetes discovery package * refactor: notifier, use targetgroup package instead of config * refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup * refactor: retrieval, use targetgroup package instead of config.TargetGroup * refactor: storage, use config util package * refactor: discovery manager, use targetgroup package instead of config.TargetGroup * refactor: use HTTPClient and TLS config from configUtil instead of config * refactor: tests, use targetgroup package instead of config.TargetGroup * refactor: fix tagetgroup.Group pointers that were removed by mistake * refactor: openstack, kubernetes: drop prefixes * refactor: remove import aliases forced due to vscode bug * refactor: move main SD struct out of config into discovery/config * refactor: rename configUtil to config_util * refactor: rename yamlUtil to yaml_config * refactor: kubernetes, remove prefixes * refactor: move the TargetGroup package to discovery/ * refactor: fix order of imports	7 years ago
Will Howard	6a80fc24cf	Parse the normalized container.PortMappings presented by the Marathon 1.5.x API Fixes #3465	7 years ago
Julius Volz	099df0c5f0	Migrate "golang.org/x/net/context" -> "context" (#3333 ) In some places, where ctxhttp or gRPC are concerned, we still need to use the old contexts.	7 years ago
Marc Sluiter	6a633eece1	Added go-conntrack for monitoring http connections (#3241 ) Added metrics for in- and outgoing traffic with go-conntrack.	7 years ago
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

26 Commits (b883f6826b4c1260c8d8b53c34f4f3fe4c94bda1)