Commit Graph

4298 Commits (a04be0bc1c85eb2d6774198c37418020115c60d4)
 

Author SHA1 Message Date
Fabian Reinartz a04be0bc1c vendor: update prometheus/tsdb
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
Fabian Reinartz fffe51fb03 Add mutex and block profiling via envvar
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
CuiHaozhi b1c18bf29b discovery openstack: support discovery hosts, add rule option.
7 years ago
Julius Volz aa5cdcb11e Remove extra space in log output
7 years ago
gdmello 35c952e344 Added logging for remote storage adapter (#3106)
7 years ago
Lynn Lin 1bf25dc1b2 fix issues reported by gofmt and spelling typo (#3127)
7 years ago
Matt Bostock 64973f5c65 cmd/prometheus: Fix capitalisation in log line (#3123)
7 years ago
Matt Bostock d31c068ae4 api.go: Fix typo in comment (#3122)
7 years ago
Brian Brazil 78205b76e9 Update Prometheus console template example for 2.0 (#3100)
7 years ago
Richard Hartmann 923be6a418 Merge pull request #3113 from prometheus/RichiH-patch-1
7 years ago
Richard Hartmann aa3fb1e7c4 Point help to docs, not main Prometheus website
7 years ago
Tobias Schmidt 3a4ee617e0 Merge pull request #3062 from cstyan/callum-1553
7 years ago
Tobias Schmidt d6a0f46baf Fix formatting of GitHub issue template
7 years ago
Fabian Reinartz 0c81d5f719 storage: instantiate correct block ranges
7 years ago
Tobias Schmidt 57a9de4a9a Merge pull request #3076 from Colstuwjx/fix/nil-target-group
7 years ago