Commit Graph

116 Commits (807428118049c188458027e9b3ed3c44c07a1570)

Author SHA1 Message Date
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
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
Fabian Reinartz f2a8261cdb Merge pull request #1177 from fabric8io/kubernetes-discovery
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.
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
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
Julius Volz 995d3b831d Fix most golint warnings.
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 3c6dd161d7 Scrape all services on empty services list.
9 years ago
Fabian Reinartz b964da4b75 Merge pull request #905 from fabric8io/kubernetes-discovery
9 years ago
Fabian Reinartz 24e91720ad Merge pull request #980 from prometheus/map-labels
9 years ago
Brian Brazil 4e70a0a14e Retrieval: Add relabel action to map label names with a regex.
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 cdcfada2ac Merge pull request #965 from prometheus/fabxc/relpath
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
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
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 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
10 years ago
Brian Brazil 682f949ab1 Add 'hashmod' relabel action.
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