Commit Graph

4819 Commits (07299cec17e69e6e967dc1d858e05af1adb09621)
 

Author SHA1 Message Date
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
Tom Wilkie 758d64ffd9 s/EncodReadResponse/EncodeReadResponse/
7 years ago
Tom Wilkie febed48703 Implement remote read server in Prometheus.
7 years ago
Takahito Yamatoya 738a51bea6 #2371 fix to display utc date at datetime picker
7 years ago
Goutham Veeramachaneni 3f0267c548 Merge branch 'dev-2.0' into go-kit/log
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
Goutham Veeramachaneni f5aed810f9 logging: Port to common/promlog
7 years ago
Björn Rabenstein 4b8666b739 Merge pull request #3176 from prometheus/beorn7/release
7 years ago
beorn7 7622c2bc5f Move to Go1.9
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
Fabian Reinartz 1b80f631a8 Merge pull request #3172 from prometheus/cutbeta4
7 years ago
Fabian Reinartz a31e6522e4 *: cut 2.0.0-beta.4
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
Fabian Reinartz 1121b9f7d4 retrieval: cache dropped series, mutate labels in place
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
Fabian Reinartz 13f59329ab Merge pull request #3162 from prometheus/cutbeta3
7 years ago
Fabian Reinartz 7f300f27cb *: cut 2.0.0-beta.3
7 years ago
Fabian Reinartz 2b2e214857 vendor: update prometheus/tsdb
7 years ago
Fabian Reinartz 63c246f924 Merge branch 'dev-2.0' of github.com:prometheus/prometheus into dev-2.0
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
Fabian Reinartz e746282772 Merge branch 'master' into dev-2.0
7 years ago
Fabian Reinartz e6d819952b Merge pull request #3145 from prometheus/mempool
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 d21f149745 *: migrate to go-kit/log
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 5bed8af4cb retrieval: pool scrape buffers
7 years ago
Fabian Reinartz d6f6ad67b3 pkg/pool: create bucketed memory pool package.
7 years ago
Fabian Reinartz a8887f46dc Merge branch 'dev-2.0' of github.com:prometheus/prometheus into dev-2.0
7 years ago
Fabian Reinartz 0efecea6d4 Adapt storage APIs to uint64 references
7 years ago
Fabian Reinartz a007eb2e1e vendor: update prometheus/tsdb to single head mode
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
Krasi Georgiev 153cb0cbe3 scraping errors will show in the log when debug mode is enabled (#3135)
7 years ago