Commit Graph

187 Commits (fe73de94525d70ea3a044f82123381e775910e54)

Author SHA1 Message Date
Fuente, Pablo Andres fe73de9452 Renaming config test file to fix build tags
7 years ago
Fuente, Pablo Andres 193dc47230 Fixing code style to adhere gofmt
7 years ago
Fuente, Pablo Andres 902fafb8e7 Fixing tests for Windows
7 years ago
Goutham Veeramachaneni 98d20d5880 Make sure rendering config produces valid config
8 years ago
Fabian Reinartz 9ba61df45a Merge pull request #2789 from mtanda/aws_default_region
8 years ago
Mitsuhiro Tanda 64cef5cd05 handle NewSession() error
8 years ago
Christian Groschupp 8f781e411c Openstack Service Discovery (#2701)
8 years ago
Roman Vynar dbe2eb2afc Hide consul token on UI. (#2797)
8 years ago
Mitsuhiro Tanda a1ddab463e config: set default region for EC2 SD
8 years ago
Tobias Schmidt 287ec6e6cc Fix outdated target_group naming in error message
8 years ago
Julius Volz 240bb671e2 config: Fix overflow checking in global config (#2783)
8 years ago
Conor Broderick 6766123f93 Replace regex with Secret type and remarshal config to hide secrets (#2775)
8 years ago
Brian Akins 27d66628a1 Allow limiting Kubernetes service discover to certain namespaces
8 years ago
Julius Volz eb14678a25 Make remote read/write use config.HTTPClientConfig
8 years ago
Julius Volz 02395a224d [WIP] Remote Read
8 years ago
Julius Volz 525da88c35 Merge pull request #2479 from YKlausz/consul-tls
8 years ago
Goutham Veeramachaneni 5c89cec65c Stricter Relabel Config Checking for Labeldrop/keep (#2510)
8 years ago
yklausz 75880b594f Adding consul capability to connect via tls
8 years ago
Michael Kraus 04eadf6e20 Allow Marathon SD without bearer_token and bearer_token_file
8 years ago
Michael Kraus 47bdcf0f67 Allow the use of bearer_token or bearer_token_file for MarathonSD
8 years ago
Julius Volz e9476b35d5 Re-add multiple remote writers
8 years ago
Alex Somesan b22eb65d0f Cleaner separation between ServiceAccount and custom authentication in K8S SD (#2348)
8 years ago
Fabian Reinartz 7eb849e6a8 Merge pull request #2307 from joyent/triton_discovery
8 years ago
Richard Kiene f3d9692d09 Add Joyent Triton discovery
8 years ago
Björn Rabenstein ad40d0abbc Merge pull request #2288 from prometheus/limit-scrape
8 years ago
Brian Brazil 30448286c7 Add sample_limit to scrape config.
8 years ago
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 ec6524ce74 test the labelTarget regex to make sure it properly validates pre-interpolated label names.
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
Frederic Branczyk 2e18c81a00 config: adapt unit tests
8 years ago
Fabian Reinartz b24602f713 kubernetes: merge back into single configuration
8 years ago