mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-14 17:44:06 -08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity
4529 commits 248 branches 440 tags 657 MiB
Commit graph

4529 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matti Savolainen ec6524ce74 test the labelTarget regex to make sure it properly validates pre-interpolated label names. 2016-10-19 13:32:42 +03:00
Matti Savolainen f867c1fd58 formating and text fixes, adjust regexp 2016-10-19 13:31:55 +03:00
Dominik Schulz 163d5a8977 Add EC2 SD metrics (#2095) 
* Add EC2 SD metrics

* Address review comments
 2016-10-19 10:20:00 +01:00
Matti Savolainen 56907ba6e3 Add interpolation to good test config. Fix regex 2016-10-19 01:19:19 +03:00
Matti Savolainen 7a36af1c85 add comment about interpolation 2016-10-19 00:42:49 +03:00
Matti Savolainen 3b8e7c1277 Merge branch 'master' of https://github.com/prometheus/prometheus into bug/target_label_unmarshal 2016-10-19 00:33:52 +03:00
Matti Savolainen 5a1e909b5d Make TargetLabel in RelabelConfig a string 2016-10-19 00:33:22 +03:00
Björn Rabenstein d93f73874f Merge pull request #2093 from dominikschulz/spelling 
Trivial spelling corrections
 2016-10-18 22:46:03 +02:00
Dominik Schulz 182e17958a Trivial spelling corrections and a small comment. 2016-10-18 20:14:38 +02:00
Victor Palma 721ed3fb41 run as prometheus user insted of root 2016-10-18 10:49:20 -05:00
Fabian Reinartz 3c8140f2e6 kubernetes: fix typo in endpoint switch case 2016-10-18 16:20:26 +02:00
bekbulatov ac702f66eb Resolve merge conflicts 2016-10-18 14:14:24 +01:00
Fabian Reinartz 228bfc1bb5 Merge pull request #2040 from prometheus/kubernetes 
Add K8S v2 pod discovery
 2016-10-17 20:09:22 +02:00
Björn Rabenstein b10879a450 Merge pull request #2078 from Nomon/master 
Add support for interpolating target_label
 2016-10-17 14:52:30 +02:00
Fabian Reinartz 1b6dfa32a9 config: rename role 'endpoint' to 'endpoints' 2016-10-17 11:53:49 +02:00
Fabian Reinartz ce45040e47 kubernetes: fix missing port labels 
This commit fixes endpoint port labeling, adjusts tests accordingly
and enhances test delta printing
 2016-10-17 11:05:13 +02:00
Fabian Reinartz 1df905ea42 vendor: add testing require dependencies 2016-10-17 11:04:52 +02:00
Frederic Branczyk 8f576a8510 retrieval: add kubernetes endpoint discovery tests 2016-10-17 10:32:10 +02:00
Frederic Branczyk 08fa4eaa92 retrieval: add kubernetes pod discovery tests 2016-10-17 10:32:10 +02:00
Frederic Branczyk 3762e39ce5 retrieval: add kubernetes service discovery tests 2016-10-17 10:32:10 +02:00
Frederic Branczyk 397072a482 retrieval: add kubernetes node discovery tests 2016-10-17 10:32:10 +02:00
Frederic Branczyk cc46058802 retrieval: kubernetes nodes are not namespaced 2016-10-17 10:32:10 +02:00
Frederic Branczyk a318d9ad27 retrieval: fix pod label and annotation prefixes 2016-10-17 10:32:10 +02:00
Frederic Branczyk 2e18c81a00 config: adapt unit tests 2016-10-17 10:32:10 +02:00
Fabian Reinartz b24602f713 kubernetes: merge back into single configuration 2016-10-17 10:32:10 +02:00
Fabian Reinartz a9cfb66b28 kubernetes: add node discovery 2016-10-17 10:32:10 +02:00
Fabian Reinartz d896a654f9 kubernetes: Add discovery of services 2016-10-17 10:32:10 +02:00
Fabian Reinartz 6d269ed870 kubernetes: infer pod information in endpoints discovery 2016-10-17 10:32:10 +02:00
Fabian Reinartz 7c439a9060 kubernetes: use and vendor 1.5 client 2016-10-17 10:32:10 +02:00
Fabian Reinartz de22524e57 kubernetes: add KubernetesV2 endpoints 2016-10-17 10:32:10 +02:00
Fabian Reinartz 2331701b50 kubernetes: Add K8S v2 pod discovery 
This adds plumbing for a parallel version of the new K8S SD
and adds pod discovery as the first role.
 2016-10-17 10:32:10 +02:00
Dominik Schulz bfa7099616 Report GCE instance metdata (#2084) 
* Report GCE instance metdata

* Fix spelling acording to code review guidelines

* Address review comments
 2016-10-17 09:45:43 +02:00
Or Cohen 50f8e35c54 Add fuzzy search to /graph textarea (#2081) 
* Add fuzzy search to /graph textarea

We have a few thousands different metrics and looking up some of them
can be quite annoying with the simple string matching.

This patch adds a fuzzy search to the textarea lookup box on the /graph
page. It uses a small neat library from github.com/mattyork/fuzzy.

* Add fuzzy lib to NOTICE and re-build assets

Previously built assets changed the mode.
 2016-10-17 09:37:11 +02:00
Fabian Reinartz 630b96c5f3 Merge pull request #2079 from prometheus/fabxc-storage 
storage: enhance Querier interface usage
 2016-10-16 10:48:51 +02:00
Fabian Reinartz 8fa18d564a storage: enhance Querier interface usage 
This extracts Querier as an instantiateable and closeable object
rather than just defining extending methods of the storage interface.
This improves composability and allows abstracting query transactions,
which can be useful for transaction-level caches, consistent data views,
and encapsulating teardown.
 2016-10-16 10:39:29 +02:00
Fabian Reinartz 5238a6845e Merge pull request #2080 from sman591/ui-aborted-requests 
ui: don’t consider aborted requests complete
 2016-10-13 08:25:32 +02:00
Stuart Olivera b76d59e68b ui: don’t consider aborted requests complete 
If an existing request is aborted due to a new request, ignore the completion of the initial request.

Example:
1. Chrome dev tools: enable 5 second network latency
2. Execute query
3. A second later, execute the query again
4. Currently, the spinner will hide, and the stats will immediately display, as if the request had completed. Instead, the spinner and stats should wait until the 2nd execution finishes.
 2016-10-12 17:20:44 -07:00
Matthias Rampke 4f96d28e60 Always show instance label on target page. (#2062) 2016-10-12 12:45:47 +02:00
Matti Savolainen bdaf0ec6a2 simplify regex 2016-10-11 22:00:14 +03:00
Matti Savolainen 23be3dab53 test label name validation 2016-10-11 21:54:33 +03:00
Matti Savolainen 8f77d271b1 validate the label name 2016-10-11 21:48:03 +03:00
Matti Savolainen 56e8e7cac3 Allow target_label to be expanded in replace label 2016-10-11 21:01:22 +03:00
Björn Rabenstein ec203a23e2 Merge pull request #2077 from prometheus/beorn7/build 
promu: Use default Go version again
 2016-10-11 16:32:06 +02:00
Björn Rabenstein 274d008fbf Merge pull request #2074 from prometheus/beorn7/build 
promu: Use default Go version again
 2016-10-11 16:29:55 +02:00
beorn7 f3837864f6 promu: Use default Go version again 
The default is Go1.7.1 now.
 2016-10-11 11:42:05 +02:00
beorn7 492eac96d5 Merge branch 'release-1.2' 2016-10-10 17:59:58 +02:00
beorn7 dd66f2e94b Fix go version spec in .promu.yml 2016-10-10 17:53:50 +02:00
beorn7 b66ce9c5cd Merge branch 'release-1.2' 2016-10-10 17:10:14 +02:00
Björn Rabenstein dc52a852dd Merge pull request #2072 from prometheus/beorn7/release 
Cut v1.2.1
 2016-10-10 17:04:28 +02:00
beorn7 ddcd92b76c Cut v1.2.1 2016-10-10 17:03:51 +02:00