Commit Graph

4314 Commits (35aaa2002d24d13c4ff797cd97691904aaedb9c8)
 

Author SHA1 Message Date
Goutham Veeramachaneni 35aaa2002d
web/api: Add tests for v2 admin API
7 years ago
Goutham Veeramachaneni d70f850a18
web/api: Fix typo which broke the 2.0 admin APIs.
7 years ago
Fabian Reinartz c4270fdbf4 Merge pull request #3229 from krasi-georgiev/update-go-stack
7 years ago
Krasi Georgiev 3c17e51391 vendor: update go-stack to fix sigpanic when debugging with delve
7 years ago
Tobias Schmidt 52ea748248 Merge pull request #3215 from prometheus/grobie/http-accept
7 years ago
Tobias Schmidt 40c278ee2d Send a HTTP Accept header when scraping
7 years ago
Fabian Reinartz 64c7932e85 Merge pull request #3202 from prometheus/beta5
7 years ago
Fabian Reinartz c2166d48bb *: cut v2.0.0-beta.5
7 years ago
Fabian Reinartz 34f0af30cf vendor: update prometheus/tsdb
7 years ago
Fabian Reinartz 254ec433ee Merge branch 'dev-2.0' of github.com:prometheus/prometheus into dev-2.0
7 years ago
Fabian Reinartz 249d69b513 Merge pull request #3186 from prometheus/startweb
7 years ago
Fabian Reinartz 701152d574 vendor: update tsdb revisions to master
7 years ago
Fabian Reinartz 7b02bfee0a web: start web handler while TSDB is starting up
7 years ago
Fabian Reinartz 18078e3fcc Merge pull request #3192 from prometheus/scrapecache
7 years ago
Fabian Reinartz 437f51a85f Fix cache maintenance on changing metric representations
7 years ago
Fabian Reinartz a04be0bc1c vendor: update prometheus/tsdb
7 years ago
Fabian Reinartz d6fbfb49eb Merge pull request #3137 from krasi-georgiev/3083-api-ignores-prefix-option
7 years ago
Krasi Georgiev b4b0999e7f add prefix to the api when prometheus started with custom web.external-url
7 years ago
Goutham Veeramachaneni 6c0070986d Merge pull request #3152 from Gouthamve/go-kit/log
7 years ago
Goutham Veeramachaneni 3f0267c548 Merge branch 'dev-2.0' into go-kit/log
7 years ago
Goutham Veeramachaneni f5aed810f9 logging: Port to common/promlog
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
Fabian Reinartz 1121b9f7d4 retrieval: cache dropped series, mutate labels in place
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
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
Fabian Reinartz 87918f3097 Merge branch 'master' into dev-2.0
7 years ago
Fabian Reinartz c70379e1c7 Merge branch 'dev-2.0' of github.com:prometheus/prometheus into dev-2.0
7 years ago
Johannes 'fish' Ziemke 70f3d1e9f9 k8s: Support discovery of ingresses (#3111)
7 years ago