Commit Graph

180 Commits (a715dd84ecf1eec7fa562265465171be8ab2ff5d)

Author SHA1 Message Date
Kraig Amador bec6870ed4 ec2_sd_configs: Support profiles for configuring the ec2 service
8 years ago
beorn7 b2f28a9e82 Merge branch 'release-1.2'
8 years ago
Brian Brazil d1ece12c70 Handle null Regex in the config as the empty regex. (#2150)
8 years ago
bekbulatov 2bc12fa2fb Set timeout for marathon_sd
8 years ago
bekbulatov c689b35858 Merge branch 'master' into marathon_tls
8 years ago
Matti Savolainen ec6524ce74 test the labelTarget regex to make sure it properly validates pre-interpolated label names.
8 years ago
Matti Savolainen 56907ba6e3 Add interpolation to good test config. Fix regex
8 years ago
Björn Rabenstein d93f73874f Merge pull request #2093 from dominikschulz/spelling
8 years ago
Dominik Schulz 182e17958a Trivial spelling corrections and a small comment.
8 years ago
bekbulatov ac702f66eb Resolve merge conflicts
8 years ago
Frederic Branczyk 2e18c81a00 config: adapt unit tests
8 years ago
bekbulatov 01b53c1180 Add tls support
8 years ago
Brian Brazil 77605649a9 Add support for remote write relabelling.
8 years ago
Donatas Abraitis 1aa8898b66 Allow number to be the first letter as well for `job_name`
8 years ago
Alexey Miroshkin e29d9394e5 Forbid invalid relabel configurations
8 years ago
Fabian Reinartz 7a0b3af0b7 config: validate Kubernetes role correctly.
8 years ago
Fabian Reinartz 7221228843 discovery/kubernetes: select between discovery role
9 years ago
Fabian Reinartz 0f21bd31ca config: deprecate `target_groups` for `static_configs`
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
Seth Miller 0988e3b937 Add support for Azure discovery
9 years ago
Julius Volz 829a029dda Update two more __meta_dns_srv_name references.
9 years ago
Fabian Reinartz e26e4b6e89 Restrict scrape timeout to interval length
9 years ago
beorn7 a7408bfb47 Unify duration parsing
9 years ago
Julien Dehee 061fe2f364 Support AirBnB's Smartstack Nerve client for SD
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
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.
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 a1574aa2b3 Move TLS options to scrape config
9 years ago
Fabian Reinartz 1ef5ed0cf2 Merge pull request #1048 from xperimental/fix/marathon-config
9 years ago
Robert Jacob eb7416e71f Fix missing unmarshal for Marathon SD config.
9 years ago
Jimmi Dyson d7a7fd4589 Kubernetes SD improvements
9 years ago
Julius Volz f63a899744 Change config regexes to full-string matches.
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
9 years ago
Fabian Reinartz b964da4b75 Merge pull request #905 from fabric8io/kubernetes-discovery
9 years ago
Brian Brazil 43449b0581 config: Update tests/examples to use __tmp_
9 years ago
Jimmi Dyson 923f8111d4 Initial Kubernetes discovery
9 years ago
Fabian Reinartz 73f1cc807d Check token and cert file existence in promtool
9 years ago
Fabian Reinartz 7a67472fc1 Resolve relative paths on configuration loading
9 years ago
Jimmi Dyson 52cf6b3e6e Configuration options for bearer tokens, client certs & CA certs
9 years ago
Johannes 'fish' Ziemke 9ab340e95e Add support for A record based DNS SD
9 years ago
Fabian Reinartz 187fe4e3d3 Fix missing defaults for empty global config blocks
9 years ago
Fabian Reinartz 2a53b107c1 Fix missing defaults in empty configurations
9 years ago
Fabian Reinartz 02e06839f2 config: hide authentication credentials in String() output
10 years ago
Brian Brazil 682f949ab1 Add 'hashmod' relabel action.
10 years ago
Fabian Reinartz dc7d27ab9a retrieval: add honor label handling and parametrized querying.
10 years ago
Brian Brazil 0dbae36d36 Allow ingested metrics to be relabeled.
10 years ago
Brian Brazil 58ceae82bc Revert "Allow ingested metrics to be relabeled."
10 years ago
Brian Brazil f2f26ca08f Allow ingested metrics to be relabeled.
10 years ago
Fabian Reinartz 116e6df096 config: raise error on unknown config 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.
10 years ago
Fabian Reinartz b5fe2e9afe Merge pull request #773 from prometheus/fabxc/simple-cfg
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 c44ac7bc26 Load rule files from entire directories
10 years ago
Fabian Reinartz 93548a8882 Add initial file based service discovery.
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 0b619b46d6 Change JobConfig to ScrapeConfig.
10 years ago
Bjoern Rabenstein 5859b74f1b Clean up license issues.
10 years ago
Bjoern Rabenstein b1e4956142 Apply a giant code cleanup.
10 years ago
Julius Volz 78ebc1a61f Ensure that job names are unique in parsed configs.
11 years ago
Julius Volz d9b4f98b44 Integrate DNS-SD support for discovering job targets.
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 39411b516d Add missing config test fixtures.
12 years ago
Julius Volz d137362257 Config tests and config cleanups+fixes.
12 years ago