RepoMirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2024-12-26 00:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,218 Commits 243 Branches 444 Tags 653 MiB
5127963e93
Commit Graph

2218 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabian Reinartz
5127963e93 Replace Makefile with simpler setup 2015-09-17 17:26:36 +02:00
Fabian Reinartz
fd26b5b0b3 Merge branch 'master' of github.com:prometheus/prometheus 2015-09-17 17:09:36 +02:00
Fabian Reinartz
568c2c4d99 Bump travis go version 2015-09-17 17:09:01 +02:00
Fabian Reinartz
704d72334c Merge pull request #1090 from prometheus/compress 
Apply HTTP handler compression everywhere
 2015-09-17 15:09:30 +02:00
Fabian Reinartz
f8a25f6af7 Apply HTTP handler compression everywhere 2015-09-17 14:49:50 +02:00
Julius Volz
c42035abff Merge pull request #1089 from prometheus/more-verbose-external-url-help 
Make -web.external-url help string more verbose.
 2015-09-17 11:28:07 +02:00
Julius Volz
24d0d9190e Make -web.external-url help string more verbose. 2015-09-16 20:35:23 +02:00
Julius Volz
681eebfaee Merge pull request #1087 from prometheus/fix-influxdb 
Fix InfluxDB write support to work with InfluxDB 0.9.x.
 2015-09-16 17:40:22 +02:00
Julius Volz
eeb1da36ac Fix InfluxDB write support to work with InfluxDB 0.9.x. 
Because the InfluxDB client library currently pulls in multiple MBs of
unnecessary dependencies, I have modified and cut up the vendored
version to only pull in the few pieces that are actually needed.

On InfluxDB's side, this dependency issue is tracked in:

https://github.com/influxdb/influxdb/issues/3447

Hopefully, it will be resolved soon.

If a password is needed for InfluxDB, it may be supplied via the
INFLUXDB_PW environment variable.
 2015-09-16 17:40:03 +02:00
Julius Volz
5f77fce578 Improve remote storage queue manager metrics. 2015-09-16 17:20:23 +02:00
Fabian Reinartz
eca41f5319 Run gofmt 2015-09-16 14:33:12 +02:00
Fabian Reinartz
9e5b317c0d Move vendor file to new location 2015-09-16 12:03:09 +02:00
Fabian Reinartz
f35382ddfb Merge pull request #1069 from prometheus/vendor 
Vendoring with govendor
 2015-09-15 15:44:57 +02:00
Fabian Reinartz
468d2eb60e Vendoring via govendor 2015-09-15 15:37:12 +02:00
Fabian Reinartz
e88eb9f164 Remove Godeps 2015-09-15 15:35:29 +02:00
Björn Rabenstein
6561897853 Merge pull request #1084 from prometheus/beorn7/storage 
Increase waiting time in TestEvictAndLoadChunkDescs
 2015-09-14 21:23:12 +02:00
beorn7
22d3a4311a Increase waiting time in TestEvictAndLoadChunkDescs 
The test had become flaky with Go1.5.

Theory here is that with Go1.5.x, sleeping for 10ms might not be
enough to wake up another goroutine, possibly because it is used for
GC. 50ms should always be enough due to GC pause guarantees with the
new GC.
 2015-09-14 21:09:46 +02:00
Brian Brazil
fa793d917e Merge pull request #1080 from prometheus/query-timeout-test 
promql: Bump sleep in query timeout test
 2015-09-14 13:00:47 +01:00
Brian Brazil
ce7f31e03c promql: Bump sleep in query timeout test 
This test is flaky, I'm presuming the time.AfterFunc
call is being delayed so the evaluation isn't getting
cancelled.
 2015-09-14 11:49:18 +01:00
Julius Volz
347630431c Merge pull request #1077 from prometheus/cleanups 
Fix some dead code, missing error checks, shadowings.
 2015-09-14 12:37:26 +02:00
Julius Volz
af513468eb Fix some dead code, missing error checks, shadowings. 
I applied
https://medium.com/@jgautheron/quality-pipeline-for-go-projects-497e34d6567
and was greeted with a deluge of warnings, most of which were not
applicable or really fixable realistically. These are some of the first
ones I decided to fix.
 2015-09-14 12:21:34 +02:00
Brian Brazil
29de4ee2b0 Merge pull request #1078 from prometheus/whats-our-vector-victor 
Remove optional vector() 2nd argument
 2015-09-13 14:14:20 +01:00
