Commit Graph

132 Commits (89b6b3be9f9fbccf540e7c22b710e5684c0429ac)

Author SHA1 Message Date
Tristan Colgate-McFarlane 4d9134e6d8 Add labeldrop and labelkeep actions. (#2279)
8 years ago
Fabian Reinartz cc35104504 config: fix naming and typo
8 years ago
Fabian Reinartz 3fb4d1191b config: rename AlertingConfig, resolve file paths
8 years ago
Fabian Reinartz 183c5749b9 config: add Alertmanager configuration
8 years ago
Fabian Reinartz 200bbe1bad config: extract SD and HTTPClient configurations
8 years ago
Fabian Reinartz ec66082749 Merge branch 'ec2_sd_profile_support' of https://github.com/Ticketmaster/prometheus into Ticketmaster-ec2_sd_profile_support
8 years ago
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 aabf4a419b use LabelNam.IsValid() instead of LabelNameRE and MatchString instead of Match
8 years ago
Matti Savolainen f867c1fd58 formating and text fixes, adjust regexp
8 years ago
Matti Savolainen 56907ba6e3 Add interpolation to good test config. Fix regex
8 years ago
Matti Savolainen 7a36af1c85 add comment about interpolation
8 years ago
Matti Savolainen 3b8e7c1277 Merge branch 'master' of https://github.com/prometheus/prometheus into bug/target_label_unmarshal
8 years ago
Matti Savolainen 5a1e909b5d Make TargetLabel in RelabelConfig a string
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
Fabian Reinartz 1b6dfa32a9 config: rename role 'endpoint' to 'endpoints'
8 years ago
Fabian Reinartz b24602f713 kubernetes: merge back into single configuration
8 years ago
Fabian Reinartz 2331701b50 kubernetes: Add K8S v2 pod discovery
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.
8 years ago
Tom Wilkie 4520e12440 Add HTTP Basic Auth & TLS support to the generic write path. (#1957)
8 years ago
Tobias Schmidt 874cb44bb6 Merge pull request #1996 from ton31337/Fix/allow_numbers_as_first_letter
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
8 years ago
Fabian Reinartz be596f82b4 Merge pull request #1783 from knyar/json
8 years ago
Frederic Branczyk b655aa002f introduce top level alerting config node
8 years ago
Frederic Branczyk 679d225c8d allow relabeling of alerts
8 years ago
Fabian Reinartz 7a0b3af0b7 config: validate Kubernetes role correctly.
8 years ago
Fabian Reinartz 919558f601 config: remove deprecated `target_groups` configuration
8 years ago
Fabian Reinartz 7221228843 discovery/kubernetes: select between discovery role
9 years ago
Anton Tolchanov 772a3af38f Allow URLs in targets defined via a JSON file
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`
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
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
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