Commit Graph

3846 Commits (f160f17a6f13583c45b693550e3f8066cbaf330e)
 

Author SHA1 Message Date
Fabian Reinartz 9ecea36ef9 Merge pull request #2259 from prometheus/federationerr
8 years ago
Fabian Reinartz cef2e04aa3 web: add error counter for federation responses
8 years ago
Fabian Reinartz 0ea0a19848 Merge pull request #2240 from agaoglu/read-timeout
8 years ago
Fabian Reinartz 9d68e81b32 web: don't return federation errors over HTTP
8 years ago
Erdem Agaoglu 054f8ebbfb Increase default max-connections
8 years ago
Erdem Agaoglu 2260079c12 Vendor x/net/netutil
8 years ago
Erdem Agaoglu e487477a17 LimitListener to limit max number of connections
8 years ago
Fabian Reinartz 893390e0c6 Merge pull request #2248 from msiebuhr/cwd-in-status
8 years ago
Morten Siebuhr c5b17263a6 web: Display current working directory on status-page
8 years ago
Björn Rabenstein a932c1a4b6 Merge pull request #1794 from cmluciano/cml/persistenceerror
8 years ago
Christopher M. Luciano 148b006e25 Clarify error message when Prometheus data dir finds unexpected files
8 years ago
Fabian Reinartz 0459dcd2e2 Merge pull request #2234 from brancz/targets-api
8 years ago
Frederic Branczyk 33b583d50e
web/api: add targets endpoint
8 years ago
Frederic Branczyk 8f8cea4fbd
retrieval: refactor TargetManager to return flat list of Targets
8 years ago
Erdem Agaoglu 9986b28380 Set read-timeout for http.Server
8 years ago
Fabian Reinartz 63fe65bf2f Merge pull request #2235 from prometheus/beorn7/doc
8 years ago
beorn7 5770d9e545 Kubernetes SD: More fixes to example config
8 years ago
Fabian Reinartz 2a89e8733f Merge pull request #2230 from prometheus/cut-1.4.1
8 years ago
Fabian Reinartz 6be1e98278 *: cut 1.4.1
8 years ago
Fabian Reinartz d95e61d418 Merge pull request #2223 from prometheus/consulfix
8 years ago
Fabian Reinartz 35da23fd82 consul: start service watch as goroutine
8 years ago
Fabian Reinartz 56f57a826f Merge pull request #2219 from prometheus/builderimg
8 years ago
Fabian Reinartz 340de6c31c circle: update golang-builder image version
8 years ago
Fabian Reinartz ecad074e46 Merge pull request #2218 from prometheus/cut-1.4.0
8 years ago
Fabian Reinartz 80455950ee *: cut 1.4.0
8 years ago
Fabian Reinartz b97f19a85e travis: update used Go compiler version
8 years ago
Fabian Reinartz 9b7f5c7f29 Merge pull request #2217 from prometheus/alertingsd
8 years ago
Fabian Reinartz 2ad56aabd4 notifier: extract alertmanager into interface
8 years ago
Fabian Reinartz cc35104504 config: fix naming and typo
8 years ago
Fabian Reinartz fd51ab46e5 Merge pull request #2215 from prometheus/alertingsd2
8 years ago
Fabian Reinartz b1f28b48a3 Fix typo
8 years ago
Fabian Reinartz 3fb4d1191b config: rename AlertingConfig, resolve file paths
8 years ago
Fabian Reinartz d4deb8bbf2 web: show discovered Alertmanagers in UI
8 years ago
Fabian Reinartz f210d96497 notifier: use dynamic service discovery
8 years ago
Fabian Reinartz 183c5749b9 config: add Alertmanager configuration
8 years ago
Fabian Reinartz 200bbe1bad config: extract SD and HTTPClient configurations
8 years ago
Fabian Reinartz dd1a656cc4 Merge pull request #2212 from prometheus/alertingsd
8 years ago
Fabian Reinartz 47623202c7 retrieval: remove metric namespaces
8 years ago
Fabian Reinartz d7f4f8b879 discovery: move TargetSet into discovery package
8 years ago
Tobias Schmidt 8b11646276 Merge pull request #2164 from tcolgate/master
8 years ago
Fabian Reinartz c34f55d7c0 Merge pull request #2213 from prometheus/alertannotations
8 years ago
Fabian Reinartz e68a3cf21f rules: update annotations on each iteration
8 years ago
Fabian Reinartz d19d1bcad3 discovery: move into top-level package
8 years ago
Fabian Reinartz 7bd9508c9b discovery: move TargetProvider and multi-constructor
8 years ago
Fabian Reinartz bd0048477c discovery: move remaining SDs into own package
8 years ago
Fabian Reinartz 5b72eae1b0 Merge pull request #2203 from prometheus/sdfix
8 years ago
Tristan Colgate ab60bc3929 Fix export of grouping modifier
8 years ago
Fabian Reinartz ec66082749 Merge branch 'ec2_sd_profile_support' of https://github.com/Ticketmaster/prometheus into Ticketmaster-ec2_sd_profile_support
8 years ago
Fabian Reinartz 06555bde93 Merge branch 'k8s_sd_metrics' of https://github.com/dominikschulz/prometheus into dominikschulz-k8s_sd_metrics
8 years ago
gambrose 52c762e9f1 The defaults stated in the example config where wrong (#2110)
8 years ago