Brian Brazil
9b382647b5 Remove optional vector() 2nd argument 2015-09-13 09:13:22 +01:00
Fabian Reinartz
896928ad00 Fix redirect path 2015-09-12 09:02:34 +02:00
Fabian Reinartz
d7b21f2fdb Merge pull request #1039 from prometheus/startpage 
Change UI start page
 2015-09-12 08:44:54 +02:00
Fabian Reinartz
87b1d47e2b Change UI start page 2015-09-12 08:40:46 +02:00
Fabian Reinartz
a1617d90f4 Merge pull request #1073 from prometheus/whats-our-vector-victor 
promql: Add vector function.
 2015-09-12 08:36:13 +02:00
Fabian Reinartz
bae9816834 Merge branch 'master' of github.com:prometheus/prometheus 2015-09-11 21:11:43 +02:00
Fabian Reinartz
b2c6378aae Fix go1.5 compile flag warnings 2015-09-11 21:11:22 +02:00
Julius Volz
af58d784fd Merge pull request #1076 from prometheus/remove-config-change-notice 
Remove notice about 0.14.x config file format change.
 2015-09-11 17:36:52 +02:00
Julius Volz
d73c8a4f0b Remove notice about 0.14.x config file format change. 2015-09-11 16:43:04 +02:00
Björn Rabenstein
2c3c1ba69f Merge pull request #1075 from prometheus/beorn7/storage 
Fix DropMetricsForFingerprints
 2015-09-11 16:06:41 +02:00
beorn7
daeccdd0e9 Fix DropMetricsForFingerprints 
It now deletes the series file also for archived series.

Also, fix a naming error in a doc comment.
 2015-09-11 15:47:23 +02:00
Julius Volz
e7c1db42f3 Merge pull request #1072 from fabric8io/kubernetes-discovery 
Clean up kubernetes http response bodies
 2015-09-11 14:47:01 +02:00
Brian Brazil
69f5fa0c1e promql: Add vector function. 
Currently the only way to convert a scalar to a vector is to
use absent(), which isn't very clean. This adds a vector()
function that's the inverse of scalar() and lets your optionally
set labels.

Example usage would be
vector(time() % 86400) < 3600
to filter to only the first hour of the day.
 2015-09-11 12:09:34 +01:00
Jimmi Dyson
7ef9399920 Clean up kubernetes http response bodies 2015-09-11 11:44:28 +01:00
Fabian Reinartz
d6ed1df4fb Merge pull request #1070 from amorken/forgotten-close 
Close HTTP connections on HTTP errors too.
 2015-09-11 00:30:54 +02:00
Anders Daljord Morken
9fb65a91af Close HTTP connections on HTTP errors too. 
Move defer resp.Body.Close() up to make sure it's called even when the
HTTP request returns something other than 200 or Decoder construction
fails. This avoids leaking and eventually running out of file descriptors.
 2015-09-10 22:41:05 +02:00
Fabian Reinartz
66f376f75a Merge pull request #1068 from prometheus/go1.5.1 
Use go1.5.1
 2015-09-10 12:19:33 +02:00
Fabian Reinartz
8456b7e12f Use go1.5.1 2015-09-10 12:11:44 +02:00
Julius Volz
6e393807c3 Merge pull request #1066 from prometheus/fix-bool 
Fix bool modifier in recording rules and printing.
 2015-09-10 12:03:11 +02:00
Julius Volz
6d3e054692 Fix bool modifier in recording rules and printing. 
Fixes https://github.com/prometheus/prometheus/issues/1065
 2015-09-10 01:37:05 +02:00
Julius Volz
9a70ee752e Merge pull request #1063 from fabric8io/kubernetes-discovery 
Kubernetes SD config check
 2015-09-09 15:28:27 +02:00
Jimmi Dyson
ec04ba38a2 Kubernetes SD config check 2015-09-09 13:24:44 +01:00
Fabian Reinartz
58c32f84ce Merge pull request #1055 from fabric8io/kubernetes-discovery 
Move TLS options to scrape config
 2015-09-09 11:24:29 +02:00
Jimmi Dyson
a1574aa2b3 Move TLS options to scrape config 
Fixes #1013, fixes #989
 2015-09-09 09:52:21 +01:00
Julius Volz
ffc5142c54 Merge pull request #1058 from prometheus/check-errors 
Fix error checking and logging around checkpointing.
 2015-09-07 19:57:16 +02:00
Julius Volz
6774a73878 Fix error checking and logging around checkpointing. 2015-09-07 19:34:59 +02:00
Julius Volz
011faf9057 Fix typo in comment. 2015-09-07 19:15:28 +02:00
Fabian Reinartz
09c353c272 Change mail address 2015-09-07 15:12:42 +02:00