mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-28 06:59:40 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
3547 commits 243 branches 444 tags 649 MiB
Commit graph

3547 commits

This branch
This branch
All branches
Author SHA1 Message Date
tattsun e714079cf2 storage: fix error message (#2270) 
* storage: add error message
 2016-12-09 22:36:27 +00:00
Fabian Reinartz 9ecea36ef9 Merge pull request #2259 from prometheus/federationerr 
web: don't return federation errors over HTTP
 2016-12-06 16:18:03 +01:00
Fabian Reinartz cef2e04aa3 web: add error counter for federation responses 2016-12-06 16:09:50 +01:00
Fabian Reinartz 0ea0a19848 Merge pull request #2240 from agaoglu/read-timeout 
Set read-timeout for http.Server
 2016-12-06 16:01:45 +01:00
Fabian Reinartz 9d68e81b32 web: don't return federation errors over HTTP 
We are writing federation responses streaming. So after
the first byte we wrote, the status header is fixed. We cannot
return an HTTP error for intermediate error but should just abort
and log instead.
 2016-12-06 15:52:50 +01:00
Erdem Agaoglu 054f8ebbfb Increase default max-connections 2016-12-06 17:45:19 +03:00
Erdem Agaoglu 2260079c12 Vendor x/net/netutil 2016-12-06 12:52:29 +03:00
Erdem Agaoglu e487477a17 LimitListener to limit max number of connections 
This also drops tcp keep-alive in ListenAndServe but it's no longer
necessary since we now close idle connections long before that.
 2016-12-06 12:45:59 +03:00
Fabian Reinartz 893390e0c6 Merge pull request #2248 from msiebuhr/cwd-in-status 
web: Display current working directory on status-page
 2016-12-05 21:41:37 +01:00
Morten Siebuhr c5b17263a6 web: Display current working directory on status-page 2016-12-05 19:46:41 +01:00
Björn Rabenstein a932c1a4b6 Merge pull request #1794 from cmluciano/cml/persistenceerror 
Clarify error message when Prometheus data dir finds unexpected files
 2016-12-05 18:40:51 +01:00
Christopher M. Luciano 148b006e25 Clarify error message when Prometheus data dir finds unexpected files 2016-12-05 10:51:57 -05:00
Fabian Reinartz 0459dcd2e2 Merge pull request #2234 from brancz/targets-api 
web/api: add targets endpoint
 2016-12-05 14:14:04 +01:00
Frederic Branczyk 33b583d50e
web/api: add targets endpoint 2016-12-05 13:13:21 +01:00
Frederic Branczyk 8f8cea4fbd
retrieval: refactor TargetManager to return flat list of Targets 2016-12-02 13:28:58 +01:00
Erdem Agaoglu 9986b28380 Set read-timeout for http.Server 
This also specifies a timeout for idle client connections, which may
cause "too many open files" errors.
See #2238
 2016-12-01 16:29:45 +03:00
Fabian Reinartz 63fe65bf2f Merge pull request #2235 from prometheus/beorn7/doc 
Kubernetes SD: More fixes to example config
 2016-11-30 09:55:09 +01:00
beorn7 5770d9e545 Kubernetes SD: More fixes to example config 
- Avoid mentioning the `in_cluster` option. (It doesn't exist anymore.)
- Replace `__meta_kubernetes_service_namespace` and
  `__meta_kubernetes_pod_namespace` (which don't exist anymore) by
  `__meta_kubernetes_namespace`.
 2016-11-29 18:42:35 +01:00
Fabian Reinartz 2a89e8733f Merge pull request #2230 from prometheus/cut-1.4.1 
*: cut 1.4.1
 2016-11-28 09:33:26 +01:00
Fabian Reinartz 6be1e98278 *: cut 1.4.1 2016-11-28 09:29:23 +01:00
Fabian Reinartz d95e61d418 Merge pull request #2223 from prometheus/consulfix 
consul: start service watch as goroutine
 2016-11-28 08:00:41 +01:00
Fabian Reinartz 35da23fd82 consul: start service watch as goroutine 2016-11-27 11:01:16 +01:00
Fabian Reinartz 56f57a826f Merge pull request #2219 from prometheus/builderimg 
circle: update golang-builder image version
 2016-11-25 16:05:53 +01:00
Fabian Reinartz 340de6c31c circle: update golang-builder image version 2016-11-25 14:29:07 +01:00
Fabian Reinartz ecad074e46 Merge pull request #2218 from prometheus/cut-1.4.0 
*: cut 1.4.0
 2016-11-25 13:35:04 +01:00
Fabian Reinartz 80455950ee *: cut 1.4.0 2016-11-25 13:28:29 +01:00
Fabian Reinartz b97f19a85e travis: update used Go compiler version 2016-11-25 13:28:19 +01:00
Fabian Reinartz 9b7f5c7f29 Merge pull request #2217 from prometheus/alertingsd 
Extract alertmanager into interface
 2016-11-25 11:28:38 +01:00
Fabian Reinartz 2ad56aabd4 notifier: extract alertmanager into interface 2016-11-25 11:19:43 +01:00
Fabian Reinartz cc35104504 config: fix naming and typo 2016-11-25 11:04:33 +01:00
Fabian Reinartz fd51ab46e5 Merge pull request #2215 from prometheus/alertingsd2 
Discover Alertmanagers dynamically
 2016-11-25 10:38:00 +01:00
Fabian Reinartz b1f28b48a3 Fix typo 2016-11-25 08:47:04 +01:00
Fabian Reinartz 3fb4d1191b config: rename AlertingConfig, resolve file paths 2016-11-24 15:19:37 +01:00
Fabian Reinartz d4deb8bbf2 web: show discovered Alertmanagers in UI 2016-11-24 15:06:50 +01:00
Fabian Reinartz f210d96497 notifier: use dynamic service discovery 2016-11-23 18:23:37 +01:00
Fabian Reinartz 183c5749b9 config: add Alertmanager configuration 2016-11-23 18:23:37 +01:00
Fabian Reinartz 200bbe1bad config: extract SD and HTTPClient configurations 2016-11-23 18:23:37 +01:00
Fabian Reinartz dd1a656cc4 Merge pull request #2212 from prometheus/alertingsd 
Extract discovery package
 2016-11-23 17:46:48 +01:00
Fabian Reinartz 47623202c7 retrieval: remove metric namespaces 2016-11-23 09:17:04 +01:00
Fabian Reinartz d7f4f8b879 discovery: move TargetSet into discovery package 2016-11-23 09:14:44 +01:00
Tobias Schmidt 8b11646276 Merge pull request #2164 from tcolgate/master 
Fix export of grouping modifier
 2016-11-22 22:59:25 -06:00
Fabian Reinartz c34f55d7c0 Merge pull request #2213 from prometheus/alertannotations 
rules: update annotations on each iteration
 2016-11-22 15:55:18 +01:00
Fabian Reinartz e68a3cf21f rules: update annotations on each iteration 2016-11-22 15:43:07 +01:00
Fabian Reinartz d19d1bcad3 discovery: move into top-level package 2016-11-22 12:56:33 +01:00
Fabian Reinartz 7bd9508c9b discovery: move TargetProvider and multi-constructor 2016-11-22 12:56:33 +01:00
Fabian Reinartz bd0048477c discovery: move remaining SDs into own package 2016-11-22 12:56:33 +01:00
Fabian Reinartz 5b72eae1b0 Merge pull request #2203 from prometheus/sdfix 
Service discovery fixes
 2016-11-21 16:46:20 +01:00
Tristan Colgate ab60bc3929 Fix export of grouping modifier 2016-11-21 14:42:45 +00:00
Fabian Reinartz ec66082749 Merge branch 'ec2_sd_profile_support' of https://github.com/Ticketmaster/prometheus into Ticketmaster-ec2_sd_profile_support 2016-11-21 11:49:23 +01:00
Fabian Reinartz 06555bde93 Merge branch 'k8s_sd_metrics' of https://github.com/dominikschulz/prometheus into dominikschulz-k8s_sd_metrics 2016-11-21 11:44:48 +01:00