Commit Graph

434 Commits (6fc9cf3a9630b54c07fa372eec47d32a8e013c8c)

Author SHA1 Message Date
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 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 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
Fabian Reinartz d896a654f9 kubernetes: Add discovery of services
8 years ago
Fabian Reinartz 6d269ed870 kubernetes: infer pod information in endpoints discovery
8 years ago
Fabian Reinartz 7c439a9060 kubernetes: use and vendor 1.5 client
8 years ago
Fabian Reinartz de22524e57 kubernetes: add KubernetesV2 endpoints
8 years ago
Fabian Reinartz 2331701b50 kubernetes: Add K8S v2 pod discovery
8 years ago
Dominik Schulz bfa7099616 Report GCE instance metdata (#2084)
8 years ago
Dominik Schulz c73aa82589 Add GCE Instance Status
8 years ago
bekbulatov 01b53c1180 Add tls support
8 years ago
Roman Vynar db63a4bd2a
Do not fail Consul discovery on Prometheus startup when Consul is down.
8 years ago
Dominik Schulz f6fbcf9aa2 Expose ec2_instance_state
8 years ago
Tom Wilkie 4520e12440 Add HTTP Basic Auth & TLS support to the generic write path. (#1957)
8 years ago
Matt Bostock 4fc619b605 Scrape: Remove JSON from Accept request header
8 years ago
Ingo Gottwald 3b546d061f Add support for GCE discovery
8 years ago
Tobias Schmidt 29ced0090f Fix common english misspellings
8 years ago
Tobias Schmidt 27074863b4 Print url.URLs correctly in tests
8 years ago
Tobias Schmidt 8f3b62bfe4 Simplify struct initialization
8 years ago
Dan Milstein 0cb6b9962e Fix broken test which relied on DNS resolution #1962
8 years ago
Fabian Reinartz fec3b54cfc Merge pull request #1946 from prometheus/ipv6
8 years ago
Fabian Reinartz a15237a0b8 retrieval: correctly handle IPv6 addresses
8 years ago
Fabian Reinartz 17cdd4f966 retrieval: fix IPv6 port default, add tests
8 years ago
Fabian Reinartz 0322c59dc3 retrieval: export NewHTTPClient
8 years ago
Dan Milstein b9fb9742ed Move test helper function into scope of test func
8 years ago
Dan Milstein 79216011cb Add basic test for TargetManager.targetSet
8 years ago
Björn Rabenstein 4b8f963847 Merge pull request #1915 from prometheus/release-1.0
8 years ago
beorn7 e2b3626e0c retrieval: Clean up target group map on config reload
8 years ago
Anders Daljord Morken 95cadd0702 Run scrape loop with interval 1 instead of 0
8 years ago