mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-10 23:54:05 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
4313 commits 246 branches 436 tags 652 MiB
Commit graph

4313 commits

This branch
This branch
All branches
Author SHA1 Message Date
Goutham Veeramachaneni d70f850a18
web/api: Fix typo which broke the 2.0 admin APIs. 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-10-04 17:02:32 +05:30
Fabian Reinartz c4270fdbf4 Merge pull request #3229 from krasi-georgiev/update-go-stack 
vendor: update go-stack to fix sigpanic when debugging with delve
 2017-10-02 16:57:04 +02:00
Krasi Georgiev 3c17e51391 vendor: update go-stack to fix sigpanic when debugging with delve 
Signed-off-by: Krasi Georgiev <krasi.root@gmail.com>
 2017-09-29 15:04:58 +03:00
Tobias Schmidt 52ea748248 Merge pull request #3215 from prometheus/grobie/http-accept 
Send a HTTP Accept header when scraping
 2017-09-25 15:18:31 +02:00
Tobias Schmidt 40c278ee2d Send a HTTP Accept header when scraping 2017-09-25 14:51:29 +02:00
Fabian Reinartz 64c7932e85 Merge pull request #3202 from prometheus/beta5 
*: release v2.0.0-beta.5
 2017-09-21 18:20:29 +02:00
Fabian Reinartz c2166d48bb *: cut v2.0.0-beta.5 2017-09-21 16:18:49 +02:00
Fabian Reinartz 34f0af30cf vendor: update prometheus/tsdb 2017-09-21 15:27:21 +02:00
Fabian Reinartz 254ec433ee Merge branch 'dev-2.0' of github.com:prometheus/prometheus into dev-2.0 2017-09-21 09:55:17 +02:00
Fabian Reinartz 249d69b513 Merge pull request #3186 from prometheus/startweb 
web: start web handler while TSDB is starting up
 2017-09-21 09:53:03 +02:00
Fabian Reinartz 701152d574 vendor: update tsdb revisions to master 2017-09-20 15:15:42 +02:00
Fabian Reinartz 7b02bfee0a web: start web handler while TSDB is starting up 2017-09-20 15:03:19 +02:00
Fabian Reinartz 18078e3fcc Merge pull request #3192 from prometheus/scrapecache 
Fix cache maintenance on changing metric representations
 2017-09-20 15:00:27 +02:00
Fabian Reinartz 437f51a85f Fix cache maintenance on changing metric representations 
We were not properly maintaining the scrape cache when the same metric
was exposed with a different string representation.
This overall reduces the scraping cache's complexity, which fixes the
issue and saves about 10% of memory in a scraping-only Prometheus
instance.
 2017-09-19 15:03:27 +02:00
Fabian Reinartz a04be0bc1c vendor: update prometheus/tsdb 2017-09-19 14:31:15 +02:00
Fabian Reinartz d6fbfb49eb Merge pull request #3137 from krasi-georgiev/3083-api-ignores-prefix-option 
fixes #3083 - api ignores prefix option - when binary started with custom web.external-url
 2017-09-18 18:10:50 +02:00
Krasi Georgiev b4b0999e7f add prefix to the api when prometheus started with custom web.external-url 
Signed-off-by: Krasi Georgiev <krasi.root@gmail.com>
 2017-09-18 17:59:27 +03:00
Goutham Veeramachaneni 6c0070986d Merge pull request #3152 from Gouthamve/go-kit/log 
Move logging to go-kit logger
 2017-09-18 16:35:44 +05:30
Goutham Veeramachaneni 3f0267c548 Merge branch 'dev-2.0' into go-kit/log 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-09-15 23:15:27 +05:30
Goutham Veeramachaneni f5aed810f9 logging: Port to common/promlog 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-09-15 12:40:50 +05:30
Fabian Reinartz 1b80f631a8 Merge pull request #3172 from prometheus/cutbeta4 
*: cut 2.0.0-beta.4
 2017-09-14 13:20:26 +02:00
Fabian Reinartz a31e6522e4 *: cut 2.0.0-beta.4 2017-09-14 12:46:49 +02:00
Fabian Reinartz 1121b9f7d4 retrieval: cache dropped series, mutate labels in place 2017-09-14 08:36:19 +02:00
Fabian Reinartz 13f59329ab Merge pull request #3162 from prometheus/cutbeta3 
*: cut 2.0.0-beta.3
 2017-09-12 12:13:16 +02:00
