Commit Graph

3393 Commits (2bc12fa2fb1ebf50f3c016b22ffa94deaeed65b9)
 

Author SHA1 Message Date
bekbulatov 2bc12fa2fb Set timeout for marathon_sd 10 years ago
bekbulatov c689b35858 Merge branch 'master' into marathon_tls 10 years ago
Dominik Schulz f002fe186a Add Marathon-SD metrics. (#2106) 10 years ago
Mitsuhiro Tanda 296644adeb Expose ec2_instance_type (#2107) 10 years ago
Dominik Schulz 36de163900 Add File-SD metrics (#2103) 10 years ago
Dominik Schulz 552ab61fa1 Change SD metric names to make logical grouping more visible. (#2102) 10 years ago
Dominik Schulz 0c69227616 Add Consul-SD metrics (#2097) 10 years ago
Fabian Reinartz 5273b55a0c Merge pull request #2090 from brancz/release-1.3 10 years ago
Frederic Branczyk 26a0fa9f98
Cut v1.3.0-beta.0 10 years ago
Dominik Schulz 255a8c8b4c Fix small typo in EC2 SD metric name (#2100) 10 years ago
Dominik Schulz 00e486a05b Add Azure-SD metrics (#2099) 10 years ago
Julius Volz 17691d9141 Merge pull request #2098 from prometheus/add-coc 10 years ago
Julius Volz 9eefce6811 Add CNCF code of conduct as the Prometheus code of conduct 10 years ago
Brian Brazil c4b4a58e3a Correctly handle on() in alerts. (#2096) 10 years ago
Björn Rabenstein 8462fe9fac Merge pull request #2094 from Nomon/bug/target_label_unmarshal 10 years ago
Matti Savolainen aabf4a419b use LabelNam.IsValid() instead of LabelNameRE and MatchString instead of Match 10 years ago
Matti Savolainen ec6524ce74 test the labelTarget regex to make sure it properly validates pre-interpolated label names. 10 years ago
Matti Savolainen f867c1fd58 formating and text fixes, adjust regexp 10 years ago
Dominik Schulz 163d5a8977 Add EC2 SD metrics (#2095) 10 years ago
Matti Savolainen 56907ba6e3 Add interpolation to good test config. Fix regex 10 years ago
Matti Savolainen 7a36af1c85 add comment about interpolation 10 years ago
Matti Savolainen 3b8e7c1277 Merge branch 'master' of https://github.com/prometheus/prometheus into bug/target_label_unmarshal 10 years ago
Matti Savolainen 5a1e909b5d Make TargetLabel in RelabelConfig a string 10 years ago
Björn Rabenstein d93f73874f Merge pull request #2093 from dominikschulz/spelling 10 years ago
Dominik Schulz 182e17958a Trivial spelling corrections and a small comment. 10 years ago
Fabian Reinartz 3c8140f2e6 kubernetes: fix typo in endpoint switch case 10 years ago
bekbulatov ac702f66eb Resolve merge conflicts 10 years ago
Fabian Reinartz 228bfc1bb5 Merge pull request #2040 from prometheus/kubernetes 10 years ago
Björn Rabenstein b10879a450 Merge pull request #2078 from Nomon/master 10 years ago
Fabian Reinartz 1b6dfa32a9 config: rename role 'endpoint' to 'endpoints' 10 years ago
Fabian Reinartz ce45040e47 kubernetes: fix missing port labels 10 years ago
Fabian Reinartz 1df905ea42 vendor: add testing require dependencies 10 years ago
Frederic Branczyk 8f576a8510 retrieval: add kubernetes endpoint discovery tests 10 years ago
Frederic Branczyk 08fa4eaa92 retrieval: add kubernetes pod discovery tests 10 years ago
Frederic Branczyk 3762e39ce5 retrieval: add kubernetes service discovery tests 10 years ago
Frederic Branczyk 397072a482 retrieval: add kubernetes node discovery tests 10 years ago
Frederic Branczyk cc46058802 retrieval: kubernetes nodes are not namespaced 10 years ago
Frederic Branczyk a318d9ad27 retrieval: fix pod label and annotation prefixes 10 years ago
Frederic Branczyk 2e18c81a00 config: adapt unit tests 10 years ago
Fabian Reinartz b24602f713 kubernetes: merge back into single configuration 10 years ago
Fabian Reinartz a9cfb66b28 kubernetes: add node discovery 10 years ago
Fabian Reinartz d896a654f9 kubernetes: Add discovery of services 10 years ago
Fabian Reinartz 6d269ed870 kubernetes: infer pod information in endpoints discovery 10 years ago
Fabian Reinartz 7c439a9060 kubernetes: use and vendor 1.5 client 10 years ago
Fabian Reinartz de22524e57 kubernetes: add KubernetesV2 endpoints 10 years ago
Fabian Reinartz 2331701b50 kubernetes: Add K8S v2 pod discovery 10 years ago
Dominik Schulz bfa7099616 Report GCE instance metdata (#2084) 10 years ago
Or Cohen 50f8e35c54 Add fuzzy search to /graph textarea (#2081) 10 years ago
Fabian Reinartz 630b96c5f3 Merge pull request #2079 from prometheus/fabxc-storage 10 years ago
Fabian Reinartz 8fa18d564a storage: enhance Querier interface usage 10 years ago