Commit Graph

4021 Commits (bea12d4be1ecd24ecafab2a16f6d9dcc0b0cbc27)
 

Author SHA1 Message Date
beorn7 bea12d4be1 Merge branch 'release-1.7'
7 years ago
Björn Rabenstein 22eadbe635 Merge pull request #3222 from prometheus/beorn7/release
7 years ago
Tobias Schmidt e8ce37ad0d Merge pull request #3223 from alcortesm/dead-code-at-stats
7 years ago
Tobias Schmidt f104a5dfc6 Merge pull request #3224 from alcortesm/config-simplify-returns
7 years ago
Alberto Cortés bb3dad9cba config: simplify some returns
7 years ago
Alberto Cortés 2c9739162e utils/stats: remove dead code
7 years ago
beorn7 f51c97c7d4 Cut v1.7.2
7 years ago
Björn Rabenstein 398fa4fd02 Merge pull request #3205 from prometheus/beorn7/ui
7 years ago
beorn7 c2e9a151ab Make all rule links link to the "Console" tab rather than "Graph"
7 years ago
beorn7 16c95ae8e7 Merge branch 'release-1.7'
7 years ago
beorn7 dd381356a5 Tweak floating point number rendering
7 years ago
beorn7 eaff0dcfc3 Merge branch 'yamatoya-fix_ui_graph_decimal_axis' into release-1.7
7 years ago
beorn7 61b6311504 Merge branch 'fix_ui_graph_decimal_axis' of git://github.com/yamatoya/prometheus into yamatoya-fix_ui_graph_decimal_axis
7 years ago
Takahito Yamatoya b1151bdabc ui changed, limit the number of digits for the larger units is 5
7 years ago
Takahito Yamatoya 1eac566d09 add ; , and change from B to G, and change from K to k, and add all the prefixes
7 years ago
Tom Wilkie fae3bd17b9 Merge pull request #3132 from tomwilkie/fix-debug-handlers
7 years ago
Tom Wilkie bbc9671d50 Get profile handlers working again after #3054 and #3146.
7 years ago
beorn7 e7aab2791a Forward-merge bug fixes frem branch 'release-1.7'
7 years ago
beorn7 f6367afca4 Merge branch 'yamatoya-fix_web_ui_utc' into release-1.7
7 years ago
beorn7 7a8e340c1a Merge branch 'fix_web_ui_utc' of git://github.com/yamatoya/prometheus into yamatoya-fix_web_ui_utc
7 years ago
Takahito Yamatoya 5d707d3aa3 #2439 library version update JQuery / JQuery.Selection / JQuery.hotkey (#3183)
7 years ago
Takahito Yamatoya ff038a4a39 bug fix
7 years ago
Takahito Yamatoya 7a3c348f83 fix decimal y-axis
7 years ago
Takahito Yamatoya 738a51bea6 #2371 fix to display utc date at datetime picker
7 years ago
beorn7 84211bd2df Foward-merge bug fixes and cherry-picks from 'release-1.7'
7 years ago
Matt Palmer 3369422327 Improve DNS response handling to prevent "stuck" records [Fixes #2799] (#3138)
7 years ago
Björn Rabenstein 4b8666b739 Merge pull request #3176 from prometheus/beorn7/release
7 years ago
beorn7 a3fd7dd335 Backport the templating fix from master
7 years ago
Julius Volz 8ebeed0b44 remote: Expose ClientConfig type (#3165)
7 years ago
Björn Rabenstein df4bc3e407 Merge pull request #3170 from tomwilkie/1.7-2969-negative-shards
7 years ago
Tom Wilkie f66f882d08 Merge pull request #3160 from bboreham/remote-keepalive
7 years ago
Tom Wilkie 4f8efdbd59 Prevent number of remote write shards from going negative.
7 years ago
Ben Kochie 1ab0bbb2c2 Merge pull request #3125 from prometheus/bjk/staticcheck
7 years ago
Björn Rabenstein 4d8e7ca185 Merge pull request #3159 from mattbostock/1.7_marathon_sd_cherrypick
7 years ago
Matt Bostock e758260986 Marathon SD: Set port index label
7 years ago
Bryan Boreham 9d6b945e41 Default HTTP keep-alive ON for remote read/write
7 years ago
Bryan Boreham e0a4d18301 Allow http keep-alive setting to be overridden in config
7 years ago
Tobias Schmidt 8bee283f8a Merge pull request #2895 from jamiemoore/ec2_discovery_rolearn
7 years ago
Jamie Moore 7a135e0a1b Add the ability to assume a role for ec2 discovery
7 years ago
Fabian Reinartz 9b4c3d4254 Merge pull request #3146 from prometheus/fixprofpath
7 years ago
Fabian Reinartz 64c7c56df8 Merge pull request #3147 from dvrkps/patch-1
7 years ago
Davor Kapsa bb853abf24 travis: add 1.x to go versions
7 years ago
Fabian Reinartz 27bdddbf51 web: fix profile paths
7 years ago
Fabian Reinartz 6ab652e3dc Merge pull request #3144 from wgliang/master
7 years ago
Fabian Reinartz a0280cc489 Merge pull request #3142 from prometheus/fish/fix-k8s-ingress-type
7 years ago
wangguoliang 7e6c6020ff should use time.Since instead of time.Now().Sub
7 years ago
Johannes 'fish' Ziemke 75aec7d970 k8s: Use versioned struct for ingress discovery
7 years ago
Johannes 'fish' Ziemke 70f3d1e9f9 k8s: Support discovery of ingresses (#3111)
7 years ago
Tobias Schmidt 29fff1eca4 Merge pull request #2966 from alkalinecoffee/consul-node-metadata
7 years ago
Tobias Schmidt d0a02703a2 Merge pull request #3105 from sak0/dev
7 years ago