Julius Volz
0179bbfe03
Fix / -> /graph redirect when using a path prefix.
2015-09-23 12:36:18 +02:00
Fabian Reinartz
cac6eea434
Merge pull request #1105 from prometheus/consulnil
...
Fix nil panic on consul error
2015-09-22 14:55:31 +02:00
Fabian Reinartz
a8126c9be1
Merge pull request #1107 from prometheus/expfmt
...
Update expfmt.NewDecoder usage
2015-09-22 13:22:00 +02:00
Fabian Reinartz
327152862c
Update expfmt.NewDecoder usage
2015-09-22 12:11:28 +02:00
Fabian Reinartz
1ce89a4a0b
Fix nil panic on consul error
2015-09-22 09:04:31 +02:00
Julius Volz
ef176e5a9b
Merge pull request #1102 from mjibson/allow-labelmap
...
Allow labelmap action
2015-09-21 22:11:53 +02:00
Matt Jibson
0e99fa6c46
Allow labelmap action
2015-09-21 15:41:19 -04:00
Björn Rabenstein
cf12e890a6
Merge pull request #1098 from prometheus/fix-direct-access-of-protobuf-fields
...
Fix creation of protobuf fields
2015-09-21 13:40:29 +02:00
Fabian Reinartz
7c0a4961ed
Merge pull request #1097 from prometheus/makefile
...
Add vetting to default make target
2015-09-19 12:40:40 +02:00
Fabian Reinartz
28c2f9e4ff
Fix phony targets and log asset generation
2015-09-19 11:51:40 +02:00
beorn7
ca63c05b4e
Fix creation of protobuf fields
2015-09-18 19:00:53 +02:00
Fabian Reinartz
171f50706a
Fix unkeyed field errors.
2015-09-18 17:00:08 +02:00
Fabian Reinartz
36ec8ba460
Fix missing return on error
2015-09-18 16:50:13 +02:00
Fabian Reinartz
e005f939fd
Fix scalar construction in function
2015-09-18 16:49:32 +02:00
Julius Volz
7ea867b4c9
Add vector() function to CHANGELOG.md.
2015-09-18 13:10:02 +02:00
Julius Volz
4c7c367a4b
Fix date of 0.16.0rc1 release in CHANGELOG.md.
2015-09-18 12:26:56 +02:00
Julius Volz
cb02af5747
Fix trailing space in Makefile.
2015-09-18 12:19:27 +02:00
Julius Volz
678c90ea82
Merge pull request #1096 from prometheus/cut-0.16.0
...
Cut Prometheus 0.16.0rc1.
2015-09-18 12:16:17 +02:00
Julius Volz
7f29ee36dd
Cut Prometheus 0.16.0rc1.
2015-09-18 12:03:57 +02:00
Fabian Reinartz
dbb66d79ab
Fix missing go version in build tags
2015-09-18 10:38:26 +02:00
Fabian Reinartz
ac9554539c
Merge pull request #1092 from prometheus/makefile
...
Native go building
2015-09-18 10:29:57 +02:00
Fabian Reinartz
c8a092ebcc
Add goenv script and fix Docker
2015-09-18 10:28:15 +02:00
Fabian Reinartz
ad64474076
Update Readme for new Makefile
2015-09-17 19:08:05 +02:00
Fabian Reinartz
54147b3ea5
Merge pull request #1094 from prometheus/pkgignore
...
Remove .pkgignore file
2015-09-17 18:46:26 +02:00
Fabian Reinartz
1cc3a0a584
Add newline to vendor.js after upstream fix
2015-09-17 18:31:56 +02:00
Fabian Reinartz
3773ffeed5
Remove .pkgignore file
2015-09-17 18:27:26 +02:00
Fabian Reinartz
92ffeadb7b
Move assets generation to top level make file
2015-09-17 17:53:54 +02:00
Fabian Reinartz
5b3a62f88d
Merge pull request #1093 from prometheus/vendor
...
Upgrade expfmt vendoring
2015-09-17 17:35:41 +02:00
Fabian Reinartz
5127963e93
Replace Makefile with simpler setup
2015-09-17 17:26:36 +02:00
Fabian Reinartz
4876e92014
Upgrade expfmt vendoring
2015-09-17 17:20:08 +02:00
Fabian Reinartz
aef3bb8651
Merge pull request #1091 from prometheus/compress
...
Remove compression from web interface
2015-09-17 17:15:01 +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
d85cee0277
Remove compression from web interface
2015-09-17 16:33:14 +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
