394 Commits (0d25931049e2e1c3820a8cbf479ec58504094124)

Author	SHA1	Message	Date
Matti Savolainen	5a1e909b5d	Make TargetLabel in RelabelConfig a string	8 years ago
Björn Rabenstein	d93f73874f	Merge pull request #2093 from dominikschulz/spelling ... Trivial spelling corrections	8 years ago
Dominik Schulz	182e17958a	Trivial spelling corrections and a small comment.	8 years ago
bekbulatov	ac702f66eb	Resolve merge conflicts	8 years ago
Fabian Reinartz	1b6dfa32a9	config: rename role 'endpoint' to 'endpoints'	8 years ago
Frederic Branczyk	2e18c81a00	config: adapt unit tests	8 years ago
Fabian Reinartz	b24602f713	kubernetes: merge back into single configuration	8 years ago
Fabian Reinartz	2331701b50	kubernetes: Add K8S v2 pod discovery ... This adds plumbing for a parallel version of the new K8S SD and adds pod discovery as the first role.	8 years ago
Dominik Schulz	72cbf8af6f	Fix small copy and paste error	8 years ago
bekbulatov	01b53c1180	Add tls support	8 years ago
Brian Brazil	77605649a9	Add support for remote write relabelling. ... Switch back to a single remote writer, as we were only ever meant to have one and the relabel semantics are clearer that way.	8 years ago
Tom Wilkie	4520e12440	Add HTTP Basic Auth & TLS support to the generic write path. (#1957) ... * Add config, HTTP Basic Auth and TLS support to the generic write path. - Move generic write path configuration to the config file - Factor out config.TLSConfig -> tlf.Config translation - Support TLSConfig for generic remote storage - Rename Run to Start, and make it non-blocking. - Dedupe code in httputil for TLS config. - Make remote queue metrics global.	8 years ago
Tobias Schmidt	874cb44bb6	Merge pull request #1996 from ton31337/Fix/allow_numbers_as_first_letter ... Allow number to be the first letter as well for `job_name`	8 years ago
Donatas Abraitis	1aa8898b66	Allow number to be the first letter as well for `job_name`	8 years ago
Ingo Gottwald	3b546d061f	Add support for GCE discovery	8 years ago
Alexey Miroshkin	e29d9394e5	Forbid invalid relabel configurations ... This fix adds check if target_label value is set in case if action is replace or hashmod Issue [#1900]	8 years ago
Fabian Reinartz	be596f82b4	Merge pull request #1783 from knyar/json ... Allow URLs in targets defined via a JSON file	8 years ago
Frederic Branczyk	b655aa002f	introduce top level alerting config node	8 years ago
Frederic Branczyk	679d225c8d	allow relabeling of alerts ... in case of dropping don't even enqueue them	8 years ago
Fabian Reinartz	7a0b3af0b7	config: validate Kubernetes role correctly.	8 years ago
Fabian Reinartz	919558f601	config: remove deprecated `target_groups` configuration	9 years ago
Fabian Reinartz	7221228843	discovery/kubernetes: select between discovery role ... This adds `role` field to the Kubernetes SD config, which indicates which type of Kubernetes SD should be run. This no longer allows discovering pods and nodes with the same SD configuration for example.	9 years ago
Anton Tolchanov	772a3af38f	Allow URLs in targets defined via a JSON file ... This enables defining `blackbox_exporter` targets (which can be URLs, because of relabeling) in a JSON file. Not sure if this is the best approach, but current behaviour is inconsistent (`UnmarshalYAML` does not have this check) and breaks officially documented way to use `blackbox_exporter`.	9 years ago
Ali Reza	98c156c361	reorder config validation, move checkOverflow before any other validation	9 years ago
Fabian Reinartz	0f21bd31ca	config: deprecate `target_groups` for `static_configs` ... This change deprecates the `target_groups` option in favor of `static_configs`. The old configuration is still accepted but prints a warning. Configuration loading errors if both options are set.	9 years ago
Jimmi Dyson	206bcfcdaa	Kubernetes SD: Remove kubeletPort config option	9 years ago
Ali Reza	c81b4e8a87	change config names to files for consistency	9 years ago
Gregory G. Tseng	7997c14b0d	Add ServerName into TLS Config	9 years ago
Seth Miller	0988e3b937	Add support for Azure discovery ... This change adds the ability to do target discovery with Microsoft's Azure platform.	9 years ago
Fabian Reinartz	37c709f917	Fix global config YAML issues	9 years ago
Fabian Reinartz	44a5e860ed	Fix scrape timeout config checks	9 years ago
Julius Volz	829a029dda	Update two more __meta_dns_srv_name references. ... Although they are only in examples/tests and don't affect anything, they could be confusing (the label has been renamed in the rest of the code a while ago).	9 years ago
Fabian Reinartz	e26e4b6e89	Restrict scrape timeout to interval length	9 years ago
beorn7	a7408bfb47	Unify duration parsing ... It's actually happening in several places (and for flags, we use the standard Go time.Duration...). This at least reduces all our home-grown parsing to one place (in model).	9 years ago
Julien Dehee	061fe2f364	Support AirBnB's Smartstack Nerve client for SD ... nerve's registration format differs from serverset. With this commit there is now a dedicated treecache file in util, and two separate files for serverset and nerve. Reference: https://github.com/airbnb/nerve	9 years ago
Fabian Reinartz	4d1c9296d5	Add new defaults for relabel configurations	9 years ago
Brian Brazil	fd2bd81cd8	Allow all instance labels in target groups ... With the blackbox exporter, the instance label will commonly be used for things other than hostnames so remove this restriction. https://example.com or https://example.com/probe/me are some examples. To prevent user error, check that urls aren't provided as targets when there's no relabelling that could potentically fix them.	9 years ago
Fabian Reinartz	f2a8261cdb	Merge pull request #1177 from fabric8io/kubernetes-discovery ... Kubernetes SD authentication options cleanup	9 years ago
Fabian Reinartz	180da1ba65	Add overflow check in TLS config	9 years ago
Jimmi Dyson	87940ec213	Kubernetes SD: Rename `masters` to `api_servers` in config	9 years ago
Jimmi Dyson	7ff5cc66ea	Kubernetes SD authentication options cleanup	9 years ago
Brian Brazil	1ddf75240d	config: Don't hide username, it's not secret. ... Usernames are not generally considered to be secrets, and treating them as secrets may lead to confusion as to how secure they are. Obscuring them also makes debugging harder.	9 years ago
Matt Jibson	dcb4856d72	Add SD for Amazon EC2 instances	9 years ago
Julius Volz	dac26cef71	Rename global "labels" config option to "external_labels".	9 years ago
Matt Jibson	0e99fa6c46	Allow labelmap action	9 years ago
Jimmi Dyson	ec04ba38a2	Kubernetes SD config check	9 years ago
Jimmi Dyson	a1574aa2b3	Move TLS options to scrape config ... Fixes #1013, fixes #989	9 years ago
Fabian Reinartz	1ef5ed0cf2	Merge pull request #1048 from xperimental/fix/marathon-config ... Fix parsing Marathon SD config	9 years ago
Robert Jacob	eb7416e71f	Fix missing unmarshal for Marathon SD config.	9 years ago
Jimmi Dyson	d7a7fd4589	Kubernetes SD improvements ... * Support multiple masters with retries against each master as required. * Scrape masters' metrics. * Add role meta label for node/service/master to make it easier for relabeling.	9 years ago
Julius Volz	f63a899744	Change config regexes to full-string matches. ... This anchors all regular expressions entered via the config to match a full string vs. a substring. THIS IS A BREAKING CHANGE! Fixes part of https://github.com/prometheus/prometheus/issues/996	9 years ago
Julius Volz	995d3b831d	Fix most golint warnings. ... This is with `golint -min_confidence=0.5`. I left several lint warnings untouched because they were either incorrect or I felt it was better not to change them at the moment.	9 years ago
Fabian Reinartz	438e232c9b	Fix grouping of import blocks	9 years ago
Fabian Reinartz	306e8468a0	Switch from client_golang/model to common/model	9 years ago
Fabian Reinartz	ac0be60bb9	Add license headers	9 years ago
Fabian Reinartz	139f27bf8a	Increase default retry interval for file SD ... The automatic refresh is a safety mechanism in case file watches fail. As they seem to be working well the interval can be increased.	9 years ago
Fabian Reinartz	3c6dd161d7	Scrape all services on empty services list.	9 years ago
Fabian Reinartz	b964da4b75	Merge pull request #905 from fabric8io/kubernetes-discovery ... Kubernetes discovery	9 years ago
Fabian Reinartz	24e91720ad	Merge pull request #980 from prometheus/map-labels ... Retrieval: Add relabel action to map labels names with a regex.	9 years ago
Brian Brazil	4e70a0a14e	Retrieval: Add relabel action to map label names with a regex. ... The intended use case is where a user has tags/labels coming from metadata in Kubernetes or EC2, and wants to make some subset of them into target labels.	9 years ago
Brian Brazil	43449b0581	config: Update tests/examples to use __tmp_	9 years ago
Jimmi Dyson	923f8111d4	Initial Kubernetes discovery ... Fixes #904	9 years ago
Fabian Reinartz	cdcfada2ac	Merge pull request #965 from prometheus/fabxc/relpath ... Resolve relative paths on configuration loading	9 years ago
Fabian Reinartz	73f1cc807d	Check token and cert file existence in promtool	9 years ago
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
Fabian Reinartz	7a67472fc1	Resolve relative paths on configuration loading ... This moves the concern of resolving the files relative to the config file into the configuration loading itself. It also fixes #921 which did not load the cert and token files relatively.	9 years ago
Jimmi Dyson	52cf6b3e6e	Configuration options for bearer tokens, client certs & CA certs ... Fixes #918, fixes #917	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
Fabian Reinartz	187fe4e3d3	Fix missing defaults for empty global config blocks	10 years ago
Fabian Reinartz	2a53b107c1	Fix missing defaults in empty configurations	10 years ago
Fabian Reinartz	435fc7234f	config: add overflow detection for serverset config	10 years ago
Fabian Reinartz	02e06839f2	config: hide authentication credentials in String() output	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	4319b06dd2	config: add omitempty for consul SD config.	10 years ago
Fabian Reinartz	7ec15956e4	config: show original input on String()	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
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	116e6df096	config: raise error on unknown config parameters. ... The YAML parser ignores additional parameters on unmarshaling. This causes frequent confusion with bad configs that pass parsing. These changes raise errors on additional parameters.	10 years ago
Fabian Reinartz	3a24a7779d	config: extend and format config example/test.	10 years ago
Fabian Reinartz	458550560c	config: error on missing regex in relabel config. ... Fixes issue #787.	10 years ago
Fabian Reinartz	b5fe2e9afe	Merge pull request #773 from prometheus/fabxc/simple-cfg ... config: simplify default config handling.	10 years ago
Fabian Reinartz	f6c33a2347	config: prevent overwrite of DefaultGlobalConfig	10 years ago
Fabian Reinartz	db3367e83f	config: ensure correct labelname in JSON target group.	10 years ago
Fabian Reinartz	0af1cff8af	config: simplify default config handling.	10 years ago
Fabian Reinartz	17c4c8ed95	config: fix json/yaml tag inconsistencies.	10 years ago
Fabian Reinartz	867f2ac979	Merge pull request #762 from prometheus/0.14.1 ... 0.14.1	10 years ago
Joonas Bergius	5d5c3878ed	Restore default ScrapeInterval of 1 minute instead of 10 seconds	10 years ago
Fabian Reinartz	0de6edbdfc	Move pkg/ to util/	10 years ago
Fabian Reinartz	dbc0d30e3e	Move string functionality to pkg/strutil	10 years ago
Fabian Reinartz	c44ac7bc26	Load rule files from entire directories	10 years ago
Fabian Reinartz	ed6572fc0c	Fix typos	10 years ago
Fabian Reinartz	b0c181dc0d	Add Consul SD configuration.	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
Fabian Reinartz	3b21c7037a	Add file SD to configuration.	10 years ago
Fabian Reinartz	d5aa012fd0	Make HTTP basic auth configurable for scrape targets.	10 years ago
Fabian Reinartz	86087120dd	Replace example config with new YAML format.	10 years ago
Fabian Reinartz	5fbde88919	Switch config to YAML format.	10 years ago
Fabian Reinartz	b5a8f7b8fa	Cleanup, test, and document config.	10 years ago
Fabian Reinartz	945c49a2dd	Add relabelling to target management. ... This commit adds a relabelling stage on the set of base labels from which a target is created. It allows to drop targets and rewrite any regular or internal label.	10 years ago
Fabian Reinartz	0b619b46d6	Change JobConfig to ScrapeConfig. ... This commit changes the configuration interface from job configs to scrape configs. This includes allowing multiple ways of target definition at once and moving DNS SD to its own config message. DNS SD can now contain multiple DNS names per configured discovery.	10 years ago
Fabian Reinartz	5015c2a0e8	Make target manager source based. ... This commit shifts responsibility for maintaining targets from providers and pools to the target manager. Target groups have a source name that identifies them for updates.	10 years ago
Fabian Reinartz	4f8673aa88	Simplify update sync for targets, format config fixtures.	10 years ago
Fabian Reinartz	0280d74167	Fix scrape timeout in config. ... The scrape timeout helper was wrapping the scrape interval.	10 years ago
Julius Volz	464524fa44	Make config/Makefile use user Go installation. ... Otherwise it will fail to "go get" the "github.com/golang/protobuf" package because its dir already exists in the vendored packages, but the copy isn't a git repository.	10 years ago
Julius Volz	af627bb2b9	Copy vendored deps manually instead of using Godeps. ... We were using Godep incorrectly (cloning repos from the internet during build time instead of including Godeps/_workspace in the GOPATH via "godep go"). However, to avoid even having to fetch "godeps" from the internet during build, this now just copies the vendored files into the GOPATH. Also, the protocol buffer library moved from Google Code to GitHub, which is reflected in these updates. This fixes https://github.com/prometheus/prometheus/issues/525	10 years ago
Bjoern Rabenstein	cf28c2efbb	Change autogenerated protobuf code.	10 years ago
Bjoern Rabenstein	5859b74f1b	Clean up license issues. ... - Move CONTRIBUTORS.md to the more common AUTHORS. - Added the required NOTICE file. - Changed "Prometheus Team" to "The Prometheus Authors". - Reverted the erroneous changes to the Apache License.	10 years ago
Bjoern Rabenstein	39efe6358b	Fix typos and import order. ... This doesn't make the import order consistend everywhere, just where it was touched by the previous commit. Change-Id: I82fc75f8691da9901c7ceb808e6f6fe8e5d62c0e	10 years ago
Bjoern Rabenstein	b1e4956142	Apply a giant code cleanup. ... Essentially: - Remove unused code. - Make it 'go vet' clean. The only remaining warnings are in generated code. - Make it 'golint' clean. The only remaining warnings are in gerenated code. - Smoothed out same minor things. Change-Id: I3fe5c1fbead27b0e7a9c247fee2f5a45bc2d42c6	10 years ago
Bjoern Rabenstein	006b5517e2	Simplify makefiles. ... This removes the dependancy on C leveldb and snappy. It also takes care of fewer dependencies as they would anyway not work on any non-Debian, non-Brew system. Change-Id: Ia70dce1ba8a816a003587927e0b3a3f8ad2fd28c	10 years ago
Julius Volz	7b013e6491	Merge "Replace some uses of obsolete `/metrics.json` with `/metrics` (haven't touched test files yet)."	11 years ago
Julius Volz	78ebc1a61f	Ensure that job names are unique in parsed configs. ... Change-Id: I6bd89e6401bd924315981db797af21bdf0b81252	11 years ago
Conor Hennessy	aada5ded85	Replace some uses of obsolete `/metrics.json` with `/metrics` ... (haven't touched test files yet). Change-Id: I48c7c0cf27a39d596627a06cbb4f5913fb3da13c	11 years ago
Conor Hennessy	2d26db7e37	Trivial regeneration of config proto (wasn't regenerated with new comments). ... Change-Id: Iaa97c8b96b40b7f13884e85a39d5a229c2d33f37	11 years ago
Julius Volz	788587426b	Make scrape timeouts configurable per job. ... Change-Id: I77a7514ad9e7969771f873d63d6353ec50082a62	11 years ago
Julius Volz	d69b85e6c9	Add global label support via Ingesters.	11 years ago
Julius Volz	c03712dc58	Update config.pb.go (now includes comments from protobuf definition file).	11 years ago
Julius Volz	a310afd28f	Update "build" -> ".build" in remaining Makefiles.	12 years ago
Julius Volz	1cf9e5840a	Fix whitespace in config.proto.	12 years ago
Matt T. Proud	f895acb9ef	Trailing build system cleanups. ... The .gitignore files had problems, and the build steps could be simplified.	12 years ago
Julius Volz	d9b4f98b44	Integrate DNS-SD support for discovering job targets.	12 years ago
Matt T. Proud	8f4c7ece92	Destroy naked returns in half of corpus. ... The use of naked return values is frowned upon. This is the first of two bulk updates to remove them.	12 years ago
Matt T. Proud	161c8fbf9b	Include deletion processor for long-tail values. ... This commit extracts the model.Values truncation behavior into the actual tiered storage, which uses it and behaves in a peculiar way—notably the retention of previous elements if the chunk were to ever go empty. This is done to enable interpolation between sparse sample values in the evaluation cycle. Nothing necessarily new here—just an extraction. Now, the model.Values TruncateBefore functionality would do what a user would expect without any surprises, which is required for the DeletionProcessor, which may decide to split a large chunk in two if it determines that the chunk contains the cut-off time.	12 years ago
Matt T. Proud	38d839d810	Include generated Protocol Buffers artifacts. ... This commit reduces the general compile time dependencies to omit the Protocol Buffer compiler and the Go Protocol Buffer generator tool. The build steps to furnish them still remain, but they can optionally be called if data.proto or config.proto are under work.	12 years ago
Julius Volz	9cea5d9df8	Convert the Prometheus configuration to protocol buffers.	12 years ago
Julius Volz	c0601abf46	Implement initial no-op alert parsing and rule parsing tests.	12 years ago
Julius Volz	f1fc7d717a	Allow replacing job targets via HTTP API. ... This roughly comprises the following changes: - index target pools by job instead of scrape interval - make targets within a pool exchangable while preserving existing health state for targets - allow exchanging targets via HTTP API (PUT) - show target lists in /status (experimental, for own debug use)	12 years ago
Julius Volz	39411b516d	Add missing config test fixtures.	12 years ago
Julius Volz	d137362257	Config tests and config cleanups+fixes.	12 years ago
Julius Volz	c3d31febd6	Move durationToString to common place and cleanup error handling.	12 years ago
Julius Volz	06ace4941d	Remove/replace last references to github.com/matttproud/...	12 years ago
Julius Volz	16d9dcd6a8	Add copyright notices to all remaining files.	12 years ago
Matt T. Proud	ea54751431	Update import paths to new location. ... This repository moved from matttproud/prometheus to prometheus/prometheus, and all import paths need to be updated.	12 years ago
Tobias Schmidt	6523536758	Fix bug in config.LoadFromFile if file is not present	12 years ago
Julius Volz	a555ded2b3	Add "w" (weeks) as a valid timeunit.	12 years ago
Matt T. Proud	efe61c18fa	Refactor target scheduling to separate facility. ... ``Target`` will be refactored down the road to support various nuanced endpoint types. Thusly incorporating the scheduling behavior within it will be problematic. To that end, the scheduling behavior has been moved into a separate assistance type to improve conciseness and testability. ``make format`` was also run.	12 years ago
Julius Volz	cb6eb30182	Fix state cleanup bug between rule/config parser runs. ... This fixes a bug that has been annoying me minorly for some time now: sometimes, after parse errors, a subsequent parser run would fail. The reason is that yylex() modifies some global variables (yytext, yydata) during its run to keep state. To make subsequent parser runs correct, these have to be reset before each run. Also, close files after reading them.	12 years ago
Julius Volz	56384bf42a	Add initial config and rule language implementation.	12 years ago