Commit Graph

68 Commits (01093009630ddf1e25a04299c6726e50b63623f4)

Author SHA1 Message Date
Brian Brazil 6b7629be27 Merge pull request #1242 from tommyulfsparre/watcher-fix
9 years ago
Jimmi Dyson c12fb447b8 Kubernetes SD: Use first TCP service port as target port & clean up
9 years ago
Tommy Ulfsparre 83e09422bf skip already watched child nodes.
9 years ago
Fabian Reinartz 29a69eecb8 Do not panic in Consul SD creation
9 years ago
Jimmi Dyson 2cca07381b KubernetesSD: Create targets for services as well as service endpoints
9 years ago
Fabian Reinartz 9cad147265 Merge pull request #1172 from federicobaldo/ec2_sd_improvements
9 years ago
Federico Baldo d14d2429ea Minor improvements to ec2 sd:
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
Jimmi Dyson ea9a173008 Kubernetes SD: Use node name as instance label
9 years ago
Julius Volz d88aea7e6f Fix SD mechanism source prefix handling.
9 years ago
Julius Volz dec9fc9c32 Merge pull request #1148 from prometheus/fix-serverset-multiple-paths
9 years ago
Matt Jibson dcb4856d72 Add SD for Amazon EC2 instances
9 years ago
Julius Volz 60cf4015a4 Fix watching multiple Zookeeper paths in serverset SD.
9 years ago
Fabian Reinartz e3b6ec9784 Switch to common/log
9 years ago
Jimmi Dyson 0d61605526 Kubernetes SD example: separate out cluster level components & services
9 years ago
Fabian Reinartz 1ce89a4a0b Fix nil panic on consul error
9 years ago
Julius Volz af513468eb Fix some dead code, missing error checks, shadowings.
9 years ago
Jimmi Dyson 7ef9399920 Clean up kubernetes http response bodies
9 years ago
Jimmi Dyson a1574aa2b3 Move TLS options to scrape config
9 years ago
Jimmi Dyson d7a7fd4589 Kubernetes SD improvements
9 years ago
Fabian Reinartz 542da6774e Fix draining of file watcher events
9 years ago
Daniel Lundin 4abf54b747 serverset: extract shard number from serverset data
9 years ago
Julius Volz 29eaa8c7cf Merge pull request #1030 from prometheus/fix-flakey-filesd
9 years ago
Julius Volz 3fd5826589 Fix flakey FileSD test.
9 years ago
Julius Volz 744d5d5a7a Merge pull request #1029 from prometheus/vet-fixes
9 years ago
Julius Volz 995d3b831d Fix most golint warnings.
9 years ago
Julius Volz 963ad82dcb Fix "go vet" errors.
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
Sharif Nassar 6cb519fe82 Add Consul ServiceID to the discovery meta labels.
9 years ago
Fabian Reinartz 0f5022c091 Add missing Kubernetes doc strings
9 years ago
Julius Volz b4adf2723d Merge pull request #994 from robbiet480/consul-datacenter-name
9 years ago
Robbie Trencheny 48e461f7db Pass through current agent Consul datacenter name
9 years ago
Fabian Reinartz d0a90964c1 Fix license header
9 years ago
Fabian Reinartz eabbdc6603 Add missing license headers
9 years ago
Julius Volz 47a96bff1a Update constant names in comments.
9 years ago
Fabian Reinartz 3c6dd161d7 Scrape all services on empty services list.
9 years ago
Fabian Reinartz 9b9ff66212 Merge pull request #977 from prometheus/fabxc/target-dedup
9 years ago
Fabian Reinartz 8fa9ec278b Add application labels as meta labels
9 years ago
Fabian Reinartz f269943950 Adjust Kubernetes SD to pipeline changes
9 years ago
Fabian Reinartz 4e84b86510 Improve target discovery pipeline
9 years ago
Fabian Reinartz f7e3722388 Rename __meta_dns_srv_name to __meta_dns_name
9 years ago
Jimmi Dyson 923f8111d4 Initial Kubernetes discovery
9 years ago
Fabian Reinartz 0138d37458 Improve unique target group sources.
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
Florian Pfitzer 1fa0b0f253 fix consul port label
9 years ago
Johannes 'fish' Ziemke 6e7d743cd4 Merge pull request #946 from prometheus/add-sd-dns-a
9 years ago
Johannes 'fish' Ziemke 9ab340e95e Add support for A record based DNS SD
9 years ago