Fabian Reinartz 7f300f27cb *: cut 2.0.0-beta.3 2017-09-12 12:13:31 +02:00
Fabian Reinartz 2b2e214857 vendor: update prometheus/tsdb 2017-09-12 12:01:54 +02:00
Fabian Reinartz 63c246f924 Merge branch 'dev-2.0' of github.com:prometheus/prometheus into dev-2.0 2017-09-12 12:01:09 +02:00
Fabian Reinartz e746282772 Merge branch 'master' into dev-2.0 2017-09-11 10:55:19 +02:00
Fabian Reinartz e6d819952b Merge pull request #3145 from prometheus/mempool 
Use memory pools for scrape buffer
 2017-09-11 10:23:19 +02:00
Tobias Schmidt 8bee283f8a Merge pull request #2895 from jamiemoore/ec2_discovery_rolearn 
Add the ability to assume a role for ec2 discovery
 2017-09-09 19:20:47 +02:00
Jamie Moore 7a135e0a1b Add the ability to assume a role for ec2 discovery 2017-09-10 00:36:43 +10:00
Fabian Reinartz d21f149745 *: migrate to go-kit/log 2017-09-08 22:01:51 +05:30
Fabian Reinartz 9b4c3d4254 Merge pull request #3146 from prometheus/fixprofpath 
web: fix profile paths
 2017-09-08 14:19:46 +02:00
Fabian Reinartz 64c7c56df8 Merge pull request #3147 from dvrkps/patch-1 
travis: add 1.x to go versions
 2017-09-08 09:36:14 +02:00
Davor Kapsa bb853abf24 travis: add 1.x to go versions 2017-09-07 17:24:02 +02:00
Fabian Reinartz 27bdddbf51 web: fix profile paths 2017-09-07 16:24:12 +02:00
Fabian Reinartz 5bed8af4cb retrieval: pool scrape buffers 
This adds a bucketed buffer pool to the scrapers so we don't have to
allocate a new buffer on each scrape or hold it fixed to the scrape
loop.

The latter can consume significant amounts of unused memory, e.g. 4GB
when scraping 2MB /metrics from 2000 targets.
 2017-09-07 14:43:21 +02:00
Fabian Reinartz d6f6ad67b3 pkg/pool: create bucketed memory pool package. 2017-09-07 14:34:05 +02:00
Fabian Reinartz a8887f46dc Merge branch 'dev-2.0' of github.com:prometheus/prometheus into dev-2.0 2017-09-07 14:15:12 +02:00
Fabian Reinartz 0efecea6d4 Adapt storage APIs to uint64 references 2017-09-07 14:14:41 +02:00
Fabian Reinartz a007eb2e1e vendor: update prometheus/tsdb to single head mode 2017-09-07 14:14:33 +02:00
Fabian Reinartz 6ab652e3dc Merge pull request #3144 from wgliang/master 
should use time.Since instead of time.Now().Sub
 2017-09-07 13:51:46 +02:00
Fabian Reinartz a0280cc489 Merge pull request #3142 from prometheus/fish/fix-k8s-ingress-type 
k8s: Use versioned struct for ingress discovery
 2017-09-07 13:51:20 +02:00
wangguoliang 7e6c6020ff should use time.Since instead of time.Now().Sub 
Signed-off-by: wgliang <liangcszzu@163.com>
 2017-09-07 18:00:45 +08:00
Johannes 'fish' Ziemke 75aec7d970 k8s: Use versioned struct for ingress discovery 2017-09-06 12:47:03 +02:00
Krasi Georgiev 153cb0cbe3 scraping errors will show in the log when debug mode is enabled (#3135) 
Signed-off-by: Krasi Georgiev <krasi.root@gmail.com>
 2017-09-05 11:55:14 +01:00
Fabian Reinartz 87918f3097 Merge branch 'master' into dev-2.0 2017-09-04 14:09:21 +02:00
Fabian Reinartz c70379e1c7 Merge branch 'dev-2.0' of github.com:prometheus/prometheus into dev-2.0 2017-09-04 13:10:50 +02:00
Johannes 'fish' Ziemke 70f3d1e9f9 k8s: Support discovery of ingresses (#3111) 
* k8s: Support discovery of ingresses

* Move additional labels below allocation

This makes it more obvious why the additional elements are allocated.
Also fix allocation for node where we only set a single label.

* k8s: Remove port from ingress discovery

* k8s: Add comment to ingress discovery example
 2017-09-04 13:10:44 +02:00
Fabian Reinartz fffe51fb03 Add mutex and block profiling via envvar 2017-09-04 13:10:32 +02:00