Commit Graph

3373 Commits (f867c1fd58c6ef0d8061d71089193de7b9598c9f)
 

Author SHA1 Message Date
Matti Savolainen f867c1fd58 formating and text fixes, adjust regexp
8 years ago
Matti Savolainen 56907ba6e3 Add interpolation to good test config. Fix regex
8 years ago
Matti Savolainen 7a36af1c85 add comment about interpolation
8 years ago
Matti Savolainen 3b8e7c1277 Merge branch 'master' of https://github.com/prometheus/prometheus into bug/target_label_unmarshal
8 years ago
Matti Savolainen 5a1e909b5d Make TargetLabel in RelabelConfig a string
8 years ago
Björn Rabenstein d93f73874f Merge pull request #2093 from dominikschulz/spelling
8 years ago
Dominik Schulz 182e17958a Trivial spelling corrections and a small comment.
8 years ago
Fabian Reinartz 3c8140f2e6 kubernetes: fix typo in endpoint switch case
8 years ago
Fabian Reinartz 228bfc1bb5 Merge pull request #2040 from prometheus/kubernetes
8 years ago
Björn Rabenstein b10879a450 Merge pull request #2078 from Nomon/master
8 years ago
Fabian Reinartz 1b6dfa32a9 config: rename role 'endpoint' to 'endpoints'
8 years ago
Fabian Reinartz ce45040e47 kubernetes: fix missing port labels
8 years ago
Fabian Reinartz 1df905ea42 vendor: add testing require dependencies
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
Frederic Branczyk 2e18c81a00 config: adapt unit tests
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
Or Cohen 50f8e35c54 Add fuzzy search to /graph textarea (#2081)
8 years ago
Fabian Reinartz 630b96c5f3 Merge pull request #2079 from prometheus/fabxc-storage
8 years ago
Fabian Reinartz 8fa18d564a storage: enhance Querier interface usage
8 years ago
Fabian Reinartz 5238a6845e Merge pull request #2080 from sman591/ui-aborted-requests
8 years ago
Stuart Olivera b76d59e68b ui: don’t consider aborted requests complete
8 years ago
Matthias Rampke 4f96d28e60 Always show instance label on target page. (#2062)
8 years ago
Matti Savolainen bdaf0ec6a2 simplify regex
8 years ago
Matti Savolainen 23be3dab53 test label name validation
8 years ago
Matti Savolainen 8f77d271b1 validate the label name
8 years ago
Matti Savolainen 56e8e7cac3 Allow target_label to be expanded in replace label
8 years ago
Björn Rabenstein 274d008fbf Merge pull request #2074 from prometheus/beorn7/build
8 years ago
beorn7 f3837864f6 promu: Use default Go version again
8 years ago
beorn7 492eac96d5 Merge branch 'release-1.2'
8 years ago
beorn7 dd66f2e94b Fix go version spec in .promu.yml
8 years ago
beorn7 b66ce9c5cd Merge branch 'release-1.2'
8 years ago
Björn Rabenstein dc52a852dd Merge pull request #2072 from prometheus/beorn7/release
8 years ago
beorn7 ddcd92b76c Cut v1.2.1
8 years ago
beorn7 dc0ad8ee34 Use Go1.7.1 with Promu
8 years ago
beorn7 3f02e33e34 Re-add counting of evict chunk ops and decrementing NumMemChunks
8 years ago
Julius Volz ab870ac653 Clean up some doc comments
8 years ago
Björn Rabenstein 5ec9869463 Merge pull request #2071 from prometheus/beorn7/storage
8 years ago
beorn7 719508752b Re-add counting of evict chunk ops and decrementing NumMemChunks
8 years ago