Commit Graph

3109 Commits (445fac56e07b29bf31b55f34493273ee1c84f9d6)
 

Author SHA1 Message Date
Fabian Reinartz d0eeae9d0e retrieval: don't sync to uninitialized scrape pool
9 years ago
beorn7 03adbe57e4 discovery/marathon: Fix race conditions in test
9 years ago
Björn Rabenstein 43a36e545b Merge pull request #1732 from prometheus/beorn7/doc
9 years ago
beorn7 44aa7ec46d doc: Update scrape config in example prometheus.yml
9 years ago
Björn Rabenstein 2ea3a837c3 Merge pull request #1731 from prometheus/release-0.19
9 years ago
Björn Rabenstein bc58d3dc50 Merge pull request #1729 from rohit01/release-0.19
9 years ago
rohit01 47dd5f74ba discovery/marathon: #1722 - ignore apps with zero ports
9 years ago
Fabian Reinartz 3dcdd2b5ea Merge pull request #1728 from alileza/file_sd
9 years ago
Ali Reza 98c156c361 reorder config validation, move checkOverflow before any other validation
9 years ago
Brian Brazil a3c4beb6ee Merge pull request #1721 from prometheus/console-time
9 years ago
Brian Brazil 4dbe689632 Do our own date parsing in console template graph controls.
9 years ago
Fabian Reinartz a08943e6d3 Merge pull request #1718 from prometheus/fabxc-template-round
9 years ago
Fabian Reinartz 25135c3691 web: round last scrape timestamp to milliseconds
9 years ago
Fabian Reinartz 76ffdf4cc5 Merge pull request #1716 from prometheus/fabxc-static-configs
9 years ago
Fabian Reinartz 0f21bd31ca config: deprecate `target_groups` for `static_configs`
9 years ago
Fabian Reinartz ad18ac51b8 Merge pull request #1715 from prometheus/fabxc-vendor-fsnotify
9 years ago
Fabian Reinartz 733ed099f5 vendor: update gopkg.in/fsnotify.v1
9 years ago
Brian Brazil 05b918a024 Merge pull request #1713 from mattbostock/document_drop
9 years ago
Matt Bostock 329a00e44f Relabel: Document whole label set is dropped
9 years ago
Brian Brazil 33759dddd2 Merge pull request #1712 from fabric8io/kubernetes-sd-node-ip-labels
9 years ago
Jimmi Dyson 206bcfcdaa
Kubernetes SD: Remove kubeletPort config option
9 years ago
Jimmi Dyson d48297c904
Kubernetes SD: Add labels for all node addresses and discover node port if available
9 years ago
Fabian Reinartz 26b1c89469 Merge pull request #1702 from pdbogen/master
9 years ago
Fabian Reinartz dd57e7ef5c Merge pull request #1699 from prometheus/fabxc-multiam
9 years ago
Fabian Reinartz 35ccca09ea Merge pull request #1704 from prometheus/fabxc-ghtemplate
9 years ago
Fabian Reinartz fa1dc018cb .github: Add issue template
9 years ago
Fabian Reinartz 9baf120cd5 notifier: dispatch to multiple Alertmanagers
9 years ago
Björn Rabenstein 2bcf712e29 Merge pull request #1657 from joshuarubin/master
9 years ago
Björn Rabenstein e084d8e8c1 Merge pull request #1701 from prometheus/beorn7/lock
9 years ago
beorn7 b274c7aaa7 Update doc comments
9 years ago
Patrick Bogen 1e6770cdc5 Initial local pods before using the pod list to initialize pod targets; include more logging in pod target creation
9 years ago
beorn7 99881ded63 Make the number of fingerprint mutexes configurable
9 years ago
Julius Volz 894cf8df2f Merge pull request #1690 from andmarios/master
9 years ago
Julius Volz 2eaccdd111 Merge pull request #1697 from sigma-star/master
9 years ago
David Gstir 2dd80225a4 Fix JS XHR requests in prom_console.js on IE11
9 years ago
Fabian Reinartz 9e952a55c6 Merge pull request #1686 from alileza/master
9 years ago
Ali Reza c81b4e8a87 change config names to files for consistency
9 years ago
Marios Andreopoulos 3f07a6b9d0
Fix consoles and console_libraries path in Dockerfile.
9 years ago
beorn7 e3ec8fa83b Merge branch 'release-0.19'
9 years ago
Fabian Reinartz 23ca13c2fb Merge pull request #1688 from prometheus/beorn7/0.19
9 years ago
beorn7 592f02925e Cut 0.19.2
9 years ago
Björn Rabenstein 3113c0d719 Merge pull request #1685 from prometheus/beorn7/fix-group
9 years ago
beorn7 5408666387 Correctly stringify GROUP_x modifiers without labels
9 years ago
Brian Brazil f55a1d463d Merge pull request #1670 from gregorygtseng/tls-servername-const
9 years ago
Gregory G. Tseng 4ceedffe86 Unexport testing constant
9 years ago
Brian Brazil bd6568ccc9 Merge pull request #1658 from gregorygtseng/tls-servername-override
9 years ago
Gregory G. Tseng 7997c14b0d Add ServerName into TLS Config
9 years ago
Julius Volz 26f3b7bbc6 Merge pull request #1669 from alileza/master
9 years ago
Julius Volz 194a486c60 Merge pull request #1660 from alileza/add_http_errorlog
9 years ago
Ali Reza 5e2b197a00 Update vendoring for github.com/prometheus/common/log
9 years ago