Commit Graph

58 Commits (dcb8ba4c68e90ae6e825effbc8076aefb91d29af)

Author SHA1 Message Date
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
beorn7 645f6772e5 Add Consul Address, ServicePort, and ServiceAddress to the meta labels.
9 years ago
Julius Volz 9d98910fca Revert "Use Consul ServiceAddress instead of Address when set"
9 years ago
Brian Brazil 3d268d681e retrieval: Handle serverset node not existing.
10 years ago
Fabian Reinartz 23862c92c4 retrieval/discovery: refresh services in Consul to recover from missing events.
10 years ago
Fabian Reinartz 459d18cf18 Merge pull request #812 from Marmelatze/consul_services
10 years ago
Florian Pfitzer 0ac7e7217e Use Consul ServiceAddress instead of Address when set
10 years ago
Brian Brazil 4d895242f9 Add support for Zookeeper Serversets for SD.
10 years ago
Fabian Reinartz 8214b4ee78 retrieval/discovery: surround __meta_consul_tags value with tag seperators.
10 years ago
Fabian Reinartz e9b344abee Fix discarding of labels in file target groups
10 years ago
Fabian Reinartz efb39cfd4e Fix file SD test
10 years ago