185 Commits (54202bc5a8326fcb04f4eafdf53b610a46053d5d)

Author	SHA1	Message	Date
Fabian Reinartz	54202bc5a8	Merge pull request #902 from xperimental/feature/marathon-discovery ... retrieval/discovery: Service discovery using marathon API	9 years ago
Robert Jacob	4d0f974c42	Add service discovery using Marathon API.	9 years ago
Will Rouesnel	7810448dbe	Add proxy_url parameter to allow specifying per-job HTTP proxy servers ... Allow scrape_configs to have an optional proxy_url option which specifies a proxy to be used for all connections to hosts in that config. Internally this modifies the various client functions to take a *url.URL pointer which currently must point to an HTTP proxy (but has been left open-ended to allow the url format to be extended to support others, such as maybe SOCKS if needed).	9 years ago
Jimmi Dyson	da4c50a6cf	Make scheme relabelable via discovery	9 years ago
Jimmi Dyson	52cf6b3e6e	Configuration options for bearer tokens, client certs & CA certs ... Fixes #918, fixes #917	9 years ago
Florian Pfitzer	1fa0b0f253	fix consul port label	9 years ago
Brian Brazil	adf7f16d1a	Merge pull request #934 from prometheus/query-params ... Retrieval: Make it possible to relabel query params	9 years ago
Brian Brazil	d8875d17d8	Retrieval: Make it possible to relabel query params ... This only allows relabelling the first value for a given parameter, this should be sufficient in practice.	9 years ago
Johannes 'fish' Ziemke	6e7d743cd4	Merge pull request #946 from prometheus/add-sd-dns-a ... Add support for A record based DNS SD	9 years ago
Johannes 'fish' Ziemke	9ab340e95e	Add support for A record based DNS SD ... If using A records, the user needs to specify "port" and set "type" to "A".	9 years ago
beorn7	645f6772e5	Add Consul Address, ServicePort, and ServiceAddress to the meta labels. ... In setups where the ServiceAddress is the relevant address for scraping, users can relabel the `__address__` label to ServiceAddress + ":" + ServicePort. This needs to be documented, of course. Will do once this is LGTM'd.	9 years ago
Julius Volz	9d98910fca	Revert "Use Consul ServiceAddress instead of Address when set" ... This reverts commit 0ac7e7217e. See discussion on https://github.com/prometheus/prometheus/pull/812 for reasoning. While fixing one use case, it breaks others, and we need a more generic way of handling this.	9 years ago
Fabian Reinartz	d53cc7935d	retrieval: avoid race conditions	10 years ago
Brian Brazil	3d268d681e	retrieval: Handle serverset node not existing. ... This stops configuration loading hanging if the Znode doesn't exist, and retries until the node does exist.	10 years ago
Fabian Reinartz	080e067601	Merge pull request #832 from prometheus/fabxc/target-test ... retrieval: double timeout in target scrape test.	10 years ago
Brian Brazil	52859b8033	Merge pull request #836 from prometheus/shard ... Add 'hashmod' relabel action.	10 years ago
Brian Brazil	682f949ab1	Add 'hashmod' relabel action. ... This takes the modulus of a hash of some labels. Combined with a keep relabel action, this allows for sharding of targets across multiple prometheus servers.	10 years ago
Fabian Reinartz	23862c92c4	retrieval/discovery: refresh services in Consul to recover from missing events.	10 years ago
Fabian Reinartz	c292979374	retrieval: double timeout in target scrape test.	10 years ago
Julius Volz	d868264bb8	Improve UI of /alerts page. ... Changes to the UI: - "Active Since" timestamps are now human-readable. - Alerting rules are now pretty-printed better. - Labels are no longer just strings, but alert bubbles (like we do on the status page for base labels). - Alert states and target health states are now capitalized in the presentation layer rather than at the source.	10 years ago
Fabian Reinartz	53b9d5917d	web: improve target URL handling and display.	10 years ago
Fabian Reinartz	dc7d27ab9a	retrieval: add honor label handling and parametrized querying. ... This commit adds the honor_labels and params arguments to the scrape config. This allows to specify query parameters used by the scrapers and handling scraped labels with precedence.	10 years ago
Fabian Reinartz	459d18cf18	Merge pull request #812 from Marmelatze/consul_services ... Use Consul ServiceAddress instead of Address when set	10 years ago
Florian Pfitzer	0ac7e7217e	Use Consul ServiceAddress instead of Address when set	10 years ago
Brian Brazil	4d895242f9	Add support for Zookeeper Serversets for SD. ... It can discover an entire tree of serversets, or just one.	10 years ago
Brian Brazil	0dbae36d36	Allow ingested metrics to be relabeled. ... The main purpose of this is to allow for blacklisting of expensive metrics as a tactical option. It could also find uses for renaming and removing labels from federation.	10 years ago
Brian Brazil	58ceae82bc	Revert "Allow ingested metrics to be relabeled." ... This reverts commit f2f26ca08f. Was accidentally pushed to master instead of a branch for PR.	10 years ago
Brian Brazil	f2f26ca08f	Allow ingested metrics to be relabeled. ... The main purpose of this is to allow for blacklisting of expensive metrics as a tactical option. It could also find uses for renaming and removing labels from federation.	10 years ago
Fabian Reinartz	b5fe2e9afe	Merge pull request #773 from prometheus/fabxc/simple-cfg ... config: simplify default config handling.	10 years ago
Brian Brazil	b8b1d3cbac	Web: Add pre-relabel labels to status page. ... Figuring out what's going on with the new service discovery and labels is difficult. Add a popover with the labels to the target table to make things simpler, and help discovery of potentially useful labels.	10 years ago
Fabian Reinartz	0af1cff8af	config: simplify default config handling.	10 years ago
Fabian Reinartz	8214b4ee78	retrieval/discovery: surround __meta_consul_tags value with tag seperators.	10 years ago
Fabian Reinartz	280d11dca8	main: exit on invalid rule files on startup.	10 years ago
Fabian Reinartz	0de6edbdfc	Move pkg/ to util/	10 years ago
Fabian Reinartz	dfaf31a1da	Move web/httputils to pkg/httputil and add DeadlineClient to it	10 years ago
Fabian Reinartz	a4f179230a	Merge pull request #744 from prometheus/fabxc/fix-labels ... Fix discarding of labels in file target groups	10 years ago
Fabian Reinartz	e9b344abee	Fix discarding of labels in file target groups	10 years ago
Fabian Reinartz	8b7e5f9184	Stop holding TargetManager lock when stopping components. ... TargetProviders may flush some last changes to the target manager before actually stopping. To properly read those form the channel the target manager must not be locked while stopping a provider.	10 years ago
Brian Brazil	f34de493d5	Add increase() function, to replace delta(..., 1). ... This calculates how much a counter increases over a given period of time, which is the area under the curve of it's rate. increase(x[5m]) is equivilent to rate(x[5m]) * 300.	10 years ago
Fabian Reinartz	efb39cfd4e	Fix file SD test	10 years ago
Julius Volz	267fd34156	Switch Prometheus to use github.com/prometheus/log. ... This change is conceptually very simple, although the diff is large. It switches logging from "github.com/golang/glog" to "github.com/prometheus/log", while not actually changing any log messages. V(1)-style logging has been changed to be log.Debug*().	10 years ago
Fabian Reinartz	7143dff02f	Add initial implementation for SD via Consul. ... This commit adds service discovery using Consul's HTTP API and watches (long polling) to retrieve target updates.	10 years ago
Fabian Reinartz	b0c181dc0d	Add Consul SD configuration.	10 years ago
Fabian Reinartz	ff832d2e03	Attach __meta_filepath label to file SD targets.	10 years ago
Fabian Reinartz	8de50619f1	Increase target test wait times ... On slow systems such as Travis CI occasionally the tests fail because the wait times are too short.	10 years ago
Fabian Reinartz	385919a65a	Avoid inter-component blocking if ingestion/scraping blocks. ... Appending to the storage can block for a long time. Timing out scrapes can also cause longer blocks. This commit avoids that those blocks affect other compnents than the target itself. Also the Target interface was removed.	10 years ago
Fabian Reinartz	1a2d57b45c	Move template functionality out of target. ... The target implementation and interface contain methods only serving a specific purpose of the templates. They were moved to the template as they operate on more fundamental target data.	10 years ago
Fabian Reinartz	dbc08d390e	Move target status data into its own object	10 years ago
Fabian Reinartz	9ca47869ed	Provide full SD configs to discovery constructors. ... Some SD configs may have many options. To be readable and consistent, make all discovery constructors receive the full config rather than the separate arguments.	10 years ago
Fabian Reinartz	93548a8882	Add initial file based service discovery. ... This commits adds file based service discovery which reads target groups from specified files. It detects changes based on file watches and regular refreshes.	10 years ago