Commit Graph

460 Commits (09666e2e2a8e017fe6026e838b69e5d5f22d2198)

Author SHA1 Message Date
Brian Brazil 6c07453ec1 Only clone the metric in the one place relabelling needs it. (#2292)
8 years ago
Brian Brazil f421ce0636 Remove label from prometheus_target_skipped_scrapes_total (#2289)
8 years ago
Frederic Branczyk 33b583d50e
web/api: add targets endpoint
8 years ago
Frederic Branczyk 8f8cea4fbd
retrieval: refactor TargetManager to return flat list of Targets
8 years ago
Fabian Reinartz 200bbe1bad config: extract SD and HTTPClient configurations
8 years ago
Fabian Reinartz 47623202c7 retrieval: remove metric namespaces
8 years ago
Fabian Reinartz d7f4f8b879 discovery: move TargetSet into discovery package
8 years ago
Fabian Reinartz d19d1bcad3 discovery: move into top-level package
8 years ago
Fabian Reinartz 7bd9508c9b discovery: move TargetProvider and multi-constructor
8 years ago
Fabian Reinartz bd0048477c discovery: move remaining SDs into own package
8 years ago
Fabian Reinartz 5b72eae1b0 Merge pull request #2203 from prometheus/sdfix
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
Fabian Reinartz 06555bde93 Merge branch 'k8s_sd_metrics' of https://github.com/dominikschulz/prometheus into dominikschulz-k8s_sd_metrics
8 years ago
Fabian Reinartz a1eec447a4 discovery: fix+consolidate Zookeeper discoveries
8 years ago
Fabian Reinartz b4d7ce1370 discovery: respect context cancellation everywhere
8 years ago
Fabian Reinartz bc7bd7202c discovery: terminate senders before closing channel
8 years ago
Frederic Branczyk 0fcea6e9fb retrieval/discovery/kubernetes: fix cache state unknown behavior (#2180)
8 years ago
Fabian Reinartz fa82c65d15 Merge pull request #2186 from prometheus/fixes
8 years ago
Fabian Reinartz 7ecc271411 Move Fatalf call into main test goroutine
8 years ago
Fabian Reinartz 530cdba103 kubernetes: only use one error logging handler
8 years ago
beorn7 92c0ef1a92 Merge branch 'release-1.2' into beorn7/release
8 years ago
Kraig Amador bec6870ed4 ec2_sd_configs: Support profiles for configuring the ec2 service
8 years ago
beorn7 0fdb74c069 Adjust dns.go to new miekg/dns package and improve error handling.
8 years ago
Brian Brazil 64263f280d Add scrape_samples_scraped to indicate samples scraped. (#2123)
8 years ago
Brian Brazil bbec65d454 Call SD metrics refresh rather than scrape. (#2120)
8 years ago
bekbulatov 2bc12fa2fb Set timeout for marathon_sd
8 years ago
bekbulatov c689b35858 Merge branch 'master' into marathon_tls
8 years ago
Dominik Schulz eb10ff9871 Also handle service update in endpoints.go
8 years ago
Dominik Schulz f002fe186a Add Marathon-SD metrics. (#2106)
8 years ago
Mitsuhiro Tanda 296644adeb Expose ec2_instance_type (#2107)
8 years ago
Dominik Schulz 36de163900 Add File-SD metrics (#2103)
8 years ago
Dominik Schulz 3d0fb0cf17 Avoid too generic label type.
8 years ago
Dominik Schulz e1e30f12cd Add Kubernetes-SD metrics.
8 years ago
Dominik Schulz 552ab61fa1 Change SD metric names to make logical grouping more visible. (#2102)
8 years ago
Dominik Schulz 0c69227616 Add Consul-SD metrics (#2097)
8 years ago
Dominik Schulz 255a8c8b4c Fix small typo in EC2 SD metric name (#2100)
8 years ago
Dominik Schulz 00e486a05b Add Azure-SD metrics (#2099)
8 years ago
Dominik Schulz 163d5a8977 Add EC2 SD metrics (#2095)
8 years ago
Fabian Reinartz 3c8140f2e6 kubernetes: fix typo in endpoint switch case
8 years ago
bekbulatov ac702f66eb Resolve merge conflicts
8 years ago
Fabian Reinartz 228bfc1bb5 Merge pull request #2040 from prometheus/kubernetes
8 years ago
Fabian Reinartz ce45040e47 kubernetes: fix missing port labels
8 years ago
Frederic Branczyk 8f576a8510 retrieval: add kubernetes endpoint discovery tests
8 years ago
Frederic Branczyk 08fa4eaa92 retrieval: add kubernetes pod discovery tests
8 years ago
Frederic Branczyk 3762e39ce5 retrieval: add kubernetes service discovery tests
8 years ago
Frederic Branczyk 397072a482 retrieval: add kubernetes node discovery tests
8 years ago
Frederic Branczyk cc46058802 retrieval: kubernetes nodes are not namespaced
8 years ago
Frederic Branczyk a318d9ad27 retrieval: fix pod label and annotation prefixes
8 years ago
Fabian Reinartz b24602f713 kubernetes: merge back into single configuration
8 years ago
Fabian Reinartz a9cfb66b28 kubernetes: add node discovery
8 years ago